Updated reload behavior for guid route, reverted changes for overview…

… index.
CenterForOpenScience · Oct 5, 2023 · 1104099 · 1104099
1 parent c849e64
commit 1104099
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/app/resolve-guid/guid-route.ts b/app/resolve-guid/guid-route.ts
@@ -20,25 +20,30 @@ export default abstract class GuidRoute extends Route {
     @service ready!: Ready;
     @service store!: Store;
 
-    abstract modelName(): keyof ModelRegistry;
-
     @task
     @waitFor
     async getModel(guid: string) {
+        const blocker = this.ready.getBlocker();
+
+        let model;
         try {
-            const blocker = this.ready.getBlocker();
-            const model = await this.store.findRecord(this.modelName(), guid, {
+            model = await this.store.findRecord(this.modelName(), guid, {
                 include: this.include(),
                 adapterOptions: this.adapterOptions(),
+                reload: true,
             });
-            blocker.done();
-            return model;
         } catch (e) {
             // To do custom error handling, add an error() action to the route that subclasses GuidRoute.
             this.send('error', e);
         }
+
+        blocker.done();
+
+        return model;
     }
 
+    abstract modelName(): keyof ModelRegistry;
+
     adapterOptions(): {} {
         return {};
     }
@@ -48,9 +53,8 @@ export default abstract class GuidRoute extends Route {
     }
 
     model(params: { guid: string }) {
-        const paramsGuid = params.guid;
         return {
-            guid: paramsGuid,
+            guid: params.guid,
             taskInstance: taskFor(this.getModel).perform(params.guid),
             task: this.getModel,
         };

diff --git a/lib/registries/addon/overview/index/controller.ts b/lib/registries/addon/overview/index/controller.ts
@@ -13,20 +13,11 @@ export default class Overview extends Controller {
     registration?: Registration;
 
     @computed('registration.{root,isRoot}')
-    get rootTitle() {
+    get root() {
         if (!this.registration || this.registration.isRoot) {
             return undefined;
         }
-        const rootTitle = this.registration.root.get('title');
-        return rootTitle;
-    }
 
-    @computed('registration.{root,isRoot}')
-    get rootId() {
-        if (!this.registration || this.registration.isRoot) {
-            return undefined;
-        }
-        const rootId = this.registration.root.get('id');
-        return rootId;
+        return this.registration.belongsTo('root').value() as Registration;
     }
 }
diff --git a/lib/registries/addon/overview/index/template.hbs b/lib/registries/addon/overview/index/template.hbs
@@ -3,9 +3,9 @@
         {{t 'registries.overview.component_of'}}
         <OsfLink
             @route='resolve-guid'
-            @models={{array this.rootId}}
+            @models={{array this.root.id}}
         >
-            {{this.rootTitle}}
+            {{this.root.title}}
         </OsfLink>
     </div>
 {{/unless}}