From 828d43eaf60b59b7071c588b0f17ed5b2ab1fc9a Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 1 Aug 2025 15:51:30 -0500 Subject: [PATCH 1/5] core: run colocated components codemod --- .../{templates => }/components/edit-form.hbs | 0 ui/lib/core/addon/components/edit-form.js | 7 ++--- .../components/message-error.hbs | 0 .../{templates => }/components/read-more.hbs | 0 .../components/readonly-form-field.hbs | 0 .../components/replication-action-demote.hbs | 0 .../components/replication-action-demote.js | 4 +-- .../components/replication-action-disable.hbs | 0 .../components/replication-action-disable.js | 4 +-- .../replication-action-generate-token.hbs | 0 .../replication-action-generate-token.js | 4 +-- .../components/replication-action-promote.hbs | 0 .../components/replication-action-promote.js | 4 +-- .../components/replication-action-recover.hbs | 0 .../components/replication-action-recover.js | 4 +-- .../components/replication-action-reindex.hbs | 0 .../components/replication-action-reindex.js | 4 +-- .../replication-action-update-primary.hbs | 0 .../replication-action-update-primary.js | 4 +-- .../components/replication-actions.hbs | 0 .../addon/components/replication-actions.js | 5 ++-- .../components/replication-secondary-card.hbs | 0 .../components/replication-secondary-card.js | 11 +++++--- .../components/replication-table-rows.hbs | 0 .../components/replication-table-rows.js | 7 ++--- .../{templates => }/components/select.hbs | 0 ui/lib/core/addon/components/select.js | 26 +++++++++---------- 27 files changed, 37 insertions(+), 47 deletions(-) rename ui/lib/core/addon/{templates => }/components/edit-form.hbs (100%) rename ui/lib/core/addon/{templates => }/components/message-error.hbs (100%) rename ui/lib/core/addon/{templates => }/components/read-more.hbs (100%) rename ui/lib/core/addon/{templates => }/components/readonly-form-field.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-action-demote.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-action-disable.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-action-generate-token.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-action-promote.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-action-recover.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-action-reindex.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-action-update-primary.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-actions.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-secondary-card.hbs (100%) rename ui/lib/core/addon/{templates => }/components/replication-table-rows.hbs (100%) rename ui/lib/core/addon/{templates => }/components/select.hbs (100%) diff --git a/ui/lib/core/addon/templates/components/edit-form.hbs b/ui/lib/core/addon/components/edit-form.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/edit-form.hbs rename to ui/lib/core/addon/components/edit-form.hbs diff --git a/ui/lib/core/addon/components/edit-form.js b/ui/lib/core/addon/components/edit-form.js index b9293f94e7d..c862115273d 100644 --- a/ui/lib/core/addon/components/edit-form.js +++ b/ui/lib/core/addon/components/edit-form.js @@ -7,19 +7,20 @@ import AdapterError from '@ember-data/adapter/error'; import { service } from '@ember/service'; import Component from '@ember/component'; import { task } from 'ember-concurrency'; -import layout from '../templates/components/edit-form'; import { next } from '@ember/runloop'; import { waitFor } from '@ember/test-waiters'; export default Component.extend({ - layout, flashMessages: service(), // internal validations invalidFormAlert: '', + modelValidations: null, + // public API model: null, + successMessage: 'Saved!', deleteSuccessMessage: 'Deleted!', deleteButtonText: 'Delete', @@ -91,5 +92,5 @@ export default Component.extend({ model.rollbackAttributes(); } this._super(...arguments); - }, + } }); diff --git a/ui/lib/core/addon/templates/components/message-error.hbs b/ui/lib/core/addon/components/message-error.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/message-error.hbs rename to ui/lib/core/addon/components/message-error.hbs diff --git a/ui/lib/core/addon/templates/components/read-more.hbs b/ui/lib/core/addon/components/read-more.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/read-more.hbs rename to ui/lib/core/addon/components/read-more.hbs diff --git a/ui/lib/core/addon/templates/components/readonly-form-field.hbs b/ui/lib/core/addon/components/readonly-form-field.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/readonly-form-field.hbs rename to ui/lib/core/addon/components/readonly-form-field.hbs diff --git a/ui/lib/core/addon/templates/components/replication-action-demote.hbs b/ui/lib/core/addon/components/replication-action-demote.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-action-demote.hbs rename to ui/lib/core/addon/components/replication-action-demote.hbs diff --git a/ui/lib/core/addon/components/replication-action-demote.js b/ui/lib/core/addon/components/replication-action-demote.js index 804e0d25284..6be70cc3ace 100644 --- a/ui/lib/core/addon/components/replication-action-demote.js +++ b/ui/lib/core/addon/components/replication-action-demote.js @@ -4,9 +4,7 @@ */ import Actions from 'core/components/replication-actions-single'; -import layout from '../templates/components/replication-action-demote'; export default Actions.extend({ - layout, - tagName: '', + tagName: '' }); diff --git a/ui/lib/core/addon/templates/components/replication-action-disable.hbs b/ui/lib/core/addon/components/replication-action-disable.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-action-disable.hbs rename to ui/lib/core/addon/components/replication-action-disable.hbs diff --git a/ui/lib/core/addon/components/replication-action-disable.js b/ui/lib/core/addon/components/replication-action-disable.js index 77c5108e1f2..f5f6287fab4 100644 --- a/ui/lib/core/addon/components/replication-action-disable.js +++ b/ui/lib/core/addon/components/replication-action-disable.js @@ -4,10 +4,8 @@ */ import Actions from 'core/components/replication-actions-single'; -import layout from '../templates/components/replication-action-disable'; export default Actions.extend({ - layout, tagName: '', actions: { @@ -15,5 +13,5 @@ export default Actions.extend({ // No data is submitted for disable request return this.onSubmit(replicationMode, clusterMode, null, evt); }, - }, + } }); diff --git a/ui/lib/core/addon/templates/components/replication-action-generate-token.hbs b/ui/lib/core/addon/components/replication-action-generate-token.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-action-generate-token.hbs rename to ui/lib/core/addon/components/replication-action-generate-token.hbs diff --git a/ui/lib/core/addon/components/replication-action-generate-token.js b/ui/lib/core/addon/components/replication-action-generate-token.js index 82b90ac96d1..e237a6bbee2 100644 --- a/ui/lib/core/addon/components/replication-action-generate-token.js +++ b/ui/lib/core/addon/components/replication-action-generate-token.js @@ -4,9 +4,7 @@ */ import Actions from './replication-actions-single'; -import layout from '../templates/components/replication-action-generate-token'; export default Actions.extend({ - layout, - tagName: '', + tagName: '' }); diff --git a/ui/lib/core/addon/templates/components/replication-action-promote.hbs b/ui/lib/core/addon/components/replication-action-promote.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-action-promote.hbs rename to ui/lib/core/addon/components/replication-action-promote.hbs diff --git a/ui/lib/core/addon/components/replication-action-promote.js b/ui/lib/core/addon/components/replication-action-promote.js index 2677574b2a4..e237a6bbee2 100644 --- a/ui/lib/core/addon/components/replication-action-promote.js +++ b/ui/lib/core/addon/components/replication-action-promote.js @@ -4,9 +4,7 @@ */ import Actions from './replication-actions-single'; -import layout from '../templates/components/replication-action-promote'; export default Actions.extend({ - layout, - tagName: '', + tagName: '' }); diff --git a/ui/lib/core/addon/templates/components/replication-action-recover.hbs b/ui/lib/core/addon/components/replication-action-recover.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-action-recover.hbs rename to ui/lib/core/addon/components/replication-action-recover.hbs diff --git a/ui/lib/core/addon/components/replication-action-recover.js b/ui/lib/core/addon/components/replication-action-recover.js index 1967151289e..6be70cc3ace 100644 --- a/ui/lib/core/addon/components/replication-action-recover.js +++ b/ui/lib/core/addon/components/replication-action-recover.js @@ -4,9 +4,7 @@ */ import Actions from 'core/components/replication-actions-single'; -import layout from '../templates/components/replication-action-recover'; export default Actions.extend({ - layout, - tagName: '', + tagName: '' }); diff --git a/ui/lib/core/addon/templates/components/replication-action-reindex.hbs b/ui/lib/core/addon/components/replication-action-reindex.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-action-reindex.hbs rename to ui/lib/core/addon/components/replication-action-reindex.hbs diff --git a/ui/lib/core/addon/components/replication-action-reindex.js b/ui/lib/core/addon/components/replication-action-reindex.js index 2faa3c1d108..6be70cc3ace 100644 --- a/ui/lib/core/addon/components/replication-action-reindex.js +++ b/ui/lib/core/addon/components/replication-action-reindex.js @@ -4,9 +4,7 @@ */ import Actions from 'core/components/replication-actions-single'; -import layout from '../templates/components/replication-action-reindex'; export default Actions.extend({ - layout, - tagName: '', + tagName: '' }); diff --git a/ui/lib/core/addon/templates/components/replication-action-update-primary.hbs b/ui/lib/core/addon/components/replication-action-update-primary.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-action-update-primary.hbs rename to ui/lib/core/addon/components/replication-action-update-primary.hbs diff --git a/ui/lib/core/addon/components/replication-action-update-primary.js b/ui/lib/core/addon/components/replication-action-update-primary.js index 8d45009d04a..e237a6bbee2 100644 --- a/ui/lib/core/addon/components/replication-action-update-primary.js +++ b/ui/lib/core/addon/components/replication-action-update-primary.js @@ -4,9 +4,7 @@ */ import Actions from './replication-actions-single'; -import layout from '../templates/components/replication-action-update-primary'; export default Actions.extend({ - layout, - tagName: '', + tagName: '' }); diff --git a/ui/lib/core/addon/templates/components/replication-actions.hbs b/ui/lib/core/addon/components/replication-actions.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-actions.hbs rename to ui/lib/core/addon/components/replication-actions.hbs diff --git a/ui/lib/core/addon/components/replication-actions.js b/ui/lib/core/addon/components/replication-actions.js index efddfaa77b7..65208f4c46a 100644 --- a/ui/lib/core/addon/components/replication-actions.js +++ b/ui/lib/core/addon/components/replication-actions.js @@ -6,7 +6,6 @@ import { alias } from '@ember/object/computed'; import Component from '@ember/component'; import ReplicationActions from 'core/mixins/replication-actions'; -import layout from '../templates/components/replication-actions'; const DEFAULTS = { token: null, @@ -18,10 +17,10 @@ const DEFAULTS = { }; export default Component.extend(ReplicationActions, DEFAULTS, { - layout, replicationMode: null, model: null, cluster: alias('model'), + reset() { if (!this || this.isDestroyed || this.isDestroying) { return; @@ -40,5 +39,5 @@ export default Component.extend(ReplicationActions, DEFAULTS, { id: null, }); }, - }, + } }); diff --git a/ui/lib/core/addon/templates/components/replication-secondary-card.hbs b/ui/lib/core/addon/components/replication-secondary-card.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-secondary-card.hbs rename to ui/lib/core/addon/components/replication-secondary-card.hbs diff --git a/ui/lib/core/addon/components/replication-secondary-card.js b/ui/lib/core/addon/components/replication-secondary-card.js index eb9cc760817..707de2efe8e 100644 --- a/ui/lib/core/addon/components/replication-secondary-card.js +++ b/ui/lib/core/addon/components/replication-secondary-card.js @@ -6,7 +6,6 @@ import { equal, reads } from '@ember/object/computed'; import Component from '@ember/component'; import { computed } from '@ember/object'; -import layout from '../templates/components/replication-secondary-card'; import { clusterStates } from 'core/helpers/cluster-states'; /** @@ -25,24 +24,28 @@ import { clusterStates } from 'core/helpers/cluster-states'; */ export default Component.extend({ - layout, tagName: '', title: null, replicationDetails: null, + state: computed('replicationDetails.state', function () { return this.replicationDetails && this.replicationDetails.state ? this.replicationDetails.state : 'unknown'; }), + connection: computed('replicationDetails.connection_state', function () { return this.replicationDetails.connection_state ? this.replicationDetails.connection_state : 'unknown'; }), + lastRemoteWAL: computed('replicationDetails.lastRemoteWAL', function () { return this.replicationDetails && this.replicationDetails.lastRemoteWAL ? this.replicationDetails.lastRemoteWAL : 0; }), + inSyncState: equal('state', 'stream-wals'), + hasErrorClass: computed('replicationDetails', 'title', 'state', 'connection', function () { const { title, state, connection } = this; @@ -54,12 +57,14 @@ export default Component.extend({ } return false; }), + knownPrimaryClusterAddrs: reads('replicationDetails.knownPrimaryClusterAddrs'), + primaryUiUrl: computed('replicationDetails.{primaries,knownPrimaryClusterAddrs}', function () { const { replicationDetails } = this; if (replicationDetails.primaries && replicationDetails.primaries.length) { return this.replicationDetails.primaries[0].api_address; } return ''; - }), + }) }); diff --git a/ui/lib/core/addon/templates/components/replication-table-rows.hbs b/ui/lib/core/addon/components/replication-table-rows.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/replication-table-rows.hbs rename to ui/lib/core/addon/components/replication-table-rows.hbs diff --git a/ui/lib/core/addon/components/replication-table-rows.js b/ui/lib/core/addon/components/replication-table-rows.js index 22d9c21a458..f9a486cc69e 100644 --- a/ui/lib/core/addon/components/replication-table-rows.js +++ b/ui/lib/core/addon/components/replication-table-rows.js @@ -6,7 +6,6 @@ import { reads } from '@ember/object/computed'; import Component from '@ember/component'; import { computed } from '@ember/object'; -import layout from '../templates/components/replication-table-rows'; /** * @module ReplicationTableRows @@ -24,18 +23,20 @@ import layout from '../templates/components/replication-table-rows'; */ export default Component.extend({ - layout, classNames: ['replication-table-rows'], replicationDetails: null, clusterMode: null, secondaryId: reads('replicationDetails.secondaryId'), + primaryClusterAddr: computed('replicationDetails.primaryClusterAddr', function () { return this.replicationDetails.primaryClusterAddr || 'None set'; }), + merkleRoot: computed('replicationDetails.merkleRoot', function () { return this.replicationDetails.merkleRoot || 'unknown'; }), + clusterId: computed('replicationDetails.clusterId', function () { return this.replicationDetails.clusterId || 'unknown'; - }), + }) }); diff --git a/ui/lib/core/addon/templates/components/select.hbs b/ui/lib/core/addon/components/select.hbs similarity index 100% rename from ui/lib/core/addon/templates/components/select.hbs rename to ui/lib/core/addon/components/select.hbs diff --git a/ui/lib/core/addon/components/select.js b/ui/lib/core/addon/components/select.js index 822c6ed4ec6..19975e22530 100644 --- a/ui/lib/core/addon/components/select.js +++ b/ui/lib/core/addon/components/select.js @@ -4,7 +4,6 @@ */ import Component from '@ember/component'; -import layout from '../templates/components/select'; /** * @module Select @@ -27,17 +26,16 @@ import layout from '../templates/components/select'; */ export default Component.extend({ - layout, - classNames: ['field'], - label: null, - selectedValue: null, - name: null, - options: null, - valueAttribute: 'value', - labelAttribute: 'label', - isInline: false, - isFullwidth: false, - noDefault: false, - onChange() {}, - ariaLabel: null, + classNames: ['field'], + label: null, + selectedValue: null, + name: null, + options: null, + valueAttribute: 'value', + labelAttribute: 'label', + isInline: false, + isFullwidth: false, + noDefault: false, + onChange() {}, + ariaLabel: null }); From c43d7335d646a893e42215d4ab3acbf2a9248c3f Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 1 Aug 2025 16:09:53 -0500 Subject: [PATCH 2/5] kmip: run colocated components codemod --- .../{templates => }/components/header-scope.hbs | 0 ui/lib/kmip/addon/components/header-scope.js | 6 ++---- .../components/kmip-breadcrumb.hbs | 0 ui/lib/kmip/addon/components/kmip-breadcrumb.js | 16 +++++++--------- .../components/operation-field-display.hbs | 0 .../addon/components/operation-field-display.js | 4 +--- 6 files changed, 10 insertions(+), 16 deletions(-) rename ui/lib/kmip/addon/{templates => }/components/header-scope.hbs (100%) rename ui/lib/kmip/addon/{templates => }/components/kmip-breadcrumb.hbs (100%) rename ui/lib/kmip/addon/{templates => }/components/operation-field-display.hbs (100%) diff --git a/ui/lib/kmip/addon/templates/components/header-scope.hbs b/ui/lib/kmip/addon/components/header-scope.hbs similarity index 100% rename from ui/lib/kmip/addon/templates/components/header-scope.hbs rename to ui/lib/kmip/addon/components/header-scope.hbs diff --git a/ui/lib/kmip/addon/components/header-scope.js b/ui/lib/kmip/addon/components/header-scope.js index 37458f3c808..0f16b52603c 100644 --- a/ui/lib/kmip/addon/components/header-scope.js +++ b/ui/lib/kmip/addon/components/header-scope.js @@ -5,10 +5,8 @@ import Component from '@ember/component'; import { service } from '@ember/service'; -import layout from '../templates/components/header-scope'; export default Component.extend({ - layout, - tagName: '', - secretMountPath: service(), + tagName: '', + secretMountPath: service() }); diff --git a/ui/lib/kmip/addon/templates/components/kmip-breadcrumb.hbs b/ui/lib/kmip/addon/components/kmip-breadcrumb.hbs similarity index 100% rename from ui/lib/kmip/addon/templates/components/kmip-breadcrumb.hbs rename to ui/lib/kmip/addon/components/kmip-breadcrumb.hbs diff --git a/ui/lib/kmip/addon/components/kmip-breadcrumb.js b/ui/lib/kmip/addon/components/kmip-breadcrumb.js index 0cc6bb7f246..3456504489d 100644 --- a/ui/lib/kmip/addon/components/kmip-breadcrumb.js +++ b/ui/lib/kmip/addon/components/kmip-breadcrumb.js @@ -5,16 +5,14 @@ import Component from '@ember/component'; import { service } from '@ember/service'; -import layout from '../templates/components/kmip-breadcrumb'; import { or } from '@ember/object/computed'; export default Component.extend({ - layout, - tagName: '', - secretMountPath: service(), - shouldShowPath: or('showPath', 'scope', 'role'), - showPath: false, - path: null, - scope: null, - role: null, + tagName: '', + secretMountPath: service(), + shouldShowPath: or('showPath', 'scope', 'role'), + showPath: false, + path: null, + scope: null, + role: null }); diff --git a/ui/lib/kmip/addon/templates/components/operation-field-display.hbs b/ui/lib/kmip/addon/components/operation-field-display.hbs similarity index 100% rename from ui/lib/kmip/addon/templates/components/operation-field-display.hbs rename to ui/lib/kmip/addon/components/operation-field-display.hbs diff --git a/ui/lib/kmip/addon/components/operation-field-display.js b/ui/lib/kmip/addon/components/operation-field-display.js index 7b184d933dd..9c98521d9e8 100644 --- a/ui/lib/kmip/addon/components/operation-field-display.js +++ b/ui/lib/kmip/addon/components/operation-field-display.js @@ -16,10 +16,8 @@ * */ import Component from '@ember/component'; -import layout from '../templates/components/operation-field-display'; export default Component.extend({ - layout, tagName: '', model: null, @@ -43,5 +41,5 @@ export default Component.extend({ operationEnabled(model, field) { return this.trueOrFalseString(model, field, 'Enabled', 'Disabled'); }, - }, + } }); From a845dd24b7a6731b22b39ad7593986fde74f97b5 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 1 Aug 2025 16:10:30 -0500 Subject: [PATCH 3/5] replication: run colocated components codemod --- .../{templates => }/components/known-secondaries-card.hbs | 0 .../{templates => }/components/known-secondaries-table.hbs | 0 .../{templates => }/components/path-filter-config-list.hbs | 0 .../replication/addon/components/path-filter-config-list.js | 4 ++-- .../{templates => }/components/replication-primary-card.hbs | 0 .../addon/{templates => }/components/replication-summary.hbs | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename ui/lib/replication/addon/{templates => }/components/known-secondaries-card.hbs (100%) rename ui/lib/replication/addon/{templates => }/components/known-secondaries-table.hbs (100%) rename ui/lib/replication/addon/{templates => }/components/path-filter-config-list.hbs (100%) rename ui/lib/replication/addon/{templates => }/components/replication-primary-card.hbs (100%) rename ui/lib/replication/addon/{templates => }/components/replication-summary.hbs (100%) diff --git a/ui/lib/replication/addon/templates/components/known-secondaries-card.hbs b/ui/lib/replication/addon/components/known-secondaries-card.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/known-secondaries-card.hbs rename to ui/lib/replication/addon/components/known-secondaries-card.hbs diff --git a/ui/lib/replication/addon/templates/components/known-secondaries-table.hbs b/ui/lib/replication/addon/components/known-secondaries-table.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/known-secondaries-table.hbs rename to ui/lib/replication/addon/components/known-secondaries-table.hbs diff --git a/ui/lib/replication/addon/templates/components/path-filter-config-list.hbs b/ui/lib/replication/addon/components/path-filter-config-list.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/path-filter-config-list.hbs rename to ui/lib/replication/addon/components/path-filter-config-list.hbs diff --git a/ui/lib/replication/addon/components/path-filter-config-list.js b/ui/lib/replication/addon/components/path-filter-config-list.js index b227956e2bc..7f77c7e3f23 100644 --- a/ui/lib/replication/addon/components/path-filter-config-list.js +++ b/ui/lib/replication/addon/components/path-filter-config-list.js @@ -34,8 +34,8 @@ export default Component.extend({ const secret = []; const auth = []; const mounts = ns - ? yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET', { namespace: ns }) - : yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET'); + ? (yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET', { namespace: ns })) + : (yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET')); ['secret', 'auth'].forEach((key) => { for (const [id, info] of Object.entries(mounts.data[key])) { diff --git a/ui/lib/replication/addon/templates/components/replication-primary-card.hbs b/ui/lib/replication/addon/components/replication-primary-card.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/replication-primary-card.hbs rename to ui/lib/replication/addon/components/replication-primary-card.hbs diff --git a/ui/lib/replication/addon/templates/components/replication-summary.hbs b/ui/lib/replication/addon/components/replication-summary.hbs similarity index 100% rename from ui/lib/replication/addon/templates/components/replication-summary.hbs rename to ui/lib/replication/addon/components/replication-summary.hbs From a084e9378b08aa7bd3227766de75bb310d93768a Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 1 Aug 2025 16:19:13 -0500 Subject: [PATCH 4/5] core: remove manual setting of templates with setComponentTemplate --- ui/lib/core/addon/components/message-error.js | 5 +---- ui/lib/core/addon/components/read-more.js | 6 +----- ui/lib/core/addon/components/readonly-form-field.js | 6 +----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/ui/lib/core/addon/components/message-error.js b/ui/lib/core/addon/components/message-error.js index 51f604ce3b3..860069e336e 100644 --- a/ui/lib/core/addon/components/message-error.js +++ b/ui/lib/core/addon/components/message-error.js @@ -4,8 +4,6 @@ */ import Component from '@glimmer/component'; -import layout from '../templates/components/message-error'; -import { setComponentTemplate } from '@ember/component'; /** * @module MessageError @@ -20,7 +18,7 @@ import { setComponentTemplate } from '@ember/component'; * @param {string} [errorMessage=null] - An Error string to display. */ -class MessageError extends Component { +export default class MessageError extends Component { get displayErrors() { const { errorMessage, errors, model } = this.args; if (errorMessage) { @@ -47,4 +45,3 @@ class MessageError extends Component { return null; } } -export default setComponentTemplate(layout, MessageError); diff --git a/ui/lib/core/addon/components/read-more.js b/ui/lib/core/addon/components/read-more.js index 9fb3727ef1e..e96b4bf93ff 100644 --- a/ui/lib/core/addon/components/read-more.js +++ b/ui/lib/core/addon/components/read-more.js @@ -4,8 +4,6 @@ */ import Component from '@glimmer/component'; -import layout from '../templates/components/read-more'; -import { setComponentTemplate } from '@ember/component'; import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; @@ -25,7 +23,7 @@ import { tracked } from '@glimmer/tracking'; * */ -class ReadMoreComponent extends Component { +export default class ReadMoreComponent extends Component { @action calculateOverflow(e) { const spanText = e.querySelector('.description-block'); @@ -45,5 +43,3 @@ class ReadMoreComponent extends Component { this.isOpen = !this.isOpen; } } - -export default setComponentTemplate(layout, ReadMoreComponent); diff --git a/ui/lib/core/addon/components/readonly-form-field.js b/ui/lib/core/addon/components/readonly-form-field.js index 1ae6741a637..704d6a0465c 100644 --- a/ui/lib/core/addon/components/readonly-form-field.js +++ b/ui/lib/core/addon/components/readonly-form-field.js @@ -15,12 +15,10 @@ */ import Component from '@glimmer/component'; -import { setComponentTemplate } from '@ember/component'; import { capitalize, dasherize } from '@ember/string'; import { humanize } from 'vault/helpers/humanize'; -import layout from '../templates/components/readonly-form-field'; -class ReadonlyFormField extends Component { +export default class ReadonlyFormField extends Component { get labelString() { if (!this.args.attr) { return ''; @@ -36,5 +34,3 @@ class ReadonlyFormField extends Component { return ''; } } - -export default setComponentTemplate(layout, ReadonlyFormField); From 1e3d224c8dbd6f33db29d93ae48dc3041ad638d9 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Fri, 1 Aug 2025 17:43:57 -0500 Subject: [PATCH 5/5] run prettier --- ui/lib/core/addon/components/edit-form.js | 2 +- .../components/replication-action-demote.js | 2 +- .../components/replication-action-disable.js | 2 +- .../replication-action-generate-token.js | 2 +- .../components/replication-action-promote.js | 2 +- .../components/replication-action-recover.js | 2 +- .../components/replication-action-reindex.js | 2 +- .../replication-action-update-primary.js | 2 +- .../addon/components/replication-actions.js | 2 +- .../components/replication-secondary-card.js | 2 +- .../components/replication-table-rows.js | 2 +- ui/lib/core/addon/components/select.js | 24 +++++++++---------- ui/lib/kmip/addon/components/header-scope.js | 4 ++-- .../kmip/addon/components/kmip-breadcrumb.js | 14 +++++------ .../components/operation-field-display.js | 2 +- .../components/path-filter-config-list.js | 4 ++-- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ui/lib/core/addon/components/edit-form.js b/ui/lib/core/addon/components/edit-form.js index c862115273d..1e240834c9f 100644 --- a/ui/lib/core/addon/components/edit-form.js +++ b/ui/lib/core/addon/components/edit-form.js @@ -92,5 +92,5 @@ export default Component.extend({ model.rollbackAttributes(); } this._super(...arguments); - } + }, }); diff --git a/ui/lib/core/addon/components/replication-action-demote.js b/ui/lib/core/addon/components/replication-action-demote.js index 6be70cc3ace..cbc7b210d4e 100644 --- a/ui/lib/core/addon/components/replication-action-demote.js +++ b/ui/lib/core/addon/components/replication-action-demote.js @@ -6,5 +6,5 @@ import Actions from 'core/components/replication-actions-single'; export default Actions.extend({ - tagName: '' + tagName: '', }); diff --git a/ui/lib/core/addon/components/replication-action-disable.js b/ui/lib/core/addon/components/replication-action-disable.js index f5f6287fab4..ef686d057fd 100644 --- a/ui/lib/core/addon/components/replication-action-disable.js +++ b/ui/lib/core/addon/components/replication-action-disable.js @@ -13,5 +13,5 @@ export default Actions.extend({ // No data is submitted for disable request return this.onSubmit(replicationMode, clusterMode, null, evt); }, - } + }, }); diff --git a/ui/lib/core/addon/components/replication-action-generate-token.js b/ui/lib/core/addon/components/replication-action-generate-token.js index e237a6bbee2..a0fc2d24d0a 100644 --- a/ui/lib/core/addon/components/replication-action-generate-token.js +++ b/ui/lib/core/addon/components/replication-action-generate-token.js @@ -6,5 +6,5 @@ import Actions from './replication-actions-single'; export default Actions.extend({ - tagName: '' + tagName: '', }); diff --git a/ui/lib/core/addon/components/replication-action-promote.js b/ui/lib/core/addon/components/replication-action-promote.js index e237a6bbee2..a0fc2d24d0a 100644 --- a/ui/lib/core/addon/components/replication-action-promote.js +++ b/ui/lib/core/addon/components/replication-action-promote.js @@ -6,5 +6,5 @@ import Actions from './replication-actions-single'; export default Actions.extend({ - tagName: '' + tagName: '', }); diff --git a/ui/lib/core/addon/components/replication-action-recover.js b/ui/lib/core/addon/components/replication-action-recover.js index 6be70cc3ace..cbc7b210d4e 100644 --- a/ui/lib/core/addon/components/replication-action-recover.js +++ b/ui/lib/core/addon/components/replication-action-recover.js @@ -6,5 +6,5 @@ import Actions from 'core/components/replication-actions-single'; export default Actions.extend({ - tagName: '' + tagName: '', }); diff --git a/ui/lib/core/addon/components/replication-action-reindex.js b/ui/lib/core/addon/components/replication-action-reindex.js index 6be70cc3ace..cbc7b210d4e 100644 --- a/ui/lib/core/addon/components/replication-action-reindex.js +++ b/ui/lib/core/addon/components/replication-action-reindex.js @@ -6,5 +6,5 @@ import Actions from 'core/components/replication-actions-single'; export default Actions.extend({ - tagName: '' + tagName: '', }); diff --git a/ui/lib/core/addon/components/replication-action-update-primary.js b/ui/lib/core/addon/components/replication-action-update-primary.js index e237a6bbee2..a0fc2d24d0a 100644 --- a/ui/lib/core/addon/components/replication-action-update-primary.js +++ b/ui/lib/core/addon/components/replication-action-update-primary.js @@ -6,5 +6,5 @@ import Actions from './replication-actions-single'; export default Actions.extend({ - tagName: '' + tagName: '', }); diff --git a/ui/lib/core/addon/components/replication-actions.js b/ui/lib/core/addon/components/replication-actions.js index 65208f4c46a..cf5ce63a3a6 100644 --- a/ui/lib/core/addon/components/replication-actions.js +++ b/ui/lib/core/addon/components/replication-actions.js @@ -39,5 +39,5 @@ export default Component.extend(ReplicationActions, DEFAULTS, { id: null, }); }, - } + }, }); diff --git a/ui/lib/core/addon/components/replication-secondary-card.js b/ui/lib/core/addon/components/replication-secondary-card.js index 707de2efe8e..04f64019366 100644 --- a/ui/lib/core/addon/components/replication-secondary-card.js +++ b/ui/lib/core/addon/components/replication-secondary-card.js @@ -66,5 +66,5 @@ export default Component.extend({ return this.replicationDetails.primaries[0].api_address; } return ''; - }) + }), }); diff --git a/ui/lib/core/addon/components/replication-table-rows.js b/ui/lib/core/addon/components/replication-table-rows.js index f9a486cc69e..d00031c6d08 100644 --- a/ui/lib/core/addon/components/replication-table-rows.js +++ b/ui/lib/core/addon/components/replication-table-rows.js @@ -38,5 +38,5 @@ export default Component.extend({ clusterId: computed('replicationDetails.clusterId', function () { return this.replicationDetails.clusterId || 'unknown'; - }) + }), }); diff --git a/ui/lib/core/addon/components/select.js b/ui/lib/core/addon/components/select.js index 19975e22530..8b45db2037c 100644 --- a/ui/lib/core/addon/components/select.js +++ b/ui/lib/core/addon/components/select.js @@ -26,16 +26,16 @@ import Component from '@ember/component'; */ export default Component.extend({ - classNames: ['field'], - label: null, - selectedValue: null, - name: null, - options: null, - valueAttribute: 'value', - labelAttribute: 'label', - isInline: false, - isFullwidth: false, - noDefault: false, - onChange() {}, - ariaLabel: null + classNames: ['field'], + label: null, + selectedValue: null, + name: null, + options: null, + valueAttribute: 'value', + labelAttribute: 'label', + isInline: false, + isFullwidth: false, + noDefault: false, + onChange() {}, + ariaLabel: null, }); diff --git a/ui/lib/kmip/addon/components/header-scope.js b/ui/lib/kmip/addon/components/header-scope.js index 0f16b52603c..985dd8c5bae 100644 --- a/ui/lib/kmip/addon/components/header-scope.js +++ b/ui/lib/kmip/addon/components/header-scope.js @@ -7,6 +7,6 @@ import Component from '@ember/component'; import { service } from '@ember/service'; export default Component.extend({ - tagName: '', - secretMountPath: service() + tagName: '', + secretMountPath: service(), }); diff --git a/ui/lib/kmip/addon/components/kmip-breadcrumb.js b/ui/lib/kmip/addon/components/kmip-breadcrumb.js index 3456504489d..d0fb4509813 100644 --- a/ui/lib/kmip/addon/components/kmip-breadcrumb.js +++ b/ui/lib/kmip/addon/components/kmip-breadcrumb.js @@ -8,11 +8,11 @@ import { service } from '@ember/service'; import { or } from '@ember/object/computed'; export default Component.extend({ - tagName: '', - secretMountPath: service(), - shouldShowPath: or('showPath', 'scope', 'role'), - showPath: false, - path: null, - scope: null, - role: null + tagName: '', + secretMountPath: service(), + shouldShowPath: or('showPath', 'scope', 'role'), + showPath: false, + path: null, + scope: null, + role: null, }); diff --git a/ui/lib/kmip/addon/components/operation-field-display.js b/ui/lib/kmip/addon/components/operation-field-display.js index 9c98521d9e8..4ec347f50f9 100644 --- a/ui/lib/kmip/addon/components/operation-field-display.js +++ b/ui/lib/kmip/addon/components/operation-field-display.js @@ -41,5 +41,5 @@ export default Component.extend({ operationEnabled(model, field) { return this.trueOrFalseString(model, field, 'Enabled', 'Disabled'); }, - } + }, }); diff --git a/ui/lib/replication/addon/components/path-filter-config-list.js b/ui/lib/replication/addon/components/path-filter-config-list.js index 7f77c7e3f23..b227956e2bc 100644 --- a/ui/lib/replication/addon/components/path-filter-config-list.js +++ b/ui/lib/replication/addon/components/path-filter-config-list.js @@ -34,8 +34,8 @@ export default Component.extend({ const secret = []; const auth = []; const mounts = ns - ? (yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET', { namespace: ns })) - : (yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET')); + ? yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET', { namespace: ns }) + : yield adapter.ajax('/v1/sys/internal/ui/mounts', 'GET'); ['secret', 'auth'].forEach((key) => { for (const [id, info] of Object.entries(mounts.data[key])) {