From cd31733fa5f4d90173afbbfa8f7d7284abce7008 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Wed, 17 Apr 2019 13:51:45 -0500 Subject: [PATCH 01/66] add initializer hook to mount engines inside the cluster route --- ui/app/initializers/enable-engines.js | 13 +++++++++++++ ui/app/router.js | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 ui/app/initializers/enable-engines.js diff --git a/ui/app/initializers/enable-engines.js b/ui/app/initializers/enable-engines.js new file mode 100644 index 000000000000..8f226b95fbea --- /dev/null +++ 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() { + console.log(this); + }; +} + +export default { + initialize, +}; diff --git a/ui/app/router.js b/ui/app/router.js index b1b87d87904e..aa49357a4967 100644 --- a/ui/app/router.js +++ b/ui/app/router.js @@ -130,6 +130,9 @@ Router.map(function() { }); }); + if (config.addRootMounts) { + config.addRootMounts.call(this); + } this.route('not-found', { path: '/*path' }); }); this.route('not-found', { path: '/*path' }); From d172a5bc4aaf90fcac7406003ae251bb1facd278 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Thu, 18 Apr 2019 15:38:24 -0500 Subject: [PATCH 02/66] add ember-engines and an in-repo addon --- ui/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/package.json b/ui/package.json index 8cabfdc59e42..4ebac16a661f 100644 --- a/ui/package.json +++ b/ui/package.json @@ -87,6 +87,7 @@ "ember-copy": "^1.0.0", "ember-data": "~3.4.0", "ember-data-model-fragments": "^3.3.0", + "ember-engines": "^0.7.0", "ember-export-application-global": "^2.0.0", "ember-fetch": "^6.1.0", "ember-inflector": "^3.0.0", @@ -141,11 +142,12 @@ "lint-staged": "^8.0.4" }, "engines": { - "node": "6.* || 8.* || >= 10.*" + "node": " >= 10.*" }, "private": true, "ember-addon": { "paths": [ + "lib/core", "lib/css" ] }, From 0bff3151f4ba37250306124f6176ca2472d532e5 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Thu, 18 Apr 2019 15:40:48 -0500 Subject: [PATCH 03/66] start moving components needed for replication to core addon --- ui/app/components/empty-state.js | 6 ------ ui/app/initializers/enable-engines.js | 8 ++++---- ui/app/templates/vault/cluster/replication/index.hbs | 8 ++++---- ui/lib/core/addon/components/empty-state.js | 9 +++++++++ .../core/addon}/components/page-header-level-left.js | 2 ++ .../core/addon}/components/page-header-level-right.js | 2 ++ .../core/addon}/components/page-header-top.js | 2 ++ ui/{app => lib/core/addon}/components/page-header.js | 2 ++ .../core/addon}/templates/components/empty-state.hbs | 0 .../templates/components/page-header-level-left.hbs | 0 .../templates/components/page-header-level-right.hbs | 0 .../core/addon}/templates/components/page-header.hbs | 0 ui/lib/core/addon/templates/components/test-fun.hbs | 2 ++ ui/lib/core/app/components/empty-state.js | 1 + ui/lib/core/app/components/page-header-level-left.js | 1 + ui/lib/core/app/components/page-header-level-right.js | 1 + ui/lib/core/app/components/page-header-top.js | 1 + ui/lib/core/app/components/page-header.js | 1 + ui/lib/core/app/components/test-fun.js | 1 + ui/lib/core/index.js | 8 ++++++++ ui/lib/core/package.json | 11 +++++++++++ 21 files changed, 52 insertions(+), 14 deletions(-) delete mode 100644 ui/app/components/empty-state.js create mode 100644 ui/lib/core/addon/components/empty-state.js rename ui/{app => lib/core/addon}/components/page-header-level-left.js (54%) rename ui/{app => lib/core/addon}/components/page-header-level-right.js (54%) rename ui/{app => lib/core/addon}/components/page-header-top.js (57%) rename ui/{app => lib/core/addon}/components/page-header.js (62%) rename ui/{app => lib/core/addon}/templates/components/empty-state.hbs (100%) rename ui/{app => lib/core/addon}/templates/components/page-header-level-left.hbs (100%) rename ui/{app => lib/core/addon}/templates/components/page-header-level-right.hbs (100%) rename ui/{app => lib/core/addon}/templates/components/page-header.hbs (100%) create mode 100644 ui/lib/core/addon/templates/components/test-fun.hbs create mode 100644 ui/lib/core/app/components/empty-state.js create mode 100644 ui/lib/core/app/components/page-header-level-left.js create mode 100644 ui/lib/core/app/components/page-header-level-right.js create mode 100644 ui/lib/core/app/components/page-header-top.js create mode 100644 ui/lib/core/app/components/page-header.js create mode 100644 ui/lib/core/app/components/test-fun.js create mode 100644 ui/lib/core/index.js create mode 100644 ui/lib/core/package.json diff --git a/ui/app/components/empty-state.js b/ui/app/components/empty-state.js deleted file mode 100644 index 04e6c3d213c7..000000000000 --- a/ui/app/components/empty-state.js +++ /dev/null @@ -1,6 +0,0 @@ -import OuterHTML from './outer-html'; - -export default OuterHTML.extend({ - title: null, - message: null, -}); diff --git a/ui/app/initializers/enable-engines.js b/ui/app/initializers/enable-engines.js index 8f226b95fbea..757c4b1e49d0 100644 --- a/ui/app/initializers/enable-engines.js +++ b/ui/app/initializers/enable-engines.js @@ -1,11 +1,11 @@ -import config from '../config/environment'; +//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() { - console.log(this); - }; + //config.addRootMounts = function() { + //console.log(this); + //}; } export default { diff --git a/ui/app/templates/vault/cluster/replication/index.hbs b/ui/app/templates/vault/cluster/replication/index.hbs index d6ca74b7af26..ea662076038f 100644 --- a/ui/app/templates/vault/cluster/replication/index.hbs +++ b/ui/app/templates/vault/cluster/replication/index.hbs @@ -10,8 +10,8 @@ @title="The current cluster configuration does not support replication" /> {{else}} - {{replication-summary - cluster=model - showModeSummary=true - }} + {{/if}} diff --git a/ui/lib/core/addon/components/empty-state.js b/ui/lib/core/addon/components/empty-state.js new file mode 100644 index 000000000000..c6bacc803982 --- /dev/null +++ b/ui/lib/core/addon/components/empty-state.js @@ -0,0 +1,9 @@ +import Component from '@ember/component'; +import layout from '../templates/components/empty-state'; + +export default Component.extend({ + layout, + tagName: '', + title: null, + message: null, +}); diff --git a/ui/app/components/page-header-level-left.js b/ui/lib/core/addon/components/page-header-level-left.js similarity index 54% rename from ui/app/components/page-header-level-left.js rename to ui/lib/core/addon/components/page-header-level-left.js index 4798652642ba..6442967e6687 100644 --- a/ui/app/components/page-header-level-left.js +++ b/ui/lib/core/addon/components/page-header-level-left.js @@ -1,5 +1,7 @@ import Component from '@ember/component'; +import layout from '../templates/components/page-header-level-left'; export default Component.extend({ + layout, tagName: '', }); diff --git a/ui/app/components/page-header-level-right.js b/ui/lib/core/addon/components/page-header-level-right.js similarity index 54% rename from ui/app/components/page-header-level-right.js rename to ui/lib/core/addon/components/page-header-level-right.js index 4798652642ba..6d5c6221107b 100644 --- a/ui/app/components/page-header-level-right.js +++ b/ui/lib/core/addon/components/page-header-level-right.js @@ -1,5 +1,7 @@ import Component from '@ember/component'; +import layout from '../templates/components/page-header-level-right'; export default Component.extend({ + layout, tagName: '', }); diff --git a/ui/app/components/page-header-top.js b/ui/lib/core/addon/components/page-header-top.js similarity index 57% rename from ui/app/components/page-header-top.js rename to ui/lib/core/addon/components/page-header-top.js index 4798652642ba..64dae0c22efb 100644 --- a/ui/app/components/page-header-top.js +++ b/ui/lib/core/addon/components/page-header-top.js @@ -1,5 +1,7 @@ import Component from '@ember/component'; +import layout from '../templates/components/page-header-top'; export default Component.extend({ + layout, tagName: '', }); diff --git a/ui/app/components/page-header.js b/ui/lib/core/addon/components/page-header.js similarity index 62% rename from ui/app/components/page-header.js rename to ui/lib/core/addon/components/page-header.js index 9a92d16670f6..0c6040701b05 100644 --- a/ui/app/components/page-header.js +++ b/ui/lib/core/addon/components/page-header.js @@ -1,6 +1,8 @@ import Component from '@ember/component'; +import layout from '../templates/components/page-header'; export default Component.extend({ + layout, tagName: '', hasLevel: true, }); diff --git a/ui/app/templates/components/empty-state.hbs b/ui/lib/core/addon/templates/components/empty-state.hbs similarity index 100% rename from ui/app/templates/components/empty-state.hbs rename to ui/lib/core/addon/templates/components/empty-state.hbs diff --git a/ui/app/templates/components/page-header-level-left.hbs b/ui/lib/core/addon/templates/components/page-header-level-left.hbs similarity index 100% rename from ui/app/templates/components/page-header-level-left.hbs rename to ui/lib/core/addon/templates/components/page-header-level-left.hbs diff --git a/ui/app/templates/components/page-header-level-right.hbs b/ui/lib/core/addon/templates/components/page-header-level-right.hbs similarity index 100% rename from ui/app/templates/components/page-header-level-right.hbs rename to ui/lib/core/addon/templates/components/page-header-level-right.hbs diff --git a/ui/app/templates/components/page-header.hbs b/ui/lib/core/addon/templates/components/page-header.hbs similarity index 100% rename from ui/app/templates/components/page-header.hbs rename to ui/lib/core/addon/templates/components/page-header.hbs diff --git a/ui/lib/core/addon/templates/components/test-fun.hbs b/ui/lib/core/addon/templates/components/test-fun.hbs new file mode 100644 index 000000000000..e9e9061b2d17 --- /dev/null +++ b/ui/lib/core/addon/templates/components/test-fun.hbs @@ -0,0 +1,2 @@ +TEST +{{yield}} \ No newline at end of file diff --git a/ui/lib/core/app/components/empty-state.js b/ui/lib/core/app/components/empty-state.js new file mode 100644 index 000000000000..5ec2afae9da6 --- /dev/null +++ b/ui/lib/core/app/components/empty-state.js @@ -0,0 +1 @@ +export { default } from 'core/components/empty-state'; diff --git a/ui/lib/core/app/components/page-header-level-left.js b/ui/lib/core/app/components/page-header-level-left.js new file mode 100644 index 000000000000..4d219df1e381 --- /dev/null +++ b/ui/lib/core/app/components/page-header-level-left.js @@ -0,0 +1 @@ +export { default } from 'core/components/page-header-level-left'; diff --git a/ui/lib/core/app/components/page-header-level-right.js b/ui/lib/core/app/components/page-header-level-right.js new file mode 100644 index 000000000000..3eb8615b7021 --- /dev/null +++ b/ui/lib/core/app/components/page-header-level-right.js @@ -0,0 +1 @@ +export { default } from 'core/components/page-header-level-right'; diff --git a/ui/lib/core/app/components/page-header-top.js b/ui/lib/core/app/components/page-header-top.js new file mode 100644 index 000000000000..c7bf111a7fc5 --- /dev/null +++ b/ui/lib/core/app/components/page-header-top.js @@ -0,0 +1 @@ +export { default } from 'core/components/page-header-top'; diff --git a/ui/lib/core/app/components/page-header.js b/ui/lib/core/app/components/page-header.js new file mode 100644 index 000000000000..ce908e6c702f --- /dev/null +++ b/ui/lib/core/app/components/page-header.js @@ -0,0 +1 @@ +export { default } from 'core/components/page-header'; diff --git a/ui/lib/core/app/components/test-fun.js b/ui/lib/core/app/components/test-fun.js new file mode 100644 index 000000000000..fd8bb180a463 --- /dev/null +++ b/ui/lib/core/app/components/test-fun.js @@ -0,0 +1 @@ +export { default } from 'core/components/test-fun'; diff --git a/ui/lib/core/index.js b/ui/lib/core/index.js new file mode 100644 index 000000000000..6a11283511b1 --- /dev/null +++ b/ui/lib/core/index.js @@ -0,0 +1,8 @@ +/* eslint-disable */ + +module.exports = { + name: require('./package').name, + isDevelopingAddon() { + return true; + }, +}; diff --git a/ui/lib/core/package.json b/ui/lib/core/package.json new file mode 100644 index 000000000000..5eabfaa33509 --- /dev/null +++ b/ui/lib/core/package.json @@ -0,0 +1,11 @@ +{ + "name": "core", + "keywords": [ + "ember-addon" + ], + "dependencies": { + "ember-cli-htmlbars": "^3.0.0", + "ember-cli-babel": "^6.16.0", + "ember-cli-htmlbars-inline-precompile": "^1.0.3" + } +} From 9079a14079877057015c3fdf38c361e101e25587 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Thu, 18 Apr 2019 16:36:52 -0500 Subject: [PATCH 04/66] move replication routes to a lazy engine --- ui/app/initializers/enable-engines.js | 8 ++++---- ui/app/router.js | 16 ---------------- ui/lib/replication/addon/engine.js | 15 +++++++++++++++ ui/lib/replication/addon/resolver.js | 3 +++ ui/lib/replication/addon/routes.js | 17 +++++++++++++++++ .../replication/addon/templates/application.hbs | 1 + ui/lib/replication/config/environment.js | 11 +++++++++++ ui/lib/replication/index.js | 16 ++++++++++++++++ ui/lib/replication/package.json | 16 ++++++++++++++++ ui/package.json | 3 ++- 10 files changed, 85 insertions(+), 21 deletions(-) create mode 100644 ui/lib/replication/addon/engine.js create mode 100644 ui/lib/replication/addon/resolver.js create mode 100644 ui/lib/replication/addon/routes.js create mode 100644 ui/lib/replication/addon/templates/application.hbs create mode 100644 ui/lib/replication/config/environment.js create mode 100644 ui/lib/replication/index.js create mode 100644 ui/lib/replication/package.json diff --git a/ui/app/initializers/enable-engines.js b/ui/app/initializers/enable-engines.js index 757c4b1e49d0..858f36b06d08 100644 --- a/ui/app/initializers/enable-engines.js +++ b/ui/app/initializers/enable-engines.js @@ -1,11 +1,11 @@ -//import config from '../config/environment'; +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() { - //console.log(this); - //}; + config.addRootMounts = function() { + this.mount('replication'); + }; } export default { diff --git a/ui/app/router.js b/ui/app/router.js index aa49357a4967..de87a5433917 100644 --- a/ui/app/router.js +++ b/ui/app/router.js @@ -114,22 +114,6 @@ 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); } diff --git a/ui/lib/replication/addon/engine.js b/ui/lib/replication/addon/engine.js new file mode 100644 index 000000000000..df319921e15b --- /dev/null +++ b/ui/lib/replication/addon/engine.js @@ -0,0 +1,15 @@ +import Engine from 'ember-engines/engine'; +import loadInitializers from 'ember-load-initializers'; +import Resolver from './resolver'; +import config from './config/environment'; + +const { modulePrefix } = config; + +const Eng = Engine.extend({ + modulePrefix, + Resolver, +}); + +loadInitializers(Eng, modulePrefix); + +export default Eng; diff --git a/ui/lib/replication/addon/resolver.js b/ui/lib/replication/addon/resolver.js new file mode 100644 index 000000000000..2fb563d6c048 --- /dev/null +++ b/ui/lib/replication/addon/resolver.js @@ -0,0 +1,3 @@ +import Resolver from 'ember-resolver'; + +export default Resolver; diff --git a/ui/lib/replication/addon/routes.js b/ui/lib/replication/addon/routes.js new file mode 100644 index 000000000000..ff0212ea3dd6 --- /dev/null +++ b/ui/lib/replication/addon/routes.js @@ -0,0 +1,17 @@ +import buildRoutes from 'ember-engines/routes'; + +export default buildRoutes(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' }); + }); + }); +}); diff --git a/ui/lib/replication/addon/templates/application.hbs b/ui/lib/replication/addon/templates/application.hbs new file mode 100644 index 000000000000..e2147cab02d6 --- /dev/null +++ b/ui/lib/replication/addon/templates/application.hbs @@ -0,0 +1 @@ +{{outlet}} \ No newline at end of file diff --git a/ui/lib/replication/config/environment.js b/ui/lib/replication/config/environment.js new file mode 100644 index 000000000000..966d9dd134c5 --- /dev/null +++ b/ui/lib/replication/config/environment.js @@ -0,0 +1,11 @@ +/* eslint-env node */ +'use strict'; + +module.exports = function(environment) { + let ENV = { + modulePrefix: 'replication', + environment, + }; + + return ENV; +}; diff --git a/ui/lib/replication/index.js b/ui/lib/replication/index.js new file mode 100644 index 000000000000..65a61d19b01b --- /dev/null +++ b/ui/lib/replication/index.js @@ -0,0 +1,16 @@ +/* eslint-env node */ +'use strict'; + +const EngineAddon = require('ember-engines/lib/engine-addon'); + +module.exports = EngineAddon.extend({ + name: 'replication', + + lazyLoading: { + enabled: true, + }, + + isDevelopingAddon() { + return true; + }, +}); diff --git a/ui/lib/replication/package.json b/ui/lib/replication/package.json new file mode 100644 index 000000000000..108f8834884a --- /dev/null +++ b/ui/lib/replication/package.json @@ -0,0 +1,16 @@ +{ + "name": "replication", + "keywords": [ + "ember-addon", + "ember-engine" + ], + "dependencies": { + "ember-cli-htmlbars": "*", + "ember-cli-babel": "*" + }, + "ember-addon": { + "paths": [ + "../core" + ] + } +} diff --git a/ui/package.json b/ui/package.json index 4ebac16a661f..3be2e1e1dcb2 100644 --- a/ui/package.json +++ b/ui/package.json @@ -148,7 +148,8 @@ "ember-addon": { "paths": [ "lib/core", - "lib/css" + "lib/css", + "lib/replication" ] }, "husky": { From a7f6ebd477ce816391af0f83bb89d536843ff2e0 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 19 Apr 2019 11:59:28 -0500 Subject: [PATCH 05/66] add assetLoader block to the build to support rootURL for engines --- ui/ember-cli-build.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js index 93b0d1ca8938..dce2bd6c07e8 100644 --- a/ui/ember-cli-build.js +++ b/ui/ember-cli-build.js @@ -2,6 +2,7 @@ 'use strict'; const EmberApp = require('ember-cli/lib/broccoli/ember-app'); +const config = require('./config/environment')(); const environment = EmberApp.env(); const isProd = environment === 'production'; @@ -10,6 +11,12 @@ const isCI = !!process.env.CI; module.exports = function(defaults) { var app = new EmberApp(defaults, { + assetLoader: { + generateURI: function(filePath) { + return `${config.rootURL.replace(/\/$/, '')}${filePath}`; + }, + }, + codemirror: { modes: ['javascript', 'ruby'], keyMaps: ['sublime'], From e25dbbaf1527c3b8d448c48d972803dc7d88bfcb Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 19 Apr 2019 12:48:56 -0500 Subject: [PATCH 06/66] share template addons in the core addon --- ui/lib/core/package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/lib/core/package.json b/ui/lib/core/package.json index 5eabfaa33509..4639d368bce6 100644 --- a/ui/lib/core/package.json +++ b/ui/lib/core/package.json @@ -4,8 +4,9 @@ "ember-addon" ], "dependencies": { - "ember-cli-htmlbars": "^3.0.0", - "ember-cli-babel": "^6.16.0", - "ember-cli-htmlbars-inline-precompile": "^1.0.3" + "ember-cli-htmlbars": "*", + "ember-cli-babel": "*", + "ember-composable-helpers": "*", + "ember-truth-helpers": "*" } } From 088157348028fc4bf8b7ae9be97b3364bdcead89 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 19 Apr 2019 12:49:28 -0500 Subject: [PATCH 07/66] share services with the replication engine --- ui/app/app.js | 8 ++++++++ ui/lib/replication/addon/engine.js | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ui/app/app.js b/ui/app/app.js index 8b963f8e10cb..f29a76df261b 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -8,10 +8,18 @@ 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: ['store', 'replication-mode'], + }, + }, + }, }); loadInitializers(App, config.modulePrefix); diff --git a/ui/lib/replication/addon/engine.js b/ui/lib/replication/addon/engine.js index df319921e15b..545742ba4d47 100644 --- a/ui/lib/replication/addon/engine.js +++ b/ui/lib/replication/addon/engine.js @@ -4,10 +4,13 @@ import Resolver from './resolver'; import config from './config/environment'; const { modulePrefix } = config; - +/* eslint-disable ember/avoid-leaking-state-in-ember-objects */ const Eng = Engine.extend({ modulePrefix, Resolver, + dependencies: { + services: ['store', 'replication-mode'], + }, }); loadInitializers(Eng, modulePrefix); From 384b9a21fb2368d65b3568602dd33748030951d4 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 19 Apr 2019 12:50:10 -0500 Subject: [PATCH 08/66] move replication code over to the replication engine --- .../replication => lib/replication/addon/controllers}/index.js | 0 .../replication => lib/replication/addon/controllers}/mode.js | 0 .../replication/addon/controllers}/mode/index.js | 0 .../replication/addon/controllers}/mode/manage.js | 0 .../replication/addon/controllers}/mode/secondaries.js | 0 .../replication/addon/controllers}/mode/secondaries/add.js | 0 .../addon/controllers}/mode/secondaries/config-create.js | 0 .../addon/controllers}/mode/secondaries/config-edit.js | 0 .../addon/controllers}/mode/secondaries/config-show.js | 0 .../replication/addon/controllers}/mode/secondaries/index.js | 0 .../replication/addon/controllers}/mode/secondaries/revoke.js | 0 .../replication/addon/controllers}/replication-mode.js | 0 .../cluster => lib/replication/addon/controllers}/replication.js | 0 .../cluster/replication => lib/replication/addon/routes}/index.js | 0 .../cluster/replication => lib/replication/addon/routes}/mode.js | 0 .../replication => lib/replication/addon/routes}/mode/index.js | 0 .../replication => lib/replication/addon/routes}/mode/manage.js | 0 .../replication/addon/routes}/mode/secondaries.js | 0 .../replication/addon/routes}/mode/secondaries/add.js | 0 .../replication/addon/routes}/mode/secondaries/config-create.js | 0 .../replication/addon/routes}/mode/secondaries/config-edit.js | 0 .../replication/addon/routes}/mode/secondaries/config-show.js | 0 .../replication/addon/routes}/mode/secondaries/revoke.js | 0 .../replication/addon/routes}/replication-base.js | 0 .../vault/cluster => lib/replication/addon/routes}/replication.js | 0 .../replication => lib/replication/addon/templates}/index.hbs | 0 .../replication => lib/replication/addon/templates}/mode.hbs | 0 .../replication/addon/templates}/mode/index.hbs | 0 .../replication/addon/templates}/mode/manage.hbs | 0 .../replication/addon/templates}/mode/secondaries/add.hbs | 0 .../addon/templates}/mode/secondaries/config-create.hbs | 0 .../replication/addon/templates}/mode/secondaries/config-edit.hbs | 0 .../replication/addon/templates}/mode/secondaries/config-show.hbs | 0 .../replication/addon/templates}/mode/secondaries/index.hbs | 0 .../replication/addon/templates}/mode/secondaries/revoke.hbs | 0 35 files changed, 0 insertions(+), 0 deletions(-) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/index.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/index.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/manage.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/secondaries.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/secondaries/add.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/secondaries/config-create.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/secondaries/config-edit.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/secondaries/config-show.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/secondaries/index.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/mode/secondaries/revoke.js (100%) rename ui/{app/controllers/vault/cluster/replication => lib/replication/addon/controllers}/replication-mode.js (100%) rename ui/{app/controllers/vault/cluster => lib/replication/addon/controllers}/replication.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/index.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode/index.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode/manage.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode/secondaries.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode/secondaries/add.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode/secondaries/config-create.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode/secondaries/config-edit.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode/secondaries/config-show.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/mode/secondaries/revoke.js (100%) rename ui/{app/routes/vault/cluster/replication => lib/replication/addon/routes}/replication-base.js (100%) rename ui/{app/routes/vault/cluster => lib/replication/addon/routes}/replication.js (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/index.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode/index.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode/manage.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode/secondaries/add.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode/secondaries/config-create.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode/secondaries/config-edit.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode/secondaries/config-show.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode/secondaries/index.hbs (100%) rename ui/{app/templates/vault/cluster/replication => lib/replication/addon/templates}/mode/secondaries/revoke.hbs (100%) diff --git a/ui/app/controllers/vault/cluster/replication/index.js b/ui/lib/replication/addon/controllers/index.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/index.js rename to ui/lib/replication/addon/controllers/index.js diff --git a/ui/app/controllers/vault/cluster/replication/mode.js b/ui/lib/replication/addon/controllers/mode.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode.js rename to ui/lib/replication/addon/controllers/mode.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/index.js b/ui/lib/replication/addon/controllers/mode/index.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/index.js rename to ui/lib/replication/addon/controllers/mode/index.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/manage.js b/ui/lib/replication/addon/controllers/mode/manage.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/manage.js rename to ui/lib/replication/addon/controllers/mode/manage.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries.js b/ui/lib/replication/addon/controllers/mode/secondaries.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/secondaries.js rename to ui/lib/replication/addon/controllers/mode/secondaries.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/add.js b/ui/lib/replication/addon/controllers/mode/secondaries/add.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/secondaries/add.js rename to ui/lib/replication/addon/controllers/mode/secondaries/add.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/config-create.js b/ui/lib/replication/addon/controllers/mode/secondaries/config-create.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/secondaries/config-create.js rename to ui/lib/replication/addon/controllers/mode/secondaries/config-create.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/config-edit.js b/ui/lib/replication/addon/controllers/mode/secondaries/config-edit.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/secondaries/config-edit.js rename to ui/lib/replication/addon/controllers/mode/secondaries/config-edit.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/config-show.js b/ui/lib/replication/addon/controllers/mode/secondaries/config-show.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/secondaries/config-show.js rename to ui/lib/replication/addon/controllers/mode/secondaries/config-show.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/index.js b/ui/lib/replication/addon/controllers/mode/secondaries/index.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/secondaries/index.js rename to ui/lib/replication/addon/controllers/mode/secondaries/index.js diff --git a/ui/app/controllers/vault/cluster/replication/mode/secondaries/revoke.js b/ui/lib/replication/addon/controllers/mode/secondaries/revoke.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/mode/secondaries/revoke.js rename to ui/lib/replication/addon/controllers/mode/secondaries/revoke.js diff --git a/ui/app/controllers/vault/cluster/replication/replication-mode.js b/ui/lib/replication/addon/controllers/replication-mode.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication/replication-mode.js rename to ui/lib/replication/addon/controllers/replication-mode.js diff --git a/ui/app/controllers/vault/cluster/replication.js b/ui/lib/replication/addon/controllers/replication.js similarity index 100% rename from ui/app/controllers/vault/cluster/replication.js rename to ui/lib/replication/addon/controllers/replication.js diff --git a/ui/app/routes/vault/cluster/replication/index.js b/ui/lib/replication/addon/routes/index.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/index.js rename to ui/lib/replication/addon/routes/index.js diff --git a/ui/app/routes/vault/cluster/replication/mode.js b/ui/lib/replication/addon/routes/mode.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode.js rename to ui/lib/replication/addon/routes/mode.js diff --git a/ui/app/routes/vault/cluster/replication/mode/index.js b/ui/lib/replication/addon/routes/mode/index.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode/index.js rename to ui/lib/replication/addon/routes/mode/index.js diff --git a/ui/app/routes/vault/cluster/replication/mode/manage.js b/ui/lib/replication/addon/routes/mode/manage.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode/manage.js rename to ui/lib/replication/addon/routes/mode/manage.js diff --git a/ui/app/routes/vault/cluster/replication/mode/secondaries.js b/ui/lib/replication/addon/routes/mode/secondaries.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode/secondaries.js rename to ui/lib/replication/addon/routes/mode/secondaries.js diff --git a/ui/app/routes/vault/cluster/replication/mode/secondaries/add.js b/ui/lib/replication/addon/routes/mode/secondaries/add.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode/secondaries/add.js rename to ui/lib/replication/addon/routes/mode/secondaries/add.js diff --git a/ui/app/routes/vault/cluster/replication/mode/secondaries/config-create.js b/ui/lib/replication/addon/routes/mode/secondaries/config-create.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode/secondaries/config-create.js rename to ui/lib/replication/addon/routes/mode/secondaries/config-create.js diff --git a/ui/app/routes/vault/cluster/replication/mode/secondaries/config-edit.js b/ui/lib/replication/addon/routes/mode/secondaries/config-edit.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode/secondaries/config-edit.js rename to ui/lib/replication/addon/routes/mode/secondaries/config-edit.js diff --git a/ui/app/routes/vault/cluster/replication/mode/secondaries/config-show.js b/ui/lib/replication/addon/routes/mode/secondaries/config-show.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode/secondaries/config-show.js rename to ui/lib/replication/addon/routes/mode/secondaries/config-show.js diff --git a/ui/app/routes/vault/cluster/replication/mode/secondaries/revoke.js b/ui/lib/replication/addon/routes/mode/secondaries/revoke.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/mode/secondaries/revoke.js rename to ui/lib/replication/addon/routes/mode/secondaries/revoke.js diff --git a/ui/app/routes/vault/cluster/replication/replication-base.js b/ui/lib/replication/addon/routes/replication-base.js similarity index 100% rename from ui/app/routes/vault/cluster/replication/replication-base.js rename to ui/lib/replication/addon/routes/replication-base.js diff --git a/ui/app/routes/vault/cluster/replication.js b/ui/lib/replication/addon/routes/replication.js similarity index 100% rename from ui/app/routes/vault/cluster/replication.js rename to ui/lib/replication/addon/routes/replication.js diff --git a/ui/app/templates/vault/cluster/replication/index.hbs b/ui/lib/replication/addon/templates/index.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/index.hbs rename to ui/lib/replication/addon/templates/index.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode.hbs b/ui/lib/replication/addon/templates/mode.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode.hbs rename to ui/lib/replication/addon/templates/mode.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode/index.hbs b/ui/lib/replication/addon/templates/mode/index.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode/index.hbs rename to ui/lib/replication/addon/templates/mode/index.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode/manage.hbs b/ui/lib/replication/addon/templates/mode/manage.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode/manage.hbs rename to ui/lib/replication/addon/templates/mode/manage.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode/secondaries/add.hbs b/ui/lib/replication/addon/templates/mode/secondaries/add.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode/secondaries/add.hbs rename to ui/lib/replication/addon/templates/mode/secondaries/add.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode/secondaries/config-create.hbs b/ui/lib/replication/addon/templates/mode/secondaries/config-create.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode/secondaries/config-create.hbs rename to ui/lib/replication/addon/templates/mode/secondaries/config-create.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode/secondaries/config-edit.hbs b/ui/lib/replication/addon/templates/mode/secondaries/config-edit.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode/secondaries/config-edit.hbs rename to ui/lib/replication/addon/templates/mode/secondaries/config-edit.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode/secondaries/config-show.hbs b/ui/lib/replication/addon/templates/mode/secondaries/config-show.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode/secondaries/config-show.hbs rename to ui/lib/replication/addon/templates/mode/secondaries/config-show.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode/secondaries/index.hbs b/ui/lib/replication/addon/templates/mode/secondaries/index.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode/secondaries/index.hbs rename to ui/lib/replication/addon/templates/mode/secondaries/index.hbs diff --git a/ui/app/templates/vault/cluster/replication/mode/secondaries/revoke.hbs b/ui/lib/replication/addon/templates/mode/secondaries/revoke.hbs similarity index 100% rename from ui/app/templates/vault/cluster/replication/mode/secondaries/revoke.hbs rename to ui/lib/replication/addon/templates/mode/secondaries/revoke.hbs From 2f4b6df1d697fc2015caa1e2715331e7f3a405f6 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 19 Apr 2019 20:50:12 -0500 Subject: [PATCH 09/66] move shared components to core and replication components to replication engine, remove some partials --- .../components/replication-mode-summary.hbs | 1 - .../components/replication-summary.hbs | 24 ----- .../partials/replication/mode-summary.hbs | 57 ---------- .../replication-mode-summary-menu.hbs | 44 -------- .../replication/replication-mode-summary.hbs | 53 --------- .../core/addon}/components/alert-banner.js | 0 .../core/addon}/components/i-con.js | 0 .../core/addon}/components/message-error.js | 0 .../components/replication-mode-summary.js | 7 +- .../templates/components/alert-banner.hbs | 0 .../templates/components/message-error.hbs | 0 .../components/replication-mode-summary.hbs | 101 ++++++++++++++++++ ui/lib/core/app/components/alert-banner.js | 1 + ui/lib/core/app/components/i-con.js | 1 + ui/lib/core/app/components/message-error.js | 1 + .../components/replication-mode-summary.js | 1 + ui/lib/core/app/components/test-fun.js | 1 - .../addon}/components/replication-actions.js | 4 +- .../addon/components/replication-enable.js} | 21 ++-- .../components/replication-secondaries.js | 2 + .../addon/components/replication-summary.js | 10 ++ .../components/replication-actions.hbs | 0 .../components/replication-enable.hbs} | 10 +- .../components/replication-summary.hbs | 83 ++++++++++++++ 24 files changed, 220 insertions(+), 202 deletions(-) delete mode 100644 ui/app/templates/components/replication-mode-summary.hbs delete mode 100644 ui/app/templates/components/replication-summary.hbs delete mode 100644 ui/app/templates/partials/replication/mode-summary.hbs delete mode 100644 ui/app/templates/partials/replication/replication-mode-summary-menu.hbs delete mode 100644 ui/app/templates/partials/replication/replication-mode-summary.hbs rename ui/{app => lib/core/addon}/components/alert-banner.js (100%) rename ui/{app => lib/core/addon}/components/i-con.js (100%) rename ui/{app => lib/core/addon}/components/message-error.js (100%) rename ui/{app => lib/core/addon}/components/replication-mode-summary.js (90%) rename ui/{app => lib/core/addon}/templates/components/alert-banner.hbs (100%) rename ui/{app => lib/core/addon}/templates/components/message-error.hbs (100%) create mode 100644 ui/lib/core/addon/templates/components/replication-mode-summary.hbs create mode 100644 ui/lib/core/app/components/alert-banner.js create mode 100644 ui/lib/core/app/components/i-con.js create mode 100644 ui/lib/core/app/components/message-error.js create mode 100644 ui/lib/core/app/components/replication-mode-summary.js delete mode 100644 ui/lib/core/app/components/test-fun.js rename ui/{app => lib/replication/addon}/components/replication-actions.js (88%) rename ui/{app/components/replication-summary.js => lib/replication/addon/components/replication-enable.js} (85%) rename ui/{app => lib/replication/addon}/components/replication-secondaries.js (84%) create mode 100644 ui/lib/replication/addon/components/replication-summary.js rename ui/{app => lib/replication/addon}/templates/components/replication-actions.hbs (100%) rename ui/{app/templates/partials/replication/enable.hbs => lib/replication/addon/templates/components/replication-enable.hbs} (97%) create mode 100644 ui/lib/replication/addon/templates/components/replication-summary.hbs diff --git a/ui/app/templates/components/replication-mode-summary.hbs b/ui/app/templates/components/replication-mode-summary.hbs deleted file mode 100644 index d3fb34c191d6..000000000000 --- a/ui/app/templates/components/replication-mode-summary.hbs +++ /dev/null @@ -1 +0,0 @@ -{{partial partialName}} diff --git a/ui/app/templates/components/replication-summary.hbs b/ui/app/templates/components/replication-summary.hbs deleted file mode 100644 index 3d0b2bad304e..000000000000 --- a/ui/app/templates/components/replication-summary.hbs +++ /dev/null @@ -1,24 +0,0 @@ -{{#if (not version.hasDRReplication)}} - {{upgrade-page title="Replication"}} -{{else if (or cluster.allReplicationDisabled cluster.replicationAttrs.replicationDisabled)}} - {{partial 'partials/replication/enable'}} -{{else if showModeSummary}} - {{partial 'partials/replication/mode-summary'}} -{{else}} - {{#if (eq replicationAttrs.mode 'initializing')}} - The cluster is initializing replication. This may take some time. - {{else}} - {{info-table-row label="Mode" value=replicationAttrs.mode}} - {{info-table-row label="Replication set" value=replicationAttrs.clusterId}} - {{info-table-row label="Secondary ID" value=replicationAttrs.secondaryId}} - {{info-table-row label="State" value=replicationAttrs.state}} - {{info-table-row label="Primary cluster address" value=replicationAttrs.primaryClusterAddr}} - {{info-table-row label="Replication state" value=replicationAttrs.replicationState}} - {{info-table-row label="Last WAL entry" value=replicationAttrs.lastWAL}} - {{info-table-row label="Last Remote WAL entry" value=replicationAttrs.lastRemoteWAL}} - {{info-table-row label="Merkle root index" value=replicationAttrs.merkleRoot}} - {{#if replicationAttrs.syncProgress}} - {{info-table-row label="Sync progress" value=(concat replicationAttrs.syncProgress.progress '/' replicationAttrs.syncProgress.total)}} - {{/if}} - {{/if}} -{{/if}} diff --git a/ui/app/templates/partials/replication/mode-summary.hbs b/ui/app/templates/partials/replication/mode-summary.hbs deleted file mode 100644 index 555d31426c50..000000000000 --- a/ui/app/templates/partials/replication/mode-summary.hbs +++ /dev/null @@ -1,57 +0,0 @@ - - -

