@compill/admin 1.0.90 → 1.0.92

package/index.cjs.js

@@ -1002,21 +1002,30 @@ function UpdateButton(_a) {
 
 function ViewButton(_a) {
   var {
+      label,
       path,
       icon
     } = _a,
-    props = tslib.__rest(_a, ["path", "icon"]);
+    props = tslib.__rest(_a, ["label", "path", "icon"]);
   const openPage = React__default["default"].useCallback(() => {
     window.open(path, '_blank');
   }, [path]);
-  return jsxRuntime.jsx(ui.IconButton, Object.assign({
-    icon: icon ? icon : mdiOpenInNew,
+  return jsxRuntime.jsx(admin.ButtonBarButton, Object.assign({
     type: "submit",
     scheme: "dark",
     variant: "glass",
     size: "md",
-    onClick: openPage
-  }, props));
+    onClick: openPage,
+    dflex: true,
+    alignItems: "center",
+    gap: "2",
+    icon: icon || mdiOpenInNew
+  }, props, {
+    children: label
+  }));
+  // return (
+  //     <IconButton icon={icon ? icon : mdiOpenInNew} type="submit" scheme="dark" variant="glass" size="md" onClick={openPage} {...props}/>
+  // )
 }
 
 function OrderCell({
@@ -1338,14 +1347,17 @@ function Buttons$1({
   buttonBar
 }) {
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [buttonBar === null || buttonBar === void 0 ? void 0 : buttonBar.map((button, index) => jsxRuntime.jsxs(React__default["default"].Fragment, {
-      children: [button.type === "link" && jsxRuntime.jsx(ViewButton, {
-        path: button.path,
-        icon: button.icon
-      }), button.type === "invalidate" && jsxRuntime.jsx(InvalidateButton, {
-        pathOrPermalink: button.pathOrPermalink
-      }), button.type == "custom" && button.render(item)]
-    }, index)), jsxRuntime.jsxs(admin.ButtonBar, {
+    children: [buttonBar && buttonBar.length > 0 && jsxRuntime.jsx(admin.ButtonBar, {
+      children: buttonBar.map((button, index) => jsxRuntime.jsxs(React__default["default"].Fragment, {
+        children: [button.type === "link" && jsxRuntime.jsx(ViewButton, {
+          label: button.label,
+          path: button.path,
+          icon: button.icon
+        }), button.type === "invalidate" && jsxRuntime.jsx(InvalidateButton, {
+          pathOrPermalink: button.pathOrPermalink
+        }), button.type == "custom" && button.render(item)]
+      }, index))
+    }), jsxRuntime.jsxs(admin.ButtonBar, {
       children: [api instanceof adminApi.API && jsxRuntime.jsx(PublishButton, {
         api: api,
         queryId: item.id,
@@ -1415,15 +1427,20 @@ function Internal({
     sections,
     buttonBar,
     type,
-    invalidateParentQueryKey
+    invalidateParentQueryKey,
+    invalidatePage
   } = pScreen;
   const mutation = api.useInvalidateParentMutation(api$1.update, invalidateParentQueryKey !== null && invalidateParentQueryKey !== void 0 ? invalidateParentQueryKey : api$1.queryKey, {
     networkMode: "always"
   });
+  const invalidatePageFn = adminApi.useInvalidatePage(invalidatePage || "");
   const save = api.useMutate(mutation, {
     processInput,
     successMsg: (item, values) => `${item.title || item.name} updated.`,
-    errorMsg: (error, item) => `Error updating ${item.title || item.name}: ${error}`
+    errorMsg: (error, item) => `Error updating ${item.title || item.name}: ${error}`,
+    onSuccess: () => {
+      if (invalidatePage) invalidatePageFn();
+    }
   });
   let editorMaxW = undefined;
   if (!type || type == "post") editorMaxW = "calc(1280px - 28rem)";else if (type == "section") editorMaxW = "calc(1280px - 22rem)";

package/index.esm.js

@@ -2,11 +2,11 @@ import { __rest, __awaiter } from 'tslib';
 import { jsx, jsxs, Fragment } from '@soperio/jsx-runtime';
 import { useApiQuery, useApiMutation, useMutate, useInvalidateMutation, useInvalidateQuery, useInvalidateParentMutation, useApiQueries } from '@compill/api';
 import { Shimmer, FlexCenter, QueryLoadingState, RetryOnError, TabContainer, ModalLoadingOverlay } from '@compill/components';
-import { Icon, Button, IconButton, Container, Tile, Popover, Collapse, Modal, Avatar, Popup, Checkbox, Badge } from '@valerya/ui';
+import { Icon, Button, Container, Tile, Popover, Collapse, Modal, Avatar, IconButton, Popup, Checkbox, Badge } from '@valerya/ui';
 import Link from 'next/link';
 import { useParams, useNavigate, Outlet, useLocation, useMatch, Link as Link$1 } from 'react-router-dom';
 import React, { useRef, useCallback, useContext as useContext$2, useLayoutEffect, useEffect, createContext } from 'react';
-import { INVALIDATE_API, API } from '@compill/admin-api';
+import { INVALIDATE_API, API, useInvalidatePage } from '@compill/admin-api';
 import { useFormikContext, Formik, Form } from 'formik';
 import { ButtonBarButton as ButtonBarButton$1, ButtonBarSubmitButton as ButtonBarSubmitButton$1, PageSectionTitle as PageSectionTitle$1, ButtonBar as ButtonBar$1, ButtonBarDialogButton as ButtonBarDialogButton$1, Breadcrumbs as Breadcrumbs$1, TableRowActionButton as TableRowActionButton$1, DialogButton as DialogButton$1 } from '@compill/admin';
 import { toast } from 'react-toastify';
@@ -992,21 +992,30 @@ function UpdateButton(_a) {
 
 function ViewButton(_a) {
   var {
+      label,
       path,
       icon
     } = _a,
-    props = __rest(_a, ["path", "icon"]);
+    props = __rest(_a, ["label", "path", "icon"]);
   const openPage = React.useCallback(() => {
     window.open(path, '_blank');
   }, [path]);
-  return jsx(IconButton, Object.assign({
-    icon: icon ? icon : mdiOpenInNew,
+  return jsx(ButtonBarButton$1, Object.assign({
     type: "submit",
     scheme: "dark",
     variant: "glass",
     size: "md",
-    onClick: openPage
-  }, props));
+    onClick: openPage,
+    dflex: true,
+    alignItems: "center",
+    gap: "2",
+    icon: icon || mdiOpenInNew
+  }, props, {
+    children: label
+  }));
+  // return (
+  //     <IconButton icon={icon ? icon : mdiOpenInNew} type="submit" scheme="dark" variant="glass" size="md" onClick={openPage} {...props}/>
+  // )
 }
 
 function OrderCell({
@@ -1328,14 +1337,17 @@ function Buttons$1({
   buttonBar
 }) {
   return jsxs(Fragment, {
-    children: [buttonBar === null || buttonBar === void 0 ? void 0 : buttonBar.map((button, index) => jsxs(React.Fragment, {
-      children: [button.type === "link" && jsx(ViewButton, {
-        path: button.path,
-        icon: button.icon
-      }), button.type === "invalidate" && jsx(InvalidateButton, {
-        pathOrPermalink: button.pathOrPermalink
-      }), button.type == "custom" && button.render(item)]
-    }, index)), jsxs(ButtonBar$1, {
+    children: [buttonBar && buttonBar.length > 0 && jsx(ButtonBar$1, {
+      children: buttonBar.map((button, index) => jsxs(React.Fragment, {
+        children: [button.type === "link" && jsx(ViewButton, {
+          label: button.label,
+          path: button.path,
+          icon: button.icon
+        }), button.type === "invalidate" && jsx(InvalidateButton, {
+          pathOrPermalink: button.pathOrPermalink
+        }), button.type == "custom" && button.render(item)]
+      }, index))
+    }), jsxs(ButtonBar$1, {
       children: [api instanceof API && jsx(PublishButton, {
         api: api,
         queryId: item.id,
@@ -1405,15 +1417,20 @@ function Internal({
     sections,
     buttonBar,
     type,
-    invalidateParentQueryKey
+    invalidateParentQueryKey,
+    invalidatePage
   } = pScreen;
   const mutation = useInvalidateParentMutation(api.update, invalidateParentQueryKey !== null && invalidateParentQueryKey !== void 0 ? invalidateParentQueryKey : api.queryKey, {
     networkMode: "always"
   });
+  const invalidatePageFn = useInvalidatePage(invalidatePage || "");
   const save = useMutate(mutation, {
     processInput,
     successMsg: (item, values) => `${item.title || item.name} updated.`,
-    errorMsg: (error, item) => `Error updating ${item.title || item.name}: ${error}`
+    errorMsg: (error, item) => `Error updating ${item.title || item.name}: ${error}`,
+    onSuccess: () => {
+      if (invalidatePage) invalidatePageFn();
+    }
   });
   let editorMaxW = undefined;
   if (!type || type == "post") editorMaxW = "calc(1280px - 28rem)";else if (type == "section") editorMaxW = "calc(1280px - 22rem)";

package/package.json

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

package/src/lib/buttons/ViewButton.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import { IconButtonProps } from "@valerya/ui";
-export declare function ViewButton({ path, icon, ...props }: Omit<IconButtonProps, "icon"> & {
+import { ButtonBarButtonProps } from "@compill/admin";
+export declare function ViewButton({ label, path, icon, ...props }: ButtonBarButtonProps & {
+    label?: string;
     path: string;
-    icon?: string;
 }): JSX.Element;

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

@@ -14,6 +14,7 @@ export type DetailsViewConfig<T = any> = {
 };
 type Screen = {
     invalidateParentQueryKey?: string[];
+    invalidatePage?: string;
     breadcrumbs?: Breadcrumb[];
     initialValues: any | ((data: any) => any);
     schema: Yup.Schema;
@@ -49,6 +50,7 @@ export type DetailViewButton = {
     type: "link";
     path: string;
     icon?: string;
+    label?: string;
 } | {
     type: "custom";
     render: (item: any) => React.ReactNode;