ui-soxo-bootstrap-core 2.4.25-dev.9 → 2.4.26

package/.github/workflows/npm-publish.yml

@@ -11,45 +11,23 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      # 1. Checkout the repository
-      - name: Checkout Code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - run: npm i
+#       - run: npm test
 
-      # 2. Setup Node.js and npm registry
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
           registry-url: https://registry.npmjs.org/
-
-      # 3. Install dependencies using ci for reproducibility
-      - name: Install Dependencies
-        run: npm ci
-
-      # 4. Verify tag matches package.json version
-      - name: Verify Tag Matches Version
-        run: |
-          TAG=${GITHUB_REF#refs/tags/}
-          PACKAGE_VERSION=$(node -p "require('./package.json').version")
-          echo "Release Tag: $TAG"
-          echo "Package Version: $PACKAGE_VERSION"
-
-          if [[ "$TAG" != "v$PACKAGE_VERSION"* ]]; then
-            echo "Error: Tag does not match package.json version"
-            exit 1
-          fi
-
-      # 5. Publish the package
-      - name: Publish Package
-        run: |
-          TAG_NAME=${GITHUB_REF#refs/tags/}
-
-          if [[ "$TAG_NAME" == *"dev"* ]]; then
-            echo "Publishing development package with 'dev' tag"
-            npm publish --tag dev
-          else
-            echo "Publishing stable package"
-            npm publish
-          fi
+      - run: npm i
+      - run: npm publish
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/core/components/extra-info/extra-info-details.js

@@ -1,7 +1,7 @@
 /**
- * ExtraInfoDetail component contains the button and the data for corresponding to script mode and will open extrainfo
+ * ExtraInfoDetail component contains the button and the data for corresponding to script mode and will open extrainfo  
  *
- * @description
+ * @description 
  * @author Sneha T
  */
 
@@ -21,135 +21,152 @@ import ExtraInfo from './extra-info';
 
 const { TabPane } = Tabs;
 
-export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition = 'left', showDrawerData, dbPtr, callback, ...record }) {
-  // State to control drawer
-  const [open, setOpen] = useState(false);
+export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition='left',showDrawerData,dbPtr,callback,...record}) {
+    // State to control drawer
+    const [open, setOpen] = useState(false);
 
-  // To set extra info data
-  const [info, setInfo] = useState([]);
-  //Setting active key for tabs
-  const [activeKey, setActiveKey] = useState(null);
+    // To set extra info data
+    const [info, setInfo] = useState([]);
+    //Setting active key for tabs
+    const [activeKey, setActiveKey] = useState(null);
 
-  // To strore selected item
-  const [selectedItem, setSelectedItem] = useState(null);
+    // To strore selected item
+    const [selectedItem, setSelectedItem] = useState(null);
 
-  const [loading, setLoading] = useState(true);
+    const [loading, setLoading] = useState(true);
 
-  /**
-   * Show Drawer
-   */
-  const showDrawer = () => {
-    setActiveKey(null); // Reset activeKey before fetching new info
+    /**
+    * Show Drawer
+    */
+    const showDrawer = () => {
 
-    getExtraInfo();
+        setActiveKey(null); // Reset activeKey before fetching new info
 
-    setOpen(true);
-  };
+        getExtraInfo();
 
-  /**
-   * Function to close
-   */
-  const onClose = () => {
-    if (typeof callback === 'function') {
-      // Only call if it exists
-      callback(false);
-    }
-    setOpen(false);
-  };
+        setOpen(true);
 
-  /**
-   * Function to get Info
-   */
-  async function getExtraInfo() {
-    setSelectedItem();
+    };
 
-    setLoading(true);
+    /**
+     * Function to close
+     */
+    const onClose = () => {
+        if (typeof callback === 'function') {
+            // Only call if it exists
+            callback(false);
+        }
+        setOpen(false);
+    };
 
-    let mode = modeValue;
+    /**
+     * Function to get Info
+     */
+    async function getExtraInfo() {
 
-    const result = await Dashboard.getExtraInfo(mode);
+        setSelectedItem()
 
-    setInfo(result);
+        setLoading(true);
 
-    setSelectedItem(result[0]);
+        let mode = modeValue
 
-    setActiveKey(result[0].id.toString()); // Set activeKey to the first item's id
+        const result = await Dashboard.getExtraInfo(mode);
 
-    setLoading(false);
-  }
+        setInfo(result);
 
-  useEffect(() => {
-    // If showDrawerData is true then call showDrawer function
-    if (showDrawerData) {
-      showDrawer();
+        setSelectedItem(result[0])
+
+        setActiveKey(result[0].id.toString()); // Set activeKey to the first item's id
+
+        setLoading(false);
     }
-  }, [showDrawerData]);
 
-  /**
+    useEffect(() => {
+        // If showDrawerData is true then call showDrawer function
+        if (showDrawerData) {
+            showDrawer();
+        }
+    }, [showDrawerData]);
+
+    /**
    * Function to render icon or button
    */
-  const renderIconOrButton = () => {
-    switch (icon) {
-      case 'InfoCircleFilled':
-        return <InfoCircleFilled onClick={showDrawer} />;
-      case 'Button':
-        return (
-          <Button size="small" onClick={showDrawer}>
-            Show Info
-          </Button>
-        );
-      default:
-        return null;
-    }
-  };
-
-  return (
-    <>
-      {/* {loading ? (
+    const renderIconOrButton = () => {
+        switch (icon) {
+            case 'InfoCircleFilled':
+                return <InfoCircleFilled onClick={showDrawer} />;
+            case 'Button':
+                return <Button size="small" onClick={showDrawer}>Show Info</Button>;
+            default:
+                return null;
+        }
+    };
+
+    
+
+    return (
+        <>
+            {/* {loading ? (
                 <>
                     <Skeleton active />
                 </>
             ) : ( */}
-      <>
-        {/*  */}
-        {/* <Button onClick={showDrawer}> */}
-
-        {/* <InfoCircleFilled onMouseEnter={showDrawer} /> */}
-
-        {renderIconOrButton()}
-        {/* </Button> */}
-        {/*  */}
-
-        {/*  */}
-        <Drawer width={'35%'} title={title} onClose={onClose} open={open}>
-          <div className="main-drawer-content">
-            <div className="drawer-container">
-              <div className="drawer-click">
-                {' '}
-                {/* Flexbox approach */}
-                <Tabs
-                  tabPosition={tabPosition}
-                  activeKey={activeKey} // Set activeKey to control the active tab
-                  onChange={(key) => {
-                    const selectedItem = info.find((item) => item.id.toString() === key);
-
-                    setSelectedItem(selectedItem);
-
-                    setActiveKey(key);
-                  }}
-                >
-                  {info.map((item) => (
-                    <TabPane tab={item.caption} key={item.id.toString()} />
-                  ))}
-                </Tabs>
-              </div>
-
-              <div className="right-drawer">{selectedItem && !loading ? <ExtraInfo item={selectedItem} record={record} dbPtr={dbPtr} /> : null}</div>
-            </div>
-          </div>
-        </Drawer>
-      </>
-      {/* )} */}
-    </>
-  );
+            <>
+                {/*  */}
+                {/* <Button onClick={showDrawer}> */}
+
+                {/* <InfoCircleFilled onMouseEnter={showDrawer} /> */}
+
+                {renderIconOrButton()}
+                {/* </Button> */}
+                {/*  */}
+
+                {/*  */}
+                <Drawer
+
+                    width={'85%'}
+
+                    title={title} onClose={onClose} open={open}>
+
+                    <div className="main-drawer-content">
+
+                        <div className="drawer-container">
+
+                            <div className="drawer-click"> {/* Flexbox approach */}
+                                <Tabs
+                                    tabPosition={tabPosition}
+
+                                    activeKey={activeKey} // Set activeKey to control the active tab
+
+                                    onChange={(key) => {
+
+                                        const selectedItem = info.find(item => item.id.toString() === key);
+
+                                        setSelectedItem(selectedItem);
+
+                                        setActiveKey(key);
+                                    }}
+                                >
+                                    {info.map(item => (
+                                        <TabPane tab={item.caption} key={item.id.toString()} />
+                                    ))}
+                                </Tabs>
+                            </div>
+
+                            <div className="right-drawer">
+
+                                {selectedItem && !loading ? <ExtraInfo item={selectedItem} record={record}  dbPtr={dbPtr}/> : null}
+
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                </Drawer>
+
+            </>
+            {/* )} */}
+        </>
+    );
 }

