From c0d7af789973cb4d0402758e993dff07dddcbfcf Mon Sep 17 00:00:00 2001 From: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:58:43 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20alias=20disappearing=20on?= =?UTF-8?q?=20target=20details=20page=20(#2519)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 🐛 alias disappearing on target details page ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-15296 * test: 💍 fix test ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-15296 --- ui/admin/app/controllers/scopes/scope/targets/index.js | 1 + .../targets/target/add-brokered-credential-sources.js | 1 + .../scopes/scope/targets/target/add-host-sources.js | 1 + .../add-injected-application-credential-sources.js | 1 + .../scope/targets/target/add-host-sources-test.js | 10 +++++++++- 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ui/admin/app/controllers/scopes/scope/targets/index.js b/ui/admin/app/controllers/scopes/scope/targets/index.js index 194b3202b..c4b6a2fc5 100644 --- a/ui/admin/app/controllers/scopes/scope/targets/index.js +++ b/ui/admin/app/controllers/scopes/scope/targets/index.js @@ -328,6 +328,7 @@ export default class ScopesScopeTargetsIndexController extends Controller { async saveWorkerFilter(target) { await target.save(); await this.router.replaceWith('scopes.scope.targets.target.workers'); + await this.router.refresh('scopes.scope.targets.target'); } /** diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-brokered-credential-sources.js b/ui/admin/app/controllers/scopes/scope/targets/target/add-brokered-credential-sources.js index f7d673d66..3193569e0 100644 --- a/ui/admin/app/controllers/scopes/scope/targets/target/add-brokered-credential-sources.js +++ b/ui/admin/app/controllers/scopes/scope/targets/target/add-brokered-credential-sources.js @@ -61,6 +61,7 @@ export default class ScopesScopeTargetsTargetAddBrokeredCredentialSourcesControl this.router.replaceWith( 'scopes.scope.targets.target.brokered-credential-sources', ); + this.router.refresh('scopes.scope.targets.target'); } /** diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-host-sources.js b/ui/admin/app/controllers/scopes/scope/targets/target/add-host-sources.js index ee171d45b..7e186e144 100644 --- a/ui/admin/app/controllers/scopes/scope/targets/target/add-host-sources.js +++ b/ui/admin/app/controllers/scopes/scope/targets/target/add-host-sources.js @@ -23,6 +23,7 @@ export default class ScopesScopeTargetsTargetAddHostSourcesController extends Co async save(target, hostSetIDs) { await target.addHostSources(hostSetIDs); this.router.replaceWith('scopes.scope.targets.target.host-sources'); + this.router.refresh('scopes.scope.targets.target'); } /** diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-injected-application-credential-sources.js b/ui/admin/app/controllers/scopes/scope/targets/target/add-injected-application-credential-sources.js index 747be566c..7a431e179 100644 --- a/ui/admin/app/controllers/scopes/scope/targets/target/add-injected-application-credential-sources.js +++ b/ui/admin/app/controllers/scopes/scope/targets/target/add-injected-application-credential-sources.js @@ -60,6 +60,7 @@ export default class ScopesScopeTargetsTargetAddInjectedApplicationCredentialSou this.router.replaceWith( 'scopes.scope.targets.target.injected-application-credential-sources', ); + this.router.refresh('scopes.scope.targets.target'); } /** diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-host-sources-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-host-sources-test.js index 68b46ac01..ee166228c 100644 --- a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-host-sources-test.js +++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-host-sources-test.js @@ -25,6 +25,7 @@ module( project: null, }, target: null, + hostCatalog: null, hostSet: null, }; @@ -53,8 +54,12 @@ module( instances.target = this.server.create('target', { scope: instances.scopes.project, }); + instances.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); instances.hostSet = this.server.create('host-set', { scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, }); urls.projectScope = `/scopes/${instances.scopes.project.id}`; @@ -75,7 +80,10 @@ module( await controller.save(target, [instances.hostSet.id]); assert.deepEqual(target.host_sources, [ - { host_source_id: instances.hostSet.id }, + { + host_catalog_id: instances.hostCatalog.id, + host_source_id: instances.hostSet.id, + }, ]); });