UI: Glimmerize application route (#27473)

* glimmerize application route

* glimmerize application controller

* ts application controller

* stabilize replication test

ui/app/controllers/application.js

@@ -1,14 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-import { service } from '@ember/service';
-import Controller from '@ember/controller';
-import config from '../config/environment';
-
-export default Controller.extend({
-  env: config.environment,
-  auth: service(),
-  store: service(),
-});

ui/app/controllers/application.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+import { service } from '@ember/service';
+import Controller from '@ember/controller';
+import config from '../config/environment';
+import type AuthService from 'vault/vault/services/auth';
+import type StoreService from 'vault/services/store';
+
+export default class ApplicationController extends Controller {
+  @service declare readonly auth: AuthService;
+  @service declare readonly store: StoreService;
+  env = config.environment;
+}

ui/app/routes/application.js

@@ -6,66 +6,67 @@
 import { service } from '@ember/service';
 import Route from '@ember/routing/route';
 import ControlGroupError from 'vault/lib/control-group-error';
+import { action } from '@ember/object';
 
-export default Route.extend({
-  controlGroup: service(),
-  routing: service('router'),
-  namespaceService: service('namespace'),
-  flagsService: service('flags'),
+export default class ApplicationRoute extends Route {
+  @service controlGroup;
+  @service('router') routing;
+  @service('namespace') namespaceService;
+  @service('flags') flagsService;
 
-  actions: {
-    willTransition() {
-      window.scrollTo(0, 0);
-    },
-    error(error, transition) {
-      const controlGroup = this.controlGroup;
-      if (error instanceof ControlGroupError) {
-        return controlGroup.handleError(error);
-      }
-      if (error.path === '/v1/sys/wrapping/unwrap') {
-        controlGroup.unmarkTokenForUnwrap();
+  @action
+  willTransition() {
+    window.scrollTo(0, 0);
+  }
+  @action
+  error(error, transition) {
+    const controlGroup = this.controlGroup;
+    if (error instanceof ControlGroupError) {
+      return controlGroup.handleError(error);
+    }
+    if (error.path === '/v1/sys/wrapping/unwrap') {
+      controlGroup.unmarkTokenForUnwrap();
+    }
+
+    const router = this.routing;
+    //FIXME transition.intent likely needs to be replaced
+    let errorURL = transition.intent.url;
+    const { name, contexts, queryParams } = transition.intent;
+
+    // If the transition is internal to Ember, we need to generate the URL
+    // from the route parameters ourselves
+    if (!errorURL) {
+      try {
+        errorURL = router.urlFor(name, ...(contexts || []), { queryParams });
+      } catch (e) {
+        // If this fails, something weird is happening with URL transitions
+        errorURL = null;
       }
+    }
+    // because we're using rootURL, we need to trim this from the front to get
+    // the ember-routeable url
+    if (errorURL) {
+      errorURL = errorURL.replace('/ui', '');
+    }
 
-      const router = this.routing;
-      //FIXME transition.intent likely needs to be replaced
-      let errorURL = transition.intent.url;
-      const { name, contexts, queryParams } = transition.intent;
+    error.errorURL = errorURL;
 
-      // If the transition is internal to Ember, we need to generate the URL
-      // from the route parameters ourselves
-      if (!errorURL) {
-        try {
-          errorURL = router.urlFor(name, ...(contexts || []), { queryParams });
-        } catch (e) {
-          // If this fails, something weird is happening with URL transitions
-          errorURL = null;
-        }
-      }
-      // because we're using rootURL, we need to trim this from the front to get
-      // the ember-routeable url
-      if (errorURL) {
-        errorURL = errorURL.replace('/ui', '');
-      }
+    // if we have queryParams, update the namespace so that the observer can fire on the controller
+    if (queryParams) {
+      /* eslint-disable-next-line ember/no-controller-access-in-routes */
+      this.controllerFor('vault.cluster').set('namespaceQueryParam', queryParams.namespace || '');
+    }
 
-      error.errorURL = errorURL;
+    // Assuming we have a URL, push it into browser history and update the
+    // location bar for the user
+    if (errorURL) {
+      router.location.setURL(errorURL);
+    }
 
-      // if we have queryParams, update the namespace so that the observer can fire on the controller
-      if (queryParams) {
-        /* eslint-disable-next-line ember/no-controller-access-in-routes */
-        this.controllerFor('vault.cluster').set('namespaceQueryParam', queryParams.namespace || '');
-      }
-
-      // Assuming we have a URL, push it into browser history and update the
-      // location bar for the user
-      if (errorURL) {
-        router.location.setURL(errorURL);
-      }
-
-      return true;
-    },
-  },
+    return true;
+  }
 
   beforeModel() {
     return this.flagsService.fetchFeatureFlags();
-  },
-});
+  }
+}

ui/tests/acceptance/enterprise-replication-test.js

@@ -314,9 +314,9 @@ module('Acceptance | Enterprise | replication', function (hooks) {
       .doesNotExist(`does not render replication summary card when both modes are not enabled as primary`);
 
     // enable DR primary replication
-    await click('[data-test-replication-details-link="dr"]');
-    // eslint-disable-next-line ember/no-settled-after-test-helper
-    await settled(); // let the controller set replicationMode in afterModel
+    await click('[data-test-sidebar-nav-link="Disaster Recovery"]');
+    // let the controller set replicationMode in afterModel
+    await waitFor('[data-test-replication-enable-form]');
     assert.dom('[data-test-replication-title]').hasText('Enable Disaster Recovery Replication');
     await click('[data-test-replication-enable]');