Merge branch 'main' into debian-support

ui/admin/app/routes/scopes/scope/auth-methods.js

@@ -60,10 +60,14 @@ export default class ScopesScopeAuthMethodsRoute extends Route {
   )
   async save(authMethod) {
     await authMethod.save();
-    await this.transitionTo(
-      'scopes.scope.auth-methods.auth-method',
-      authMethod
-    );
+    if (this.can.can('read model', authMethod)) {
+      await this.transitionTo(
+        'scopes.scope.auth-methods.auth-method',
+        authMethod
+      );
+    } else {
+      await this.transitionTo('scopes.scope.auth-methods');
+    }
     this.refresh();
   }
 

ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js

@@ -60,10 +60,14 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route
       adapterOptions.password = password;
     }
     await account.save({ adapterOptions });
-    await this.transitionTo(
-      'scopes.scope.auth-methods.auth-method.accounts.account',
-      account
-    );
+    if (this.can.can('read model', account)) {
+      await this.transitionTo(
+        'scopes.scope.auth-methods.auth-method.accounts.account',
+        account
+      );
+    } else {
+      await this.transitionTo('scopes.scope.auth-methods.auth-method.accounts');
+    }
     this.refresh();
   }
 

ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js

@@ -55,10 +55,16 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
   )
   async save(credentialLibrary) {
     await credentialLibrary.save();
-    await this.transitionTo(
-      'scopes.scope.credential-stores.credential-store.credential-libraries.credential-library',
-      credentialLibrary
-    );
+    if (this.can.can('read model', credentialLibrary)) {
+      await this.transitionTo(
+        'scopes.scope.credential-stores.credential-store.credential-libraries.credential-library',
+        credentialLibrary
+      );
+    } else {
+      await this.transitionTo(
+        'scopes.scope.credential-stores.credential-store.credential-libraries'
+      );
+    }
     this.refresh();
   }
 

ui/admin/app/routes/scopes/scope/groups.js

@@ -57,7 +57,11 @@ export default class ScopesScopeGroupsRoute extends Route {
   )
   async save(group) {
     await group.save();
-    await this.transitionTo('scopes.scope.groups.group', group);
+    if (this.can.can('read model', group)) {
+      await this.transitionTo('scopes.scope.groups.group', group);
+    } else {
+      await this.transitionTo('scopes.scope.groups');
+    }
     this.refresh();
   }
 

ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js

@@ -59,10 +59,16 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou
   )
   async save(hostSet) {
     await hostSet.save();
-    await this.transitionTo(
-      'scopes.scope.host-catalogs.host-catalog.host-sets.host-set',
-      hostSet
-    );
+    if (this.can.can('read model', hostSet)) {
+      await this.transitionTo(
+        'scopes.scope.host-catalogs.host-catalog.host-sets.host-set',
+        hostSet
+      );
+    } else {
+      await this.transitionTo(
+        'scopes.scope.host-catalogs.host-catalog.host-sets'
+      );
+    }
     this.refresh();
   }
 

ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js

@@ -58,10 +58,14 @@ export default class ScopesScopeHostCatalogsHostCatalogHostsRoute extends Route
   )
   async save(host) {
     await host.save();
-    await this.transitionTo(
-      'scopes.scope.host-catalogs.host-catalog.hosts.host',
-      host
-    );
+    if (this.can.can('read model', host)) {
+      await this.transitionTo(
+        'scopes.scope.host-catalogs.host-catalog.hosts.host',
+        host
+      );
+    } else {
+      await this.transitionTo('scopes.scope.host-catalogs.host-catalog.hosts');
+    }
     this.refresh();
   }
 

ui/admin/app/routes/scopes/scope/roles.js

@@ -58,7 +58,11 @@ export default class ScopesScopeRolesRoute extends Route {
   )
   async save(role) {
     await role.save();
-    await this.transitionTo('scopes.scope.roles.role', role);
+    if (this.can.can('read model', role)) {
+      await this.transitionTo('scopes.scope.roles.role', role);
+    } else {
+      await this.transitionTo('scopes.scope.roles');
+    }
     this.refresh();
   }
 

ui/admin/app/routes/scopes/scope/targets.js

@@ -60,7 +60,11 @@ export default class ScopesScopeTargetsRoute extends Route {
   )
   async save(target) {
     await target.save();
-    await this.transitionTo('scopes.scope.targets.target', target);
+    if (this.can.can('read model', target)) {
+      await this.transitionTo('scopes.scope.targets.target', target);
+    } else {
+      await this.transitionTo('scopes.scope.targets');
+    }
     this.refresh();
   }
 

ui/admin/app/routes/scopes/scope/users.js

@@ -59,7 +59,11 @@ export default class ScopesScopeUsersRoute extends Route {
   )
   async save(user) {
     await user.save();
-    await this.transitionTo('scopes.scope.users.user', user);
+    if (this.can.can('read model', user)) {
+      await this.transitionTo('scopes.scope.users.user', user);
+    } else {
+      await this.transitionTo('scopes.scope.users');
+    }
     this.refresh();
   }
 

ui/admin/app/templates/scopes/scope/groups/index.hbs

@@ -71,7 +71,6 @@
           as |message|
         >
           <message.description>
-            {{t 'resources.group.description'}}
             {{#if (can 'list collection' this.scope collection='groups')}}
               {{! can list (at least):  show default welcome message}}
               {{t 'resources.group.description'}}