changes after eval

Author: Helge Müller

addon/components/application-visualization.js

@@ -21,6 +21,16 @@ export default ApplicationRendering.extend(AlertifyHandler,{
       this.get('interaction').on('singleClick', this.get('clickListenerSingle'));
       this.get('interaction').on('doubleClick', this.get('clickListenerDouble'));
     },
+    cleanup(){
+      this._super(...arguments);
+      this.get('interaction').off('singleClick',this, this.clickListenerSingle);
+      this.get('interaction').off('doubleClick',this, this.clickListenerDouble);
+    },
+    willDestroyElement(){
+      this._super(...arguments);
+      this.get('interaction').off('singleClick',this, this.clickListenerSingle);
+      this.get('interaction').off('doubleClick',this, this.clickListenerDouble);
+    },
     clickListenerSingle(emberModel){
       if(emberModel!=undefined){
           if(this.get('selectTarget')){

addon/components/landscape-visualization.js

@@ -27,6 +27,7 @@ export default LandscapeRendering.extend(AlertifyHandler,{
 
       this.get('interaction').on('showApplication', function (emberModel) {
         this.set('landscapeService.application', emberModel);
+       // this.trigger('doubleClick', emberModel);
       });
 
       this.get('interaction').on('singleClick', this.clickListenerSingle);
@@ -67,7 +68,6 @@ export default LandscapeRendering.extend(AlertifyHandler,{
             this.set("model.actionType","doubleClick");
             this.set('selectTarget',false);
             this.showAlertifyMessage(`Target selected 'double click' on '`+emberModel.get('constructor.modelName')+"'");
-
           }else{
             if(this.get("model.targetType")==emberModel.get('constructor.modelName') && this.get("model.targetId")==emberModel.get("id")&& this.get('model.actionType')=="doubleClick"){
               if(this.get("runmode")){

addon/controllers/tutorial/list.js

@@ -25,6 +25,7 @@ export default Controller.extend(AlertifyHandler,{
      let newSequence = this.get('store').createRecord("sequence",{
         title: "new sequence"
       })
+      tutorial.set('expanded',true);
       tutorial.get('sequences').pushObject(newSequence);
       newSequence.save().then(function () {
         tutorial.save();
@@ -34,6 +35,7 @@ export default Controller.extend(AlertifyHandler,{
       let newStep = this.get('store').createRecord("step",{
          title: "new step"
        })
+       sequence.set('expanded',true);
        sequence.get('steps').pushObject(newStep);
        newStep.save().then(function () {
         sequence.save();

addon/models/sequence.js

@@ -5,4 +5,7 @@ export default DS.Model.extend({
   text: DS.attr('string'),
   landscapeTimestamp: DS.attr('string'),
   steps: DS.hasMany('step',{async:false}),
+  containsSteps: function() {
+    return this.get('steps.length')>0;
+  }.property('steps')
 });

addon/models/tutorial.js

@@ -4,4 +4,7 @@ export default DS.Model.extend({
   title: DS.attr('string'),
   landscapeTimestamp: DS.attr('string'),
   sequences: DS.hasMany('sequence',{async:false}),
+  containsSequences: function() {
+    return this.get('sequences.length')>0;
+  }.property('sequences')
 });

addon/routes/tutorial/sequence.js

@@ -9,7 +9,9 @@ export default BaseRoute.extend(AuthenticatedRouteMixin, {
     this._super(...arguments);
     controller.set('landscapeService.liveMode',false);
     controller.get('landscapeService').updateLandscapeList(true);
-    controller.get('landscapeService.landscape',null);
+    
+    controller.set('landscapeService.landscape',null);
+    controller.set('landscapeService.application', null);
 
     if(controller.get('currentUser.user.isAdmin')){
       controller.set('runmode',false);

addon/serializers/tutoriallandscape.js

@@ -6,26 +6,22 @@ import SaveRelationshipsMixin from 'ember-data-save-relationships';
 
 export default LandscapeSerializer.extend(SaveRelationshipsMixin,{
   attrs: {
-    events:{serialize:true},
     systems:{serialize:true},
     totalApplicationCommunications:{serialize:true}
   },
   payloadKeyFromModelName(model){
     return model;
   },
   serializeRecordForIncluded(key,relationship){
-    if(this.serializedTypes.indexOf(key)!==-1){
-      return;
-    }
     if (relationship.kind === 'belongsTo') {
       var nextSnapshot = this.belongsTo(key);
       nextSnapshot.serializedTypes=this.serializedTypes;
       nextSnapshot.included=this.included;
       if(nextSnapshot.record.threeJSModel!=undefined){
           nextSnapshot.record.set('threeJSModel', null);
       }
-      if(this.serializedTypes.indexOf(key)==-1){
-        this.serializedTypes.push(key);
+      if(this.serializedTypes.indexOf(nextSnapshot.get('id'))==-1){
+        this.serializedTypes.push(nextSnapshot.get('id'));
         nextSnapshot.serializeRecordForIncluded=this.serializeRecordForIncluded;
         if(nextSnapshot.record.get('id')!=undefined){
           this.included.push(nextSnapshot.record.serialize({includeId:true}).data);
@@ -37,10 +33,9 @@ export default LandscapeSerializer.extend(SaveRelationshipsMixin,{
       var self=this;
       var nkey=key;
       var hasmany=this.hasMany(nkey);
-      if(hasmany!=undefined){
       hasmany.forEach(function(v){
         if(v.record.threeJSModel!=undefined){
-          v.record.set('threeJSModel', null);
+            v.record.set('threeJSModel', null);
         }
         if(self.included==undefined){
           self.included=[];
@@ -51,7 +46,7 @@ export default LandscapeSerializer.extend(SaveRelationshipsMixin,{
               value.serializedTypes=self.serializedTypes;
               value.included=self.included;
               if(self.serializedTypes.indexOf(nkey)==-1){
-                self.serializedTypes.push(nkey);
+                self.serializedTypes.push(nextSnapshot.get('id'));
               }
               value.serializeRecordForIncluded=self.serializeRecordForIncluded;
               value.eachRelationship(self.serializeRecordForIncluded,value);
@@ -60,24 +55,24 @@ export default LandscapeSerializer.extend(SaveRelationshipsMixin,{
         }
       });
     }
-    }
   },
   serialize(snapshot) {
     let json = this._super(...arguments);
-    // snapshot.hasMany('systems').forEach(function(v,k){
-    //   delete json.data.relationships.systems.data[k].attributes.threeJSModel;
-    // });
-    //
-    // snapshot.hasMany('totalApplicationCommunications').forEach(function(v,k){
-    //   delete json.data.relationships.totalApplicationCommunications.data[k].attributes.threeJSModel;
-    // });
 
     snapshot.serializeRecordForIncluded=this.serializeRecordForIncluded;
     snapshot.serializedTypes=[];
     snapshot.included=[];
     snapshot.eachRelationship(this.serializeRecordForIncluded,snapshot);
 
-    json.included=snapshot.included;
+    snapshot.hasMany('systems').forEach(function(v,k){
+      delete json.data.relationships.systems.data[k].attributes.threeJSModel;
+    });
+
+    snapshot.hasMany('totalApplicationCommunications').forEach(function(v,k){
+      delete json.data.relationships.totalApplicationCommunications.data[k].attributes.threeJSModel;
+    });
+
+json.included=snapshot.included;
     var newjson={
       data:{
         id: snapshot.record.get('id'),
@@ -108,7 +103,7 @@ export default LandscapeSerializer.extend(SaveRelationshipsMixin,{
   },
   normalizeResponse(store, primaryModelClass, payload, id, requestType) {
     var json = {};
-    if(Array.isArray(payload.data)){
+    if(Array.isArray(payload.data) ){
       json = {data:[]};
      payload.data.forEach(function(v,k){
        json.data[k]=JSON.parse(v.attributes.landscape).data;
@@ -127,6 +122,10 @@ export default LandscapeSerializer.extend(SaveRelationshipsMixin,{
         json.included=payload.included;
       }
     }
+  // if(requestType=="queryRecord"){
+  //   json.data=json.data[0];
+  //   return this._super(store, primaryModelClass, json, id, requestType);
+  // }
     return this._super(store, primaryModelClass, json, id, requestType);
   }
 });

addon/templates/components/sequence-form.hbs

@@ -1,4 +1,4 @@
-{{#link-to "tutorial.list"}}{{svg-jar "reply" class="octicon align-middle"}}{{/link-to}}
+{{#link-to "tutorial.list"}}{{svg-jar "reply" class="octicon align-middle"}}  Back{{/link-to}}
 {{#bs-form model=model onSubmit=(action "saveSequenceChanges" model) as |form|}}
   {{form.element controlType="text" label="Title" placeholder="Enter New Sequence Title" property="title"}}
 {{bs-button defaultText="Save" type="primary" buttonType="submit"}}

addon/templates/components/step-form.hbs

@@ -1,5 +1,5 @@
 {{#unless runmode}}
-  {{#link-to "tutorial.list"}}{{svg-jar "reply" class="octicon align-middle"}}{{/link-to}}
+  {{#link-to "tutorial.list"}}{{svg-jar "reply" class="octicon align-middle"}} Back{{/link-to}}
   {{#bs-form model=model onSubmit=(action "saveStepChanges" model) as |form|}}
     {{form.element controlType="text" label="Title" placeholder="Enter New Step Title" property="title"}}
     {{form.element controlType="textarea" label="Text"  rows=18 placeholder="Text" property="text"}}
@@ -38,6 +38,22 @@
       {{/unless}}
     {{/unless}}
   {{/unless}}
+
+    {{#if model.targetType}}
+     {{#if model.actionType}}
+      {{#if model.targetId}}
+      {{#if landscapeService.landscape.systems}}
+         Target:  {{model.actionType}} on <span title={{model.targetId}}>{{targetName}}</span>
+        {{else}}
+        Target:  {{model.actionType}} on {{help-tooltip title=model.targetId}}
+        <div class="spinner-border spinner-border-sm" role="status">
+            <span class="sr-only"> </span>
+        </div>
+        {{/if}}
+      {{/if}}      
+    {{/if}}
+    {{/if}}
+
 {{else}}
   <h2>{{model.title}}</h2>
   <pre style='white-space:pre-line;display:inline-block'>{{model.text}}</pre>
@@ -49,7 +65,8 @@
           onClick=(action "skipStep")
           type="secondary"
           outline=true
-          title="next step"
+          disabled=(not landscapeService.landscape.systems)
+          title="next step" as |button|
         }}
         next
         {{/bs-button}}

addon/templates/components/tutorial-form.hbs

@@ -1,4 +1,4 @@
-{{#link-to "tutorial.list"}}{{svg-jar "reply" class="octicon align-middle"}}{{/link-to}}
+{{#link-to "tutorial.list"}}{{svg-jar "reply" class="octicon align-middle"}}  Back{{/link-to}}
 {{#bs-form model=model onSubmit=(action "saveTutorialChanges" model) as |form|}}
     {{form.element controlType="text" label="Title" placeholder="Enter new tutorial title" property="title"}}
 {{bs-button defaultText="Save it" type="primary" buttonType="submit"}}