@visns-studio/visns-components 1.7.6 → 1.7.7

package/components/crm/visns-data-grid.jsx

@@ -327,35 +327,33 @@ const DataGrid = forwardRef(
             ).indexOf(cellElement);
 
             if (columnIndex === rowProps.columns.length - 1) {
+                // Handle last column click
             } else {
-                if (
-                    rowProps.columns[columnIndex].link &&
-                    rowProps.columns[columnIndex].link.url
-                ) {
-                    if (rowProps.columns[columnIndex].link.folder) {
-                        window.location.href =
-                            rowProps.columns[columnIndex].link.url +
-                            rowProps.data[
-                                rowProps.columns[columnIndex].link.key
-                            ] +
-                            "/" +
+                const column = rowProps.columns[columnIndex];
+
+                if (column.link && column.link.url) {
+                    const fileRelationArray = column.id.split(".");
+                    const linkUrl = column.link.url;
+                    const linkKey = rowProps.columns[columnIndex].link.key;
+                    const rowData = rowProps.data[linkKey];
+
+                    if (column.link.folder) {
+                        const linkFolder =
                             rowProps.columns[columnIndex].link.folder;
+
+                        if (rowProps.data[fileRelationArray[0]]) {
+                            window.location.href = `${linkUrl}${rowData}/${linkFolder}`;
+                        }
                     } else {
-                        navigate(
-                            `${rowProps.columns[columnIndex].link.url}${
-                                rowProps.data[
-                                    rowProps.columns[columnIndex].link.key
-                                ]
-                            }`
-                        );
+                        navigate(`${linkUrl}${rowData}`);
                     }
-                } else if (rowProps.columns[columnIndex].link.popup) {
+                } else if (column.link && column.link.popup) {
+                    const linkPopup = column.link.popup;
+                    const linkKey = rowProps.columns[columnIndex].link.key;
+                    const rowData = rowProps.data[linkKey];
+
                     window.open(
-                        `${rowProps.columns[columnIndex].link.popup}/${
-                            rowProps.data[
-                                rowProps.columns[columnIndex].link.key
-                            ]
-                        }`,
+                        `${linkPopup}/${rowData}`,
                         "",
                         "width=1440,height=1024,menubar=1,resizable=1,status=1,titlebar=1,toolbar=1"
                     );

package/package.json

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