inserted tutorial and new interaction binding

Helge Müller · Helge Müller · commit 1cdb8699e160 · 2019-06-12T16:38:45.000+02:00
diff --git a/addon/components/application-interaction.js b/addon/components/application-interaction.js
@@ -3,5 +3,7 @@ import { inject as service } from "@ember/service";
 import AlertifyHandler from 'explorviz-frontend/mixins/alertify-handler';
 
 export default Interaction.extend(AlertifyHandler,{
-  landscapeService: service()
+  landscapeService: service(),
+  tutorialService: service(),
+  store: service()
 });
diff --git a/addon/components/application-visualization.js b/addon/components/application-visualization.js
@@ -16,11 +16,6 @@ export default ApplicationRendering.extend(AlertifyHandler,{
       }else{
         this.set('interaction.model',this.get('interactionModel'));
       }
-
-      this.set('interaction.tutorialService',this.get('tutorialService'));
-      this.set('interaction.landscapeService',this.get('landscapeService'));
-
-
       this.set('interaction.completed',this.get('completed'));
       this.set('interaction.runmode',this.get('runmode'));
       this.get('interaction').on('singleClick', this.get('clickListenerSingle'));
@@ -33,6 +28,7 @@ export default ApplicationRendering.extend(AlertifyHandler,{
             this.set("model.targetId",emberModel.get("id"));
             this.set("model.actionType","singleClick");
             this.set('selectTarget',false);
+            this.showAlertifyMessage(`Target selected 'single click' on '`+emberModel.get('constructor.modelName')+"' with name '"+emberModel.get('name')+"'");
           }else{
             if(this.get("model.targetType")==emberModel.get('constructor.modelName') && this.get("model.targetId")==emberModel.get("id")&& this.get('model.actionType')=="singleClick"){
               if(this.get("runmode")){
@@ -49,6 +45,7 @@ export default ApplicationRendering.extend(AlertifyHandler,{
             this.set("model.targetId",emberModel.get("id"));
             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")){
diff --git a/addon/components/landscape-interaction.js b/addon/components/landscape-interaction.js
@@ -3,5 +3,7 @@ import { inject as service } from "@ember/service";
 import AlertifyHandler from 'explorviz-frontend/mixins/alertify-handler';
 
 export default Interaction.extend(AlertifyHandler,{
-  landscapeService: service()
+  landscapeService: service(),
+  tutorialService: service(),
+  store: service()
 });
diff --git a/addon/components/landscape-visualization.js b/addon/components/landscape-visualization.js
@@ -23,18 +23,19 @@ export default LandscapeRendering.extend(AlertifyHandler,{
         this.set('interaction.model',this.get('interactionModel'));
       }
       this.set('interaction.completed',this.get('completed'));
-
-      this.set('interaction.tutorialService',this.get('tutorialService'));
-      this.set('interaction.landscapeService',this.get('landscapeService'));
-
       this.set('interaction.runmode',this.get('runmode'));
 
       this.get('interaction').on('showApplication', function (emberModel) {
         self.set('landscapeService.application', emberModel);
       });
 
-      this.get('interaction').on('singleClick', this.get('clickListenerSingle'));
-      this.get('interaction').on('doubleClick', this.get('clickListenerDouble'));
+      this.get('interaction').on('singleClick', this.clickListenerSingle);
+      this.get('interaction').on('doubleClick', 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){
@@ -43,6 +44,7 @@ export default LandscapeRendering.extend(AlertifyHandler,{
             this.set("model.targetId",emberModel.get("id"));
             this.set("model.actionType","singleClick");
             this.set('selectTarget',false);
+            this.showAlertifyMessage(`Target selected 'single click' on '`+emberModel.get('constructor.modelName')+"' with name '"+emberModel.get('name')+"'");
           }else{
             if(this.get("model.targetType")==emberModel.get('constructor.modelName') && this.get("model.targetId")==emberModel.get("id")&& this.get('model.actionType')=="singleClick"){
               if(this.get("runmode")){
@@ -59,6 +61,8 @@ export default LandscapeRendering.extend(AlertifyHandler,{
             this.set("model.targetId",emberModel.get("id"));
             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")){
@@ -68,6 +72,13 @@ export default LandscapeRendering.extend(AlertifyHandler,{
           }
       }
     },
+    getLandscape(){
+      if(this.get('landscapeService.livelandscapes')){
+        return this.get('landscapeRepo.latestLandscape');
+      }else{
+        return this.get('landscapeService.landscape');
+      }
+    },
     completed(laststep){
       if(this.get('runmode')){
         var step = this.get('tutorialService').getNextStep(laststep);
diff --git a/addon/components/sequence-form.js b/addon/components/sequence-form.js
@@ -7,11 +7,10 @@ export default Component.extend(AlertifyHandler,{
   layout,
   tutorialService: service(),
   landscapeService: service(),
+  tagName: "",
   actions:{
-    resetLandscape(){
-      if(this.get('landscapeService.landscape')!=null){
-        this.set('landscapeService.landscape',null);
-      }
+    toggleSetLandscape(){
+      this.set('landscapeService.selectLandscape',!this.get('landscapeService.selectLandscape'));
     },
     saveSequenceChanges(sequence) {
       if(sequence) {
diff --git a/addon/components/side-form-layout.js b/addon/components/side-form-layout.js
@@ -5,21 +5,21 @@ import { computed } from '@ember/object';
 
 export default Component.extend({
   layout,
+  tagName: "",
   store: service(),
   tutorialService: service(),
   landscapeService: service(),
   renderingService: service(),
   landscapeRepo: service("repos/landscape-repository"),
   landscapeListener: service(),
   currentUser: service(),
-  
-  showLandscape: computed('landscapeRepo.latestApplication', function() {
-    return !this.get('landscapeRepo.latestApplication');
+  showLandscape: computed('landscapeService.application', function() {
+    return !this.get('landscapeService.application');
   }),
-  selectMode: computed('landscapeService.landscape',function(){
-      if(this.get('model.constructor.modelName')=="tutorial" || this.get('model.constructor.modelName')=="sequence"){
-        return !this.get('landscapeService.landscape');
-      }
+  selectMode: computed('landscapeService.selectLandscape',function(){
+    if(this.get('model.constructor.modelName')=="tutorial" || this.get('model.constructor.modelName')=="sequence"){
+      return this.get('landscapeService.selectLandscape') ;
+    }
     return false;
   }),
   liveMode: computed('landscapeService.livelandscapes','selectMode', function() {
@@ -28,19 +28,13 @@ export default Component.extend({
     }
     return false;
   }),
-  init(){
-    this._super(...arguments);
-    this.get('landscapeService').updateLandscapeList(true);
-    this.get('landscapeListener').initSSE();
-    this.get('landscapeListener').set('pauseVisualizationReload',true);
-  },
   actions: {
+   
     resetView() {
       this.get('renderingService').reSetupScene();
     },
     openLandscapeView() {
-      this.set('landscapeRepo.latestApplication', null);
-      this.set('landscapeRepo.replayApplication', null);
+      this.set('landscapeService.application', null);
     },
     toggleTimeline() {
       this.get('renderingService').toggleTimeline();
@@ -58,6 +52,12 @@ export default Component.extend({
       interaction.set('selectTarget',!interaction.get('selectTarget'));
     }
   },
+  init(){
+    this._super(...arguments);
+    this.get('landscapeService').updateLandscapeList(true);
+    this.get('landscapeListener').initSSE();
+    this.get('landscapeListener').set('pauseVisualizationReload',true);
+  },
   showTimeline() {
     this.set('renderingService.showTimeline', true);
   },
@@ -80,4 +80,5 @@ export default Component.extend({
     this._super(...arguments);
     this.get('additionalData').off('showWindow', this, this.onShowWindow);
   },
+
 });
diff --git a/addon/components/step-form.js b/addon/components/step-form.js
@@ -2,11 +2,27 @@ import Component from '@ember/component';
 import layout from '../templates/components/step-form';
 import AlertifyHandler from 'explorviz-frontend/mixins/alertify-handler';
 import { inject as service } from "@ember/service";
+import { computed } from '@ember/object';
 
 export default Component.extend(AlertifyHandler,{
   layout,
+  tagName: "",
   tutorialService: service(),
   landscapeService: service(),
+  store: service(),
+  nextStepAvailable: computed("model",function(){
+    return this.get('tutorialService').getNextStep(this.get('model'));
+  }),
+  targetName: computed("model.targetId","model.targetType",function(){
+    if(this.get("model.targetType")==undefined ||this.get("model.targetId")==undefined){
+      return "";
+    }
+    let object = this.get('store').peekRecord(this.get("model.targetType"),this.get("model.targetId"));
+    if(object!=undefined){
+      return object.get('name');
+    }
+     return "";
+  }),
   actions:{
     skipStep(){
       var step = this.get('tutorialService').getNextStep(this.get('model'));
@@ -25,7 +41,7 @@ export default Component.extend(AlertifyHandler,{
           }
         });
         this.get('tutorialService').set('activeStep',step);
-        this.set('model',step);
+        this.get('landscapeService').setInteractionModel(step);
       }else{
         this.showAlertifyMessage(`Last step completed.`);
       }
@@ -49,8 +65,12 @@ export default Component.extend(AlertifyHandler,{
       }
     },
     toggleSelectTarget(){
-      this.set('landscapeService.landscapeinteraction.selectTarget',!this.get('landscapeService.landscapeinteraction.selectTarget'));
-      this.set('landscapeService.applicationinteraction.selectTarget',!this.get('landscapeService.applicationinteraction.selectTarget'));
+      if(this.get('landscapeService.application')){
+        this.set('landscapeService.applicationinteraction.selectTarget',!this.get('landscapeService.applicationinteraction.selectTarget'));
+        this.set('')
+      }else{
+        this.set('landscapeService.landscapeinteraction.selectTarget',!this.get('landscapeService.landscapeinteraction.selectTarget'));
+      }
     },
     removeTarget(){
       this.set('model.targetType',"");
diff --git a/addon/components/timeline.js b/addon/components/timeline.js
@@ -9,20 +9,23 @@ import AlertifyHandler from 'explorviz-frontend/mixins/alertify-handler';
 export default Timeline.extend(AlertifyHandler,{
     layout,
     landscapeService: service(),
+    landscapeListener: service(),
     chartClickHandler(evt) {
       this._super(...arguments);
       this.set('importLandscape',true);
       this.set('tutorialActivePoint',this.get('timelineChart').getElementAtEvent(evt)[0]);
     },
     actions:{
        submit(){
-        if ( this.get('tutorialActivePoint')) {
-        this.get('landscapeListener').set('pauseVisualizationReload',true);
-        this.get('landscapeService').importLandscape(this.get('tutorialActivePoint')._chart.data.datasets[this.get('tutorialActivePoint')._datasetIndex].data[this.get('tutorialActivePoint')._index].x,this.get('landscapeName'));
-        this.set('model.landscapeTimestamp',this.get('tutorialActivePoint')._chart.data.datasets[this.get('tutorialActivePoint')._datasetIndex].data[this.get('tutorialActivePoint')._index].x);
-        this.get('landscapeListener').set('livelandscapes',false);
-
-        }
+         if ( this.get('tutorialActivePoint')) {
+            this.get('landscapeListener').set('pauseVisualizationReload',true);
+            this.get('landscapeService').importLandscape(this.get('tutorialActivePoint')._chart.data.datasets[this.get('tutorialActivePoint')._datasetIndex].data[this.get('tutorialActivePoint')._index].x,this.get('landscapeName'));
+            this.set('model.landscapeTimestamp',this.get('tutorialActivePoint')._chart.data.datasets[this.get('tutorialActivePoint')._datasetIndex].data[this.get('tutorialActivePoint')._index].x);
+            this.get('landscapeService').set('livelandscapes',false);
+         }
+      },
+      close(){
+          this.get('landscapeListener').set('pauseVisualizationReload',false);
       }
     }
 });
diff --git a/addon/components/tutorial-form.js b/addon/components/tutorial-form.js
@@ -7,14 +7,13 @@ export default Component.extend(AlertifyHandler,{
   layout,
   tutorialService: service(),
   landscapeService: service(),
+  tagName: "",
   actions:{
     saveTutorialChanges(tutorial){
       this.get('tutorialService').saveTutorialChanges(tutorial);
     },
-    resetLandscape(){
-      if(this.get('landscapeService.landscape')!=null){
-        this.set('landscapeService.landscape',null);
-      }
+    toggleSetLandscape(){
+      this.set('landscapeService.selectLandscape',!this.get('landscapeService.selectLandscape'));
     },
   
   }
diff --git a/addon/controllers/tutorial.js b/addon/controllers/tutorial.js
@@ -13,7 +13,6 @@ export default Controller.extend({
      controller.initRendering();
 
    },
-
    actions: {
      resetRoute() {
        //const routeName = this.get('tutorial');
diff --git a/addon/controllers/tutorial/list.js b/addon/controllers/tutorial/list.js
@@ -39,5 +39,14 @@ export default Controller.extend(AlertifyHandler,{
         sequence.save();
        });
     },
+    deleteStep(step){
+      step.destroyRecord();
+    },
+    deleteSequence(sequence){
+      sequence.destroyRecord();
+    },
+    deleteTutorial(tutorial){
+      tutorial.destroyRecord();
+    }
   }
 });
diff --git a/addon/controllers/tutorial/tutorial.js b/addon/controllers/tutorial/tutorial.js
@@ -4,5 +4,5 @@ import AlertifyHandler from 'explorviz-frontend/mixins/alertify-handler';
 
 export default Controller.extend(AlertifyHandler,{
   tutorialService:service(),
-  landscapeService:service()
+  landscapeService:service(),
 });
diff --git a/addon/routes/tutorial/run.js b/addon/routes/tutorial/run.js
@@ -13,13 +13,16 @@ export default BaseRoute.extend(AuthenticatedRouteMixin, {
     controller.set('landscapeService.liveMode',false);
     var step = controller.get('tutorialService').getNextStep();
     controller.set('tutorialService.activeStep',step);
+    controller.get('landscapeService.landscape',null);
+    
     controller.get('tutorialService').getSequence(step).then((sequence)=>{
       if(sequence!=undefined && sequence.get('landscapeTimestamp')!=undefined){
         controller.get('landscapeService').loadLandscape(sequence);
       }else{
         controller.get('landscapeService').loadLandscape(model);
       }
     });
+
   },
   actions: {
     // @Override BaseRoute
diff --git a/addon/routes/tutorial/sequence.js b/addon/routes/tutorial/sequence.js
@@ -9,6 +9,8 @@ export default BaseRoute.extend(AuthenticatedRouteMixin, {
     this._super(...arguments);
     controller.set('landscapeService.liveMode',false);
     controller.get('landscapeService').updateLandscapeList(true);
+    controller.get('landscapeService.landscape',null);
+
     if(controller.get('currentUser.user.isAdmin')){
       controller.set('runmode',false);
     }
diff --git a/addon/routes/tutorial/step.js b/addon/routes/tutorial/step.js
@@ -6,12 +6,10 @@ export default BaseRoute.extend(AuthenticatedRouteMixin, {
         return this.get('store').findRecord('step',params.step_id);
   },
   setupController(controller, model) {
-    this._super(...arguments);
     controller.set('landscapeService.liveMode',false);
     controller.get('landscapeService').updateLandscapeList(true);
-    if(controller.get('currentUser.user.isAdmin')){
-      controller.set('runmode',false);
-    }
+    controller.get('landscapeService.landscape',null);
+
     controller.get('tutorialService').getSequence(model).then((sequence)=>{
       if(sequence.get('landscapeTimestamp')!=undefined){
         controller.get('landscapeService').loadLandscape(sequence);
@@ -21,7 +19,11 @@ export default BaseRoute.extend(AuthenticatedRouteMixin, {
         });
       }
     });
-
+    
+    if(controller.get('currentUser.user.isAdmin')){
+      controller.set('runmode',false);
+    }
+    this._super(...arguments);
 
   },
   actions: {
diff --git a/addon/routes/tutorial/tutorial.js b/addon/routes/tutorial/tutorial.js
@@ -8,6 +8,7 @@ export default BaseRoute.extend(AuthenticatedRouteMixin, {
   setupController(controller, model) {
     this._super(...arguments);
     controller.get('landscapeService').updateLandscapeList(true);
+    controller.get('landscapeService.landscape',null);
     controller.get('landscapeService').loadLandscape(model);
     controller.set('landscapeService.liveMode',false);
     if(controller.get('currentUser.user.isAdmin')){
diff --git a/addon/services/landscape-service.js b/addon/services/landscape-service.js
diff --git a/addon/templates/components/landscape-select/landscapelist.hbs b/addon/templates/components/landscape-select/landscapelist.hbs
diff --git a/addon/templates/components/sequence-form.hbs b/addon/templates/components/sequence-form.hbs
diff --git a/addon/templates/components/side-form-layout.hbs b/addon/templates/components/side-form-layout.hbs
diff --git a/addon/templates/components/step-form.hbs b/addon/templates/components/step-form.hbs
diff --git a/addon/templates/components/tutorial-form.hbs b/addon/templates/components/tutorial-form.hbs
diff --git a/addon/templates/tutorial/list.hbs b/addon/templates/tutorial/list.hbs
