MOBILE-3847 mod: Improve error message when module not found

scripts/langindex.json

@@ -1497,6 +1497,7 @@
   "core.course.insufficientavailablequota": "local_moodlemobileapp",
   "core.course.insufficientavailablespace": "local_moodlemobileapp",
   "core.course.manualcompletionnotsynced": "local_moodlemobileapp",
+  "core.course.modulenotfound": "local_moodlemobileapp",
   "core.course.nocontentavailable": "local_moodlemobileapp",
   "core.course.overriddennotice": "grades",
   "core.course.refreshcourse": "local_moodlemobileapp",

src/addons/mod/assign/services/assign.ts

@@ -17,7 +17,7 @@ import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreInterceptor } from '@classes/interceptor';
 import { CoreWSExternalWarning, CoreWSExternalFile, CoreWSFile } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreCourseCommonModWSOptions } from '@features/course/services/course';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreGrades } from '@features/grades/services/grades';
@@ -218,7 +218,7 @@ export class AddonModAssignProvider {
             }
         }
 
-        throw new CoreError('Assignment not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/book/services/book.ts

@@ -17,7 +17,7 @@ import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreTagItem } from '@features/tag/services/tag';
 import { CoreWSExternalWarning, CoreWSExternalFile, CoreWS } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreCourseLogHelper } from '@features/course/services/log-helper';
 import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/services/course';
 import { CoreUtils } from '@services/utils/utils';
@@ -103,7 +103,7 @@ export class AddonModBookProvider {
             return book;
         }
 
-        throw new CoreError('Book not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/chat/services/chat.ts

@@ -61,7 +61,7 @@ export class AddonModChatProvider {
             return chat;
         }
 
-        throw new CoreError('Chat not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/choice/services/choice.ts

@@ -23,7 +23,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModChoiceOffline } from './choice-offline';
 import { AddonModChoiceAutoSyncData, AddonModChoiceSyncProvider } from './choice-sync';
 
@@ -215,7 +215,7 @@ export class AddonModChoiceProvider {
             return currentChoice;
         }
 
-        throw new CoreError('Choice not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/data/services/data.ts

@@ -25,7 +25,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModDataFieldsDelegate } from './data-fields-delegate';
 import { AddonModDataOffline } from './data-offline';
 import { AddonModDataAutoSyncData, AddonModDataSyncProvider } from './data-sync';
@@ -586,7 +586,7 @@ export class AddonModDataProvider {
             return currentData;
         }
 
-        throw new CoreError('Activity not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/feedback/services/feedback.ts

@@ -22,7 +22,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning, CoreWSStoredFile } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModFeedbackOffline } from './feedback-offline';
 import { AddonModFeedbackAutoSyncData, AddonModFeedbackSyncProvider } from './feedback-sync';
 
@@ -605,7 +605,7 @@ export class AddonModFeedbackProvider {
             return currentFeedback;
         }
 
