hashicorp · meirish · May 13, 2019 · Apr 17, 2019 · Apr 18, 2019 · Apr 18, 2019
diff --git a/ui/.storybook/preview-head.html b/ui/.storybook/preview-head.html
@@ -1,4 +1,6 @@
-<meta name="vault/config/environment" content="%7B%22modulePrefix%22%3A%22vault%22%2C%22environment%22%3A%22development%22%2C%22rootURL%22%3A%22/ui/%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22POLLING_URLS%22%3A%5B%22sys/health%22%2C%22sys/replication/status%22%2C%22sys/seal-status%22%5D%2C%22NAMESPACE_ROOT_URLS%22%3A%5B%22sys/health%22%2C%22sys/seal-status%22%2C%22sys/license/features%22%5D%2C%22DEFAULT_PAGE_SIZE%22%3A15%2C%22LOG_TRANSITIONS%22%3Atrue%7D%2C%22flashMessageDefaults%22%3A%7B%22timeout%22%3A7000%2C%22sticky%22%3Afalse%2C%22preventDuplicates%22%3Atrue%7D%2C%22contentSecurityPolicyHeader%22%3A%22Content-Security-Policy%22%2C%22contentSecurityPolicyMeta%22%3Atrue%2C%22contentSecurityPolicy%22%3A%7B%22connect-src%22%3A%5B%22%27self%27%22%5D%2C%22img-src%22%3A%5B%22%27self%27%22%2C%22data%3A%22%5D%2C%22form-action%22%3A%5B%22%27none%27%22%5D%2C%22script-src%22%3A%5B%22%27self%27%22%5D%2C%22style-src%22%3A%5B%22%27unsafe-inline%27%22%2C%22%27self%27%22%5D%2C%22default-src%22%3A%5B%22%27none%27%22%5D%2C%22font-src%22%3A%5B%22%27self%27%22%5D%2C%22media-src%22%3A%5B%22%27self%27%22%5D%7D%2C%22emberData%22%3A%7B%22enableRecordDataRFCBuild%22%3Afalse%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
+<meta name="vault/config/environment" content="%7B%22modulePrefix%22%3A%22vault%22%2C%22environment%22%3A%22development%22%2C%22rootURL%22%3A%22/ui/%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22POLLING_URLS%22%3A%5B%22sys/health%22%2C%22sys/replication/status%22%2C%22sys/seal-status%22%5D%2C%22NAMESPACE_ROOT_URLS%22%3A%5B%22sys/health%22%2C%22sys/seal-status%22%2C%22sys/license/features%22%5D%2C%22DEFAULT_PAGE_SIZE%22%3A15%2C%22LOG_TRANSITIONS%22%3Atrue%7D%2C%22flashMessageDefaults%22%3A%7B%22timeout%22%3A7000%2C%22sticky%22%3Afalse%7D%2C%22contentSecurityPolicyHeader%22%3A%22Content-Security-Policy%22%2C%22contentSecurityPolicyMeta%22%3Atrue%2C%22contentSecurityPolicy%22%3A%7B%22connect-src%22%3A%5B%22%27self%27%22%5D%2C%22img-src%22%3A%5B%22%27self%27%22%2C%22data%3A%22%5D%2C%22form-action%22%3A%5B%22%27none%27%22%5D%2C%22script-src%22%3A%5B%22%27self%27%22%5D%2C%22style-src%22%3A%5B%22%27unsafe-inline%27%22%2C%22%27self%27%22%5D%2C%22default-src%22%3A%5B%22%27none%27%22%5D%2C%22font-src%22%3A%5B%22%27self%27%22%5D%2C%22media-src%22%3A%5B%22%27self%27%22%5D%7D%2C%22emberData%22%3A%7B%22enableRecordDataRFCBuild%22%3Afalse%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
+<meta name="replication/config/environment" content="%7B%22modulePrefix%22%3A%22replication%22%2C%22environment%22%3A%22development%22%7D" />
+<meta name="vault/config/asset-manifest" content="%7B%22bundles%22%3A%7B%22replication%22%3A%7B%22assets%22%3A%5B%7B%22uri%22%3A%22/ui/engines-dist/replication/assets/engine-vendor.js%22%2C%22type%22%3A%22js%22%7D%2C%7B%22uri%22%3A%22/ui/engines-dist/replication/assets/engine.js%22%2C%22type%22%3A%22js%22%7D%5D%7D%7D%7D" />
 <link rel="stylesheet" href="/assets/vendor.css" />
 <link rel="stylesheet" href="/assets/vault.css" />
 <link rel="icon" href="/favicon.png" />

diff --git a/ui/app/app.js b/ui/app/app.js
@@ -8,10 +8,27 @@ defineModifier();
 
 let App;
 
+/* eslint-disable ember/avoid-leaking-state-in-ember-objects */
 App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver,
+  engines: {
+    replication: {
+      dependencies: {
+        services: [
+          'auth',
+          'flash-messages',
+          'namespace',
+          'replication-mode',
+          'router',
+          'store',
+          'version',
+          'wizard',
+        ],
+      },
+    },
+  },
 });
 
 loadInitializers(App, config.modulePrefix);

