diff --git a/ui/lib/core/addon/components/replication-action-demote.js b/ui/lib/core/addon/components/replication-action-demote.js new file mode 100644 index 0000000000..8832e96c55 --- /dev/null +++ b/ui/lib/core/addon/components/replication-action-demote.js @@ -0,0 +1,6 @@ +import Actions from 'core/components/replication-actions-single'; +import layout from '../templates/components/replication-action-demote'; + +export default Actions.extend({ + layout, +}); diff --git a/ui/lib/core/addon/components/replication-action-disable.js b/ui/lib/core/addon/components/replication-action-disable.js new file mode 100644 index 0000000000..59e0ad273d --- /dev/null +++ b/ui/lib/core/addon/components/replication-action-disable.js @@ -0,0 +1,6 @@ +import Actions from 'core/components/replication-actions-single'; +import layout from '../templates/components/replication-action-disable'; + +export default Actions.extend({ + layout, +}); diff --git a/ui/lib/core/addon/components/replication-action-promote.js b/ui/lib/core/addon/components/replication-action-promote.js new file mode 100644 index 0000000000..a984c1d202 --- /dev/null +++ b/ui/lib/core/addon/components/replication-action-promote.js @@ -0,0 +1,6 @@ +import Actions from './replication-actions-single'; +import layout from '../templates/components/replication-action-promote'; + +export default Actions.extend({ + layout, +}); diff --git a/ui/lib/core/addon/components/replication-action-recover.js b/ui/lib/core/addon/components/replication-action-recover.js new file mode 100644 index 0000000000..0738f4fe32 --- /dev/null +++ b/ui/lib/core/addon/components/replication-action-recover.js @@ -0,0 +1,6 @@ +import Actions from 'core/components/replication-actions-single'; +import layout from '../templates/components/replication-action-recover'; + +export default Actions.extend({ + layout, +}); diff --git a/ui/lib/core/addon/components/replication-action-reindex.js b/ui/lib/core/addon/components/replication-action-reindex.js new file mode 100644 index 0000000000..e75631bf61 --- /dev/null +++ b/ui/lib/core/addon/components/replication-action-reindex.js @@ -0,0 +1,6 @@ +import Actions from 'core/components/replication-actions-single'; +import layout from '../templates/components/replication-action-reindex'; + +export default Actions.extend({ + layout, +}); diff --git a/ui/lib/core/addon/components/replication-action-update-primary.js b/ui/lib/core/addon/components/replication-action-update-primary.js new file mode 100644 index 0000000000..6a67bb025f --- /dev/null +++ b/ui/lib/core/addon/components/replication-action-update-primary.js @@ -0,0 +1,6 @@ +import Actions from './replication-actions-single'; +import layout from '../templates/components/replication-action-update-primary'; + +export default Actions.extend({ + layout, +}); diff --git a/ui/lib/replication/addon/components/replication-actions-single.js b/ui/lib/core/addon/components/replication-actions-single.js similarity index 100% rename from ui/lib/replication/addon/components/replication-actions-single.js rename to ui/lib/core/addon/components/replication-actions-single.js diff --git a/ui/lib/replication/addon/components/replication-actions.js b/ui/lib/core/addon/components/replication-actions.js similarity index 87% rename from ui/lib/replication/addon/components/replication-actions.js rename to ui/lib/core/addon/components/replication-actions.js index 6e4e17b4f1..53b009a525 100644 --- a/ui/lib/replication/addon/components/replication-actions.js +++ b/ui/lib/core/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 'replication/mixins/replication-actions'; +import ReplicationActions from 'core/mixins/replication-actions'; +import layout from '../templates/components/replication-actions'; const DEFAULTS = { token: null, @@ -14,14 +15,11 @@ const DEFAULTS = { }; export default Component.extend(ReplicationActions, DEFAULTS, { + layout, replicationMode: null, model: null, cluster: alias('model'), - didReceiveAttrs() { - this._super(...arguments); - }, - reset() { if (!this || this.isDestroyed || this.isDestroying) { return; diff --git a/ui/lib/replication/addon/helpers/replication-action-for-mode.js b/ui/lib/core/addon/helpers/replication-action-for-mode.js similarity index 100% rename from ui/lib/replication/addon/helpers/replication-action-for-mode.js rename to ui/lib/core/addon/helpers/replication-action-for-mode.js diff --git a/ui/lib/replication/addon/mixins/replication-actions.js b/ui/lib/core/addon/mixins/replication-actions.js similarity index 100% rename from ui/lib/replication/addon/mixins/replication-actions.js rename to ui/lib/core/addon/mixins/replication-actions.js diff --git a/ui/lib/replication/addon/templates/components/replication-action-demote.hbs b/ui/lib/core/addon/templates/components/replication-action-demote.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/replication-action-demote.hbs rename to ui/lib/core/addon/templates/components/replication-action-demote.hbs diff --git a/ui/lib/replication/addon/templates/components/replication-action-disable.hbs b/ui/lib/core/addon/templates/components/replication-action-disable.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/replication-action-disable.hbs rename to ui/lib/core/addon/templates/components/replication-action-disable.hbs diff --git a/ui/lib/replication/addon/templates/components/replication-action-promote.hbs b/ui/lib/core/addon/templates/components/replication-action-promote.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/replication-action-promote.hbs rename to ui/lib/core/addon/templates/components/replication-action-promote.hbs diff --git a/ui/lib/replication/addon/templates/components/replication-action-recover.hbs b/ui/lib/core/addon/templates/components/replication-action-recover.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/replication-action-recover.hbs rename to ui/lib/core/addon/templates/components/replication-action-recover.hbs diff --git a/ui/lib/replication/addon/templates/components/replication-action-reindex.hbs b/ui/lib/core/addon/templates/components/replication-action-reindex.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/replication-action-reindex.hbs rename to ui/lib/core/addon/templates/components/replication-action-reindex.hbs diff --git a/ui/lib/replication/addon/templates/components/replication-action-update-primary.hbs b/ui/lib/core/addon/templates/components/replication-action-update-primary.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/replication-action-update-primary.hbs rename to ui/lib/core/addon/templates/components/replication-action-update-primary.hbs diff --git a/ui/lib/core/addon/templates/components/replication-actions.hbs b/ui/lib/core/addon/templates/components/replication-actions.hbs new file mode 100644 index 0000000000..9579ee4590 --- /dev/null +++ b/ui/lib/core/addon/templates/components/replication-actions.hbs @@ -0,0 +1,15 @@ +{{#if loading}} + +{{else}} + + {{#each (if selectedAction (array selectedAction) (replication-action-for-mode replicationMode model.replicationAttrs.modeForUrl)) as |replicationAction index|}} +
+ {{component (concat 'replication-action-' replicationAction) + onSubmit=(action "onSubmit") + replicationMode=replicationMode + model=model + replicationDisplayMode=replicationDisplayMode + }} +
+ {{/each}} +{{/if}} diff --git a/ui/lib/core/app/components/replication-action-demote.js b/ui/lib/core/app/components/replication-action-demote.js new file mode 100644 index 0000000000..064b3d459b --- /dev/null +++ b/ui/lib/core/app/components/replication-action-demote.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-action-demote'; diff --git a/ui/lib/core/app/components/replication-action-disable.js b/ui/lib/core/app/components/replication-action-disable.js new file mode 100644 index 0000000000..64bd793ee3 --- /dev/null +++ b/ui/lib/core/app/components/replication-action-disable.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-action-disable'; diff --git a/ui/lib/core/app/components/replication-action-promote.js b/ui/lib/core/app/components/replication-action-promote.js new file mode 100644 index 0000000000..89344dad47 --- /dev/null +++ b/ui/lib/core/app/components/replication-action-promote.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-action-promote'; diff --git a/ui/lib/core/app/components/replication-action-recover.js b/ui/lib/core/app/components/replication-action-recover.js new file mode 100644 index 0000000000..bb7563b7e5 --- /dev/null +++ b/ui/lib/core/app/components/replication-action-recover.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-action-recover'; diff --git a/ui/lib/core/app/components/replication-action-reindex.js b/ui/lib/core/app/components/replication-action-reindex.js new file mode 100644 index 0000000000..27ebd4ba55 --- /dev/null +++ b/ui/lib/core/app/components/replication-action-reindex.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-action-reindex'; diff --git a/ui/lib/core/app/components/replication-action-update-primary.js b/ui/lib/core/app/components/replication-action-update-primary.js new file mode 100644 index 0000000000..82eadbef09 --- /dev/null +++ b/ui/lib/core/app/components/replication-action-update-primary.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-action-update-primary'; diff --git a/ui/lib/core/app/components/replication-actions-single.js b/ui/lib/core/app/components/replication-actions-single.js new file mode 100644 index 0000000000..65a99d5c37 --- /dev/null +++ b/ui/lib/core/app/components/replication-actions-single.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-actions-single'; diff --git a/ui/lib/core/app/components/replication-actions.js b/ui/lib/core/app/components/replication-actions.js new file mode 100644 index 0000000000..debe69531d --- /dev/null +++ b/ui/lib/core/app/components/replication-actions.js @@ -0,0 +1 @@ +export { default } from 'core/components/replication-actions'; diff --git a/ui/lib/core/app/helpers/replication-action-for-mode.js b/ui/lib/core/app/helpers/replication-action-for-mode.js new file mode 100644 index 0000000000..ae5d3dac48 --- /dev/null +++ b/ui/lib/core/app/helpers/replication-action-for-mode.js @@ -0,0 +1 @@ +export { default } from 'core/helpers/replication-action-for-mode'; diff --git a/ui/lib/core/app/mixins/replication-actions.js b/ui/lib/core/app/mixins/replication-actions.js new file mode 100644 index 0000000000..6ba429de1d --- /dev/null +++ b/ui/lib/core/app/mixins/replication-actions.js @@ -0,0 +1 @@ +export { default } from 'core/mixins/replication-actions'; diff --git a/ui/lib/replication/addon/components/replication-action-demote.js b/ui/lib/replication/addon/components/replication-action-demote.js deleted file mode 100644 index e84bd01486..0000000000 --- a/ui/lib/replication/addon/components/replication-action-demote.js +++ /dev/null @@ -1,3 +0,0 @@ -import Actions from './replication-actions-single'; - -export default Actions.extend(); diff --git a/ui/lib/replication/addon/components/replication-action-disable.js b/ui/lib/replication/addon/components/replication-action-disable.js deleted file mode 100644 index e84bd01486..0000000000 --- a/ui/lib/replication/addon/components/replication-action-disable.js +++ /dev/null @@ -1,3 +0,0 @@ -import Actions from './replication-actions-single'; - -export default Actions.extend(); diff --git a/ui/lib/replication/addon/components/replication-action-promote.js b/ui/lib/replication/addon/components/replication-action-promote.js deleted file mode 100644 index e84bd01486..0000000000 --- a/ui/lib/replication/addon/components/replication-action-promote.js +++ /dev/null @@ -1,3 +0,0 @@ -import Actions from './replication-actions-single'; - -export default Actions.extend(); diff --git a/ui/lib/replication/addon/components/replication-action-recover.js b/ui/lib/replication/addon/components/replication-action-recover.js deleted file mode 100644 index e84bd01486..0000000000 --- a/ui/lib/replication/addon/components/replication-action-recover.js +++ /dev/null @@ -1,3 +0,0 @@ -import Actions from './replication-actions-single'; - -export default Actions.extend(); diff --git a/ui/lib/replication/addon/components/replication-action-reindex.js b/ui/lib/replication/addon/components/replication-action-reindex.js deleted file mode 100644 index e84bd01486..0000000000 --- a/ui/lib/replication/addon/components/replication-action-reindex.js +++ /dev/null @@ -1,3 +0,0 @@ -import Actions from './replication-actions-single'; - -export default Actions.extend(); diff --git a/ui/lib/replication/addon/components/replication-action-update-primary.js b/ui/lib/replication/addon/components/replication-action-update-primary.js deleted file mode 100644 index e84bd01486..0000000000 --- a/ui/lib/replication/addon/components/replication-action-update-primary.js +++ /dev/null @@ -1,3 +0,0 @@ -import Actions from './replication-actions-single'; - -export default Actions.extend(); diff --git a/ui/lib/replication/addon/components/replication-summary.js b/ui/lib/replication/addon/components/replication-summary.js index 34479653a4..e39844c540 100644 --- a/ui/lib/replication/addon/components/replication-summary.js +++ b/ui/lib/replication/addon/components/replication-summary.js @@ -3,7 +3,7 @@ import { alias } from '@ember/object/computed'; import { get, computed } from '@ember/object'; import Component from '@ember/component'; import decodeConfigFromJWT from 'replication/utils/decode-config-from-jwt'; -import ReplicationActions from 'replication/mixins/replication-actions'; +import ReplicationActions from 'core/mixins/replication-actions'; import { task } from 'ember-concurrency'; const DEFAULTS = { diff --git a/ui/lib/replication/addon/templates/components/replication-actions.hbs b/ui/lib/replication/addon/templates/components/replication-actions.hbs deleted file mode 100644 index ecff120f87..0000000000 --- a/ui/lib/replication/addon/templates/components/replication-actions.hbs +++ /dev/null @@ -1,17 +0,0 @@ -{{#if loading}} - -{{else}} - - {{#each (if selectedAction (array selectedAction) (replication-action-for-mode replicationMode model.replicationAttrs.modeForUrl)) as |replicationAction index|}} - {{#if (get model (concat 'can' (camelize replicationAction)))}} -
- {{component (concat 'replication-action-' replicationAction) - onSubmit=(action "onSubmit") - replicationMode=replicationMode - model=model - replicationDisplayMode=replicationDisplayMode - }} -
- {{/if}} - {{/each}} -{{/if}} diff --git a/ui/tests/integration/components/replication-actions-test.js b/ui/tests/integration/components/replication-actions-test.js index 9fe7a194fd..309cd51d05 100644 --- a/ui/tests/integration/components/replication-actions-test.js +++ b/ui/tests/integration/components/replication-actions-test.js @@ -4,14 +4,9 @@ import Service from '@ember/service'; import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; import { click, fillIn, blur, render, find } from '@ember/test-helpers'; -import { camelize } from '@ember/string'; -import engineResolverFor from 'ember-engines/test-support/engine-resolver-for'; - import hbs from 'htmlbars-inline-precompile'; import sinon from 'sinon'; -const resolver = engineResolverFor('replication'); - const storeStub = Service.extend({ callArgs: null, adapterFor() { @@ -32,7 +27,7 @@ const routerService = Service.extend({ }); module('Integration | Component | replication actions', function(hooks) { - setupRenderingTest(hooks, { resolver }); + setupRenderingTest(hooks); hooks.beforeEach(function() { run(() => { @@ -99,7 +94,6 @@ module('Integration | Component | replication actions', function(hooks) { mode: clusterMode, modeForUrl: clusterMode, }, - [`can${camelize(action)}`]: true, reload() { return resolve(); },