@visns-studio/visns-components 4.6.6 → 4.6.8

package/components/crm/generic/GenericDetail.jsx

@@ -653,6 +653,11 @@ function GenericDetail({
                         case 'dynamicform':
                             return (
                                 <GenericDynamic
+                                    buttons={
+                                        activeTabConfig.setting?.buttons
+                                            ? activeTabConfig.setting.buttons
+                                            : []
+                                    }
                                     data={data}
                                     fetchData={handleReload}
                                     label={

package/components/crm/generic/GenericDynamic.jsx

@@ -73,6 +73,7 @@ const renderValue = (field, data) => {
 };
 
 const GenericDynamic = ({
+    buttons,
     data,
     fetchData,
     label,
@@ -85,7 +86,6 @@ const GenericDynamic = ({
     type,
     userProfile,
 }) => {
-    const toastId = useRef(null);
     const [activeForm, setActiveForm] = useState({});
     const [activeFormKey, setActiveFormKey] = useState(0);
 
@@ -372,6 +372,30 @@ const GenericDynamic = ({
         setActiveFormKey(key);
     };
 
+    const handleCustomButton = async (s) => {
+        let payload = {};
+        switch (s.type) {
+            case 'save':
+                if (s.payload?.length > 0) {
+                    s.payload.forEach((p) => {
+                        if (data[p]) {
+                            payload[p] = data[p];
+                        }
+                    });
+                }
+
+                const res = await Download(s.url, s.method, payload);
+
+                if (res.data) {
+                    saveAs(res.data);
+                }
+                break;
+            default:
+                console.info(s, 'default');
+                break;
+        }
+    };
+
     const handleAddNewForm = async (showToast = true) => {
         try {
             if (activeForm && activeForm.id) {
@@ -845,6 +869,21 @@ const GenericDynamic = ({
                 )}
             </div>
             <div className={styles.polActions}>
+                {buttons.length > 0 &&
+                    buttons.map((button, buttonKey) => (
+                        <button
+                            className={button.className}
+                            key={`button-${buttonKey}`}
+                            onClick={(e) => {
+                                e.preventDefault();
+
+                                handleCustomButton(button);
+                            }}
+                        >
+                            {button.label}
+                        </button>
+                    ))}
+
                 {multiple && templateStatus && (
                     <button className="btn" onClick={handleAddNewForm}>
                         Add New Form

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,12 +210,20 @@ function GenericIndex({ layout = 'full', setting, userProfile }) {
         }
     }, [rowsSelected, setting?.functions?.checkboxUpdate]);
 
-    const renderTable = useCallback(
-        () =>
+    const renderTable = useCallback(() => {
+        // 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 &&
             config.ajaxSetting &&
             config.form &&
             config.columns &&
-            config.settings ? (
+            config.settings
+        ) {
+            return (
                 <Table
                     {...config}
                     ref={gridRef}
@@ -224,9 +233,11 @@ function GenericIndex({ layout = 'full', setting, userProfile }) {
                     style={userProfile?.settings?.style || {}}
                     userProfile={userProfile}
                 />
-            ) : null,
-        [config, windowHeight, userProfile, setConfig, setTotal]
-    );
+            );
+        }
+
+        return null;
+    }, [config, subnav, windowHeight, userProfile, setConfig, setTotal]);
 
     const renderContentBasedOnType = useCallback(() => {
         switch (config.type) {

package/package.json

@@ -58,7 +58,7 @@
         "react-dom": "^17.0.1"
     },
     "name": "@visns-studio/visns-components",
-    "version": "4.6.6",
+    "version": "4.6.8",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
     "scripts": {