- Replication -

- - -
-

- {{i-con class="has-text-grey is-medium" glyph="replication" size=20}} - Disaster Recovery (DR) -

- {{#if cluster.dr.replicationEnabled}} - {{#link-to - "vault.cluster.replication.mode.index" - "dr" - class="link-plain" - }} - {{replication-mode-summary - mode="dr" - cluster=cluster - tagName="span" - }} - {{/link-to}} - {{else}} - {{replication-mode-summary - mode="dr" - cluster=cluster - tagName="div" - }} - {{/if}} -
-
-

- {{i-con class="has-text-grey is-medium" glyph="perf-replication" size=20}} - Performance -

- {{#if cluster.dr.replicationEnabled}} - {{#link-to - "vault.cluster.replication.mode.index" - "performance" - class="link-plain" - }} - {{replication-mode-summary - mode="performance" - cluster=cluster - tagName="span" - }} - {{/link-to}} - {{else}} - {{replication-mode-summary - mode="performance" - cluster=cluster - tagName="div" - }} - {{/if}} -
diff --git a/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs b/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs deleted file mode 100644 index 18eb45904fd7..000000000000 --- a/ui/app/templates/partials/replication/replication-mode-summary-menu.hbs +++ /dev/null @@ -1,44 +0,0 @@ -
-
- {{#if replicationUnsupported}} - Unsupported - {{else if replicationEnabled}} - - {{capitalize modeForUrl}} - - {{#if secondaryId}} - - - {{secondaryId}} - - - {{/if}} - - - {{clusterIdDisplay}} - - - {{else if (and (eq mode 'performance') (not version.hasPerfReplication))}} - Learn more - {{else if auth.currentToken}} - Enable {{if (eq mode 'performance') 'Performance' 'DR'}} - {{else}} - Not enabled - {{/if}} -
-
- {{#if replicationEnabled}} - {{#if (get cluster (concat mode 'StateGlyph'))}} - - {{i-con size=16 glyph=(get cluster (concat mode 'StateGlyph'))}} - - {{else if syncProgress}} - - {{syncProgress.progress}} of {{syncProgress.total}} keys - - {{/if}} - {{else}} - - {{/if}} -
-
diff --git a/ui/app/templates/partials/replication/replication-mode-summary.hbs b/ui/app/templates/partials/replication/replication-mode-summary.hbs deleted file mode 100644 index fe972ed49ea6..000000000000 --- a/ui/app/templates/partials/replication/replication-mode-summary.hbs +++ /dev/null @@ -1,53 +0,0 @@ -
-
- {{#if (and (eq mode 'performance') (not version.hasPerfReplication))}} -

- Performance Replication is a feature of Vault Enterprise Premium. -

-

- {{#upgrade-link linkClass="button is-ghost has-icon-right" pageName="Performance Replication"}} - Learn more - {{i-con glyph="chevron-right"}} - {{/upgrade-link}} -

- {{else if replicationEnabled}} -
- Enabled -
- - {{capitalize modeForUrl}} - - {{#if secondaryId}} - - - {{secondaryId}} - - - {{/if}} - - - {{clusterIdDisplay}} - - - {{else}} -

- {{#if (eq mode 'dr')}} - DR is designed to protect against catastrophic failure of entire clusters. Secondaries do not forward service requests (until they are elected and become a new primary). - {{else}} - Performance Replication scales workloads horizontally across clusters to make requests faster. Local secondaries handle read requests but forward writes to the primary to be handled. - {{/if}} -

- {{/if}} -
-
-
- {{#if replicationDisabled}} - {{#link-to "vault.cluster.replication.mode.index" cluster.name mode class="button is-primary"}} - Enable - {{/link-to}} - {{else if (eq mode 'dr')}} - {{cluster.drReplicationStateDisplay}} - {{else if (eq mode 'performance')}} - {{cluster.perfReplicationStateDisplay}} - {{/if}} -
diff --git a/ui/app/components/alert-banner.js b/ui/lib/core/addon/components/alert-banner.js similarity index 100% rename from ui/app/components/alert-banner.js rename to ui/lib/core/addon/components/alert-banner.js diff --git a/ui/app/components/i-con.js b/ui/lib/core/addon/components/i-con.js similarity index 100% rename from ui/app/components/i-con.js rename to ui/lib/core/addon/components/i-con.js diff --git a/ui/app/components/message-error.js b/ui/lib/core/addon/components/message-error.js similarity index 100% rename from ui/app/components/message-error.js rename to ui/lib/core/addon/components/message-error.js diff --git a/ui/app/components/replication-mode-summary.js b/ui/lib/core/addon/components/replication-mode-summary.js similarity index 90% rename from ui/app/components/replication-mode-summary.js rename to ui/lib/core/addon/components/replication-mode-summary.js index cd7716b8ee05..616925add7aa 100644 --- a/ui/app/components/replication-mode-summary.js +++ b/ui/lib/core/addon/components/replication-mode-summary.js @@ -2,6 +2,7 @@ import { inject as service } from '@ember/service'; import { equal } from '@ember/object/computed'; import { getProperties, get, computed } from '@ember/object'; import Component from '@ember/component'; +import layout from '../templates/components/replication-mode-summary'; const replicationAttr = function(attr) { return computed('mode', `cluster.{dr,performance}.${attr}`, function() { @@ -10,6 +11,7 @@ const replicationAttr = function(attr) { }); }; export default Component.extend({ + layout, version: service(), router: service(), namespace: service(), @@ -50,9 +52,4 @@ export default Component.extend({ clusterIdDisplay: replicationAttr('clusterIdDisplay'), mode: null, cluster: null, - partialName: computed('display', function() { - return this.get('display') === 'menu' - ? 'partials/replication/replication-mode-summary-menu' - : 'partials/replication/replication-mode-summary'; - }), }); diff --git a/ui/app/templates/components/alert-banner.hbs b/ui/lib/core/addon/templates/components/alert-banner.hbs similarity index 100% rename from ui/app/templates/components/alert-banner.hbs rename to ui/lib/core/addon/templates/components/alert-banner.hbs diff --git a/ui/app/templates/components/message-error.hbs b/ui/lib/core/addon/templates/components/message-error.hbs similarity index 100% rename from ui/app/templates/components/message-error.hbs rename to ui/lib/core/addon/templates/components/message-error.hbs diff --git a/ui/lib/core/addon/templates/components/replication-mode-summary.hbs b/ui/lib/core/addon/templates/components/replication-mode-summary.hbs new file mode 100644 index 000000000000..339e8d400385 --- /dev/null +++ b/ui/lib/core/addon/templates/components/replication-mode-summary.hbs @@ -0,0 +1,101 @@ +{{#if (eq display 'menu')}} +
+
+ {{#if replicationUnsupported}} + Unsupported + {{else if replicationEnabled}} + + {{capitalize modeForUrl}} + + {{#if secondaryId}} + + + {{secondaryId}} + + + {{/if}} + + + {{clusterIdDisplay}} + + + {{else if (and (eq mode 'performance') (not (has-feature "Performance Replication")))}} + Learn more + {{else if auth.currentToken}} + Enable {{if (eq mode 'performance') 'Performance' 'DR'}} + {{else}} + Not enabled + {{/if}} +
+
+ {{#if replicationEnabled}} + {{#if (get cluster (concat mode 'StateGlyph'))}} + + {{i-con size=16 glyph=(get cluster (concat mode 'StateGlyph'))}} + + {{else if syncProgress}} + + {{syncProgress.progress}} of {{syncProgress.total}} keys + + {{/if}} + {{else}} + + {{/if}} +
+
+{{else}} +
+
+ {{#if (and (eq mode 'performance') (not (has-feature "Performance Replication")))}} +

+ Performance Replication is a feature of Vault Enterprise Premium. +

+

+ {{#upgrade-link linkClass="button is-ghost has-icon-right" pageName="Performance Replication"}} + Learn more + {{i-con glyph="chevron-right"}} + {{/upgrade-link}} +

+ {{else if replicationEnabled}} +
+ Enabled +
+ + {{capitalize modeForUrl}} + + {{#if secondaryId}} + + + {{secondaryId}} + + + {{/if}} + + + {{clusterIdDisplay}} + + + {{else}} +

+ {{#if (eq mode 'dr')}} + DR is designed to protect against catastrophic failure of entire clusters. Secondaries do not forward service requests (until they are elected and become a new primary). + {{else}} + Performance Replication scales workloads horizontally across clusters to make requests faster. Local secondaries handle read requests but forward writes to the primary to be handled. + {{/if}} +

+ {{/if}} +
+
+
+ {{#if replicationDisabled}} + {{#link-to "vault.cluster.replication.mode.index" cluster.name mode class="button is-primary"}} + Enable + {{/link-to}} + {{else if (eq mode 'dr')}} + {{cluster.drReplicationStateDisplay}} + {{else if (eq mode 'performance')}} + {{cluster.perfReplicationStateDisplay}} + {{/if}} +
+ +{{/if}} diff --git a/ui/lib/core/app/components/alert-banner.js b/ui/lib/core/app/components/alert-banner.js new file mode 100644 index 000000000000..64985f13c61f --- /dev/null +++ b/ui/lib/core/app/components/alert-banner.js @@ -0,0 +1 @@ +export { default } from 'core/components/alert-banner'; diff --git a/ui/lib/core/app/components/i-con.js b/ui/lib/core/app/components/i-con.js new file mode 100644 index 000000000000..583d6b68f007 --- /dev/null +++ b/ui/lib/core/app/components/i-con.js @@ -0,0 +1 @@ +export { default } from 'core/components/i-con'; diff --git a/ui/lib/core/app/components/message-error.js b/ui/lib/core/app/components/message-error.js new file mode 100644 index 000000000000..f1aa6ebdaa43 --- /dev/null +++ b/ui/lib/core/app/components/message-error.js @@ -0,0 +1 @@ +export { default } from 'core/components/message-error'; diff --git a/ui/lib/core/app/components/replication-mode-summary.js b/ui/lib/core/app/components/replication-mode-summary.js new file mode 100644 index 000000000000..fbe45992db1d --- /dev/null +++ b/ui/lib/core/app/components/replication-mode-summary.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-mode-summary'; diff --git a/ui/lib/core/app/components/test-fun.js b/ui/lib/core/app/components/test-fun.js deleted file mode 100644 index fd8bb180a463..000000000000 --- a/ui/lib/core/app/components/test-fun.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'core/components/test-fun'; diff --git a/ui/app/components/replication-actions.js b/ui/lib/replication/addon/components/replication-actions.js similarity index 88% rename from ui/app/components/replication-actions.js rename to ui/lib/replication/addon/components/replication-actions.js index c2ad4ae8334f..bec3c041eb75 100644 --- a/ui/app/components/replication-actions.js +++ b/ui/lib/replication/addon/components/replication-actions.js @@ -1,7 +1,8 @@ import { alias } from '@ember/object/computed'; import Component from '@ember/component'; import { computed } from '@ember/object'; -import ReplicationActions from 'vault/mixins/replication-actions'; +import ReplicationActions from 'replication/mixins/replication-actions'; +import layout from '../templates/components/replication-actions'; const DEFAULTS = { token: null, @@ -14,6 +15,7 @@ const DEFAULTS = { }; export default Component.extend(ReplicationActions, DEFAULTS, { + layout, replicationMode: null, selectedAction: null, tagName: 'form', diff --git a/ui/app/components/replication-summary.js b/ui/lib/replication/addon/components/replication-enable.js similarity index 85% rename from ui/app/components/replication-summary.js rename to ui/lib/replication/addon/components/replication-enable.js index 745722a6d9a2..963f9957583c 100644 --- a/ui/app/components/replication-summary.js +++ b/ui/lib/replication/addon/components/replication-enable.js @@ -1,11 +1,13 @@ -import { inject as service } from '@ember/service'; -import { alias } from '@ember/object/computed'; -import { get, computed } from '@ember/object'; import Component from '@ember/component'; -import decodeConfigFromJWT from 'vault/utils/decode-config-from-jwt'; -import ReplicationActions from 'vault/mixins/replication-actions'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; import { task } from 'ember-concurrency'; +import decodeConfigFromJWT from 'replication/utils/decode-config-from-jwt'; +import ReplicationActions from 'replication/mixins/replication-actions'; + +import layout from '../templates/components/replication-enable'; + const DEFAULTS = { mode: 'primary', token: null, @@ -20,8 +22,10 @@ const DEFAULTS = { }; export default Component.extend(ReplicationActions, DEFAULTS, { + layout, wizard: service(), - version: service(), + tagName: '', + didReceiveAttrs() { this._super(...arguments); const initialReplicationMode = this.get('initialReplicationMode'); @@ -29,11 +33,6 @@ export default Component.extend(ReplicationActions, DEFAULTS, { this.set('replicationMode', initialReplicationMode); } }, - showModeSummary: false, - initialReplicationMode: null, - cluster: null, - - replicationAttrs: alias('cluster.replicationAttrs'), tokenIncludesAPIAddr: computed('token', function() { const config = decodeConfigFromJWT(get(this, 'token')); diff --git a/ui/app/components/replication-secondaries.js b/ui/lib/replication/addon/components/replication-secondaries.js similarity index 84% rename from ui/app/components/replication-secondaries.js rename to ui/lib/replication/addon/components/replication-secondaries.js index c1f862976fc5..a5f0ef9b02ff 100644 --- a/ui/app/components/replication-secondaries.js +++ b/ui/lib/replication/addon/components/replication-secondaries.js @@ -1,7 +1,9 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; +import layout from '../templates/components/replication-secondaries'; export default Component.extend({ + layout, cluster: null, replicationMode: null, secondaries: null, diff --git a/ui/lib/replication/addon/components/replication-summary.js b/ui/lib/replication/addon/components/replication-summary.js new file mode 100644 index 000000000000..0fb7c79231fd --- /dev/null +++ b/ui/lib/replication/addon/components/replication-summary.js @@ -0,0 +1,10 @@ +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import layout from '../templates/components/replication-summary'; + +export default Component.extend({ + layout, + showModeSummary: false, + cluster: null, + replicationAttrs: alias('cluster.replicationAttrs'), +}); diff --git a/ui/app/templates/components/replication-actions.hbs b/ui/lib/replication/addon/templates/components/replication-actions.hbs similarity index 100% rename from ui/app/templates/components/replication-actions.hbs rename to ui/lib/replication/addon/templates/components/replication-actions.hbs diff --git a/ui/app/templates/partials/replication/enable.hbs b/ui/lib/replication/addon/templates/components/replication-enable.hbs similarity index 97% rename from ui/app/templates/partials/replication/enable.hbs rename to ui/lib/replication/addon/templates/components/replication-enable.hbs index 007d1db99c01..f0a9f37211a4 100644 --- a/ui/app/templates/partials/replication/enable.hbs +++ b/ui/lib/replication/addon/templates/components/replication-enable.hbs @@ -46,7 +46,7 @@ {{i-con class="is-medium" glyph="perf-replication" size=20}} Performance Replication - {{#if (not version.hasPerfReplication)}} + {{#if (not (has-feature "Performance Replication"))}}

Performance Replication is a feature of {{#upgrade-link pageName="Performance Replication"}}Vault Enterprise Premium{{/upgrade-link}}

@@ -92,11 +92,11 @@

{{i-con class="is-medium" glyph="perf-replication" size=20}} Performance - {{#if (not version.hasPerfReplication)}} + {{#if (not (has-feature "Performance Replication"))}} {{edition-badge edition="Premium"}} {{/if}}

- {{#if (not version.hasPerfReplication)}} + {{#if (not (has-feature "Performance Replication"))}}

Performance Replication is a feature of {{#upgrade-link pageName="Performance Replication"}}Vault Enterprise Premium{{/upgrade-link}}

@@ -107,7 +107,7 @@ {{/if}}
- {{#if version.hasPerfReplication}} + {{#if (has-feature "Performance Replication")}} {{radio-button value="performance" groupValue=replicationMode @@ -171,7 +171,7 @@ {{#if (and (eq replicationMode 'dr') (not cluster.performance.replicationDisabled) - version.hasPerfReplication + (has-feature "Performance Replication") ) }}
diff --git a/ui/lib/replication/addon/templates/components/replication-summary.hbs b/ui/lib/replication/addon/templates/components/replication-summary.hbs new file mode 100644 index 000000000000..4d4b7cfd3b9e --- /dev/null +++ b/ui/lib/replication/addon/templates/components/replication-summary.hbs @@ -0,0 +1,83 @@ +{{#if (not (has-feature "DR Replication"))}} + {{upgrade-page title="Replication"}} +{{else if (or cluster.allReplicationDisabled cluster.replicationAttrs.replicationDisabled)}} + +{{else if showModeSummary}} + + +

+ Replication +

+ + +
+

+ {{i-con class="has-text-grey is-medium" glyph="replication" size=20}} + Disaster Recovery (DR) +

+ {{#if cluster.dr.replicationEnabled}} + {{#link-to + "vault.cluster.replication.mode.index" + "dr" + class="link-plain" + }} + {{replication-mode-summary + mode="dr" + cluster=cluster + tagName="span" + }} + {{/link-to}} + {{else}} + {{replication-mode-summary + mode="dr" + cluster=cluster + tagName="div" + }} + {{/if}} +
+
+

+ {{i-con class="has-text-grey is-medium" glyph="perf-replication" size=20}} + Performance +

+ {{#if cluster.dr.replicationEnabled}} + {{#link-to + "vault.cluster.replication.mode.index" + "performance" + class="link-plain" + }} + {{replication-mode-summary + mode="performance" + cluster=cluster + tagName="span" + }} + {{/link-to}} + {{else}} + {{replication-mode-summary + mode="performance" + cluster=cluster + tagName="div" + }} + {{/if}} +
+{{else}} + {{#if (eq replicationAttrs.mode 'initializing')}} + The cluster is initializing replication. This may take some time. + {{else}} + {{info-table-row label="Mode" value=replicationAttrs.mode}} + {{info-table-row label="Replication set" value=replicationAttrs.clusterId}} + {{info-table-row label="Secondary ID" value=replicationAttrs.secondaryId}} + {{info-table-row label="State" value=replicationAttrs.state}} + {{info-table-row label="Primary cluster address" value=replicationAttrs.primaryClusterAddr}} + {{info-table-row label="Replication state" value=replicationAttrs.replicationState}} + {{info-table-row label="Last WAL entry" value=replicationAttrs.lastWAL}} + {{info-table-row label="Last Remote WAL entry" value=replicationAttrs.lastRemoteWAL}} + {{info-table-row label="Merkle root index" value=replicationAttrs.merkleRoot}} + {{#if replicationAttrs.syncProgress}} + {{info-table-row label="Sync progress" value=(concat replicationAttrs.syncProgress.progress '/' replicationAttrs.syncProgress.total)}} + {{/if}} + {{/if}} +{{/if}} From a6cf9b42500f7fd2f532804c9503184d7469b12f Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 19 Apr 2019 20:53:53 -0500 Subject: [PATCH 10/66] move shared helpers and utils to core --- ui/{app => lib/core/addon}/helpers/has-feature.js | 0 ui/{app => lib/core/addon}/utils/b64.js | 0 ui/lib/core/app/helpers/has-feature.js | 1 + ui/lib/core/app/utils/b64.js | 1 + ui/{app => lib/replication/addon}/mixins/replication-actions.js | 0 .../replication/addon}/utils/decode-config-from-jwt.js | 2 +- 6 files changed, 3 insertions(+), 1 deletion(-) rename ui/{app => lib/core/addon}/helpers/has-feature.js (100%) rename ui/{app => lib/core/addon}/utils/b64.js (100%) create mode 100644 ui/lib/core/app/helpers/has-feature.js create mode 100644 ui/lib/core/app/utils/b64.js rename ui/{app => lib/replication/addon}/mixins/replication-actions.js (100%) rename ui/{app => lib/replication/addon}/utils/decode-config-from-jwt.js (93%) diff --git a/ui/app/helpers/has-feature.js b/ui/lib/core/addon/helpers/has-feature.js similarity index 100% rename from ui/app/helpers/has-feature.js rename to ui/lib/core/addon/helpers/has-feature.js diff --git a/ui/app/utils/b64.js b/ui/lib/core/addon/utils/b64.js similarity index 100% rename from ui/app/utils/b64.js rename to ui/lib/core/addon/utils/b64.js diff --git a/ui/lib/core/app/helpers/has-feature.js b/ui/lib/core/app/helpers/has-feature.js new file mode 100644 index 000000000000..c5a79021c2c6 --- /dev/null +++ b/ui/lib/core/app/helpers/has-feature.js @@ -0,0 +1 @@ +export { default } from 'core/helpers/has-feature'; diff --git a/ui/lib/core/app/utils/b64.js b/ui/lib/core/app/utils/b64.js new file mode 100644 index 000000000000..cf7ae9479711 --- /dev/null +++ b/ui/lib/core/app/utils/b64.js @@ -0,0 +1 @@ +export { encodeString, decodeString } from 'core/utils/b64'; diff --git a/ui/app/mixins/replication-actions.js b/ui/lib/replication/addon/mixins/replication-actions.js similarity index 100% rename from ui/app/mixins/replication-actions.js rename to ui/lib/replication/addon/mixins/replication-actions.js diff --git a/ui/app/utils/decode-config-from-jwt.js b/ui/lib/replication/addon/utils/decode-config-from-jwt.js similarity index 93% rename from ui/app/utils/decode-config-from-jwt.js rename to ui/lib/replication/addon/utils/decode-config-from-jwt.js index d0c840621df3..66e541f2a83e 100644 --- a/ui/app/utils/decode-config-from-jwt.js +++ b/ui/lib/replication/addon/utils/decode-config-from-jwt.js @@ -1,4 +1,4 @@ -import { decodeString } from 'vault/utils/b64'; +import { decodeString } from 'core/utils/b64'; /* * @param token - Replication Secondary Activation Token From e7ab3981cdb6523fe95f6b12bbc8f9147d08e55a Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 19 Apr 2019 20:55:42 -0500 Subject: [PATCH 11/66] move named replication route to addon application route --- .../addon/controllers/{replication.js => application.js} | 0 .../addon/routes/{replication.js => application.js} | 3 ++- ui/lib/replication/addon/routes/index.js | 2 +- ui/lib/replication/addon/routes/replication-base.js | 5 +++-- 4 files changed, 6 insertions(+), 4 deletions(-) rename ui/lib/replication/addon/controllers/{replication.js => application.js} (100%) rename ui/lib/replication/addon/routes/{replication.js => application.js} (93%) diff --git a/ui/lib/replication/addon/controllers/replication.js b/ui/lib/replication/addon/controllers/application.js similarity index 100% rename from ui/lib/replication/addon/controllers/replication.js rename to ui/lib/replication/addon/controllers/application.js diff --git a/ui/lib/replication/addon/routes/replication.js b/ui/lib/replication/addon/routes/application.js similarity index 93% rename from ui/lib/replication/addon/routes/replication.js rename to ui/lib/replication/addon/routes/application.js index 900927c3ad86..f599e73fa3ef 100644 --- a/ui/lib/replication/addon/routes/replication.js +++ b/ui/lib/replication/addon/routes/application.js @@ -6,6 +6,7 @@ import ClusterRoute from 'vault/mixins/cluster-route'; export default Route.extend(ClusterRoute, { version: service(), + store: service(), beforeModel() { return this.get('version') @@ -16,7 +17,7 @@ export default Route.extend(ClusterRoute, { }, model() { - return this.modelFor('vault.cluster'); + return this.store.findRecord('cluster', 'vault'); }, afterModel(model) { diff --git a/ui/lib/replication/addon/routes/index.js b/ui/lib/replication/addon/routes/index.js index 5aabd99f7b36..ca69628790bf 100644 --- a/ui/lib/replication/addon/routes/index.js +++ b/ui/lib/replication/addon/routes/index.js @@ -7,6 +7,6 @@ export default Route.extend({ this.get('replicationMode').setMode(null); }, model() { - return this.modelFor('vault.cluster.replication'); + return this.modelFor('application'); }, }); diff --git a/ui/lib/replication/addon/routes/replication-base.js b/ui/lib/replication/addon/routes/replication-base.js index f2cab56d76b3..f4ab308b25f8 100644 --- a/ui/lib/replication/addon/routes/replication-base.js +++ b/ui/lib/replication/addon/routes/replication-base.js @@ -5,6 +5,9 @@ import Route from '@ember/routing/route'; import UnloadModelRouteMixin from 'vault/mixins/unload-model-route'; export default Route.extend(UnloadModelRouteMixin, { + store: service(), + version: service(), + rm: service('replication-mode'), modelPath: 'model.config', fetchMounts() { return hash({ @@ -15,7 +18,5 @@ export default Route.extend(UnloadModelRouteMixin, { }); }, - version: service(), - rm: service('replication-mode'), replicationMode: alias('rm.mode'), }); From fa7a39a6de1bfa3e86f76bbc8bf25f6c9dcda4f0 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 19 Apr 2019 20:56:13 -0500 Subject: [PATCH 12/66] update shared services and core addon deps --- ui/app/app.js | 2 +- ui/lib/core/package.json | 7 ++++++- ui/lib/replication/addon/engine.js | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ui/app/app.js b/ui/app/app.js index f29a76df261b..ce5fac065d35 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -16,7 +16,7 @@ App = Application.extend({ engines: { replication: { dependencies: { - services: ['store', 'replication-mode'], + services: ['auth', 'replication-mode', 'router', 'store', 'version', 'wizard'], }, }, }, diff --git a/ui/lib/core/package.json b/ui/lib/core/package.json index 4639d368bce6..db4b0f12169c 100644 --- a/ui/lib/core/package.json +++ b/ui/lib/core/package.json @@ -4,9 +4,14 @@ "ember-addon" ], "dependencies": { + "ember-auto-import": "*", "ember-cli-htmlbars": "*", + "ember-cli-htmlbars-inline-precompile": "*", "ember-cli-babel": "*", + "ember-radio-button": "*", "ember-composable-helpers": "*", - "ember-truth-helpers": "*" + "ember-truth-helpers": "*", + "ember-concurrency": "*", + "base64-js": "*" } } diff --git a/ui/lib/replication/addon/engine.js b/ui/lib/replication/addon/engine.js index 545742ba4d47..9bf2648b89e6 100644 --- a/ui/lib/replication/addon/engine.js +++ b/ui/lib/replication/addon/engine.js @@ -9,7 +9,7 @@ const Eng = Engine.extend({ modulePrefix, Resolver, dependencies: { - services: ['store', 'replication-mode'], + services: ['auth', 'replication-mode', 'router', 'store', 'version', 'wizard'], }, }); From f657fc4f36f0b6f08b4952557f524274cd5dcbe9 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Mon, 22 Apr 2019 09:13:41 -0500 Subject: [PATCH 13/66] comment out usage of i-con component for now --- .../addon/templates/components/replication-enable.hbs | 8 ++++++++ .../addon/templates/components/replication-summary.hbs | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/ui/lib/replication/addon/templates/components/replication-enable.hbs b/ui/lib/replication/addon/templates/components/replication-enable.hbs index f0a9f37211a4..6409c236dcb9 100644 --- a/ui/lib/replication/addon/templates/components/replication-enable.hbs +++ b/ui/lib/replication/addon/templates/components/replication-enable.hbs @@ -35,7 +35,9 @@ {{#if initialReplicationMode}} {{#if (eq initialReplicationMode 'dr')}}

+ {{!-- TODO convert to a new component that doesn't use partials {{i-con class="is-medium" glyph="replication" size=24}} + --}} Disaster Recovery (DR) Replication

@@ -43,7 +45,9 @@

{{else if (eq initialReplicationMode 'performance')}}

+ {{!-- TODO convert to a new component that doesn't use partials {{i-con class="is-medium" glyph="perf-replication" size=20}} + --}} Performance Replication

{{#if (not (has-feature "Performance Replication"))}} @@ -68,7 +72,9 @@