Merge pull request #3949 from NoelDeMartin/MOBILE-4524

MOBILE-4524 search: Optimize WS calls
moodlehq · Feb 29, 2024 · 0c49a45 · 0c49a45
2 parents 5d3e8db + 1e3eed6
commit 0c49a45
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/src/addons/block/searchforums/services/block-handler.ts b/src/addons/block/searchforums/services/block-handler.ts
@@ -34,26 +34,28 @@ export class AddonBlockSearchForumsHandlerService extends CoreBlockBaseHandler {
      * @inheritdoc
      */
     async isEnabled(): Promise<boolean> {
-        const enabled = await CoreSearchGlobalSearch.isEnabled();
-
-        if (!enabled) {
-            return false;
-        }
-
-        const forumSearchAreas = ['mod_forum-activity', 'mod_forum-post'];
-        const searchAreas = await CoreSearchGlobalSearch.getSearchAreas();
-
-        return searchAreas.some(({ id }) => forumSearchAreas.includes(id));
+        return CoreSearchGlobalSearch.isEnabled();
     }
 
     /**
      * @inheritdoc
      */
-    getDisplayData(block: CoreCourseBlock, contextLevel: string, instanceId: number): CoreBlockHandlerData | undefined {
+    async getDisplayData(
+        block: CoreCourseBlock,
+        contextLevel: string,
+        instanceId: number,
+    ): Promise<undefined | CoreBlockHandlerData> {
         if (contextLevel !== 'course') {
             return;
         }
 
+        const forumSearchAreas = ['mod_forum-activity', 'mod_forum-post'];
+        const searchAreas = await CoreSearchGlobalSearch.getSearchAreas();
+
+        if (!searchAreas.some(({ id }) => forumSearchAreas.includes(id))) {
+            return;
+        }
+
         return {
             title: 'addon.block_searchforums.pluginname',
             class: 'addon-block-search-forums',

diff --git a/src/core/features/block/classes/base-block-handler.ts b/src/core/features/block/classes/base-block-handler.ts
@@ -47,7 +47,7 @@ export class CoreBlockBaseHandler implements CoreBlockHandler {
         block: CoreCourseBlock, // eslint-disable-line @typescript-eslint/no-unused-vars
         contextLevel: string, // eslint-disable-line @typescript-eslint/no-unused-vars
         instanceId: number, // eslint-disable-line @typescript-eslint/no-unused-vars
-    ): undefined | CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
+    ): undefined | CoreBlockHandlerData | Promise<undefined | CoreBlockHandlerData> {
         // To be overridden.
         return undefined;
     }

diff --git a/src/core/features/block/services/block-delegate.ts b/src/core/features/block/services/block-delegate.ts
@@ -45,7 +45,7 @@ export interface CoreBlockHandler extends CoreDelegateHandler {
         block: CoreCourseBlock,
         contextLevel: string,
         instanceId: number,
-    ): undefined | CoreBlockHandlerData | Promise<CoreBlockHandlerData>;
+    ): undefined | CoreBlockHandlerData | Promise<undefined | CoreBlockHandlerData>;
 }
 
 /**