Pull request #653: Integration/maker checker workflow

Merge in WALTZ/waltz from integration/maker-checker-workflow to db-feature/waltz-7440-propose-flow-enhancements-and-bug-fixes

* commit '597ed657338774e637c365850af5a4610b0a9b9e':
  minor refactor for code readability
  removed lock from initiateAction and added reset store for propose delete
  incorporated review comments
  minor refactor
  modification of code readability
  small refactor
  small refactor
  added negative integration test case
  small refactor
  added positive integration test case for propose flow actions
  fixed disable button for existing flow in create,edit and delete propose flow
  minor style change to fix the column header while scrolling
  minor refactor
  revert previous change
  minor refactor for changing header of help panel on create propose flow screen
  sort data based on last updated for historical tab
  modified basis offset format on approve/reject screen
  removed restore button on logical flow screen when maker checker enabled

Author: khushi-jain-db

waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/ProposedFlowWorkflowServiceTest.java

@@ -65,7 +65,7 @@
 
 <div class="row">
     <div class="col-sm-12">
-        <div class={_.size(rowData) > 6 ? "waltz-scroll-region-300" : ""}>
+        <div class={_.size(rowData) > 6 ? "waltz-scroll-region-300" : ""} style="padding: 0">
             <table class="table table-condensed table-hover small fixed-table">
                 <colgroup>
                     {#each columnDefs as col}
@@ -119,4 +119,11 @@
     .searching {
         color: deepskyblue;
     }
+
+    thead th {
+        position: sticky;
+        top: 0;
+        background-color: white;
+        z-index: 1;
+    }
 </style>

waltz-ng/client/common/svelte/GridWithCellRenderer.svelte

@@ -52,6 +52,16 @@
     $: logicalFlowCall = targetLogicalFlowId ? logicalFlowStore.getById(targetLogicalFlowId) : null;
     $: $logicalFlow = logicalFlowCall ? $logicalFlowCall.data : null;
 
+    $: $logicalFlow || $physicalFlow || $physicalSpecification ||$dataTypes, resetDuplicateState();
+
+    function resetDuplicateState() {
+        if ($duplicateProposeFlowMessage) {
+            $duplicateProposeFlowMessage = null;
+            $existingProposeFlowId = null;
+        }
+    }
+
+
     function goToWorkflow(proposedFlowId) {
         $pageInfo = {
             state: "main.proposed-flow.view",
@@ -138,7 +148,7 @@
 
                 <span>
                 <button class="btn btn-success"
-                        disabled={incompleteRecord || commandLaunched}
+                        disabled={incompleteRecord || commandLaunched || $duplicateProposeFlowMessage}
                         on:click={() => launchCommand()}>
                     Propose
                 </button>

waltz-ng/client/data-flow/components/svelte/propose-data-flow/ProposeDataFlowView.svelte

@@ -145,6 +145,7 @@ $: filteredGridData = gridData
         .filter(d => ($filters.state.length === 0) || $filters.state.includes(d.workflowState.state))
         .filter(d => ($filters.change.length === 0) || $filters.change.includes(d.flowDef.proposalType))
         .filter(d => ($filters.proposer.length === 0) || $filters.proposer.includes(d.createdBy === userName ? "USER" : "OTHERS"))
+        .sort((a, b) => new Date(b.workflowState.lastUpdatedAt) - new Date(a.workflowState.lastUpdatedAt))
         .sort((a, b) => $filters.state.indexOf(a.workflowState.state) - $filters.state.indexOf(b.workflowState.state))
         .sort((a, b) => $filters.change.indexOf(a.flowDef.proposalType) - $filters.change.indexOf(b.flowDef.proposalType))
         .sort((a, b) => $filters.proposer.indexOf(a.createdBy === userName ? "USER" : "OTHERS")

waltz-ng/client/data-flow/components/svelte/user-dashboard/ProposedFlowSection.svelte

@@ -54,6 +54,9 @@
 
     function cancel() {
         cancelProposeDeleteFlow(false);
+        $deleteFlowReason = null;
+        $duplicateProposeFlowMessage = null;
+        $existingProposeFlowId = null;
     }
 
     $: ratingSchemeCall = ratingSchemeStore.loadAll();
@@ -124,7 +127,7 @@
             {/if}
             <div style="display: flex; justify-content: flex-end;margin: 0;gap: 0.5rem">
                 <button class="btn btn-sm btn-primary"
-                        disabled={!workingCopy?.rating?.length}>
+                        disabled={!workingCopy?.rating?.length || $existingProposeFlowId}>
                     Submit
                 </button>
                 <button type="button" class="btn btn-sm" on:click={cancel}>

waltz-ng/client/data-types/components/usage-panel/ReasonSelection.svelte

@@ -84,9 +84,8 @@
                         Save
                     </a>
                     <a ng-if="$ctrl.dataFlowProposalsEnabled"
-                       ng-click="$ctrl.onSavePropose()"
-                       class="clickable"
-                       ng-disabled="!($ctrl.isDirty && $ctrl.isReasonSelected)">
+                       ng-click="!$ctrl.isProposeDisabled && $ctrl.isDirty && $ctrl.isReasonSelected && $ctrl.onSavePropose()"                       class="clickable"
+                       ng-disabled="$ctrl.isProposeDisabled || !($ctrl.isDirty && $ctrl.isReasonSelected)">
                         Propose Edit
                     </a>
                     |

waltz-ng/client/data-types/components/usage-panel/data-type-usage-panel-propose-flow.html

@@ -54,7 +54,8 @@ const initialState = {
     isReasonSelected:false,
     proposalType:PROPOSAL_TYPES.EDIT,
     duplicateProposeFlowMessage,
-    existingProposeFlowId
+    existingProposeFlowId,
+    isProposeDisabled:false
 };
 
 
@@ -79,6 +80,10 @@ function controller(serviceBroker, userService, $q) {
 
             });
 
+        existingProposeFlowId.subscribe((value)=>{
+            vm.isProposeDisabled = !_.isNil(value);
+        })
+
 
         const decoratedRef = vm.parentEntityRef
             ? vm.parentEntityRef
@@ -104,6 +109,9 @@ function controller(serviceBroker, userService, $q) {
 
     vm.onHideEdit = () => {
         vm.visibility.editor = false;
+        editDataTypeReason.set(null);
+        duplicateProposeFlowMessage.set(null);
+        existingProposeFlowId.set(null);
     };
 
     editDataTypeReason.subscribe(value => {

waltz-ng/client/data-types/components/usage-panel/data-type-usage-panel-propose-flow.js

@@ -52,7 +52,7 @@
 
     <div class="waltz-page-summary waltz-page-summary-attach">
         <waltz-section-actions>
-            <button ng-if="ctrl.canRestore"
+            <button ng-if="!ctrl.dataFlowProposalsEnabled && ctrl.canRestore"
                     class="btn btn-xs btn-primary"
                     uib-popover="Restore this flow, any physical flows that were active when this logical flow was removed will also be restored"
                     popover-append-to-body="true"

waltz-ng/client/logical-flow/pages/view/logical-flow-view.html

@@ -26,6 +26,7 @@ import _ from "lodash";
 import {displayError} from "../../../common/error-utils";
 import AlignedDataTypesList from "../../components/aligned-data-types-list/AlignedDataTypesList.svelte";
 import {copyTextToClipboard} from "../../../common/browser-utils";
+import {isDataFlowProposalsEnabled} from "../../../common/utils/settings-util";
 
 
 const initialState = {
@@ -38,8 +39,7 @@ const initialState = {
     updateCommand: {
         readOnly: false,
     },
-    AlignedDataTypesList,
-    dataFlowProposalsRatingSchemeSetting:null
+    AlignedDataTypesList
 };
 
 function controller($q,
@@ -53,7 +53,6 @@ function controller($q,
 
     vm.$onInit = () => {
         const flowId = $stateParams.id;
-        const DATAFLOW_PROPOSAL_SETTING_NAME="feature.data-flow-proposals.enabled";
 
         vm.entityReference = {
             id: flowId,
@@ -98,8 +97,7 @@ function controller($q,
             .loadViewData(CORE_API.SettingsStore.findAll, [])
             .then(r => {
                 let settings = r.data;
-                vm.dataFlowProposalsEnabled= settings
-                    .filter(t => t.name === DATAFLOW_PROPOSAL_SETTING_NAME)[0].value === "true";
+                vm.dataFlowProposalsEnabled = isDataFlowProposalsEnabled(settings)
             });
 
     };

waltz-ng/client/logical-flow/pages/view/logical-flow-view.js

@@ -2,8 +2,10 @@
     import EntityLink from "../../common/svelte/EntityLink.svelte";
     import Icon from "../../common/svelte/Icon.svelte";
     import { safe,STATES } from "../utils";
+    import toBasisOffsetFilter from "../../common/filters/to-basis-offset-filter";
 
     export let proposedFlow = {};
+    const toBasisOffsetFilterFn = toBasisOffsetFilter();
 
     $: flowDef = proposedFlow?.flowDef || {};
 
@@ -29,7 +31,7 @@
             }:null,
             value: safe(flowDef?.flowAttributes?.name) || safe(flowDef?.specification?.name)
         },
-        { key: "Basis Offset", value: safe(flowDef?.flowAttributes?.basisOffset) },
+        { key: "Basis Offset", value: toBasisOffsetFilterFn(safe(flowDef?.flowAttributes?.basisOffset)) },
         { key: "Criticality", value: safe(flowDef?.flowAttributes?.criticality) },
         { key: "Transport", value: safe(flowDef?.flowAttributes?.transport) },
         { key: "Frequency", value: safe(flowDef?.flowAttributes?.frequency) },