package/core/components/landing-api/landing-api.js

@@ -96,6 +96,7 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
    * @param reports
    */
   async function loadMenus(reports) {
+
     setLoader(true);
 
     // setReports(report)
@@ -105,12 +106,16 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
     // console.log(result);
 
     if (result && Array.isArray(result.result) && result.result.length) {
+
       // setModules(result.result);
+
       // result.result.map((ele) => {
       //     let languageString = JSON.parse(ele.attributes)
       //     console.log('language_string', languageString);
       //     if (languageString && languageString.languages) {
+
       //         const language = i18n.language;
+
       //         i18n.addResourceBundle(language, 'translation', languageString.languages[i18n.language]);
       //     }
       // })
@@ -121,6 +126,7 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
       dispatch({ type: 'settings', payload: result.result.settings });
     }
 
+
     // Reports length
     if (reports.length) {
       reportMenus = [
@@ -147,25 +153,30 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
 
     /**If there is roles assigned to the user */
     // for matria
-    const useCoreMenus = process.env.REACT_APP_USE_CORE_MENUS === 'true';
-    if (useCoreMenus) {
-      if (result && result.result && reportMenus) {
-        setAllModules([...result.result, ...reportMenus, ...coreModules]);
-      } else {
-        //If there is no roles assigned to the user
-        setAllModules([...coreModules]);
-      }
+   const useCoreMenus= process.env.REACT_APP_USE_CORE_MENUS === 'true';
+   if(useCoreMenus){
+     if (result && result.result && reportMenus) {
+      setAllModules([...result.result, ...reportMenus, ...coreModules]);
     } else {
-      //  for nura
-      if (result && result.result.menus && reportMenus) {
-        setAllModules([...result.result.menus, ...reportMenus, ...coreModules]);
-      } else {
-        //If there is no roles assigned to the user
-        setAllModules([...coreModules]);
-      }
+      //If there is no roles assigned to the user
+      setAllModules([...coreModules]);
     }
-    setLoader(false);
+
+   } else{
+    //  for nura
+    if (result && result.result.menus && reportMenus) {
+      setAllModules([...result.result.menus, ...reportMenus, ...coreModules]);
+    } else {
+      //If there is no roles assigned to the user
+      setAllModules([...coreModules]);
+    }
+
+    
   }
+  setLoader(false);
+
+   }
+  
 
   /**
    * Load the scripts
@@ -246,12 +257,6 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
 
             <Route exact key={'profile'} path={'/profile'} render={(props) => <Profile {...props} />} />
 
-            {/* More specific routes should come before general/dynamic routes */}
-
-
-            <Route path={'/reports/:id'} render={(props) => <ReportingDashboard CustomComponents={CustomComponents} {...props} />} />
-            
-
             <Route path={'/menus/:id'} render={() => <ModuleRoutes model={MenusAPI} />} />
 
             {/* <Switch> */}
@@ -268,6 +273,9 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
               }}
             />
 
