ui-soxo-bootstrap-core 2.6.16 → 2.6.17

package/DEVELOPER_GUIDE.md

@@ -0,0 +1,294 @@
+# 📦 NPM Release Workflow — Task-Based Development → Develop → Master
+
+This guide describes the complete workflow for publishing **task-based development builds** and **stable releases** using GitHub Actions, Git tags, and npm versioning.
+
+Incorrect versioning or incorrect tags will break the publish pipeline — follow the process exactly.
+
+---
+
+# 📘 Table of Contents
+
+- Overview
+- Branch Strategy
+- Task Branch Workflow
+- Versioning Rules
+- Development Release Workflow (`develop`)
+- Promotion Workflow (Dev → Master)
+- Publishing via GitHub Release UI
+- How GitHub Action Detects Release Type
+- Summary Table
+- Common Mistakes & Fixes
+
+---
+
+# 🧩 Overview
+
+We maintain two release channels:
+
+| Channel             | Branch  | Tag            | Purpose             |
+| ------------------- | ------- | -------------- | ------------------- |
+| Stable (`latest`)   | master  | `vX.Y.Z`       | Production release  |
+| Development (`dev`) | develop | `vX.Y.Z-dev.N` | QA/internal testing |
+
+Releases are triggered using Git tags:
+
+```
+npm version
+```
+
+---
+
+# 🌿 Branch Strategy
+
+## `master`
+
+- Production-ready code
+- Publishes **stable** builds
+- Versions never include a `dev` suffix
+
+## `develop`
+
+- Used for QA/internal testing
+- Publishes **development** builds
+- Versions always include `-dev.N`
+
+## Task Branches
+
+- Create from `master`
+- Naming: `task/<JIRA-ID>-<description>`
+- After completing work, merge into `develop`
+
+---
+
+# 🏗️ Task Branch Workflow
+
+### 1. Create a task branch
+
+```bash
+git checkout master
+git pull origin master
+git checkout -b task/<JIRA-ID>-<description>
+```
+
+### 2. Work on the task
+
+```bash
+git add .
+git commit -m "TASK-123: Implement XYZ"
+```
+
+### 3. Merge into develop
+
+```bash
+git checkout develop
+git pull origin develop
+git merge task/<JIRA-ID>-<description>
+```
+
+---
+
+# 🔧 Versioning Rules
+
+## Development Versions
+
+```
+X.Y.Z-dev.N
+```
+
+Example:
+
+```
+2.4.30-dev.0
+```
+
+## Stable Versions
+
+```
+X.Y.Z
+```
+
+## Rules
+
+- Each version must be unique
+- Dev versions do **not** convert into stable versions
+- Git tag must exactly match `package.json` version
+
+---
+
+# 🟦 Development Release Workflow (`develop`)
+
+### 1. Switch to develop
+
+```bash
+git checkout develop
+git pull origin develop
+```
+
+### 2. Create a new development version
+
+```bash
+npm version prerelease --preid=dev
+```
+
+### 3. Push commit + tag
+
+```bash
+git push --follow-tags
+```
+
+### 4. GitHub Action publishes dev build
+
+```
+npm publish --tag dev
+```
+
+### 5. Install the dev build
+
+```bash
+npm install ui-soxo-bootstrap-core@dev
+```
+
+---
+
+# 🟩 Promotion Workflow (Dev → Master)
+
+### 1. Switch to master
+
+```bash
+git checkout master
+git pull origin master
+```
+
+### 2. Merge develop into master
+
+```bash
+git merge develop
+```
+
+### 3. Bump the stable version
+
+```bash
+npm version patch
+# or
+npm version minor
+# or
+npm version major
+```
+
+### 4. Push with tags
+
+```bash
+git push --follow-tags
+```
+
+### 5. GitHub Action publishes stable build
+
+```
+npm publish
+```
+
+### 6. Install stable version
+
+```bash
+npm install ui-soxo-bootstrap-core
+# or
+npm install ui-soxo-bootstrap-core@<version>
+```
+
+---
+
+# 🟧 Publishing via GitHub Release UI
+
+### Important
+
+**The tag must match the `package.json` version exactly**, including the `v` prefix.
+
+Example:
+
+```
+package.json: "version": "2.4.31-dev.0"
+GitHub Tag:  v2.4.31-dev.0
+```
+
+---
+
+## Steps
+
+### 1. Ensure `develop` branch is up to date
+
+Push your changes.
+
+### 2. Ensure version contains a dev suffix
+
+If not:
+
+```bash
+npm version prerelease --preid=dev
+git push --follow-tags
+```
+
+### 3. Open GitHub → Releases → Draft a new release
+
+### 4. Create tag matching the version
+
+Example:
+
+```
+v2.4.31-dev.0
+```
+
+### 5. Select target branch = `develop`
+
+### 6. Title = tag version
+
+Description is optional.
+
+### 7. Publish the release
+
+Triggers:
+
+```
+npm publish --tag dev
+```
+
+---
+
+# ⚙️ How GitHub Action Detects Release Type
+
+If version contains `dev`:
+
+```
+npm publish --tag dev
+```
+
+Otherwise:
+
+```
+npm publish
+```
+
+---
+
+# 📊 Summary Table
+
+| Step                   | Branch  | Command                              | Tag            | Publish Type |
+| ---------------------- | ------- | ------------------------------------ | -------------- | ------------ |
+| Create task branch     | master  | `git checkout -b task/<ID>`          | —              | —            |
+| Merge task → develop   | develop | `git merge task/<ID>`                | —              | —            |
+| Dev version            | develop | `npm version prerelease --preid=dev` | `vX.Y.Z-dev.N` | dev          |
+| Publish dev build      | develop | `git push --follow-tags`             | —              | dev          |
+| Merge develop → master | master  | `git merge develop`                  | —              | —            |
+| Stable version         | master  | `npm version patch/minor/major`      | `vX.Y.Z`       | latest       |
+| Publish stable build   | master  | `git push --follow-tags`             | —              | latest       |
+
+---
+
+# ⚠️ Common Mistakes & Fixes
+
+| Mistake                   | Issue              | Fix                          |
+| ------------------------- | ------------------ | ---------------------------- |
+| Tag doesn't match version | Publish fails      | Always use `npm version`     |
+| Manual tag creation       | Version mismatch   | Avoid manual tagging         |
+| Dev publish from master   | Wrong channel      | Verify branch before tagging |
+| Not pushing tags          | Workflow won’t run | Use `git push --follow-tags` |
+| Merging incomplete tasks  | Breaks dev builds  | Test before merging          |

