Pull request #352: Prevent non-concree data types from being removed where there is an underlying physical flow

Merge in WALTZ/waltz from WALTZ/waltz-jws:CTCTOWALTZ-3054-removal-of-non-concrete-data-types-6998 to db-feature/waltz-6998-prevent-dts-with-phys-flows-beng-removed

* commit 'c63ec9d93d53cebfff46e83e175e1d4a86ee5efb':
  Prevent non-concree data types from being removed where there is an underlying physical flow

Author: jessica-woodland-scott

waltz-ng/client/data-types/components/usage-selector/data-type-usage-selector.js

@@ -112,6 +112,8 @@ function controller($q, serviceBroker) {
         vm.visibleDataTypes = vm.showAllDataTypes
             ? vm.enrichedDataTypes
             : reduceToSelectedNodesOnly(vm.enrichedDataTypes, suggestedAndSelectedTypes);
+
+        return vm.enrichedDataTypes;
     };
 
     const doSave = () => {
@@ -149,7 +151,9 @@ function controller($q, serviceBroker) {
         let dt = vm.enrichedDataTypesById[id];
         while (dt) {
             const parent = vm.enrichedDataTypesById[dt.parentId];
-            if (_.get(parent, ["dataType", "concrete"], true) === false) {
+            const parentIsAbstract = _.get(parent, ["dataType", "concrete"], true) === false;
+            const parentIsRemovable = _.get(parent, ["usage", "isRemovable"], false) === true;
+            if (parentIsAbstract && parentIsRemovable) {
                 vm.typeUnchecked(parent.id, parent);
             }
             dt = parent;
@@ -181,7 +185,7 @@ function controller($q, serviceBroker) {
                 vm.used = usage;
                 vm.suggestedDataTypes = suggestions;
                 vm.onDirty(false);
-                postLoadActions(usage, suggestions);
+                return postLoadActions(usage, suggestions);
             });
     };