diff --git a/ui/app/components/download-button.js b/ui/app/components/download-button.js
@@ -3,7 +3,7 @@ import { computed } from '@ember/object';
 import hbs from 'htmlbars-inline-precompile';
 
 export default Component.extend({
-  layout: hbs`{{#if hasBlock}} {{yield}} {{else}} {{actionText}} {{/if}}`,
+  layout: hbs`{{#if (has-block)}} {{yield}} {{else}} {{actionText}} {{/if}}`,
   tagName: 'a',
   role: 'button',
   attributeBindings: ['role', 'download', 'href'],

diff --git a/ui/app/components/empty-state.js b/ui/app/components/empty-state.js
diff --git a/ui/app/components/i-con.js b/ui/app/components/i-con.js
diff --git a/ui/app/components/info-table-row.js b/ui/app/components/info-table-row.js
diff --git a/ui/app/components/popup-menu.js b/ui/app/components/popup-menu.js
diff --git a/ui/app/components/secret-form-header.js b/ui/app/components/secret-form-header.js
diff --git a/ui/app/components/status-menu.js b/ui/app/components/status-menu.js
@@ -18,7 +18,7 @@ export default Component.extend({
   glyphName: computed('type', function() {
     const glyphs = {
       cluster: 'status-indicator',
-      user: 'person',
+      user: 'user-square-outline',
     };
     return glyphs[this.type];
   }),

diff --git a/ui/app/components/toolbar-actions.js b/ui/app/components/toolbar-actions.js
diff --git a/ui/app/components/toolbar.js b/ui/app/components/toolbar.js
diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/add.js b/ui/app/controllers/vault/cluster/replication/mode/secondaries/add.js
diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/index.js b/ui/app/controllers/vault/cluster/replication/mode/secondaries/index.js
diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/revoke.js b/ui/app/controllers/vault/cluster/replication/mode/secondaries/revoke.js
diff --git a/ui/app/helpers/includes.js b/ui/app/helpers/includes.js
diff --git a/ui/app/helpers/reduce-to-array.js b/ui/app/helpers/reduce-to-array.js
diff --git a/ui/app/initializers/enable-engines.js b/ui/app/initializers/enable-engines.js
@@ -0,0 +1,13 @@
+import config from '../config/environment';
+
+export function initialize(/* application */) {
+  // attach mount hooks to the environment config
+  // context will be the router DSL
+  config.addRootMounts = function() {
+    this.mount('replication');
+  };
+}
+
+export default {
+  initialize,
+};
diff --git a/ui/app/mixins/cluster-route.js b/ui/app/mixins/cluster-route.js
@@ -13,6 +13,7 @@ export { INIT, UNSEAL, AUTH, CLUSTER, DR_REPLICATION_SECONDARY };
 
 export default Mixin.create({
   auth: service(),
+  store: service(),
 
   transitionToTargetRoute(transition) {
     const targetRoute = this.targetRouteName(transition);
@@ -28,7 +29,7 @@ export default Mixin.create({
   },
 
   clusterModel() {
-    return this.modelFor(CLUSTER);
+    return this.modelFor(CLUSTER) || this.store.peekRecord('cluster', 'vault');
   },
 
   authToken() {

diff --git a/ui/app/models/cluster.js b/ui/app/models/cluster.js
@@ -70,7 +70,7 @@ export default DS.Model.extend({
   }),
 
   stateGlyph(state) {
-    const glyph = 'checkmark-circled-outline';
+    const glyph = 'check-circled-outline';
 
     const glyphs = {
       'stream-wals': 'android-sync',

diff --git a/ui/app/router.js b/ui/app/router.js
@@ -114,22 +114,9 @@ Router.map(function() {
         this.route('edit', { path: '/:policy_name/edit' });
       });
       this.route('replication-dr-promote');
-      this.route('replication', function() {
-        this.route('index', { path: '/' });
-        this.route('mode', { path: '/:replication_mode' }, function() {
-          //details
-          this.route('index', { path: '/' });
-          this.route('manage');
-          this.route('secondaries', function() {
-            this.route('add', { path: '/add' });
-            this.route('revoke', { path: '/revoke' });
-            this.route('config-show', { path: '/config/show/:secondary_id' });
-            this.route('config-edit', { path: '/config/edit/:secondary_id' });
-            this.route('config-create', { path: '/config/create/:secondary_id' });
-          });
-        });
-      });
-
+      if (config.addRootMounts) {
+        config.addRootMounts.call(this);
+      }
       this.route('not-found', { path: '/*path' });
     });
     this.route('not-found', { path: '/*path' });

diff --git a/ui/app/routes/vault/cluster/replication/mode/index.js b/ui/app/routes/vault/cluster/replication/mode/index.js
diff --git a/ui/app/styles/components/console-ui-panel.scss b/ui/app/styles/components/console-ui-panel.scss
@@ -106,7 +106,7 @@
   margin-left: calc(#{$console-spacing} - 0.33rem);
   position: relative;
 
-  .icon {
+  .hs-icon {
     position: absolute;
     left: 0;
     top: 0;