Merge pull request #35 from velrest/hot-fix

reload relation table if new project is added

addon/controllers/project.js

@@ -1,7 +1,6 @@
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
-import { task, lastValue } from "ember-concurrency-decorators";
 
 export default class ProjectController extends Controller {
   @service router;
@@ -18,22 +17,15 @@ export default class ProjectController extends Controller {
     return Number(this.router.currentRoute.params.project_id);
   }
 
-  @lastValue("fetchProjects") projects = [];
+  get projects() {
+    return this.constructionProject.projects;
+  }
 
-  @task
-  *fetchProjects() {
-    const links = yield this.store.query("gwr-link", {
-      local_id: this.model.id,
-    });
-    // We make a request for each project here but the probability
-    // that there are a lot of linked projects is rather small so this
-    // should be okay. Would be a future pain point if this requirement
-    // would change.
-    const projects = yield Promise.all(
-      links.map(({ eproid }) =>
-        this.constructionProject.getFromCacheOrApi(eproid)
-      )
-    );
+  @action
+  async onLoad() {
+    // We then use `constructionProject.projects` in the template to reference this.
+    // This is so we can update the table if we add a new project in the subroute /new
+    const projects = await this.constructionProject.all.perform(this.model);
 
     // Load the first project in the list if none is selected so we always display a project.
     if (
@@ -42,8 +34,6 @@ export default class ProjectController extends Controller {
     ) {
       this.transitionToRoute("project.form", projects[0].EPROID);
     }
-
-    return projects;
   }
 
   @action

addon/controllers/project/form.js

@@ -65,6 +65,8 @@ export default class ProjectFormController extends Controller {
         localId: this.model.instanceId,
       });
       await link.save();
+      // Reload the overview table to display the new project
+      await this.constructionProject.all.perform(this.model.instanceId);
       this.transitionToRoute("project.form", project.EPROID);
     } else {
       await this.constructionProject.update(this.project);

addon/routes/project.js

@@ -2,6 +2,6 @@ import Route from "@ember/routing/route";
 
 export default class ProjectRoute extends Route {
   async model() {
-    return this.modelFor("application");
+    return this.modelFor("application").id;
   }
 }

addon/routes/project/new.js

@@ -13,6 +13,7 @@ export default class ProjectNewRoute extends Route {
     project.constructionLocalisation.municipalityId = this.config.municipalityId;
     project.constructionLocalisation.municipalityName = this.config.municipalityName;
     project.constructionLocalisation.cantonAbbreviation = this.config.cantonAbbreviation;
+    project.constructionSurveyDept = this.config.constructionSurveyDept;
     return { project, instanceId: this.modelFor("application").id };
   }
 }

addon/services/construction-project.js

@@ -1,4 +1,5 @@
 import { inject as service } from "@ember/service";
+import { task, lastValue } from "ember-concurrency-decorators";
 import ConstructionProject from "ember-ebau-gwr/models/construction-project";
 import ConstructionProjectsList from "ember-ebau-gwr/models/construction-projects-list";
 import SearchResult from "ember-ebau-gwr/models/search-result";
@@ -7,6 +8,8 @@ import XMLApiService from "./xml-api";
 
 export default class BuildingProjectService extends XMLApiService {
   @service config;
+  @service store;
+
   cache = {};
 
   createAndCacheProject(xml) {
@@ -130,4 +133,20 @@ export default class BuildingProjectService extends XMLApiService {
 
     return new SearchResult(await response.text()).constructionProjectsList;
   }
+
+  @lastValue("all") projects = [];
+  @task
+  *all(localId) {
+    const links = yield this.store.query("gwr-link", {
+      local_id: localId,
+    });
+    // We make a request for each project here but the probability
+    // that there are a lot of linked projects is rather small so this
+    // should be okay. Would be a future pain point if this requirement
+    // would change.
+    const projects = yield Promise.all(
+      links.map(({ eproid }) => this.getFromCacheOrApi(eproid))
+    );
+    return projects;
+  }
 }

addon/templates/project.hbs

@@ -1,5 +1,5 @@
-<div {{did-insert (perform this.fetchProjects)}}>
-  {{#if this.fetchProjects.isRunning}}
+<div {{did-insert this.onLoad}}>
+  {{#if this.constructionProject.all.isRunning}}
     <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
       <UkSpinner @ratio="3" />
     </div>

addon/templates/project/form.hbs

@@ -86,6 +86,7 @@
         disabled
         readonly
       />
+      <Field type="number" @attr="constructionSurveyDept" disabled readonly />
 
       <Field
         @inputType="select"
@@ -117,8 +118,6 @@
         @attr="totalCostsOfProject"
       />
 
-      <Field type="number" @required={{true}} @attr="constructionSurveyDept" />
-
       <Field
         @inputType="select"
         @attr="typeOfConstruction"

tests/dummy/mirage/config.js

@@ -4,7 +4,8 @@ export default function () {
       return schema.gwrLinks
         .all()
         .filter(
-          (link) => link.attrs.localId === Number(request.queryParams.local_id)
+          (link) =>
+            Number(link.attrs.localId) === Number(request.queryParams.local_id)
         );
     }
     return schema.gwrLinks.all();