add hooks for unseal and setting component state on the service

Author: meirish

ui/app/components/shamir-flow.js

@@ -21,26 +21,25 @@ const DEFAULTS = {
 export default Component.extend(DEFAULTS, {
   tagName: '',
   store: inject.service(),
-  wizard: inject.service(),
   formText: null,
   fetchOnInit: false,
   buttonText: 'Submit',
   thresholdPath: 'required',
   generateAction: false,
 
   init() {
+    this._super(...arguments);
     if (this.get('fetchOnInit')) {
       this.attemptProgress();
     }
-    if (this.get('action') === 'unseal') {
-      this.get('wizard').transitionTutorialMachine(this.get('wizard.currentState'), 'NOOP', {
-        threshold: this.get('threshold'),
-        progress: this.get('progress'),
-      });
-    }
-    return this._super(...arguments);
   },
 
+  didInsertElement() {
+    this._super(...arguments);
+    this.onUpdate(this.getProperties(Object.keys(DEFAULTS)));
+  },
+
+  onUpdate() {},
   onShamirSuccess() {},
   // can be overridden w/an attr
   isComplete(data) {
@@ -62,17 +61,23 @@ export default Component.extend(DEFAULTS, {
   hasProgress: computed.gt('progress', 0),
 
   actionSuccess(resp) {
-    const { isComplete, onShamirSuccess, thresholdPath } = this.getProperties(
+    let { onActionSuccess, isComplete, onShamirSuccess, thresholdPath } = this.getProperties(
+      'onActionSuccess',
       'isComplete',
       'onShamirSuccess',
       'thresholdPath'
     );
+    let threshold = get(resp, thresholdPath);
+    let props = {
+      ...resp,
+      threshold,
+    };
     this.stopLoading();
-    this.set('threshold', get(resp, thresholdPath));
-    this.setProperties(resp);
-    if (isComplete(resp)) {
+    this.setProperties(props);
+    onUpdate(props);
+    if (isComplete(props)) {
       this.reset();
-      onShamirSuccess(resp);
+      onShamirSuccess(props);
     }
   },
 

ui/app/controllers/vault/cluster/unseal.js

@@ -5,12 +5,16 @@ export default Ember.Controller.extend({
 
   actions: {
     transitionToCluster(resp) {
-      debugger;
       return this.get('model').reload().then(() => {
         this.get('wizard').transitionTutorialMachine(this.get('wizard.currentState'), 'CONTINUE', resp);
         return this.transitionToRoute('vault.cluster', this.get('model.name'));
       });
     },
+
+    setUnsealState(resp) {
+      this.get('wizard').set('componentState', resp);
+    },
+
     isUnsealed(data) {
       return data.sealed === false;
     },

ui/app/routes/vault/cluster/unseal.js

@@ -1,20 +1 @@
-import ClusterRouteBase from './cluster-route-base';
-import Ember from 'ember';
-
-const { inject } = Ember;
-
-export default ClusterRouteBase.extend({
-  wizard: inject.service(),
-
-  beforeModel() {
-    this._super(...arguments);
-    debugger;
-    if (this.get('wizard.currentState') === 'active.init.save') {
-      this.get('wizard').transitionTutorialMachine(this.get('wizard.currentState'), 'CONTINUE');
-    }
-  },
-  afterModel() {
-    this._super(...arguments);
-    debugger;
-  },
-});
+export { default } from './cluster-route-base';

ui/app/services/wizard.js

@@ -30,20 +30,20 @@ export default Service.extend({
     if (!this.storageHasKey(TUTORIAL_STATE)) {
       this.saveState('currentState', TutorialMachine.initialState);
       this.saveExtState(TUTORIAL_STATE, this.get('currentState'));
-    } else {
-      this.saveState('currentState', this.getExtState(TUTORIAL_STATE));
-      if (this.storageHasKey(FEATURE_LIST)) {
-        this.set('featureList', this.getExtState(FEATURE_LIST));
-        if (this.storageHasKey(FEATURE_STATE)) {
-          this.saveState('featureState', this.getExtState(FEATURE_STATE));
-        } else {
-          if (FeatureMachine != null) {
-            this.saveState('featureState', FeatureMachine.initialState);
-            this.saveExtState(FEATURE_STATE, this.get('featureState'));
-          }
+      return;
+    }
+    this.saveState('currentState', this.getExtState(TUTORIAL_STATE));
+    if (this.storageHasKey(FEATURE_LIST)) {
+      this.set('featureList', this.getExtState(FEATURE_LIST));
+      if (this.storageHasKey(FEATURE_STATE)) {
+        this.saveState('featureState', this.getExtState(FEATURE_STATE));
+      } else {
+        if (FeatureMachine != null) {
+          this.saveState('featureState', FeatureMachine.initialState);
+          this.saveExtState(FEATURE_STATE, this.get('featureState'));
         }
-        this.buildFeatureMachine();
       }
+      this.buildFeatureMachine();
     }
   },
 
@@ -62,7 +62,6 @@ export default Service.extend({
   },
 
   transitionTutorialMachine(currentState, event, extendedState) {
-    debugger;
     if (extendedState) {
       this.set('componentState', extendedState);
     }

ui/app/templates/vault/cluster/unseal.hbs

@@ -10,6 +10,7 @@
     </MessageInPage>
     <ShamirFlow
       @action="unseal"
+      @onUpdate={{action 'setUnsealState'}}
       @onShamirSuccess={{action 'transitionToCluster'}}
       @buttonText="Unseal"
       @thresholdPath="t"