Merge pull request #1418 from StochSS/domain-types-update

Domain types update

client/domain-view/domain-view.js

@@ -74,6 +74,7 @@ module.exports = View.extend({
       this.renderTypesQuickview();
     }else{
       this.updateParticleViews();
+      this.model.on('update-type-deps', this.updateTypeDeps, this);
       this.model.on('update-geometry-deps', this.updateGeometryDeps, this);
       this.model.on('update-lattice-deps', this.updateLatticeDeps, this);
       this.model.on('update-transformation-deps', this.updateTransformationDeps, this);
@@ -562,6 +563,19 @@ module.exports = View.extend({
     });
     this.model.transformations.trigger('update-inuse', {deps: deps});
   },
+  updateTypeDeps: function () {
+    let deps = [];
+    let typeNames = this.model.types.map((type) => {
+      return type.name;
+    });
+    this.model.actions.forEach((action) => {
+      let type = this.model.types.get(action.typeID, 'typeID').name;
+      if(typeNames.includes(type) && !deps.includes(type)) {
+        deps.push(type);
+      }
+    });
+    this.model.types.trigger('update-inuse', {deps: deps});
+  },
   updateParticleViews: function () {
     this.renderNewParticleView();
     this.renderEditParticleView();

client/domain-view/templates/editType.pug

@@ -11,31 +11,17 @@ div.mx-1
 
         input(type="checkbox" data-hook="select" data-toggle="collapse" data-target="#collapse-type-details" + this.model.typeID)
 
-    div.col-sm-3
+    div.col-sm-5
 
       div(data-hook="type-name" data-target=this.model.typeID)
 
-    div.col-sm-3
+    div.col-sm-4
 
       div=this.model.numParticles
 
-    div.col-sm-3
-
-      button.btn.btn-outline-secondary.box-shadow(data-type=this.model.typeID data-hook='unassign-all') Un-Assign Particles
-
     div.col-sm-2
 
-      button.btn.btn-outline-secondary.box-shadow.dropdown-toggle(
-        id="delete-domain-type",
-        data-toggle="dropdown",
-        aria-haspopup="true",
-        aria-expanded="false",
-        type="button"
-      ) Delete <span class="caret"></span>
-
-      ul.dropdown-menu(aria-labelledby="delete-domain-type")
-        li.dropdown-item(data-hook="delete-type" data-type=this.model.typeID) Type
-        li.dropdown-item(data-hook="delete-all" data-type=this.model.typeID) Type and Particles
+      button.btn.btn-outline-secondary.box-shadow(data-hook="remove") X
 
   div-mx-1.pl-2(data-hook="type-details")
 

client/domain-view/templates/typesView.pug

@@ -42,14 +42,18 @@ div#domain-types-editor.card
 
             h6.inline <b>Edit</b>
 
-          div.col-sm-3
+          div.col-sm-5
 
             h6.inline <b>Name</b>
 
-          div.col-sm-8
+          div.col-sm-4
 
             h6.inline <b>Number of Particles</b>
 
+          div.col-sm-2
+
+            h6.inline <b>Remove</b>
+
         div.my-3(data-hook="edit-domain-types-list")
 
         button.btn.btn-outline-primary.box-shadow(data-hook="add-domain-type") Add Type

client/domain-view/views/action-view.js

@@ -211,18 +211,21 @@ module.exports = View.extend({
     this.model.geometry = e.target.value;
     this.model.collection.parent.trigger('update-geometry-deps');
     this.model.collection.parent.trigger('update-transformation-deps');
+    this.updateViewer();
   },
   selectLattice: function (e) {
     this.model.lattice = e.target.value;
     this.model.collection.parent.trigger('update-lattice-deps');
     this.model.collection.parent.trigger('update-transformation-deps');
+    this.updateViewer();
   },
   setParticleFixed: function (e) {
     this.model.fixed = !this.model.fixed;
     this.updateViewer();
   },
   setParticleType: function (e) {
     this.model.typeID = Number(e.target.value);
+    this.model.collection.parent.trigger('update-type-deps');
     this.updateViewer();
   },
   setPoint: function (e) {

client/domain-view/views/actions-view.js

@@ -55,6 +55,7 @@ module.exports = View.extend({
       this.collection.on('update-geometry-options', this.updateGeometryOptions, this);
       this.collection.on('update-lattice-options', this.updateLatticeOptions, this);
       this.collection.on('update-transformation-options', this.updateTransformationOptions, this);
+      this.collection.on('update-type-options', this.updateTypeOptions, this);
     }
     this.renderViewActionsView();
   },
@@ -122,5 +123,14 @@ module.exports = View.extend({
       view.renderGeometrySelectView();
       view.renderLatticeSelectView();
     });
+  },
+  updateTypeOptions: function ({currName=null, newName=null}={}) {
+    if(currName === null && newName === null) { return; }
+    this.editActionsView.views.forEach((view) => {
+      if(view.model.typeID === currName) {
+        view.model.typeID = newName;
+      }
+      view.renderTypeSelectView();
+    });
   }
 });

client/domain-view/views/type-view.js

@@ -37,17 +37,19 @@ module.exports = View.extend({
         el.checked = value;
       },
       hook: 'select'
+    },
+    'model.inUse': {
+      hook: 'remove',
+      type: 'booleanAttribute',
+      name: 'disabled',
     }
   },
   events: {
-    'change [data-hook=type-name]' : 'handleRenameType',
-    'change [data-target=type-defaults]' : 'updateView',
+    'change [data-hook=type-name]' : 'updateDepsOptions',
+    'change [data-target=type-defaults]' : 'updateViewer',
     'change [data-hook=td-fixed]' : 'setTDFixed',
-    'change [data-hook=type-geometry]' : 'updateView',
     'click [data-hook=select]' : 'selectType',
-    'click [data-hook=unassign-all]' : 'handleUnassignParticles',
-    'click [data-hook=delete-type]' : 'handleDeleteType',
-    'click [data-hook=delete-all]' : 'handleDeleteTypeAndParticle',
+    'click [data-hook=remove]' : 'handleDeleteType',
   },
   initialize: function (attrs, options) {
     View.prototype.initialize.apply(this, arguments);
@@ -66,24 +68,10 @@ module.exports = View.extend({
     app.documentSetup();
   },
   handleDeleteType: function (e) {
-    let type = Number(e.target.dataset.type);
-    this.model.collection.removeType(this.model);
-    this.parent.parent.deleteType(this.model.typeID);
-  },
-  handleDeleteTypeAndParticle: function (e) {
-    let type = Number(e.target.dataset.type);
+    let typeID = this.model.typeID;
+    let actions = this.model.collection.parent.actions;
     this.model.collection.removeType(this.model);
-    this.parent.parent.deleteType(this.model.typeID, {unassign: false});
-  },
-  handleRenameType: function (e) {
-    this.updateView();
-    let type = Number(e.target.parentElement.parentElement.dataset.target);
-    let name = e.target.value;
-    this.parent.parent.renameType(type, name);
-  },
-  handleUnassignParticles: function () {
-    this.model.numParticles = 0;
-    this.parent.parent.unassignAllParticles(this.model.typeID);
+    actions.trigger('update-type-options', {currName: typeID});
   },
   openTypeDetails: function () {
     $("#collapse-type-details" + this.model.typeID).collapse("show");
@@ -93,23 +81,28 @@ module.exports = View.extend({
   },
   setTDFixed: function (e) {
     this.model.fixed = e.target.checked;
-    this.updateView();
+    this.updateViewer();
   },
   update: function () {},
+  updateDepsOptions: function (e) {
+    let typeID = this.model.typeID;
+    this.model.name = e.target.value;
+    this.model.collection.parent.actions.trigger(
+      'update-type-options', {currName: typeID, newName: this.model.typeID}
+    );
+  },
   updateValid: function () {},
-  updateView: function () {
+  updateViewer: function () {
     this.parent.renderViewTypeView();
-    this.parent.parent.updateParticleViews({includeGeometry: true});
   },
   subviews: {
-    inputTypeID: {
+    inputName: {
       hook: "type-name",
       prepareView: function (el) {
         return new InputView({
           parent: this,
           required: true,
           name: 'name',
-          modelKey: 'name',
           tests: [tests.invalidChar],
           valueType: 'string',
           value: this.model.name

client/domain-view/views/types-view.js

@@ -48,6 +48,8 @@ module.exports = View.extend({
       $(this.queryByHook('view-domain-types')).addClass('active');
     }else{
       this.renderEditTypeView();
+      this.collection.on("update-inuse", this.updateInUse, this);
+      this.collection.parent.trigger('update-type-deps');
     }
     this.toggleDomainError();
     this.renderViewTypeView();
@@ -57,6 +59,7 @@ module.exports = View.extend({
   },
   handleAddDomainType: function () {
     let name = this.collection.addType();
+    this.collection.parent.actions.trigger('update-type-options', {currName: name});
     this.parent.addType(name);
   },
   renderEditTypeView: function () {
@@ -101,5 +104,11 @@ module.exports = View.extend({
       errorMsg.addClass('component-valid');
       errorMsg.removeClass('component-invalid');
     }
+  },
+  updateInUse: function ({deps=null}={}) {
+    if(deps === null) { return; }
+    this.collection.forEach((type) => {
+      type.inUse = deps.includes(type.name);
+    });
   }
 });

client/models/domain-type.js

@@ -31,6 +31,10 @@ module.exports = State.extend({
     volume: 'number'
   },
   session: {
+    inUse: {
+      type: 'boolean',
+      default: false,
+    },
     numParticles: 'number',
     selected: {
       type: 'boolean',