-        throw new CoreError('Feedback not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/folder/services/folder.ts

@@ -20,7 +20,7 @@ import { CoreCourseLogHelper } from '@features/course/services/log-helper';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaModFolder:';
 
@@ -80,7 +80,7 @@ export class AddonModFolderProvider {
             return currentFolder;
         }
 
-        throw new CoreError('Folder not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/forum/services/forum.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { CoreError } from '@classes/errors/error';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreCourseCommonModWSOptions } from '@features/course/services/course';
 import { CoreCourseLogHelper } from '@features/course/services/log-helper';
@@ -480,7 +481,7 @@ export class AddonModForumProvider {
         const forum = forums.find(forum => forum.cmid == cmId);
 
         if (!forum) {
-            throw new Error('Forum not found');
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
         return forum;

src/addons/mod/glossary/services/glossary.ts

@@ -811,7 +811,7 @@ export class AddonModGlossaryProvider {
             return glossary;
         }
 
-        throw new CoreError('Glossary not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**
@@ -835,7 +835,7 @@ export class AddonModGlossaryProvider {
             return glossary;
         }
 
-        throw new CoreError('Glossary not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/h5pactivity/services/h5pactivity.ts

@@ -528,7 +528,7 @@ export class AddonModH5PActivityProvider {
             return currentActivity;
         }
 
-        throw new CoreError(Translate.instant('addon.mod_h5pactivity.errorgetactivity'));
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/imscp/services/imscp.ts

@@ -24,7 +24,7 @@ import { CoreSitesCommonWSOptions, CoreSites } from '@services/sites';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaModImscp:';
 
@@ -183,7 +183,7 @@ export class AddonModImscpProvider {
             return currentImscp;
         }
 
-        throw new CoreError('Imscp not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/label/services/label.ts

@@ -19,7 +19,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaModLabel:';
 
@@ -77,7 +77,7 @@ export class AddonModLabelProvider {
             return currentLabel;
         }
 
-        throw new CoreError('Label not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/lesson/services/lesson.ts

@@ -1445,7 +1445,7 @@ export class AddonModLessonProvider {
             return currentLesson;
         }
 
-        throw new CoreError('Lesson not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/lti/services/lti.ts

@@ -110,7 +110,7 @@ export class AddonModLtiProvider {
             return currentLti;
         }
 
-        throw new CoreError('Activity not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/page/services/page.ts

@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreSitesCommonWSOptions, CoreSites } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreWSExternalWarning, CoreWSExternalFile } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreFilepool } from '@services/filepool';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreUtils } from '@services/utils/utils';
@@ -79,7 +79,7 @@ export class AddonModPageProvider {
             return currentPage;
         }
 
-        throw new CoreError('Page not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/quiz/services/quiz.ts

@@ -748,7 +748,7 @@ export class AddonModQuizProvider {
         const quiz = response.quizzes.find(quiz => quiz[key] == value);
 
         if (!quiz) {
-            throw new CoreError('Quiz not found.');
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
         return quiz;

src/addons/mod/resource/services/resource.ts

@@ -21,7 +21,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 
 const ROOT_CACHE_KEY = 'mmaModResource:';
 
@@ -82,7 +82,7 @@ export class AddonModResourceProvider {
             return currentResource;
         }
 
-        throw new CoreError('Resource not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/scorm/services/scorm.ts

@@ -1105,7 +1105,7 @@ export class AddonModScormProvider {
 
         const currentScorm = <AddonModScormScorm> response.scorms.find(scorm => scorm[key] == value);
         if (!currentScorm) {
-            throw new CoreError('SCORM not found.');
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
         // If the SCORM isn't available the WS returns a warning and it doesn't return timeopen and timeclosed.

src/addons/mod/survey/services/survey.ts

@@ -22,7 +22,7 @@ import { CoreFilepool } from '@services/filepool';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { AddonModSurveyOffline } from './survey-offline';
 
 const ROOT_CACHE_KEY = 'mmaModSurvey:';
@@ -121,7 +121,7 @@ export class AddonModSurveyProvider {
             return currentSurvey;
         }
 
-        throw new CoreError('Activity not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/url/services/url.ts

@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreSites, CoreSitesCommonWSOptions } from '@services/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreWSExternalWarning, CoreWSExternalFile } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreConstants } from '@/core/constants';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
 import { CoreCourse } from '@features/course/services/course';
@@ -131,7 +131,7 @@ export class AddonModUrlProvider {
             return currentUrl;
         }
 
-        throw new CoreError('Url not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/wiki/services/wiki.ts

@@ -397,7 +397,7 @@ export class AddonModWikiProvider {
             return currentWiki;
         }
 
-        throw new CoreError('Wiki not found.');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**

src/addons/mod/workshop/services/workshop.ts

@@ -23,7 +23,7 @@ import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@
 import { CoreTextFormat, defaultTextFormat } from '@services/utils/text';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreStatusWithWarningsWSResponse, CoreWS, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
-import { makeSingleton } from '@singletons';
+import { makeSingleton, Translate } from '@singletons';
 import { CoreFormFields } from '@singletons/form';
 import { AddonModWorkshopOffline } from './workshop-offline';
 import { AddonModWorkshopAutoSyncData, AddonModWorkshopSyncProvider } from './workshop-sync';
@@ -272,7 +272,7 @@ export class AddonModWorkshopProvider {
 
         const workshop = response.workshops.find((workshop) => workshop[key] == value);
         if (!workshop) {
-            throw new CoreError('Activity not found');
+            throw new CoreError(Translate.instant('core.course.modulenotfound'));
         }
 
         // Set submission types for Moodle 3.5 and older.

src/core/features/course/lang.json

@@ -41,6 +41,7 @@
     "insufficientavailablespace": "You are trying to download {{size}}. This will leave your device with insufficient space to operate normally. Please clear some storage space first.",
     "insufficientavailablequota": "Your device could not allocate space to save this download. It may be reserving space for app and system updates. Please clear some storage space first.",
     "manualcompletionnotsynced": "Manual completion not synchronised.",
+    "modulenotfound": "Resource or activity not found, please make sure you're online and it's still available.",
     "nocontentavailable": "No content available at the moment.",
     "overriddennotice": "Your final grade from this activity was manually adjusted.",
     "refreshcourse": "Refresh course",

src/core/features/course/services/course.ts

@@ -505,7 +505,7 @@ export class CoreCourseProvider {
             return foundModule;
         }
 
-        throw Error('Module not found');
+        throw new CoreError(Translate.instant('core.course.modulenotfound'));
     }
 
     /**