@compill/admin 1.0.53 → 1.0.55

package/index.cjs.js

@@ -20,6 +20,7 @@ var admin = require('@compill/admin');
 var reactDom = require('react-dom');
 var table = require('@compill/table');
 var hooks = require('@compill/hooks');
+var router = require('next/router');
 var reactQuery = require('@tanstack/react-query');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -1444,10 +1445,10 @@ function TableCreateButton(_a) {
       children
     } = _a,
     props = __rest$1(_a, ["children"]);
-  return jsxRuntime.jsx(admin.ButtonBarDialogButton, Object.assign({}, props, {
-    children: children !== null && children !== void 0 ? children : jsxRuntime.jsx(ui.Icon, {
+  return jsxRuntime.jsxs(admin.ButtonBarDialogButton, Object.assign({}, props, {
+    children: [jsxRuntime.jsx(ui.Icon, {
       path: mdiPlusThick
-    })
+    }), children]
   }));
 }
 
@@ -2241,7 +2242,7 @@ function ItemDeleteDialog(_a) {
       children: `Delete ${itemLabel}`
     }), jsxRuntime.jsxs(ui.Modal.Body, {
       pb: "6",
-      children: [!msg && `Do you really want to delete ${itemLabel}?`, msg && msg(itemLabel)]
+      children: [!msg && `Do you really want to delete ${itemLabel}?`, msg && react.runIfFn(msg, itemLabel)]
     }), jsxRuntime.jsxs(ui.Modal.Footer, {
       dflex: true,
       placeContent: "end",
@@ -2289,18 +2290,20 @@ function TableViewProvider({
       case "edit":
         {
           const editConfig = react.runIfFn(editView, item);
-          if (editConfig.type == "customDialog") {
-            setDialog(editConfig.render({
-              show: true,
-              onClose: onCloseDialog
-            }));
-          } else {
-            setDialog(jsxRuntime.jsx(DialogRenderer, {
-              onClose: onCloseDialog,
-              config: editConfig,
-              queryId: item.id,
-              invalidateQueryKey: queryKey
-            }));
+          if (editConfig) {
+            if (editConfig.type == "customDialog") {
+              setDialog(editConfig.render({
+                show: true,
+                onClose: onCloseDialog
+              }));
+            } else {
+              setDialog(jsxRuntime.jsx(DialogRenderer, {
+                onClose: onCloseDialog,
+                config: editConfig,
+                queryId: item.id,
+                invalidateQueryKey: queryKey
+              }));
+            }
           }
           break;
         }
@@ -2499,6 +2502,7 @@ const schemes$1 = {
 
 function useTableProps(api, table, rowActions) {
   const navigate = reactRouterDom.useNavigate();
+  const nextRouter = router.useRouter();
   const openLink = hooks.useOpenLink();
   const {
     onAction
@@ -2509,7 +2513,27 @@ function useTableProps(api, table, rowActions) {
     } = table,
     props = __rest$1(table, ["onRowClick", "columns"]);
   const onRowClickHandler = React__default["default"].useCallback(item => {
-    if ((onRowClick === null || onRowClick === void 0 ? void 0 : onRowClick.type) === "navigate") navigate(react.runIfFn(onRowClick.path, item));else if ((onRowClick === null || onRowClick === void 0 ? void 0 : onRowClick.type) == "link") openLink(`${process.env["NEXT_PUBLIC_WEBSITE_URL"]}/${react.runIfFn(onRowClick.path, item)}`);
+    var _a;
+    const config = react.runIfFn(onRowClick, item);
+    if (config) {
+      switch (config.type) {
+        case "navigate":
+          {
+            navigate((_a = react.runIfFn(config.path, item)) !== null && _a !== void 0 ? _a : "");
+            break;
+          }
+        case "nextpush":
+          {
+            nextRouter.push(react.runIfFn(config.path, item));
+            break;
+          }
+        case "link":
+          {
+            openLink(`${process.env["NEXT_PUBLIC_WEBSITE_URL"]}/${react.runIfFn(config.path, item)}`);
+            break;
+          }
+      }
+    }
   }, [navigate, onRowClick]);
   const columns = React__default["default"].useMemo(() => {
     const columns = table.columns.concat([]);
@@ -2527,7 +2551,7 @@ function useTableProps(api, table, rowActions) {
       }));
     }
     return columns;
-  }, [table]);
+  }, [table, onAction, rowActions, api]);
   const tableProps = Object.assign({}, props);
   tableProps.columns = columns;
   tableProps.onRowClick = onRowClickHandler;
@@ -2653,7 +2677,8 @@ function TableButtonBar({
       queryKey: queryKey
     }), buttonBar && buttonBar.map((button, index) => jsxRuntime.jsxs(React__default["default"].Fragment, {
       children: [button.type === "create" && editView && jsxRuntime.jsx(TableCreateButton, {
-        buildDialog: createDialogFn(button.data)
+        buildDialog: createDialogFn(button.data),
+        children: button.label
       }), button.type === "invalidate" && jsxRuntime.jsx(InvalidateButton, {
         pathOrPermalink: button.pathOrPermalink
       }), button.type === "custom" && button.render()]

package/index.esm.js

@@ -16,6 +16,7 @@ import { PageSectionTitle as PageSectionTitle$1, ButtonBarDialogButton as Button
 import { createPortal } from 'react-dom';
 import { TableContextProvider, useTableContext, Table } from '@compill/table';
 import { useOpenLink, useBoolean } from '@compill/hooks';
+import { useRouter } from 'next/router';
 import { useQueryClient } from '@tanstack/react-query';
 
 /******************************************************************************
@@ -1435,10 +1436,10 @@ function TableCreateButton(_a) {
       children
     } = _a,
     props = __rest$1(_a, ["children"]);
-  return jsx(ButtonBarDialogButton$1, Object.assign({}, props, {
-    children: children !== null && children !== void 0 ? children : jsx(Icon, {
+  return jsxs(ButtonBarDialogButton$1, Object.assign({}, props, {
+    children: [jsx(Icon, {
       path: mdiPlusThick
-    })
+    }), children]
   }));
 }
 
@@ -2232,7 +2233,7 @@ function ItemDeleteDialog(_a) {
       children: `Delete ${itemLabel}`
     }), jsxs(Modal.Body, {
       pb: "6",
-      children: [!msg && `Do you really want to delete ${itemLabel}?`, msg && msg(itemLabel)]
+      children: [!msg && `Do you really want to delete ${itemLabel}?`, msg && runIfFn(msg, itemLabel)]
     }), jsxs(Modal.Footer, {
       dflex: true,
       placeContent: "end",
@@ -2280,18 +2281,20 @@ function TableViewProvider({
       case "edit":
         {
           const editConfig = runIfFn(editView, item);
-          if (editConfig.type == "customDialog") {
-            setDialog(editConfig.render({
-              show: true,
-              onClose: onCloseDialog
-            }));
-          } else {
-            setDialog(jsx(DialogRenderer, {
-              onClose: onCloseDialog,
-              config: editConfig,
-              queryId: item.id,
-              invalidateQueryKey: queryKey
-            }));
+          if (editConfig) {
+            if (editConfig.type == "customDialog") {
+              setDialog(editConfig.render({
+                show: true,
+                onClose: onCloseDialog
+              }));
+            } else {
+              setDialog(jsx(DialogRenderer, {
+                onClose: onCloseDialog,
+                config: editConfig,
+                queryId: item.id,
+                invalidateQueryKey: queryKey
+              }));
+            }
           }
           break;
         }
@@ -2490,6 +2493,7 @@ const schemes$1 = {
 
 function useTableProps(api, table, rowActions) {
   const navigate = useNavigate();
+  const nextRouter = useRouter();
   const openLink = useOpenLink();
   const {
     onAction
@@ -2500,7 +2504,27 @@ function useTableProps(api, table, rowActions) {
     } = table,
     props = __rest$1(table, ["onRowClick", "columns"]);
   const onRowClickHandler = React.useCallback(item => {
-    if ((onRowClick === null || onRowClick === void 0 ? void 0 : onRowClick.type) === "navigate") navigate(runIfFn(onRowClick.path, item));else if ((onRowClick === null || onRowClick === void 0 ? void 0 : onRowClick.type) == "link") openLink(`${process.env["NEXT_PUBLIC_WEBSITE_URL"]}/${runIfFn(onRowClick.path, item)}`);
+    var _a;
+    const config = runIfFn(onRowClick, item);
+    if (config) {
+      switch (config.type) {
+        case "navigate":
+          {
+            navigate((_a = runIfFn(config.path, item)) !== null && _a !== void 0 ? _a : "");
+            break;
+          }
+        case "nextpush":
+          {
+            nextRouter.push(runIfFn(config.path, item));
+            break;
+          }
+        case "link":
+          {
+            openLink(`${process.env["NEXT_PUBLIC_WEBSITE_URL"]}/${runIfFn(config.path, item)}`);
+            break;
+          }
+      }
+    }
   }, [navigate, onRowClick]);
   const columns = React.useMemo(() => {
     const columns = table.columns.concat([]);
@@ -2518,7 +2542,7 @@ function useTableProps(api, table, rowActions) {
       }));
     }
     return columns;
-  }, [table]);
+  }, [table, onAction, rowActions, api]);
   const tableProps = Object.assign({}, props);
   tableProps.columns = columns;
   tableProps.onRowClick = onRowClickHandler;
@@ -2644,7 +2668,8 @@ function TableButtonBar({
       queryKey: queryKey
     }), buttonBar && buttonBar.map((button, index) => jsxs(React.Fragment, {
       children: [button.type === "create" && editView && jsx(TableCreateButton, {
-        buildDialog: createDialogFn(button.data)
+        buildDialog: createDialogFn(button.data),
+        children: button.label
       }), button.type === "invalidate" && jsx(InvalidateButton, {
         pathOrPermalink: button.pathOrPermalink
       }), button.type === "custom" && button.render()]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@compill/admin",
-    "version": "1.0.53",
+    "version": "1.0.55",
     "module": "./index.esm.js",
     "main": "./index.cjs.js"
 }

package/src/lib/json/table/useTableProps.d.ts

@@ -1,3 +1,3 @@
-import { TableRowAction, TableViewTable } from "../types/TableView";
 import { API } from "@compill/admin-api";
+import { TableRowAction, TableViewTable } from "../types/TableView";
 export declare function useTableProps(api: API<any>, table: TableViewTable, rowActions?: TableRowAction[] | ((item?: any) => TableRowAction[])): any;

package/src/lib/json/types/TableView.d.ts

@@ -36,10 +36,7 @@ export type TableViewEditView = CustomDialog | EditItemDialogConfig | QueryWrapp
 export type TableViewTable = Omit<TableProps, "onRowClick" | "queryKey" | "queryFn"> & {
     initialVisibleColumns?: string[];
     onRowClick?: {
-        type: "navigate";
-        path: string | ((item: any) => string);
-    } | {
-        type: "link";
+        type: "navigate" | "nextpush" | "link";
         path: string | ((item: any) => string);
     };
 };