Merge pull request #335 from hashicorp/oss/merge-main-edf623adf07eaff5a730a728020ce3bc03ba6d7b

[main] OSS to ENT merge of (edf623a)

ui/admin/app/components/form/worker/create-worker-led/index.hbs

@@ -229,12 +229,9 @@
       </div>
     {{/unless}}
   </div>
-
-  <Rose::LinkButton
-    @route='scopes.scope.workers'
-    @style='secondary'
-    {{on 'click' @refresh}}
-  >
-    {{t 'actions.done'}}
-  </Rose::LinkButton>
+  <Hds::Button
+    @color='secondary'
+    @text={{if @model.isNew (t 'actions.cancel') (t 'actions.done')}}
+    {{on 'click' @cancel}}
+  />
 </Rose::Form>

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

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();
+  }
+}

ui/admin/app/templates/scopes/scope/workers/new.hbs

@@ -20,8 +20,8 @@
   <page.body>
     <Form::Worker::CreateWorkerLed
       @model={{@model}}
+      @cancel={{route-action 'cancel' @model}}
       @submit={{route-action 'createWorkerLed' @model}}
-      @refresh={{route-action 'refresh'}}
     />
   </page.body>
 

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`<Form::Worker::CreateWorkerLed @model={{this.model}} @submit={{this.submit}} @refresh={{this.refresh}} />`
+        hbs`<Form::Worker::CreateWorkerLed @model={{this.model}} @submit={{this.submit}} @cancel={{this.cancel}} />`
       );
 
       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`<Form::Worker::CreateWorkerLed @model={{this.model}} @submit={{this.submit}} @refresh={{this.refresh}} />`
+        hbs`<Form::Worker::CreateWorkerLed @model={{this.model}} @submit={{this.submit}} @cancel={{this.cancel}} />`
       );
 
       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`<Form::Worker::CreateWorkerLed @model={{this.model}} @submit={{this.submit}} @refresh={{this.refresh}} />`
+        hbs`<Form::Worker::CreateWorkerLed @model={{this.model}} @submit={{this.submit}} @cancel={{this.cancel}} />`
       );
 
       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`<Form::Worker::CreateWorkerLed @model={{this.model}} @submit={{this.submit}} @refresh={{this.refresh}} />`
+        hbs`<Form::Worker::CreateWorkerLed @model={{this.model}} @submit={{this.submit}} @cancel={{this.cancel}} />`
       );
 
       assert.dom('[name="cluster_id"]').hasNoValue();