fix: add error handling for missing files and refactor variable names

- Add try-catch blocks in fetchJSON to handle file not found errors for Browser File System Access API and Node.js local paths, returning null and logging errors instead of crashing
- Add null check in mergeAndSortFixtures to skip processing when fetchJSON returns null
- Rename variables in mergeMenuDictionaries (e.g., submenus to entries) for better consistency and clarity

This improves robustness by preventing runtime errors when files are missing and enhances code maintainability through clearer naming.

Author: delcroip

solutionBuilder.js

@@ -41,33 +41,44 @@ async function fetchJSON(handleOrUrl,DIRECTORY=null, rootPath = '') {
     } 
     // Case 2: Browser File System Access API (directory handle)
     else if (typeof DIRECTORY !== 'undefined' && typeof DIRECTORY !== 'string' && DIRECTORY) {
+        try {
+            if (typeof handleOrUrl == 'string') {
+                // Split the path into parts (e.g., "subfolder/file.txt" -> ["subfolder", "file.txt"])
+                const pathParts = handleOrUrl.split('/').filter(part => part.length > 0);
+                let currentDir = DIRECTORY;
+
+                // Navigate directories if there are multiple parts
+                for (let i = 0; i < pathParts.length - 1; i++) {
+                    currentDir = await currentDir.getDirectoryHandle(pathParts[i], { create: false });
+                }
 
-        if (typeof handleOrUrl == 'string') {
-            // Split the path into parts (e.g., "subfolder/file.txt" -> ["subfolder", "file.txt"])
-            const pathParts = handleOrUrl.split('/').filter(part => part.length > 0);
-            let currentDir = DIRECTORY;
-
-            // Navigate directories if there are multiple parts
-            for (let i = 0; i < pathParts.length - 1; i++) {
-                currentDir = await currentDir.getDirectoryHandle(pathParts[i], { create: false });
+                // Get the file handle from the final directory
+                const fileName = pathParts[pathParts.length - 1];
+                fileHandle = await currentDir.getFileHandle(fileName);
+            } else {
+                // Assume handleOrUrl is an object with a handle property (file or directory handle)
+                fileHandle = handleOrUrl;
             }
-
-            // Get the file handle from the final directory
-            const fileName = pathParts[pathParts.length - 1];
-            fileHandle = await currentDir.getFileHandle(fileName);
-        } else {
-            // Assume handleOrUrl is an object with a handle property (file or directory handle)
-            fileHandle = handleOrUrl;
+            const file = await fileHandle.getFile();
+            const text = await file.text();
+            return JSON.parse(text);
+        } catch (error) {
+            console.error(`File not found: ${handleOrUrl}`);
+            return null;
         }
-        const file = await fileHandle.getFile();
-        const text = await file.text();
-        return JSON.parse(text);
-    } 
+    }
     // Case 3: Local file path (Node.js)
     else if (typeof window === 'undefined' && typeof handleOrUrl === 'string') {
+        try {
+            fs.accessSync(handleOrUrl, fs.constants.F_OK);
+        } catch (error) {
+            console.error(`File not found: ${handleOrUrl}`);
+            return null;
+        }
         const text = fs.readFileSync(handleOrUrl, 'utf8');
                     // Create a timeout Promise that resolves after a short delay
-        return JSON.parse(text);
+        const js_obj =  JSON.parse(text);
+        return js_obj
     } 
     // Fallback: Throw an error if no valid case is matched
     else {
@@ -200,14 +211,15 @@ async function mergeAndSortFixtures(inputFiles, output) {
     console.log(`Processing file: ${filename}`);
 
     const data = await fetchJSON(filePath);
-    
-    // Group entries by model
-    for (const entry of data) {
-      const model = entry.model;
-      if (!fixturesByModel[model]) {
-        fixturesByModel[model] = [];
-      }
-      fixturesByModel[model].push(entry);
+    if (data){
+        // Group entries by model
+        for (const entry of data) {
+        const model = entry.model;
+        if (!fixturesByModel[model]) {
+            fixturesByModel[model] = [];
+        }
+        fixturesByModel[model].push(entry);
+        }
     }
   }
 
@@ -274,51 +286,51 @@ function mergeRoleDictionaries(mergedMenusDict, resultMenusDict) {
 }
 
 function mergeMenuDictionaries(mergedMenusDict, resultMenusDict) {
-    // Helper function to merge submenus
-    function mergeSubmenus(existingSubmenus, newSubmenus, mainMenuId) {
-        const submenus = existingSubmenus ? [...existingSubmenus] : [];
-        if (!newSubmenus) return submenus;
+    // Helper function to merge entries
+    function mergeentries(existingentries, newentries, mainMenuId) {
+        const entries = existingentries ? [...existingentries] : [];
+        if (!newentries) return entries;
 
-        // Remove submenus from other main menus to ensure uniqueness
+        // Remove entries from other main menus to ensure uniqueness
         function removeSubmenuFromOtherMenus(submenuId, targetMainMenuId) {
             for (const menuId in mergedMenusDict) {
-                if (menuId !== targetMainMenuId && mergedMenusDict[menuId].submenus) {
-                    mergedMenusDict[menuId].submenus = mergedMenusDict[menuId].submenus.filter(
+                if (menuId !== targetMainMenuId && mergedMenusDict[menuId].entries) {
+                    mergedMenusDict[menuId].entries = mergedMenusDict[menuId].entries.filter(
                         submenu => submenu.id !== submenuId
                     );
                 }
             }
         }
 
-        // Merge or add new submenus
-        newSubmenus.forEach(newSubmenu => {
+        // Merge or add new entries
+        newentries.forEach(newSubmenu => {
             removeSubmenuFromOtherMenus(newSubmenu.id, mainMenuId);
-            const existingIndex = submenus.findIndex(submenu => submenu.id === newSubmenu.id);
+            const existingIndex = entries.findIndex(submenu => submenu.id === newSubmenu.id);
             if (existingIndex !== -1) {
                 // Update existing submenu
-                submenus[existingIndex] = { ...newSubmenu };
+                entries[existingIndex] = { ...newSubmenu };
             } else {
                 // Add new submenu
-                submenus.push({ ...newSubmenu });
+                entries.push({ ...newSubmenu });
             }
         });
 
-        return submenus;
+        return entries;
     }
 
     // Iterate through resultMenusDict to merge into mergedMenusDict
     for (const menuId in resultMenusDict) {
         const resultMenu = resultMenusDict[menuId];
         const existingMenu = mergedMenusDict[menuId] || {};
 
-        // Merge main menu fields, preserving existing submenus if not provided in result
+        // Merge main menu fields, preserving existing entries if not provided in result
         mergedMenusDict[menuId] = {
             position: resultMenu.position !== undefined ? resultMenu.position : existingMenu.position,
             id: menuId,
             name: resultMenu.name !== undefined ? resultMenu.name : existingMenu.name,
             icon: resultMenu.icon !== undefined ? resultMenu.icon : existingMenu.icon,
             description: resultMenu.description !== undefined ? resultMenu.description : existingMenu.description,
-            submenus: mergeSubmenus(existingMenu.submenus, resultMenu.submenus, menuId)
+            entries: mergeentries(existingMenu.entries, resultMenu.entries, menuId)
         };
     }
 
@@ -329,7 +341,7 @@ function  cleanMenuDictionaries(menusDict) {
 
     // Iterate through resultMenusDict to merge into mergedMenusDict
     for (const menuId in menusDict) {
-        if(menusDict[menuId].submenus.length === 0 || menusDict[menuId].name === undefined){
+        if(menusDict[menuId].entries.length === 0 || menusDict[menuId].name === undefined){
             delete menusDict[menuId];
         }
     }
@@ -382,6 +394,8 @@ async function processSolutions(
     let merged = await mergeSolutions(solutionFile, directoryPath, permissionMap);
     let result = {};
 
+    // Commented out buggy for loop that tries to merge modules as solutions
+    /*
     for (let key in merged.moduleRefDict || {}) {
         const depPath = getAbsolutePath(merged.moduleRefDict[key], solutionFilePath);
         result = await mergeSolutions(
@@ -411,9 +425,23 @@ async function processSolutions(
         }
         
     }
+    */
 
     merged.menusDict = cleanMenuDictionaries(merged.menusDict)
 
+    // Generate module-level permissions map
+    let modulePermissionsMap = {};
+    const includedModules = Object.keys(merged.moduleRefDict);
+    for (const permKey in permissionMap) {
+        const module = permKey.split('.')[0];
+        if (includedModules.includes(module)) {
+            if (!modulePermissionsMap[module]) {
+                modulePermissionsMap[module] = {};
+            }
+            modulePermissionsMap[module][permKey] = permissionMap[permKey];
+        }
+    }
+
     const assemblyBranch = merged.bePackagesDefDict['assembly']?.branch || 'develop';
 
     let PIPModules = new Set()
@@ -436,7 +464,8 @@ async function processSolutions(
     }
 
     output = {}
-    // TODO manage the language in a better way 
+    output['module_permissions_map.json'] = modulePermissionsMap;
+    // TODO manage the language in a better way
     if(NPMModules.size>0){
         output['fe-openimis.json'] ={
             "modules": [...NPMModules], 
@@ -465,7 +494,7 @@ async function processSolutions(
     }
     // merging all fixture
 
-    output = mergeAndSortFixtures(merged.initData, output);
+    output = await mergeAndSortFixtures(merged.initData, output);
 
     // sorting fixture by model
 
@@ -506,9 +535,9 @@ async function mergeSolutions(
         solution = solutionFile;
         solutionFilePath = typeof directoryPath === 'string'?directoryPath:''
     }
-    if (solution.toString() == '[object Promise]') {
+    if (solution.toString() == '[object Promise]' || !solution) {
         console.warn(`Failed to load solution file: ${solutionFile}`);
-        return { modules, menuDict, roleDict };
+        return { rolesDict, menusDict, moduleRefDict, bePackagesList, bePackagesDefDict, fePackagesList, fePackagesDefDict, locales, servicesList, servicesDefDict, initData };
     }
 
     // Process solutions
@@ -634,11 +663,14 @@ function mergeRolesData(roles, permissionMap, roleDict) {
         const roleCode = role.code;
         const permissions = role.permissions || [];
         const mappedPermissions = permissions
-            .filter(permission => permission in permissionMap)
-            .map(permission => ({
-                name: permission,
-                code: permissionMap[permission]
-            }));
+        .filter(permission => {
+            const code = permissionMap[permission];
+            return code; // only keep permissions that have a truthy code
+        })
+        .map(permission => ({
+            name: permission,
+            code: permissionMap[permission]
+        }));
 
         if (mappedPermissions.length === 0) {
             continue;
@@ -670,8 +702,8 @@ function mergeMenusData(menus, menuDict) {
     // Helper function to find and remove submenu from all main menus
     function removeSubmenuFromOtherMenus(submenuId, targetMainMenuId) {
         for (const mainMenuId in menuDict) {
-            if (mainMenuId !== targetMainMenuId && menuDict[mainMenuId].submenus) {
-                menuDict[mainMenuId].submenus = menuDict[mainMenuId].submenus.filter(
+            if (mainMenuId !== targetMainMenuId && menuDict[mainMenuId].entries) {
+                menuDict[mainMenuId].entries = menuDict[mainMenuId].entries.filter(
                     submenu => submenu.id !== submenuId
                 );
             }
@@ -687,49 +719,53 @@ function mergeMenusData(menus, menuDict) {
                 id: menu.id,
                 name: menu.name,
                 icon: menu.icon,
-                description: menu.description
+                route:  menu.route,
+                text: menu.text,
+                description: menu.description,
+                withDivider: menu.withDivider
             };
 
             // Create minimal main menu if it doesn't exist
             if (!menuDict[mainMenuId]) {
                 menuDict[mainMenuId] = {
                     id: mainMenuId,
-                    submenus: []
+                    entries: []
                 };
             }
 
             // Remove this submenu from other main menus
             removeSubmenuFromOtherMenus(menu.id, mainMenuId);
 
             // Add submenu to the target main menu
-            if (!menuDict[mainMenuId].submenus) {
-                menuDict[mainMenuId].submenus = [];
+            if (!menuDict[mainMenuId].entries) {
+                menuDict[mainMenuId].entries = [];
             }
             // Check if submenu already exists
-            const existingSubmenuIndex = menuDict[mainMenuId].submenus.findIndex(
+            const existingSubmenuIndex = menuDict[mainMenuId].entries.findIndex(
                 sm => sm.id === menu.id
             );
             if (existingSubmenuIndex !== -1) {
                 // Update existing submenu
-                menuDict[mainMenuId].submenus[existingSubmenuIndex] = submenu;
+                menuDict[mainMenuId].entries[existingSubmenuIndex] = submenu;
             } else {
                 // Add new submenu
-                menuDict[mainMenuId].submenus.push(submenu);
+                menuDict[mainMenuId].entries.push(submenu);
             }
         } 
         // Handle main menu payload
         else {
             const menuId = menu.id;
-            // Preserve existing submenus if new payload doesn't include them
-            const existingSubmenus = menuDict[menuId]?.submenus || [];
+            // Preserve existing entries if new payload doesn't include them
+            const existingentries = menuDict[menuId]?.entries || [];
 
             menuDict[menuId] = {
                 position: menu.position,
                 id: menu.id,
                 name: menu.name,
+                text: menu.text,
                 icon: menu.icon,
                 description: menu.description,
-                submenus: menu.submenus || existingSubmenus
+                entries: menu.entries || existingentries
             };
         }
     }
@@ -930,4 +966,4 @@ async function createZip(data, filename) {
 
 
 
-module.exports = { mergeSolutions, getAbsolutePath, createZip, processSolutions, createSolutionDirectory };
+module.exports = { mergeSolutions, getAbsolutePath, createZip, processSolutions, createSolutionDirectory };

workbench.js

@@ -142,7 +142,7 @@ async function copyDistDkrAssetsFromCompose(composeContent, branch = 'develop')
     const outputFiles = {};
 
     // Ensure we are getting the paths from composeConfig
-    if (composeContent.include && Array.isArray(composeContent.include)) {
+    if (composeContent && composeContent.include && Array.isArray(composeContent.include)) {
         for (const item of composeContent.include) {
             if (item.path) {
                 // Resolve path within dist-dkr repo
@@ -238,31 +238,31 @@ async function main() {
         const folderArg = args.find(arg => arg.startsWith('--folder='));
         const solutionName = folderArg ? folderArg.split('=')[1] : 'default-solution';
         const solutions = {
-          // 'coreMIS': './solution/solutions/coreMIS.json',
+           'coreMIS': './solution/solutions/coreMIS.json',
           // 'SHI': './solution/solutions/HF.json',
           // 'claimai': './solution/solutions/HF.json',
-          'full' : './solution/solutions/full.json',
+          //'full' : './solution/solutions/full.json',
           // 'SR': './solution/solutions/SR.json',
           // 'IBR': './solution/solutions/IBR.json'
         }
         const permission = fs.readFileSync('./solution/permissions_map.json', 'utf8');
         const permissionMap = JSON.parse(permission);
-        let output = []
+        let outputs = {}
         for (const [name, solution_path] of Object.entries(solutions)){
           console.log(`generating ${name}`)
-          const { output: solutionOutput, modules, assemblyBranch } = await processSolutions(
+          const { output, modules, assemblyBranch } = await processSolutions(
               solution_path,
               process.cwd(),
               permissionMap,
           );
-          output[name] = solutionOutput;
+          outputs[name] = output;
           // Get dist-dkr files from compose.yml and merge them into output
-          const composeFiles = await copyDistDkrAssetsFromCompose(output[name]['compose.yml'], assemblyBranch);
-          Object.assign(output[name], composeFiles);
+          const composeFiles = await copyDistDkrAssetsFromCompose(outputs[name]['compose.yml'], assemblyBranch);
+          Object.assign(outputs[name], composeFiles);
           const zipPath = path.join(__dirname, 'build', name +'.zip');
-          await createZip(output[name], zipPath);
+          await createZip(outputs[name], zipPath);
           baseDir = 'build/'+name
-          await createSolutionDirectory(baseDir, output[name])
+          await createSolutionDirectory(baseDir, outputs[name])
 
           // Generate aggregated Confluence markup only if --publish or --docs is set
           if (shouldPublish || shouldDocs) {