diff --git a/ui/admin/app/components/form/worker/create-worker-led/index.hbs b/ui/admin/app/components/form/worker/create-worker-led/index.hbs index b1ee62fd5..b22a61a41 100644 --- a/ui/admin/app/components/form/worker/create-worker-led/index.hbs +++ b/ui/admin/app/components/form/worker/create-worker-led/index.hbs @@ -229,12 +229,9 @@ {{/unless}} - - - {{t 'actions.done'}} - + \ No newline at end of file diff --git a/ui/admin/app/routes/scopes/scope/workers.js b/ui/admin/app/routes/scopes/scope/workers.js index 2233369e6..ac4cc2591 100644 --- a/ui/admin/app/routes/scopes/scope/workers.js +++ b/ui/admin/app/routes/scopes/scope/workers.js @@ -47,6 +47,13 @@ export default class ScopesScopeWorkersRoute extends Route { return super.refresh(...arguments); } + @action + cancel(worker) { + const { isNew } = worker; + if (isNew) worker.rollbackAttributes(); + this.router.replaceWith('scopes.scope.workers'); + this.refresh(); + } /** * Save a worker in current scope. * @param {WorkerModel} worker diff --git a/ui/admin/app/routes/scopes/scope/workers/worker/index.js b/ui/admin/app/routes/scopes/scope/workers/worker/index.js index 600cec296..d1c082f48 100644 --- a/ui/admin/app/routes/scopes/scope/workers/worker/index.js +++ b/ui/admin/app/routes/scopes/scope/workers/worker/index.js @@ -4,5 +4,12 @@ */ import Route from '@ember/routing/route'; +import { action } from '@ember/object'; -export default class ScopesScopeWorkersWorkerIndexRoute extends Route {} +export default class ScopesScopeWorkersWorkerIndexRoute extends Route { + @action + cancel(worker) { + worker.rollbackAttributes(); + this.refresh(); + } +} diff --git a/ui/admin/app/templates/scopes/scope/workers/new.hbs b/ui/admin/app/templates/scopes/scope/workers/new.hbs index 0353346dc..00a343fe4 100644 --- a/ui/admin/app/templates/scopes/scope/workers/new.hbs +++ b/ui/admin/app/templates/scopes/scope/workers/new.hbs @@ -20,8 +20,8 @@ diff --git a/ui/admin/tests/integration/components/form/worker/create-worker-led-test.js b/ui/admin/tests/integration/components/form/worker/create-worker-led-test.js index 46f9fcdfe..93328b665 100644 --- a/ui/admin/tests/integration/components/form/worker/create-worker-led-test.js +++ b/ui/admin/tests/integration/components/form/worker/create-worker-led-test.js @@ -28,12 +28,12 @@ module( const guid = v1(); this.model = {}; this.submit = () => {}; - this.refresh = () => {}; + this.cancel = () => {}; windowService.location.hostname = `${guid}.boundary.hcp.dev`; await render( - hbs`` + hbs`` ); assert.dom('[name="cluster_id"]').hasValue(guid); @@ -44,12 +44,12 @@ module( const guid = v1(); this.model = {}; this.submit = () => {}; - this.refresh = () => {}; + this.cancel = () => {}; windowService.location.hostname = `${guid}.boundary.hcp.to`; await render( - hbs`` + hbs`` ); assert.dom('[name="cluster_id"]').hasValue(guid); @@ -60,12 +60,12 @@ module( const guid = v1(); this.model = {}; this.submit = () => {}; - this.refresh = () => {}; + this.cancel = () => {}; windowService.location.hostname = `${guid}.boundary.hashicorp.cloud`; await render( - hbs`` + hbs`` ); assert.dom('[name="cluster_id"]').hasValue(guid); @@ -75,12 +75,12 @@ module( const windowService = this.owner.lookup('service:browser/window'); this.model = {}; this.submit = () => {}; - this.refresh = () => {}; + this.cancel = () => {}; windowService.location.hostname = `personal.website.com`; await render( - hbs`` + hbs`` ); assert.dom('[name="cluster_id"]').hasNoValue();