refactor: remove usage of useCaluma in route

Author: Yelinz

ember/.eslintignore

@@ -18,6 +18,3 @@
 /.node_modules.ember-try/
 /bower.json.ember-try
 /package.json.ember-try
-
-# mirage
-/mirage/mirage

ember/app/cases/detail/controller.js

@@ -1,7 +1,20 @@
 import Controller from "@ember/controller";
+import getCaseQuery from "caluma-portal-demo/gql/queries/get-case";
+import { queryManager } from "ember-apollo-client";
+import { dropTask, lastValue } from "ember-concurrency";
 
 export default class CasesDetailController extends Controller {
-  get case() {
-    return this.model.value[0];
+  @queryManager apollo;
+
+  @lastValue("getCase") case;
+  @dropTask
+  *getCase() {
+    return (yield this.apollo.query(
+      {
+        query: getCaseQuery,
+        variables: { filter: [{ id: this.model }] },
+      },
+      "allCases.edges"
+    )).map(({ node }) => node)[0];
   }
 }

ember/app/cases/detail/edit/controller.js

@@ -1,7 +1,5 @@
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 
 export default class CasesDetailEditController extends Controller {
-  get case() {
-    return this.model.value[0];
-  }
+  @controller("cases.detail") parent;
 }

ember/app/cases/detail/edit/route.js

@@ -1,7 +1,3 @@
 import CasesDetailRoute from "caluma-portal-demo/cases/detail/index/route";
 
-export default class CasesDetailEditRoute extends CasesDetailRoute {
-  model() {
-    return this.modelFor("cases.detail");
-  }
-}
+export default class CasesDetailEditRoute extends CasesDetailRoute {}

ember/app/cases/detail/edit/template.hbs

@@ -1,3 +1,3 @@
-{{#if @model}}
-  <CfContent @documentId={{this.case.document.id}} />
+{{#if this.parent.case}}
+  <CfContent @documentId={{this.parent.case.document.id}} />
 {{/if}}

ember/app/cases/detail/index/controller.js

@@ -1,4 +1,4 @@
-import Controller from "@ember/controller";
+import Controller, { inject as controller } from "@ember/controller";
 import { inject as service } from "@ember/service";
 import cancelCaseMutation from "caluma-portal-demo/gql/mutations/cancel-case";
 import { queryManager } from "ember-apollo-client";
@@ -7,16 +7,13 @@ import { dropTask } from "ember-concurrency";
 export default class CasesDetailIndexController extends Controller {
   @service router;
   @queryManager apollo;
-
-  get case() {
-    return this.model.value[0];
-  }
+  @controller("cases.detail") parent;
 
   @dropTask
   *closeCase() {
     yield this.apollo.mutate({
       mutation: cancelCaseMutation,
-      variables: { case: this.case.id },
+      variables: { case: this.parent.case.id },
     });
     this.router.transitionTo("cases.index");
   }

ember/app/cases/detail/index/route.js

@@ -1,7 +1,3 @@
 import Route from "@ember/routing/route";
 
-export default class CasesDetailRoute extends Route {
-  model() {
-    return this.modelFor("cases.detail");
-  }
-}
+export default class CasesDetailRoute extends Route {}

ember/app/cases/detail/index/template.hbs

@@ -12,13 +12,13 @@
             {{t "cases.status"}}
           </th>
           <td class="uk-width-1-3">
-            <CaseStateLabel @state={{this.case.raw.status}} @iconPosition="right" />
+            <CaseStateLabel @state={{this.parent.case.status}} @iconPosition="right" />
           </td>
           <th class="uk-text-bold uk-width-1-6">
             {{t "cases.description"}}
           </th>
           <td class="uk-width-1-3">
-            {{or this.case.form.description "-"}}
+            {{or this.parent.case.form.description "-"}}
           </td>
         </tr>
         <tr>
@@ -28,8 +28,8 @@
           <td class="uk-width-1-3">
             {{
               if
-              this.case.createdAt
-              (moment-format this.case.createdAt "DD.MM.YYYY")
+              this.parent.case.createdAt
+              (moment-format this.parent.case.createdAt "DD.MM.YYYY")
               "-"
             }}
           </td>
@@ -39,8 +39,8 @@
           <td class="uk-width-1-3">
             {{
               if
-              this.case.modifiedAt
-              (moment-format this.case.modifiedAt "DD.MM.YYYY")
+              this.parent.case.modifiedAt
+              (moment-format this.parent.case.modifiedAt "DD.MM.YYYY")
               "-"
             }}
           </td>
@@ -76,7 +76,7 @@
       {{t "cases.deleteText"}}
     </p>
     <UkButton
-      @onClick={{perform this.closeCase this.case}}
+      @onClick={{perform this.closeCase}}
       @disabled={{this.closeCase.isRunning}}
       @loading={{this.closeCase.isRunning}}
     >

ember/app/cases/detail/route.js

@@ -1,13 +1,12 @@
 import Route from "@ember/routing/route";
-import { useCalumaQuery } from "@projectcaluma/ember-core/caluma-query";
-import { allCases } from "@projectcaluma/ember-core/caluma-query/queries";
+
 export default class CasesDetailRoute extends Route {
   model({ case_id }) {
-    const caseQuery = useCalumaQuery(this, allCases, () => ({
-      options: { pageSize: 1 },
-      filter: [{ id: case_id }],
-    }));
+    return case_id;
+  }
 
-    return caseQuery;
+  setupController(controller, post) {
+    super.setupController(controller, post);
+    controller.getCase.perform();
   }
 }

ember/app/cases/detail/template.hbs

@@ -1,4 +1,4 @@
-{{#if @model.isLoading}}
+{{#if this.getCase.isRunning}}
   <div class="uk-text-center uk-padding">
     <UkSpinner @ratio={{2}} />
   </div>