[UI] remove ember route action helper

.changelog/23004.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Removed ember-route-action-helper and migrated all {{route-action}} usages to explicit route/controller logic.
+```

ui/packages/consul-ui/app/components/consul/policy/form/index.hbs

@@ -108,7 +108,7 @@
                   </BlockSlot>
                 </ModalDialog>
               {{else}}
-                <DeleteConfirmation @message={{message}} @execute={{queue execute (fn @delete @item)}} @cancel={{cancel}} />
+                <DeleteConfirmation @message={{message}} @execute={{queue execute (fn @onDelete @item)}} @cancel={{cancel}} />
               {{/if}}
             </BlockSlot>
           </ConfirmationDialog>

ui/packages/consul-ui/app/components/consul/role/form/index.hbs

@@ -106,7 +106,7 @@
                 </BlockSlot>
               </ModalDialog>
             {{else}}
-              <DeleteConfirmation @message={{message}} @execute={{queue execute (fn @delete @item)}} @cancel={{cancel}} />
+              <DeleteConfirmation @message={{message}} @execute={{queue execute (fn @onDelete @item)}} @cancel={{cancel}} />
             {{/if}}
           </BlockSlot>
         </ConfirmationDialog>

ui/packages/consul-ui/app/controllers/application.js

@@ -22,6 +22,20 @@ export default class ApplicationController extends Controller {
   // as the nspace and dc variables aren't available directly on the Route
   // look to see if we can move this up there so we can empty the Controller
   // out again
+
+  @action
+  gotoDefaultDcServices(dcName) {
+    // Preserve prior semantics (was route.replaceWith with a hash)
+    // If your router expects a positional segment instead, change to: this.router.replaceWith('dc.services.index', dcName);
+    this.router.replaceWith('dc.services.index', { dc: dcName });
+  }
+
+  @action
+  onClientChanged(e) {
+    const route = getOwner(this).lookup('route:application');
+    route.onClientChanged(e);
+  }
+
   @action
   reauthorize(e) {
     // TODO: For the moment e isn't a real event

ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js

@@ -32,8 +32,27 @@ export default class EditController extends Controller {
     );
   }
 
+  // Forwarders replacing route-action usage
   @action
-  delete(item) {
+  onCreate(item, event) {
+    event?.preventDefault();
+    this.target.send('create', item, event);
+  }
+
+  @action
+  onUpdate(item, event) {
+    event?.preventDefault();
+    this.target.send('update', item, event);
+  }
+
+  @action
+  onCancel(item, event) {
+    event?.preventDefault();
+    this.target.send('cancel', item, event);
+  }
+
+  @action
+  onDelete(item) {
     this.target.send('delete', item);
   }
 }

ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+
+export default class DcAclsPoliciesIndexController extends Controller {
+  @action
+  delete(item) {
+    // delegate to the route (WithBlockingActions mixin) which has the delete action
+    this.target.send('delete', item);
+  }
+}

ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js

@@ -32,8 +32,27 @@ export default class EditController extends Controller {
     );
   }
 
+  // Forwarders replacing route-action helper usage
   @action
-  delete(item) {
+  onCreate(item, event) {
+    event?.preventDefault();
+    this.target.send('create', item, event);
+  }
+
+  @action
+  onUpdate(item, event) {
+    event?.preventDefault();
+    this.target.send('update', item, event);
+  }
+
+  @action
+  onCancel(item, event) {
+    event?.preventDefault();
+    this.target.send('cancel', item, event);
+  }
+
+  @action
+  onDelete(item) {
     this.target.send('delete', item);
   }
 }

ui/packages/consul-ui/app/controllers/dc/acls/roles/index.js

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+
+export default class DcAclsRolesIndexController extends Controller {
+  @action
+  delete(item) {
+    this.target.send('delete', item);
+  }
+}

ui/packages/consul-ui/app/controllers/dc/acls/tokens/edit.js

@@ -53,7 +53,25 @@ export default class EditController extends Controller {
   }
 
   @action
-  delete(item) {
+  onCreate(item, event) {
+    event?.preventDefault();
+    this.target.send('create', item, event);
+  }
+
+  @action
+  onUpdate(item, event) {
+    event?.preventDefault();
+    this.target.send('update', item, event);
+  }
+
+  @action
+  onCancel(item, event) {
+    event?.preventDefault();
+    this.target.send('cancel', item, event);
+  }
+
+  @action
+  onDelete(item) {
     this.target.send('delete', item);
   }
 }

ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+
+export default class DcAclsTokensIndexController extends Controller {
+  @action
+  onUse(item) {
+    this.target.send('use', item);
+  }
+  @action
+  onDelete(item) {
+    this.target.send('delete', item);
+  }
+  @action
+  onLogout(item) {
+    this.target.send('logout', item);
+  }
+  @action
+  onClone(item) {
+    this.target.send('clone', item);
+  }
+}

ui/packages/consul-ui/app/controllers/dc/intentions/create.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class DcIntentionsCreateController extends Controller {
+  @service router;
+
+  @action
+  goToIndex(dc) {
+    this.router.transitionTo('dc.intentions.index', dc);
+  }
+}

ui/packages/consul-ui/app/controllers/dc/intentions/edit.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class DcIntentionsEditController extends Controller {
+  @service router;
+
+  @action
+  goToIndex(dc) {
+    this.router.transitionTo('dc.intentions.index', dc);
+  }
+}

ui/packages/consul-ui/app/controllers/dc/nodes/show/index.js

@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class DcNodesShowIndexController extends Controller {
+  @service router;
+
+  @action
+  goServices() {
+    this.router.replaceWith('dc.nodes.show.services');
+  }
+
+  @action
+  goHealthChecks() {
+    this.router.replaceWith('dc.nodes.show.healthchecks');
+  }
+}

ui/packages/consul-ui/app/controllers/dc/services/show/index.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class DcServicesShowIndexController extends Controller {
+  @service router;
+
+  @action
+  forward(tabs = {}) {
+    if (tabs.topology) return this.router.replaceWith('dc.services.show.topology');
+    if (tabs.upstreams) return this.router.replaceWith('dc.services.show.upstreams');
+    if (tabs.services) return this.router.replaceWith('dc.services.show.services');
+    return this.router.replaceWith('dc.services.show.instances');
+  }
+}

ui/packages/consul-ui/app/controllers/dc/services/show/topology.js

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+import { getOwner } from '@ember/application';
+
+export default class TopologyController extends Controller {
+  @action
+  createIntention(source, destination) {
+    const route = getOwner(this).lookup('route:dc.services.show.topology');
+    return route.createIntention(source, destination);
+  }
+}

ui/packages/consul-ui/app/routes/dc/acls/index.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Route from 'consul-ui/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class DcAclsIndexRoute extends Route {
+  @service router;
+
+  beforeModel() {
+    this.router.replaceWith('dc.acls.tokens');
+  }
+}

ui/packages/consul-ui/app/routes/dc/nodes/show/rtt.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Route from 'consul-ui/routing/route';
+
+export default class DcNodesShowRttRoute extends Route {
+  redirect(model) {
+    const distances = model?.tomography?.distances;
+    if (Array.isArray(distances) && distances.length == 0) {
+      this.replaceWith('dc.nodes.show');
+    }
+  }
+}

ui/packages/consul-ui/app/routes/dc/show/index.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+import Route from 'consul-ui/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class DcShowIndexRoute extends Route {
+  // Use the abilities service (ember-can) backing the {{can}} helper
+  @service abilities;
+
+  afterModel() {
+    const canAccess = this.abilities.can('access overview');
+    this.replaceWith(canAccess ? 'dc.show.serverstatus' : 'dc.services.index');
+  }
+}

ui/packages/consul-ui/app/services/repository/coordinate.js

@@ -35,6 +35,9 @@ export default class CoordinateService extends RepositoryService {
     let results = {};
     if (coordinates.length > 1) {
       results = tomography(params.id, coordinates);
+    } else {
+      // Ensure consistent shape
+      results = { distances: [], min: 0, median: 0, max: 0 };
     }
     results.meta = coordinates.meta;
     return results;

ui/packages/consul-ui/app/templates/application.hbs

@@ -26,11 +26,11 @@
         {{document-attrs class='has-partitions'}}
       {{/if}}
 
-      {{! Listen out for blocking query/client setting changes }}
-      <DataSource
-        @src={{uri 'settings://consul:client'}}
-        @onchange={{route-action 'onClientChanged'}}
-      />
+    {{! Listen out for blocking query/client setting changes }}
+    <DataSource
+      @src={{uri 'settings://consul:client'}}
+      @onchange={{this.onClientChanged}}
+    />
 
       {{! Tell CSS about our theme }}
       <DataSource @src={{uri 'settings://consul:theme'}} as |source|>
@@ -60,18 +60,16 @@
         {{! as we don't know the dc, any inital permission based }}
         {{! redirects are in the dc.show route}}
 
-        {{! 2022-04-15: Temporarily reverting the services page to the default }}
-        {{did-insert
-          (route-action 'replaceWith' 'dc.services.index' (hash dc=(env 'CONSUL_DATACENTER_LOCAL')))
-        }}
-      {{else}}
-        {{! If we are notfound, guess the params we need }}
-        {{#if (eq route.currentName 'notfound')}}
-          <DataSource
-            @src={{uri '/*/*/*/notfound/${path}' (hash path=route.params.notfound)}}
-            @onchange={{action (mut this.notfound) value='data'}}
-          />
-        {{/if}}
+      {{! 2022-04-15: Temporarily reverting the services page to the default }}
+      {{did-insert (fn this.gotoDefaultDcServices (env 'CONSUL_DATACENTER_LOCAL'))}}
+    {{else}}
+      {{! If we are notfound, guess the params we need }}
+      {{#if (eq route.currentName 'notfound')}}
+        <DataSource
+          @src={{uri '/*/*/*/notfound/${path}' (hash path=route.params.notfound)}}
+          @onchange={{action (mut this.notfound) value='data'}}
+        />
+      {{/if}}
 
         {{! Make sure we guess and default to the right params when not found }}
         {{#let

ui/packages/consul-ui/app/templates/dc/acls/index.hbs

@@ -6,5 +6,4 @@
 <Route
   @name={{this.routeName}}
 as |route|>
-  {{did-insert (route-action 'replaceWith' 'dc.acls.tokens')}}
 </Route>

ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs

@@ -119,10 +119,10 @@ as |dc partition nspace id item create|}}
           @dc={{dc}}
           @id={{id}}
           @items={{this.items}}
-          @onCreate={{route-action 'create' item}}
-          @onUpdate={{route-action 'update' item}}
-          @onCancel={{route-action 'cancel' item}}
-          @onDelete={{route-action 'delete'}}
+          @onCreate={{fn this.onCreate item}}
+          @onUpdate={{fn this.onUpdate item}}
+          @onCancel={{fn this.onCancel item}}
+          @onDelete={{fn this.onDelete item}}
           @onItemsChange={{action (mut this.items) value="data"}}
         />
   {{/if}}