+            {/* <Route path={'/users'} render={() => <ModuleRoutes model={UsersAPI} />} /> */}
+
+            <Route path={'/reports/:id'} render={(props) => <ReportingDashboard CustomComponents={CustomComponents} {...props} />} />
 
             <Route exact key={'change-password'} path={'/change-password'} render={(props) => <ChangePassword {...props} />} />
 

package/core/lib/Store.js

@@ -48,25 +48,25 @@ import { ConfigProvider, theme } from 'antd';
 const initialTheme = () => {
   try {
     //  manage theme with env
-    const isEnvThemeTrue = process.env.REACT_APP_THEME;
+      const isEnvThemeTrue = process.env.REACT_APP_THEME;
 
-    console.log('REACT_APP_THEME:', isEnvThemeTrue);
-    const matchedTheme = themes.find((t) => t.name === isEnvThemeTrue);
+      console.log('REACT_APP_THEME:', isEnvThemeTrue);
+       const matchedTheme = themes.find(t => t.name === isEnvThemeTrue);
 
     if (matchedTheme) return matchedTheme;
-
-    // Check saved theme
-    const savedTheme = localStorage.getItem('selectedTheme');
-    if (savedTheme) {
-      return JSON.parse(savedTheme);
+  
+      // Check saved theme
+      const savedTheme = localStorage.getItem('selectedTheme');
+      if (savedTheme) {
+        return JSON.parse(savedTheme);
+      }
+  
+      // Fallback to default
+      return themes[0];
+    } catch (e) {
+      console.error('Error loading theme:', e);
+      return themes[0];
     }
-
-    // Fallback to default
-    return themes[0];
-  } catch (e) {
-    console.error('Error loading theme:', e);
-    return themes[0];
-  }
 };
 
 const initialState = {
@@ -87,7 +87,7 @@ let app = {};
  * @param {*} param0
  * @returns
  */
-export const GlobalProvider = ({ children, CustomModels,CustomComponents, appSettings: settings }) => {
+export const GlobalProvider = ({ children, CustomModels, appSettings: settings }) => {
   // console.log("Setting up store");
 
   const [branches, setBranches] = useState([]);
@@ -226,14 +226,13 @@ export const GlobalProvider = ({ children, CustomModels,CustomComponents, appSet
   let store = {
     app: app,
     user: state.user,
-    settings: state.settings,
+    settings:state.settings,
     dispatch: dispatch,
     twilio: state.twilio,
     isMobile,
     branches,
     defaultBranch: state.defaultBranch,
     CustomModels: CustomModels,
-    CustomComponents:CustomComponents,
     selectedBranch: state.selectedBranch,
     kiosk: state.kiosk,
     state,
@@ -315,8 +314,7 @@ export const AppReducer = (state, action) => {
 
     case 'CustomModels':
       return { ...state, CustomModels: action.CustomModels };
-    case 'CustomComponents':
-      return { ...state, CustomComponents: action.CustomComponents };
+
     // # TODO Below Variable might be removed
     case 'selectedLocation':
       localStorage.selectedLocation = JSON.stringify(action.payload);

package/core/lib/components/index.js

@@ -109,8 +109,6 @@ import ConsentComponent from './consent/consent'
 import TaskOverviewLegacy from './../models/process/components/task-overview-legacy/task-overview-legacy'
 
 import ReportingDashboard from '../../modules/reporting/components/reporting-dashboard/reporting-dashboard';
-
-import ProcessStepsPage from '../../modules/steps/steps'
 export {
 
   // Bootstrap Components
@@ -199,8 +197,7 @@ export {
   // WebCamera,
   ConsentComponent,
 
-  ReportingDashboard,
-  ProcessStepsPage
+  ReportingDashboard
 
 
 }