package/core/models/menus/components/menu-lists/menu-lists.js

@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useEffect } from 'react';
-import { Space, Popconfirm, Input, Drawer, Skeleton, Collapse, message, Tag } from 'antd';
+import { Space, Popconfirm, Input, Drawer, Skeleton, Collapse, message, Tag, Empty } from 'antd';
 import { ReloadOutlined, DeleteOutlined, EditOutlined, PlusCircleFilled, CopyOutlined } from '@ant-design/icons';
 import { Button, Card, Switch, DraggableWrapper } from '../../../../lib';
 //  for draggable menu list import { DndProvider } from "react-dnd";
@@ -203,7 +203,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
     model.delete(rec).then(loadMenus);
   };
 
-  const filtered = records.filter((r) => r.name?.toUpperCase().includes(query.toUpperCase()));
+  const filtered = records.filter((r) => r.caption?.toUpperCase().includes(query.toUpperCase()));
 
   const visibleItems = filtered;
 
@@ -362,50 +362,53 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
             <Card>
               <DndProvider backend={HTML5Backend}>
                 <Collapse accordion>
-                  {visibleItems.map((item, index) => (
-                    <Panel
-                      key={item.id}
-                      header={
-                        <DraggableWrapper
-                          id={item.id}
-                          index={index}
-                          movePanel={movePanel}
-                          item={item}
-                          dragEnabled={dragMode}
-                          level={1}
-                          parentId={null}
-                          onCrossLevelMove={handleCrossLevelMove}
-                          canAcceptChildren={true}
-                        />
-                      }
-                      //  only show arrow if sub_menus exist
-                      showArrow={item.sub_menus && item.sub_menus.length > 0}
-                      //  disable panel
-                      // collapsible={item.sub_menus && item.sub_menus.length > 0 ? 'header' : 'disabled'}
-                      extra={panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerVisible, deleteRecord)}
-                    >
-                      {item.sub_menus && item.sub_menus.length > 0 && (
-                        <NestedMenu
-                          parentId={item.id}
-                          step={item.step + 1}
-                          items={item.sub_menus || []}
-                          model={model}
-                          dragMode={dragMode}
-                          setSelectedRecord={setSelectedRecord}
-                          setDrawerTitle={setDrawerTitle}
-                          setDrawerVisible={setDrawerVisible}
-                          deleteRecord={deleteRecord}
-                          level={2}
-                          onCrossLevelMove={handleCrossLevelMove}
-                          onChange={(subMenus) => {
-                            const updated = records.map((r) => (r.id === item.id ? { ...r, sub_menus: subMenus } : r));
-                            setRecords(updated);
-                            setOrderChanged(true);
-                          }}
-                        />
-                      )}
-                    </Panel>
-                  ))}
+                  {visibleItems && visibleItems.length > 0 ? (
+                    visibleItems.map((item, index) => (
+                      <Panel
+                        key={item.id}
+                        header={
+                          <DraggableWrapper
+                            id={item.id}
+                            index={index}
+                            movePanel={movePanel}
+                            item={item}
+                            dragEnabled={dragMode}
+                            level={1}
+                            parentId={null}
+                            onCrossLevelMove={handleCrossLevelMove}
+                            canAcceptChildren={true}
+                          />
+                        }
+                        showArrow={item.sub_menus && item.sub_menus.length > 0}
+                        extra={panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerVisible, deleteRecord)}
+                      >
+                        {item.sub_menus && item.sub_menus.length > 0 && (
+                          <NestedMenu
+                            parentId={item.id}
+                            step={item.step + 1}
+                            items={item.sub_menus || []}
+                            model={model}
+                            dragMode={dragMode}
+                            setSelectedRecord={setSelectedRecord}
+                            setDrawerTitle={setDrawerTitle}
+                            setDrawerVisible={setDrawerVisible}
+                            deleteRecord={deleteRecord}
+                            level={2}
+                            onCrossLevelMove={handleCrossLevelMove}
+                            onChange={(subMenus) => {
+                              const updated = records.map((r) => (r.id === item.id ? { ...r, sub_menus: subMenus } : r));
+                              setRecords(updated);
+                              setOrderChanged(true);
+                            }}
+                          />
+                        )}
+                      </Panel>
+                    ))
+                  ) : (
+                    <div style={{ textAlign: 'center', padding: '40px 0' }}>
+                      <Empty description="No Menu Items" />
+                    </div>
+                  )}
                 </Collapse>
               </DndProvider>
             </Card>

