Merge pull request #108 from boomerang-io/fix-243-parametersDescripti…

…onColumn fix: add description column to output params table
boomerang-io · Nov 17, 2021 · cf952a4 · cf952a4
2 parents c83a955 + ba70233
commit cf952a4
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/src/ApiServer/fixtures/workflowExecution.js b/src/ApiServer/fixtures/workflowExecution.js
@@ -90,9 +90,19 @@ const workflowExecution = {
         },
         {
           name: "test",
-          description: "Test description",
+          description: null,
           value: "Testing value",
         },
+        {
+          name: "test again",
+          description: "Test description",
+          value: null,
+        },
+        {
+          name: "test one more result",
+          description: null,
+          value: null,
+        },
       ],
     },
     {

diff --git a/src/Components/CreateWorkflow/__snapshots__/CreateWorkflow.spec.js.snap b/src/Components/CreateWorkflow/__snapshots__/CreateWorkflow.spec.js.snap
@@ -43,10 +43,11 @@ exports[`CreateWorkflow --- Snapshot Test Capturing Snapshot of CreateWorkflow 1
     class="bx--bmrg-modal-portal"
   >
     <div
-      class="bx--bmrg-modal-overlay --is-open"
+      class="bx--bmrg-modal-overlay"
     >
       <div
-        class="bx--bmrg-modal-container bx--bmrg-modal-composed-container bx--modal-container modal-container-fix-width modalContainer --is-open"
+        aria-modal="true"
+        class="bx--bmrg-modal-container bx--bmrg-modal-composed-container bx--modal-container modal-container-fix-width modalContainer"
         role="dialog"
         tabindex="-1"
       >

diff --git a/src/Components/PreviewConfig/__snapshots__/PreviewConfig.spec.js.snap b/src/Components/PreviewConfig/__snapshots__/PreviewConfig.spec.js.snap
@@ -45,10 +45,11 @@ exports[`PreviewConfig --- Snapshot Capturing Snapshot of Task Templates 1`] = `
     class="bx--bmrg-modal-portal"
   >
     <div
-      class="bx--bmrg-modal-overlay --is-open"
+      class="bx--bmrg-modal-overlay"
     >
       <div
-        class="bx--bmrg-modal-container bx--bmrg-modal-composed-container bx--modal-container modal-container-fix-width --is-open"
+        aria-modal="true"
+        class="bx--bmrg-modal-container bx--bmrg-modal-composed-container bx--modal-container modal-container-fix-width"
         role="dialog"
         tabindex="-1"
       >

diff --git a/src/Components/WorkflowCard/UpdateWorkflow/__snapshots__/UpdateWorkflow.spec.js.snap b/src/Components/WorkflowCard/UpdateWorkflow/__snapshots__/UpdateWorkflow.spec.js.snap
@@ -20,10 +20,11 @@ exports[`ImportWorkflow --- Snapshot Test Capturing Snapshot of ImportWorkflow 1
     class="bx--bmrg-modal-portal"
   >
     <div
-      class="bx--bmrg-modal-overlay --is-open"
+      class="bx--bmrg-modal-overlay"
     >
       <div
-        class="bx--bmrg-modal-container bx--bmrg-modal-flow-container bx--modal-container modal-container-fix-width container --is-open"
+        aria-modal="true"
+        class="bx--bmrg-modal-container bx--bmrg-modal-flow-container bx--modal-container modal-container-fix-width container"
         role="dialog"
         tabindex="-1"
       >

diff --git a/...ures/Execution/Main/ExecutionTaskLog/TaskItem/OutputPropertiesLog/OutputPropertiesLog.tsx b/...ures/Execution/Main/ExecutionTaskLog/TaskItem/OutputPropertiesLog/OutputPropertiesLog.tsx
@@ -13,14 +13,15 @@ type Props = {
 };
 
 function OutputPropertiesLog({ flowTaskName, flowTaskOutputs, isOutput }: Props) {
-  let arrayProps: { id: string; key: string; value: string }[] = [];
+  let arrayProps: { id: string; key: string; value: string; description?: string }[] = [];
   if (Array.isArray(flowTaskOutputs)) {
     flowTaskOutputs.forEach(
       (val: { name: string; description: string; value: string }, index: number) =>
         (arrayProps = arrayProps.concat({
           id: `${val.name}-${index}`,
           key: val.name,
-          value: `${val.description}${val.value ? " - " + val.value : ""}`,
+          description: val.description ? val.description : "---",
+          value: val.value ? val.value : "---",
         }))
     );
   } else {

diff --git a/...on/Main/ExecutionTaskLog/TaskItem/OutputPropertiesLog/PropertiesTable/PropertiesTable.tsx b/...on/Main/ExecutionTaskLog/TaskItem/OutputPropertiesLog/PropertiesTable/PropertiesTable.tsx
@@ -41,13 +41,15 @@ function PropertiesTable({ data: properties, hasJsonValues = false }: Props) {
           <StructuredListHead>
             <StructuredListRow head>
               <StructuredListCell head>Parameter</StructuredListCell>
+              {!hasJsonValues && <StructuredListCell head>Description</StructuredListCell>}
               <StructuredListCell head>Value</StructuredListCell>
             </StructuredListRow>
           </StructuredListHead>
           <StructuredListBody>
-            {Array.isArray(properties) && properties.map((property: {key: string; value: string;}, i: number) => (
+            {Array.isArray(properties) && properties.map((property: {key: string; value: string; description?: string;}, i: number) => (
               <StructuredListRow key={`row-${i}`}>
                 <StructuredListCell>{property.key}</StructuredListCell>
+                {!hasJsonValues && <StructuredListCell>{property?.description ?? "---"}</StructuredListCell>}
                 <StructuredListCell>
                   {<code className={styles.code}>{formatPropertyValue(property.value)}</code>}
                 </StructuredListCell>