Fixing bugs.

Author: krulis-martin

src/components/Exercises/ExercisesListItem/ExercisesListItem.js

@@ -147,7 +147,7 @@ const ExercisesListItem = ({
             </OverlayTrigger>
           </Link>
         )}
-        {permissionHints.viewPipelines && permissionHints.viewScoreConfig && (
+        {permissionHints.viewConfig && permissionHints.viewScoreConfig && (
           <Link to={EXERCISE_EDIT_CONFIG_URI_FACTORY(id)}>
             <OverlayTrigger
               placement="bottom"

src/components/Pipelines/PipelineExercisesList/PipelineExercisesList.js

@@ -62,28 +62,30 @@ const PipelineExercisesList = ({
     fullView || pipelineExercises.size < COLLAPSE_LIMIT ? 1000000 : PREVIEW_SIZE
   );
   return (
-    <Table hover className="mb-1" size="xs">
-      <thead>
-        <tr>
-          <th className="pl-4">
-            <FormattedMessage id="generic.name" defaultMessage="Name" />
-          </th>
-          <th>
-            <FormattedMessage id="generic.author" defaultMessage="Author" />
-          </th>
-          <th className="shrink-col text-nowrap">
-            {pipelineExercises.size > 5 && (
-              <small className="text-muted">
-                <FormattedMessage
-                  id="app.pipelineExercisessList.totalCount"
-                  defaultMessage="Total exercises: {count}"
-                  values={{ count: pipelineExercises.size }}
-                />
-              </small>
-            )}
-          </th>
-        </tr>
-      </thead>
+    <Table hover={pipelineExercises.size > 0} className="mb-1" size="xs">
+      {pipelineExercises.size > 0 && (
+        <thead>
+          <tr>
+            <th className="pl-4">
+              <FormattedMessage id="generic.name" defaultMessage="Name" />
+            </th>
+            <th>
+              <FormattedMessage id="generic.author" defaultMessage="Author" />
+            </th>
+            <th className="shrink-col text-nowrap">
+              {pipelineExercises.size > 5 && (
+                <small className="text-muted">
+                  <FormattedMessage
+                    id="app.pipelineExercisessList.totalCount"
+                    defaultMessage="Total exercises: {count}"
+                    values={{ count: pipelineExercises.size }}
+                  />
+                </small>
+              )}
+            </th>
+          </tr>
+        </thead>
+      )}
 
       <tbody>
         {exercises.map(exercise => (
@@ -133,12 +135,12 @@ const PipelineExercisesList = ({
           </tr>
         ))}
 
-        {exercises.length === 0 && (
+        {pipelineExercises.size === 0 && (
           <tr>
-            <td className="text-center" colSpan={3}>
+            <td className="text-center text-muted" colSpan={3}>
               <FormattedMessage
                 id="app.pipelineExercisessList.empty"
-                defaultMessage="There are no exercises using this pipelines at the moment."
+                defaultMessage="There are no exercises using this pipeline at the moment."
               />
             </td>
           </tr>

src/containers/DeletePipelineButtonContainer/DeletePipelineButtonContainer.js

@@ -28,8 +28,10 @@ export default connect(
   }),
   (dispatch, { id, onDeleted }) => ({
     deletePipeline: () => {
-      onDeleted && onDeleted();
-      return dispatch(deletePipeline(id));
+      return dispatch(deletePipeline(id)).then(res => {
+        onDeleted && onDeleted();
+        return res;
+      });
     },
   })
 )(DeletePipelineButtonContainer);

src/helpers/pipelines.js

@@ -81,7 +81,7 @@ export const getVariablesUtilization = defaultMemoize(boxes => {
   boxes.forEach(box =>
     ['portsIn', 'portsOut'].forEach(ports =>
       Object.keys(box[ports])
-        .filter(port => box[ports][port])
+        .filter(port => box[ports][port] && box[ports][port].value)
         .forEach(port => {
           const { value } = box[ports][port];
           if (!utils[value]) {

src/locales/en.json

@@ -1137,7 +1137,7 @@
   "app.pipelineEditContainer.versionChanged": "The pipeline structure was updated whilst you were editing it. If you load the new pipeline, it will be pushed as a new state in editor (you can use undo button to revert it).",
   "app.pipelineEditContainer.versionChangedTitle": "The pipeline was updated",
   "app.pipelineExercisessList.collapse": "Collapse the list and show only short preview.",
-  "app.pipelineExercisessList.empty": "There are no exercises using this pipelines at the moment.",
+  "app.pipelineExercisessList.empty": "There are no exercises using this pipeline at the moment.",
   "app.pipelineExercisessList.expand": "Expand the list and show all {count} exercises.",
   "app.pipelineExercisessList.totalCount": "Total exercises: {count}",
   "app.pipelineFilesTable.description": "Supplementary files are files which can be referenced as remote file in pipeline configuration.",

src/pages/EditExercise/EditExercise.js

@@ -101,7 +101,7 @@ class EditExercise extends Component {
               <ExerciseNavigation
                 exerciseId={exercise.id}
                 canEdit={hasPermissions(exercise, 'update')}
-                canViewTests={hasPermissions(exercise, 'viewPipelines', 'viewScoreConfig')}
+                canViewTests={hasPermissions(exercise, 'viewConfig', 'viewScoreConfig')}
                 canViewLimits={hasPermissions(exercise, 'viewLimits')}
                 canViewAssignments={hasPermissions(exercise, 'viewAssignments')}
               />

src/pages/EditExerciseConfig/EditExerciseConfig.js

@@ -288,7 +288,7 @@ class EditExerciseConfig extends Component {
             <ExerciseNavigation
               exerciseId={exercise.id}
               canEdit={hasPermissions(exercise, 'update')}
-              canViewTests={hasPermissions(exercise, 'viewPipelines', 'viewScoreConfig')}
+              canViewTests={hasPermissions(exercise, 'viewConfig', 'viewScoreConfig')}
               canViewLimits={hasPermissions(exercise, 'viewLimits')}
               canViewAssignments={hasPermissions(exercise, 'viewAssignments')}
             />

src/pages/EditExerciseLimits/EditExerciseLimits.js

@@ -157,7 +157,7 @@ class EditExerciseLimits extends Component {
             <ExerciseNavigation
               exerciseId={exercise.id}
               canEdit={hasPermissions(exercise, 'update')}
-              canViewTests={hasPermissions(exercise, 'viewPipelines', 'viewScoreConfig')}
+              canViewTests={hasPermissions(exercise, 'viewConfig', 'viewScoreConfig')}
               canViewLimits={hasPermissions(exercise, 'viewLimits')}
               canViewAssignments={hasPermissions(exercise, 'viewAssignments')}
             />

src/pages/Exercise/Exercise.js

@@ -129,7 +129,7 @@ class Exercise extends Component {
             <ExerciseNavigation
               exerciseId={exercise.id}
               canEdit={hasPermissions(exercise, 'update')}
-              canViewTests={hasPermissions(exercise, 'viewPipelines', 'viewScoreConfig')}
+              canViewTests={hasPermissions(exercise, 'viewConfig', 'viewScoreConfig')}
               canViewLimits={hasPermissions(exercise, 'viewLimits')}
               canViewAssignments={hasPermissions(exercise, 'viewAssignments')}
             />

src/pages/ExerciseAssignments/ExerciseAssignments.js

@@ -131,7 +131,7 @@ class ExerciseAssignments extends Component {
             <ExerciseNavigation
               exerciseId={exercise.id}
               canEdit={hasPermissions(exercise, 'update')}
-              canViewTests={hasPermissions(exercise, 'viewPipelines', 'viewScoreConfig')}
+              canViewTests={hasPermissions(exercise, 'viewConfig', 'viewScoreConfig')}
               canViewLimits={hasPermissions(exercise, 'viewLimits')}
               canViewAssignments={hasPermissions(exercise, 'viewAssignments')}
             />