fix(scope): sort by full (hierarchical) name (#565)

projectcaluma · Sep 26, 2022 · 9cf849b · 9cf849b
1 parent ebcf415
commit 9cf849b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/addon/components/acl-wizzard.hbs b/addon/components/acl-wizzard.hbs
@@ -1,7 +1,7 @@
 {{#if this.modelToSelect}}
   <div class="uk-margin">
     <SectionTitle @model="{{this.modelToSelect}}s" @noCreateLink="true" />
-    <DataTable @modelName={{this.modelToSelect}} as |table|>
+    <DataTable @modelName={{this.modelToSelect}} @defaultSort={{this.sort}} as |table|>
       <table.head>
         {{#each (get this.fields this.modelToSelect) as |field|}}
           <th>
@@ -37,7 +37,7 @@
           @selected={{this.user}}
           @header={{this.user.username}}
           @model="user"
-          @selectEntry={{set this.modelToSelect "user"}}
+          @selectEntry={{fn this.openModel "user"}}
           data-test-select-user
         >
           <div uk-grid data-test-body>
@@ -61,7 +61,7 @@
         <AclWizzard::SelectCard
           @selected={{this.role}}
           @model="role"
-          @selectEntry={{set this.modelToSelect "role"}}
+          @selectEntry={{fn this.openModel "role"}}
           data-test-select-role
         />
 
@@ -78,7 +78,7 @@
         <AclWizzard::SelectCard
           @selected={{this.scope}}
           @model="scope"
-          @selectEntry={{set this.modelToSelect "scope"}}
+          @selectEntry={{fn this.openModel "scope"}}
           data-test-select-scope
         />
       {{/unless}}

diff --git a/addon/components/acl-wizzard.js b/addon/components/acl-wizzard.js
@@ -2,6 +2,10 @@ import { action } from "@ember/object";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 
+const DEFAULT_SORT = {
+  scope: "full_name",
+};
+
 export default class AclWizzardComponent extends Component {
   @tracked modelToSelect;
   @tracked user;
@@ -31,4 +35,10 @@ export default class AclWizzardComponent extends Component {
     this[this.modelToSelect] = model;
     this.modelToSelect = null;
   }
+
+  @action
+  openModel(model) {
+    this.modelToSelect = model;
+    this.sort = DEFAULT_SORT[model];
+  }
 }
diff --git a/addon/routes/scopes.js b/addon/routes/scopes.js
@@ -8,7 +8,7 @@ export default class ScopesRoute extends Route {
   model() {
     // this eager fetching is necessary, since we need a store-independent result set
     // for use-cases where we have other non-relevant scopes in store
-    return this.store.query("scope", {});
+    return this.store.query("scope", { sort: "full_name" });
   }
 
   redirect(scopes, transition) {