@visns-studio/visns-components 4.6.7 → 4.6.9

package/components/crm/DataGrid.jsx

@@ -20,6 +20,10 @@ import NumberFilter from '@inovua/reactdatagrid-community/NumberFilter';
 import SelectFilter from '@inovua/reactdatagrid-community/SelectFilter';
 import DateFilter from '@inovua/reactdatagrid-community/DateFilter';
 import ReactDataGrid from '@inovua/reactdatagrid-community';
+// import NumberFilter from '@visns-studio/visns-datagrid-enterprise/NumberFilter';
+// import SelectFilter from '@visns-studio/visns-datagrid-enterprise/SelectFilter';
+// import DateFilter from '@visns-studio/visns-datagrid-enterprise/DateFilter';
+// import ReactDataGrid from '@visns-studio/visns-datagrid-enterprise';
 import { Gallery } from 'react-grid-gallery';
 import { confirmAlert } from 'react-confirm-alert';
 import { toast } from 'react-toastify';

package/components/crm/generic/GenericIndex.jsx

@@ -51,6 +51,7 @@ function useConfig(setting, tabs, filters, setRowsSelected, tableSetting) {
             if (activeTabConfig) {
                 setConfig((currentConfig) => ({
                     ...currentConfig,
+                    id: activeTabConfig.id,
                     ajaxSetting: activeTabConfig.ajaxSetting,
                     form: activeTabConfig.form,
                     columns: activeTabConfig.columns,
@@ -209,24 +210,63 @@ function GenericIndex({ layout = 'full', setting, userProfile }) {
         }
     }, [rowsSelected, setting?.functions?.checkboxUpdate]);
 
-    const renderTable = useCallback(
-        () =>
-            config.ajaxSetting &&
-            config.form &&
-            config.columns &&
-            config.settings ? (
-                <Table
-                    {...config}
-                    ref={gridRef}
-                    gridHeight={windowHeight * 0.65}
-                    setConfig={setConfig}
-                    setTotal={setTotal}
-                    style={userProfile?.settings?.style || {}}
-                    userProfile={userProfile}
-                />
-            ) : null,
-        [config, windowHeight, userProfile, setConfig, setTotal]
-    );
+    const renderTable = useCallback(() => {
+        const isConfigValid = (config) => {
+            return (
+                config.ajaxSetting &&
+                config.form &&
+                config.columns &&
+                config.settings
+            );
+        };
+
+        const renderTableComponent = () => (
+            <Table
+                {...config}
+                ref={gridRef}
+                gridHeight={windowHeight * 0.65}
+                setConfig={setConfig}
+                setTotal={setTotal}
+                style={userProfile?.settings?.style || {}}
+                userProfile={userProfile}
+            />
+        );
+
+        if (subnav) {
+            // Find the active subnav item with show: true
+            const activeSubnav = subnav.find((item) => item.show === true);
+
+            // Check if the config.id matches the active subnav id
+            if (
+                activeSubnav &&
+                activeSubnav.id === config.id &&
+                isConfigValid(config)
+            ) {
+                return renderTableComponent();
+            }
+
+            // Check for active alternative subnav
+            const activeAltSubNav = subnav.find(
+                (item) =>
+                    item.class === 'subactive' || item.class === 'activetab'
+            );
+
+            const activeTabExist =
+                config.ajaxSetting?.where?.some(
+                    (w) =>
+                        w.id === activeAltSubNav?.id &&
+                        parseInt(w.value) === parseInt(activeAltSubNav?.value)
+                ) || false;
+
+            if (isConfigValid(config) && activeTabExist) {
+                return renderTableComponent();
+            }
+        } else if (isConfigValid(config)) {
+            return renderTableComponent();
+        }
+
+        return null;
+    }, [config, subnav, windowHeight, userProfile, setConfig, setTotal]);
 
     const renderContentBasedOnType = useCallback(() => {
         switch (config.type) {

package/package.json

@@ -2,6 +2,7 @@
     "dependencies": {
         "@fontsource/barlow": "^5.0.13",
         "@inovua/reactdatagrid-community": "^5.10.2",
+        "@inovua/reactdatagrid-enterprise": "^5.10.2",
         "@nivo/bar": "^0.87.0",
         "@nivo/core": "^0.87.0",
         "@nivo/line": "^0.87.0",
@@ -11,10 +12,10 @@
         "akar-icons": "^1.9.31",
         "array-move": "^4.0.0",
         "awesome-debounce-promise": "^2.1.0",
-        "axios": "^1.7.3",
+        "axios": "^1.7.4",
         "dayjs": "^1.11.12",
         "file-saver": "^2.0.5",
-        "framer-motion": "^11.3.21",
+        "framer-motion": "^11.3.27",
         "html-react-parser": "^5.1.12",
         "lodash": "^4.17.21",
         "lodash.debounce": "^4.0.8",
@@ -58,7 +59,7 @@
         "react-dom": "^17.0.1"
     },
     "name": "@visns-studio/visns-components",
-    "version": "4.6.7",
+    "version": "4.6.9",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
     "scripts": {