fix: use full-name in parent scope selection (#389)

Co-authored-by: Christian Zosel <[email protected]>
projectcaluma · Jan 27, 2022 · f54d27a · f54d27a
1 parent b407b5e
commit f54d27a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/addon/models/scope.js b/addon/models/scope.js
@@ -5,6 +5,7 @@ import LocalizedModel from "ember-emeis/models/localized";
 
 export default class ScopeModel extends LocalizedModel {
   @localizedAttr name;
+  @localizedAttr fullName;
   @localizedAttr description;
   @attr level;
   @attr meta;

diff --git a/addon/templates/scopes/edit.hbs b/addon/templates/scopes/edit.hbs
@@ -1,18 +1,3 @@
-{{!-- <ul uk-tab class="uk-child-width-1-2">
-  <li>
-    <LinkTo @route="scopes.edit.index" @model={{this.model}} data-test-scopes-edit-index-link>
-      {{t "emeis.scopes.edit.edit-scope"}}
-    </LinkTo>
-  </li>
-
-  <li>
-    <LinkTo @route="scopes.edit.acl" @model={{this.model}} data-test-scopes-edit-acl-link>
-      {{t "emeis.scopes.edit.acl.title"}}
-    </LinkTo>
-  </li>
-</ul>
-{{outlet}} --}}
-
 <div uk-grid class="uk-grid-divider">
     <div class="uk-width-1-2@xl">
       <h3>{{t "emeis.scopes.edit.edit-scope"}}</h3>
@@ -49,7 +34,7 @@
             @placeholder="{{t "emeis.scopes.headings.parent"}}..."
             @onChange={{this.setParent}} as |scope|
           >
-            {{scope.name}}
+            {{scope.fullName}}
           </RelationshipSelect>
         </EditForm::Element>
 

diff --git a/tests/acceptance/scopes-test.js b/tests/acceptance/scopes-test.js
@@ -69,7 +69,7 @@ module("Acceptance | scopes", function (hooks) {
     await fillIn('[name="name"]', name);
     await fillIn('[name="description"]', description);
 
-    await selectChoose(".ember-power-select-trigger", futureParent.name.en);
+    await selectChoose(".ember-power-select-trigger", futureParent.fullName.en);
 
     this.assertRequest("PATCH", `/api/v1/scopes/${scope.id}`, (request) => {
       const { attributes, relationships } = JSON.parse(

diff --git a/tests/dummy/mirage/factories/scope.js b/tests/dummy/mirage/factories/scope.js
@@ -5,6 +5,10 @@ import localize from "./localize";
 
 export default Factory.extend({
   name: () => localize(faker.company.companyName()),
+  fullName: () =>
+    localize(
+      `${faker.company.companyName()} \u00bb ${faker.company.companyName()}`
+    ),
   description: () => localize(faker.lorem.paragraph()),
   level: () => 0,
   meta: () => {},