Refresh competences subroutes on view param change

Co-authored-by: Iris Benoit-Martin <[email protected]> Co-authored-by: Jérémie Jadé <[email protected]>
1024pix · Oct 10, 2024 · b88a514 · b88a514
1 parent 218608d
commit b88a514
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/pix-editor/app/controllers/authenticated/competence.js b/pix-editor/app/controllers/authenticated/competence.js
@@ -92,7 +92,7 @@ export default class CompetenceController extends Controller {
 
   setView(value) {
     if (this.view !== value) {
-      this.view = value;
+      this.router.transitionTo({ queryParams: { view: value } });
     }
   }
 

diff --git a/pix-editor/app/routes/authenticated/competence.js b/pix-editor/app/routes/authenticated/competence.js
@@ -6,6 +6,12 @@ export default class CompetenceRoute extends Route {
   @service store;
   @service router;
 
+  queryParams = {
+    view: {
+      refreshModel: true,
+    },
+  };
+
   model(params) {
     return this.store.findRecord('competence', params.competence_id);
   }

diff --git a/pix-editor/app/routes/authenticated/competence/prototypes.js b/pix-editor/app/routes/authenticated/competence/prototypes.js
@@ -9,6 +9,8 @@ export default class PrototypesRoute extends Route {
   refreshing = false;
 
   async model() {
+    // eslint-disable-next-line no-unused-vars
+    const { view } = this.paramsFor('authenticated.competence');
     const competence = this.modelFor('authenticated.competence');
     if (this.refreshing) {
       const themes = await competence.hasMany('rawThemes').reload();

diff --git a/pix-editor/app/routes/authenticated/competence/prototypes/single.js b/pix-editor/app/routes/authenticated/competence/prototypes/single.js
@@ -56,7 +56,7 @@ export default class SingleRoute extends Route {
             if (transition.targetName === 'authenticated.competence.quality.index' && skill.productionPrototype) {
               return this.router.transitionTo('authenticated.competence.quality.single', this.currentData.getCompetence(), skill);
             } else if (transition.targetName === 'authenticated.competence.skills.index') {
-              return this.router.transitionTo('authenticated.competence.skills.single', this.currentData.getCompetence(), skill);
+              return this.router.transitionTo('authenticated.competence.skills.single', this.currentData.getCompetence(), skill.id);
             }
           }
         }

diff --git a/pix-editor/app/routes/authenticated/competence/skills/single.js b/pix-editor/app/routes/authenticated/competence/skills/single.js
@@ -47,7 +47,7 @@ export default class SingleRoute extends Route {
         const skill = this.controllerFor('authenticated.competence.skills.single').skill;
         const prototype = skill.productionPrototype;
         if (prototype) {
-          return this.router.transitionTo('authenticated.competence.prototypes.single', prototype);
+          return this.router.transitionTo('authenticated.competence.prototypes.single', prototype.id);
         } else {
           const tube = skill.tube;
           return this.router.transitionTo('authenticated.competence.prototypes.list', tube.get('id'), skill.id);