@firecms/core 3.0.0-canary.164 → 3.0.0-canary.166

package/dist/components/common/default_entity_actions.d.ts

@@ -1,6 +1,4 @@
 import { EntityAction } from "../../types";
 export declare const editEntityAction: EntityAction;
 export declare const copyEntityAction: EntityAction;
-export declare const archiveEntityAction: EntityAction;
-export declare const openWebsiteAction: EntityAction;
 export declare const deleteEntityAction: EntityAction;

package/dist/components/common/useColumnsIds.d.ts

@@ -1,5 +1,6 @@
 import { EntityCollection, ResolvedEntityCollection, ResolvedProperty } from "../../types";
 import { PropertyColumnConfig } from "../EntityCollectionTable/EntityCollectionTableProps";
+export declare const COLLECTION_GROUP_PARENT_ID = "collectionGroupParent";
 export declare function useColumnIds<M extends Record<string, any>>(collection: ResolvedEntityCollection<M>, includeSubcollections: boolean): PropertyColumnConfig[];
 export declare function getColumnKeysForProperty(property: ResolvedProperty, key: string, disabled?: boolean): PropertyColumnConfig[];
 export declare function getFormFieldKeys(collection: EntityCollection): string[];

package/dist/index.es.js

@@ -2,7 +2,7 @@ import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { c } from "react-compiler-runtime";
 import * as React from "react";
 import React__default, { forwardRef, useState, useRef, useEffect, useContext, useCallback, useMemo, createRef, createContext, useLayoutEffect, createElement } from "react";
-import { getColorSchemeForSeed, CHIP_COLORS, Tooltip, IconButton, InfoIcon, Typography, ContentCopyIcon, CircleIcon, FunctionsIcon, iconKeys, coolIconKeys, Icon, ErrorIcon, cls, defaultBorderMixin, OpenInNewIcon, TextareaAutosize, focusedDisabled, MultiSelect, MultiSelectItem, Select, SelectItem, BooleanSwitch, DateTimeField, Skeleton, paperMixin, EditIcon, KeyboardTabIcon, DoNotDisturbOnIcon, Menu, MoreVertIcon, MenuItem, Checkbox, CircularProgress, SearchBar, Badge, ArrowUpwardIcon, Popover, FilterListIcon, Button, CenteredView, AssignmentIcon, Label, CloseIcon, TextField, BooleanSwitchWithLabel, useOutsideAlerter, Dialog, DialogTitle, DialogContent, DialogActions, FileCopyIcon, ArchiveIcon, DeleteIcon, AddIcon, ExpandablePanel, Markdown, ArrowForwardIcon, Card, cardMixin, cardClickableMixin, StarIcon, Chip, Collapse, Container, NotesIcon, Tab, Tabs, Alert, FilterListOffIcon, SearchIcon, LoadingButton, Avatar, DarkModeIcon, LightModeIcon, LogoutIcon, HandleIcon, RemoveIcon, KeyboardArrowUpIcon, KeyboardArrowDownIcon, debounce, DescriptionIcon, fieldBackgroundMixin, fieldBackgroundHoverMixin, fieldBackgroundDisabledMixin, ArrowDropDownIcon, ShortTextIcon, SubjectIcon, FormatQuoteIcon, HttpIcon, MailIcon, FlagIcon, ListIcon, ListAltIcon, NumbersIcon, FormatListNumberedIcon, UploadFileIcon, DriveFolderUploadIcon, LinkIcon, AddLinkIcon, ScheduleIcon, BallotIcon, RepeatIcon, ViewStreamIcon, Sheet, MenuIcon, ChevronLeftIcon } from "@firecms/ui";
+import { getColorSchemeForSeed, CHIP_COLORS, Tooltip, IconButton, InfoIcon, Typography, ContentCopyIcon, CircleIcon, FunctionsIcon, iconKeys, coolIconKeys, Icon, ErrorIcon, cls, defaultBorderMixin, OpenInNewIcon, TextareaAutosize, focusedDisabled, MultiSelect, MultiSelectItem, Select, SelectItem, BooleanSwitch, DateTimeField, Skeleton, paperMixin, EditIcon, KeyboardTabIcon, DoNotDisturbOnIcon, Menu, MoreVertIcon, MenuItem, Checkbox, CircularProgress, SearchBar, Badge, ArrowUpwardIcon, Popover, FilterListIcon, Button, CenteredView, AssignmentIcon, Label, CloseIcon, TextField, BooleanSwitchWithLabel, useOutsideAlerter, Dialog, DialogTitle, DialogContent, DialogActions, FileCopyIcon, DeleteIcon, AddIcon, ExpandablePanel, Markdown, ArrowForwardIcon, Card, cardMixin, cardClickableMixin, StarIcon, Chip, Collapse, Container, NotesIcon, Tab, Tabs, Alert, FilterListOffIcon, SearchIcon, LoadingButton, Avatar, DarkModeIcon, LightModeIcon, LogoutIcon, HandleIcon, RemoveIcon, KeyboardArrowUpIcon, KeyboardArrowDownIcon, debounce, DescriptionIcon, fieldBackgroundMixin, fieldBackgroundHoverMixin, fieldBackgroundDisabledMixin, ArrowDropDownIcon, ShortTextIcon, SubjectIcon, FormatQuoteIcon, HttpIcon, MailIcon, FlagIcon, ListIcon, ListAltIcon, NumbersIcon, FormatListNumberedIcon, UploadFileIcon, DriveFolderUploadIcon, LinkIcon, AddLinkIcon, ScheduleIcon, BallotIcon, RepeatIcon, ViewStreamIcon, Sheet, MenuIcon, ChevronLeftIcon } from "@firecms/ui";
 import { SnackbarProvider as SnackbarProvider$1, useSnackbar } from "notistack";
 import hash from "object-hash";
 import { useFormex, setIn, getIn, useCreateFormex, Formex, Field } from "@firecms/formex";
