Merge pull request #128 from openimis/fix/merge-develop-to-release-br…

…anch fix: merge develop branch to the release one
openimis · Apr 12, 2024 · 70777dc · 70777dc
2 parents 9a0176b + 85d9387
commit 70777dc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/modules-config.js b/modules-config.js
@@ -45,15 +45,21 @@ export const packages = [
 `);
 
   stream.write(`
-export function loadModules (cfg = {}) {
-  return [
-    ${modules
-      .map(
-        ({ name, logicalName, moduleName }) =>
-          `require("${moduleName}").${name ?? "default"}(cfg["${logicalName}"] || {})`,
-      )
-      .join(",\n    ")}
-  ];\n
+export function loadModules(cfg = {}) {
+  const loadedModules = [];
+${modules
+.map(({ name, logicalName, moduleName }) => {
+return `
+  try {
+    loadedModules.push(require("${moduleName}").${name ?? "default"}(cfg["${logicalName}"] || {}));
+  } catch (error) {
+    alert(\`Failed to load module "${moduleName}". More details can be found in the developer console. Look for: \${error}\`);
+    console.error(error);
+  }
+`;
+})
+.join("")}
+  return loadedModules;
 }
 `);
 

diff --git a/openimis-config.js b/openimis-config.js
@@ -45,15 +45,21 @@ export const packages = [
 `);
 
   stream.write(`
-export function loadModules (cfg = {}) {
-  return [
-    ${modules
-      .map(
-        ({ name, logicalName, moduleName }) =>
-          `require("${moduleName}").${name ?? "default"}(cfg["${logicalName}"] || {})`,
-      )
-      .join(",\n    ")}
-  ];\n
+export function loadModules(cfg = {}) {
+  const loadedModules = [];
+${modules
+.map(({ name, logicalName, moduleName }) => {
+return `
+  try {
+    loadedModules.push(require("${moduleName}").${name ?? "default"}(cfg["${logicalName}"] || {}));
+  } catch (error) {
+    alert(\`Failed to load module "${moduleName}". More details can be found in the developer console. Look for: \${error}\`);
+    console.error(error);
+  }
+`;
+})
+.join("")}
+  return loadedModules;
 }
 `);
 

diff --git a/src/translations/ref.json b/src/translations/ref.json
@@ -40,6 +40,6 @@
   "validation.maxValue": "{value} above allowed {max}",
   "addTooltip": "Create new",
   "saveTooltip": "Save changes",
-  "resetFilterTooltip": "Reset search criteria",
-  "refreshFilterTooltip": "Search again"
+  "resetFilterTooltip": "Reset filters",
+  "refreshFilterTooltip": "Search"
 }