package/core/modules/reporting/components/reporting-dashboard/display-columns/build-display-columns.js

@@ -27,9 +27,13 @@ function getExportDefinition(entry, record) {
  * @param {boolean} root0.isFixedIndex
  * @param {Object} root0.CustomComponents
  * @param {Function} root0.refresh
+ * @param {Object} [root0.otherDetails={}] - Optional details from the report configuration.
+ * @param {boolean} [root0.otherDetails.isFilterEnabled] - Fallback to enable filtering on all columns.
+ * @param {boolean} [root.otherDetails.isSortingEnabled] - Fallback to enable sorting on all columns.
+ * @param {boolean} [root0.otherDetails.isHeaderWrapEnabled] - Fallback to enable header text wrapping for all columns.
  * @returns {Array}
  */
-export default function buildDisplayColumns({ columns = [], patients = [], isFixedIndex, CustomComponents, refresh }) {
+export default function buildDisplayColumns({ columns = [], patients = [], isFixedIndex, CustomComponents, refresh, otherDetails = {} }) {
   const displayColumns = [
     {
       title: '#',
@@ -42,6 +46,11 @@ export default function buildDisplayColumns({ columns = [], patients = [], isFix
   ];
 
   columns.forEach((entry, index) => {
+    const isFilterEnabled = entry.isFilterEnabled || otherDetails?.isFilterEnabled;
+    const isSortingEnabled = entry.isSortingEnabled || otherDetails?.isSortingEnabled;
+    const isHeaderWrapEnabled = otherDetails?.isHeaderWrapEnabled;
+
+    const titleStyle = isHeaderWrapEnabled ? { whiteSpace: 'pre-wrap', overflowWrap: 'break-word' } : {};
     displayColumns.push({
       render: (record) =>
         renderDisplayCell({
@@ -52,20 +61,26 @@ export default function buildDisplayColumns({ columns = [], patients = [], isFix
         }),
       field: entry.field,
       title: (
-        <Tooltip title={entry.tooltip || entry.title}>
-          <span>{entry.title}</span>
+        <Tooltip
+          title={entry.tooltip || entry.title}
+          overlayInnerStyle={{
+            whiteSpace: 'normal',
+            overflowWrap: 'break-word',
+          }}
+        >
+          <span style={titleStyle}>{entry.title}</span>
         </Tooltip>
       ),
       key: entry.field || `display_column_${index}`,
       width: entry.width ? parseInt(entry.width, 10) : 160,
       fixed: entry.isFixedColumn ? entry.isFixedColumn : null,
       filters:
-        entry.isFilterEnabled && Array.isArray(patients)
+        isFilterEnabled && Array.isArray(patients)
           ? [...new Set(patients.map((item) => item[entry.field]).filter(Boolean))].map((value) => ({ text: value, value }))
           : null,
-      onFilter: entry.isFilterEnabled ? (value, record) => record[entry.field] === value : null,
-      sorter: entry.isSortingEnabled ? (a, b) => String(a[entry.field]).localeCompare(String(b[entry.field])) : null,
-      filterSearch: entry.isFilterEnabled ? entry.isFilterEnabled : false,
+      onFilter: isFilterEnabled ? (value, record) => record[entry.field] === value : null,
+      sorter: isSortingEnabled ? (a, b) => String(a[entry.field]).localeCompare(String(b[entry.field])) : null,
+      filterSearch: isFilterEnabled ? isFilterEnabled : false,
       exportDefinition: (record) => getExportDefinition(entry, record),
       align: entry.type === 'number' ? 'right' : 'left',
     });

package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.js

@@ -299,7 +299,7 @@ export default function ReportingDashboard({
       // Update patients
       setPatients(resultDetails || []);
       console.log(parsedColumns);
-         
+
       // Check if columns are not yet defined
       if (parsedColumns.length === 0 && resultDetails.length > 0) {
         // Create columns dynamically from resultDetails keys
@@ -599,6 +599,7 @@ function GuestList({
 
   const { isMobile, dispatch } = useContext(GlobalContext);
   const [single, setSingle] = useState({});
+  const otherDetails = config.other_details1 ? JSON.parse(config.other_details1) : {};
 
   // const [view, setView] = useState(isMobile ? true : false); //Need to check this condition
   const cols = buildDisplayColumns({
@@ -607,6 +608,7 @@ function GuestList({
     isFixedIndex,
     CustomComponents,
     refresh,
+    otherDetails
   });
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.6.16",
+  "version": "2.6.17",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"