@@ -874,6 +874,28 @@ function isValidRegExp(input) {
   const simpleRegexp = input.match(/((?![*+?])(?:[^\r\n[/\\]|\\.|\[(?:[^\r\n\]\\]|\\.)*])+)/);
   return !!simpleRegexp;
 }
+const reservedKeys = ["edit", "copy", "delete"];
+function mergeEntityActions(currentActions, newActions) {
+  const updatedActions = [];
+  currentActions.forEach((action) => {
+    const newAction = newActions.find((a) => a.key === action.key);
+    if (newAction) {
+      const mergedAction = {
+        ...action,
+        ...newAction
+      };
+      updatedActions.push(mergedAction);
+    } else {
+      updatedActions.push(action);
+    }
+  });
+  newActions.forEach((action) => {
+    if (!currentActions.find((a) => a.key === action.key) && (!action.key || !reservedKeys.includes(action.key))) {
+      updatedActions.push(action);
+    }
+  });
+  return updatedActions;
+}
 function useDebouncedCallback(value, callback, immediate, t0) {
   const $ = c(9);
   const timeoutMs = t0 === void 0 ? 300 : t0;
@@ -6857,15 +6879,17 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
   const hasCollapsedActions = actions.some((a) => a.collapsed || a.collapsed === void 0);
   const collapsedActions = actions.filter((a_0) => a_0.collapsed || a_0.collapsed === void 0);
   const uncollapsedActions = actions.filter((a_1) => a_1.collapsed === false);
-  return /* @__PURE__ */ jsxs("div", { className: cls("h-full flex items-center justify-center flex-col bg-surface-50 dark:bg-surface-900 bg-opacity-90 dark:bg-opacity-90 z-10", frozen ? "sticky left-0" : ""), style: {
+  return /* @__PURE__ */ jsxs("div", { className: cls("h-full flex items-center justify-center flex-col bg-surface-50 dark:bg-surface-900 bg-opacity-90 dark:bg-opacity-90 z-10", frozen ? "sticky left-0" : ""), onClick: useCallback((event) => {
+    event.stopPropagation();
+  }, []), style: {
     width,
     position: frozen ? "sticky" : "initial",
     left: frozen ? 0 : "initial",
     contain: "strict"
   }, children: [
     (hasActions || selectionEnabled) && /* @__PURE__ */ jsxs("div", { className: "w-34 flex justify-center", children: [
-      uncollapsedActions.map((action, index) => /* @__PURE__ */ jsx(Tooltip, { title: action.name, asChild: true, children: /* @__PURE__ */ jsx(IconButton, { onClick: (event) => {
-        event.stopPropagation();
+      uncollapsedActions.map((action, index) => /* @__PURE__ */ jsx(Tooltip, { title: action.name, asChild: true, children: /* @__PURE__ */ jsx(IconButton, { onClick: (event_0) => {
+        event_0.stopPropagation();
         action.onClick({
           entity,
           fullPath,
@@ -6895,8 +6919,8 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
       ] }, index_0)) }),
       selectionEnabled && /* @__PURE__ */ jsx(Tooltip, { title: `Select ${entity.id}`, children: /* @__PURE__ */ jsx(Checkbox, { size: largeLayout ? "medium" : "small", checked: Boolean(isSelected), onCheckedChange }) })
     ] }),
-    !hideId && size !== "xs" && /* @__PURE__ */ jsx("div", { className: "w-[138px] text-center overflow-hidden truncate font-mono text-xs text-text-secondary dark:text-text-secondary-dark max-w-full text-ellipsis px-2", onClick: (event_0) => {
-      event_0.stopPropagation();
+    !hideId && size !== "xs" && /* @__PURE__ */ jsx("div", { className: "w-[138px] text-center overflow-hidden truncate font-mono text-xs text-text-secondary dark:text-text-secondary-dark max-w-full text-ellipsis px-2", onClick: (event_1) => {
+      event_1.stopPropagation();
     }, children: entity ? entity.id : /* @__PURE__ */ jsx(Skeleton, {}) })
   ] });
 };
@@ -7105,7 +7129,7 @@ function getTablePropertyColumnWidth(property) {
 function getSubcollectionColumnId(collection) {
   return `subcollection:${collection.id ?? collection.path}`;
 }
-const COLLECTION_GROUP_PARENT_ID$1 = "collectionGroupParent";
+const COLLECTION_GROUP_PARENT_ID = "collectionGroupParent";
 function useColumnIds(collection, includeSubcollections) {
   const $ = c(5);
   let t0;
@@ -7116,7 +7140,7 @@ function useColumnIds(collection, includeSubcollections) {
         propertyColumnConfigs = hideAndExpandKeys(collection, collection.propertiesOrder);
         if (collection.collectionGroup) {
           propertyColumnConfigs.push({
-            key: COLLECTION_GROUP_PARENT_ID$1,
+            key: COLLECTION_GROUP_PARENT_ID,
             disabled: true
           });
         }
@@ -7171,7 +7195,7 @@ function hideAndExpandKeys(collection, keys) {
         }];
       }
     }
-    if (collection.collectionGroup && key === COLLECTION_GROUP_PARENT_ID$1) {
+    if (collection.collectionGroup && key === COLLECTION_GROUP_PARENT_ID) {
       return [{
         key,
         disabled: true
@@ -7190,7 +7214,7 @@ function getDefaultColumnKeys(collection, includeSubCollections) {
     columnIds.push(...subCollectionIds.filter((subColId) => !columnIds.includes(subColId)));
   }
   if (collection.collectionGroup) {
-    columnIds.push(COLLECTION_GROUP_PARENT_ID$1);
+    columnIds.push(COLLECTION_GROUP_PARENT_ID);
   }
   return hideAndExpandKeys(collection, columnIds);
 }
@@ -9468,6 +9492,7 @@ function getRecentIds(collectionId) {
 }
 const editEntityAction = {
   icon: /* @__PURE__ */ jsx(EditIcon, {}),
+  key: "edit",
   name: "Edit",
   collapsed: false,
   onClick({
@@ -9500,6 +9525,7 @@ const editEntityAction = {
 const copyEntityAction = {
   icon: /* @__PURE__ */ jsx(FileCopyIcon, {}),
   name: "Copy",
+  key: "copy",
   onClick({
     entity,
     collection,
@@ -9523,34 +9549,10 @@ const copyEntityAction = {
     return Promise.resolve(void 0);
   }
 };
-const archiveEntityAction = {
-  icon: /* @__PURE__ */ jsx(ArchiveIcon, {}),
-  name: "Archive",
-  onClick({
-    entity,
-    collection,
-    context: {
-      dataSource
-    }
-  }) {
-    return Promise.resolve(void 0);
-  }
-};
-const openWebsiteAction = {
-  icon: /* @__PURE__ */ jsx(OpenInNewIcon, {}),
-  name: "See in website",
-  onClick({
-    entity,
-    collection,
-    context
-  }) {
-    window.open(`https://example.com/${entity.id}`, "_blank");
-    return Promise.resolve(void 0);
-  }
-};
 const deleteEntityAction = {
   icon: /* @__PURE__ */ jsx(DeleteIcon, {}),
   name: "Delete",
+  key: "delete",
   onClick({
     entity,
     fullPath,
@@ -11517,7 +11519,7 @@ function EntityEditViewInner({
     const actions = [];
     if (createEnabled) actions.push(copyEntityAction);
     if (deleteEnabled) actions.push(deleteEntityAction);
-    if (customEntityActions) actions.push(...customEntityActions);
+    if (customEntityActions) return mergeEntityActions(actions, customEntityActions);
     return actions;
   }, [authController, inputCollection, path]);
   const modified = formex.dirty;
@@ -12125,7 +12127,6 @@ function EntityCollectionViewStartActions(t0) {
   }
   return t5;
 }
-const COLLECTION_GROUP_PARENT_ID = "collectionGroupParent";
 const EntityCollectionView = React__default.memo(function EntityCollectionView2({
   fullPath: fullPathProp,
   parentCollectionIds,
@@ -12375,7 +12376,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     const actions = [editEntityAction];
     if (createEnabled) actions.push(copyEntityAction);
     if (deleteEnabled) actions.push(deleteEntityAction);
-    if (customEntityActions) actions.push(...customEntityActions);
+    if (customEntityActions) return mergeEntityActions(actions, customEntityActions);
     return actions;
   };
   const getIdColumnWidth = () => {
@@ -16015,7 +16016,7 @@ const PropertyPreview = React__default.memo(function PropertyPreview2(props) {
       propertyOrBuilder: inputProperty,
       propertyConfigs: customizationController.propertyConfigs
     });
-    if (value === void 0 || property === null) {
+    if (property === null) {
       let t02;
       if ($[10] === Symbol.for("react.memo_cache_sentinel")) {
         t02 = /* @__PURE__ */ jsx(EmptyValue, {});
@@ -16036,7 +16037,7 @@ const PropertyPreview = React__default.memo(function PropertyPreview2(props) {
           customProps: property.customProps
         });
       } else {
-        if (value === null) {
+        if (value === void 0 || value === null) {
           let t02;
           if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
             t02 = /* @__PURE__ */ jsx(EmptyValue, {});
@@ -22533,6 +22534,7 @@ export {
   AuthControllerContext,
   BlockFieldBinding,
   BooleanPreview,
+  COLLECTION_GROUP_PARENT_ID,
   COLLECTION_PATH_SEPARATOR,
   CircularProgressCenter,
   ConfirmationDialog,
@@ -22611,7 +22613,6 @@ export {
   VirtualTable,
   addInitialSlash,
   applyPermissionsFunctionIfEmpty,
-  archiveEntityAction,
   buildAdditionalFieldDelegate,
   buildCollection,
   buildEntityCallbacks,
@@ -22685,7 +22686,7 @@ export {
   makePropertiesNonEditable,
   mergeCollection,
   mergeDeep,
-  openWebsiteAction,
+  mergeEntityActions,
   pick,
   plural,
   printChanged,