Merge pull request #13 from openimis/feature/OSB-44

OSB-44: Integrate 'solution builder' repository with 'solution' repository + OSB-47 changes

Author: delcroip

README.md

@@ -4,6 +4,113 @@ This script processes a `solution.json` file and combines the `menus` key from m
 
 ## How It Works
 
+### ⚠️ Requirements
+
+- **Node.js v18 or higher is required**
+  - This version is necessary for modern features like `Blob` and `arrayBuffer()` support used during ZIP creation.
+  - You can verify your version with:
+    ```bash
+    node -v
+    ```
+---
+
+### 🚀 What It Does
+
+The `workbench.js` script:
+1. **Reads** a solution configuration JSON (e.g., `HF.json`).
+2. **Generates** supporting files like:
+   - `fe-openimis.json`
+   - `generated-menu.json`
+   - `generated-roles.json`
+   - `compose.yml`
+3. **Creates** a ZIP archive (`output.zip`) containing the above outputs.
+4. **(Optional)** Pushes the generated solution to a new branch in the `openimis/solutions` GitHub repo.
+
+### Usage
+
+#### 📦 Basic: Generate ZIP Only
+
+```bash
+node workbench.js
+```
+
+This will create `output.zip` in the project root with the generated solution files.
+
+---
+
+#### 🚀 Publish to GitHub
+
+```bash
+node workbench.js --publish
+```
+
+This generates the ZIP and:
+
+* Clones the [openimis/solutions](https://github.com/openimis/solutions) repository.
+* Creates a new branch based on `develop`.
+* Pushes the solution into a subfolder matching the default name (`default-solution`).
+
+---
+
+#### 📝 Publish with Custom Folder Name
+
+```bash
+node workbench.js --publish --folder=coreMIS-test
+```
+
+This behaves like the previous command but publishes the solution inside a subfolder called `coreMIS-test`.
+
+---
+
+### Example Output Structure
+
+After running, you will see:
+
+```
+output.zip
+solution/
+├— fe-openimis.json
+├— generated-menu.json
+├— generated-roles.json
+└— compose.yml
+```
+
+---
+
+### 🚼 Cleanup
+
+Temporary folders (`temp_solutions_repo` and `unzipped_output`) are automatically cleaned between runs.
+
+---
+
+### 📁 Default Config Path
+
+Ensure your `<solution>.json` is located at:
+
+```
+./solution/solutions/<solution>.json
+```
+
+You can customize this path in the script if needed.
+
+---
+
+### 🔥 Dependencies
+
+Install dependencies using:
+
+```bash
+npm install jszip simple-git yaml unzipper
+```
+
+---
+
+### 📬 Contributing
+
+Merge to `develop` in `openimis/solutions` is disabled. This script creates a **new branch** like `solution/coreMIS-test` and **pushes only that branch**.
+
+---
+
 ### file structure
 
 ```yaml

solution/solutions/HF.json

@@ -9,6 +9,11 @@
     "./healthfinancing-bundle.json",
     "./core-bundle.json"
   ],
-  "services": ["db"],
-  "fePackageSource": {}
+  "services":["db"],
+  "fePackageSource":{
+    
+  },
+  "moduleConfiguration": {
+    "logo": "./sources/logo/openIMIS.png"
+  }
 }

solution/solutions/core-bundle.json

@@ -12,5 +12,8 @@
     "../services/base.json",
     "../services/cache.json",
     "../services/opensearch.json"
-  ]
+  ],
+  "moduleConfiguration": {
+    "logo": "./sources/logo/openIMIS.png"
+  }
 }

solution/solutions/coreMIS.json

@@ -8,5 +8,8 @@
     "./good-distribution-bundle.json",
     "./core-bundle.json"
   ],
-  "services":["db"]
+  "services":["db"],
+  "moduleConfiguration": {
+    "logo": "./sources/logo/coremis.png"
+  }
 }

solution/sources/logo/coremis.png

@@ -0,0 +1,16 @@
+{
+  "theme":
+  {
+    "name": "defaultBlue",
+    "primaryColor": "#004E96",
+    "errorColor": "#801a00",
+    "whiteColor": "#fff",
+    "backgroundColor": "#e4f2ff",
+    "headerColor": "#BCD4E6",
+    "greyColor": "grey",
+    "selectedTableRowColor": "rgba(0, 0, 0, 0.08)",
+    "hoveredTableRowColor": "rgba(0, 0, 0, 0.12)",
+    "toggledButtonColor": "#999999",
+    "lockedBackgroundPattern": "repeating-linear-gradient(45deg, #D3D3D3 1px, #D3D3D3 1px, #fff 10px, #fff 10px)"
+  }
+}

solution/sources/logo/openIMIS.png

@@ -4,8 +4,12 @@ if(typeof window === 'undefined'){
     path = require('path'); // CommonJS
     JSZip = require('jszip'); // CommonJS
     yaml = require('js-yaml'); // 
+    const { Blob } = require('buffer');
 }
 
+const mime = require('mime-types');
+const { v4: uuidv4 } = require('uuid');
+
 
 
 // solution-builder.js
@@ -140,20 +144,24 @@ function getFePackageConf(name, definition, branch){
 }
 
 
-function makeCoreModuleConfiguration(menus){
+function makeCoreModuleConfiguration(menusDict) {
+    const config = {
+        menus: Object.values(menusDict).sort((a, b) => (a.position || 0) - (b.position || 0))
+    };
+
     return [
         {
-          "model": "core.moduleconfiguration",
-          "fields": {
-            "id": "ebdbdbe5-c9be-4e66-8c49-edd1e5284c7c",
-            "module": "fe-core",
-            "version": "1",
-            "config": "{\n  \"menus\": "+JSON.stringify(menus).replace(/"/g, '\"')+"}",
-            "is_exposed": true,
-            "layer": "fe"
-          }
+            model: 'core.moduleconfiguration',
+            fields: {
+                id: uuidv4(),
+                module: 'fe-core',
+                version: '1',
+                config: JSON.stringify(config, null, 2),
+                is_exposed: true,
+                layer: 'fe'
+            }
         }
-      ]
+    ];
 }
 
 async function processSolutions(    
@@ -163,13 +171,27 @@ async function processSolutions(
     branch = 'develop'
 )
 {
-    solutionFilePath = getAbsolutePath(typeof solutionFile == 'string'?solutionFile:'', '', false)
-    const merged = await mergeSolutions(
-        solutionFile,
-        directoryPath,
-        permissionMap
-    )
-    let result = {}
+    const solutionFilePath = getAbsolutePath(typeof solutionFile === 'string' ? solutionFile : '', '', false);
+
+    let solutionJson = {};
+    try {
+        solutionJson = JSON.parse(fs.readFileSync(solutionFile, 'utf8'));
+    } catch (e) {
+        console.warn('⚠️ Failed to parse root solution JSON file:', e.message);
+    }
+
+    let logoPath = null;
+    if (solutionJson?.moduleConfiguration?.logo) {
+        logoPath = path.resolve(path.dirname(solutionFilePath), solutionJson.moduleConfiguration.logo);
+    }
+
+    let themePath = null;
+    if (solutionJson?.moduleConfiguration?.theme) {
+        themePath = path.resolve(path.dirname(solutionFilePath), solutionJson.moduleConfiguration.theme);
+    }
+
+    let merged = await mergeSolutions(solutionFile, directoryPath, permissionMap);
+    let result = {};
 
     for (let key in merged.moduleRefDict || {}) {
         const depPath = getAbsolutePath(merged.moduleRefDict[key], solutionFilePath);
@@ -228,8 +250,12 @@ async function processSolutions(
     if(PIPModules.size>0){
         output['be-openimis.json'] ={"modules": [...PIPModules]};
     }
-    if(Object.keys(merged.menusDict).length>0){
-        output['fixtures/module-configuration-core.json'] =makeCoreModuleConfiguration(merged.menusDict);
+    if (Object.keys(merged.menusDict).length > 0) {
+        const coreModuleConfig = makeCoreModuleConfiguration(merged.menusDict);
+
+        // Inject logo/theme using resolved paths
+        await injectLogoTheme(coreModuleConfig[0], logoPath, themePath);
+        output['fixtures/module-configuration-core.json'] = coreModuleConfig;
     }
     if(Object.keys(merged.rolesDict).length>0){
         output['fixtures/roles.json'] = merged.rolesDict;
@@ -422,6 +448,41 @@ function mergeMenusData(menus, menuDict) {
 }
 
 
+async function injectLogoTheme(menuJson, logoPath, themePath) {
+    if (!menuJson.fields || !menuJson.fields.config) {
+        console.warn("⚠️ menuJson is missing 'fields.config'");
+        return;
+    }
+
+    // Parse the existing config JSON string
+    let config;
+    try {
+        config = JSON.parse(menuJson.fields.config);
+    } catch (e) {
+        console.error("❌ Failed to parse menuJson.fields.config:", e);
+        return;
+    }
+
+    // Inject logo
+    if (logoPath && fs.existsSync(logoPath)) {
+        const img = fs.readFileSync(logoPath);
+        const mimeType = mime.lookup(logoPath) || 'image/png';
+        const base64 = img.toString('base64');
+        config.logo = {
+            value: `data:${mimeType};base64,${base64}`
+        };
+    }
+
+    // Inject theme
+    if (themePath && fs.existsSync(themePath)) {
+        const themeData = JSON.parse(fs.readFileSync(themePath, 'utf8'));
+        config.theme = themeData.theme;
+    }
+    // Write back to config as string
+    menuJson.fields.config = JSON.stringify(config, null, 2);
+}
+
+
 // Function to get headers with GitHub API key
 function getHeaders() {
     const headers = {