@firecms/core 3.0.0-canary.161 → 3.0.0-canary.163

package/dist/index.es.js

@@ -5577,10 +5577,10 @@ function EntityPreview({
   const titleProperty = getEntityTitlePropertyKey(resolvedCollection, customizationController.propertyConfigs);
   const imagePropertyKey = getEntityImagePreviewPropertyKey(resolvedCollection);
   const imageProperty = imagePropertyKey ? resolvedCollection.properties[imagePropertyKey] : void 0;
-  const usedImageProperty = "of" in imageProperty ? imageProperty.of : imageProperty;
+  const usedImageProperty = imageProperty && "of" in imageProperty ? imageProperty.of : imageProperty;
   const restProperties = listProperties.filter((p) => p !== titleProperty && p !== imagePropertyKey);
-  const imageValue = getValueInPath(entity.values, imagePropertyKey);
-  const usedImageValue = "of" in imageProperty ? (imageValue ?? []).length > 0 ? imageValue[0] : void 0 : imageValue;
+  const imageValue = imagePropertyKey ? getValueInPath(entity.values, imagePropertyKey) : void 0;
+  const usedImageValue = imageProperty !== void 0 ? "of" in imageProperty ? (imageValue ?? []).length > 0 ? imageValue[0] : void 0 : imageValue : void 0;
   return /* @__PURE__ */ jsxs(EntityPreviewContainer, { onClick: disabled ? void 0 : onClick, hover: disabled ? void 0 : hover, size, children: [
     /* @__PURE__ */ jsxs("div", { className: cls("flex w-10 h-10 ml-1 mr-2 shrink-0", size === "small" ? "my-0.5" : "m-2 self-start"), children: [
       usedImageProperty && usedImageValue && /* @__PURE__ */ jsx(PropertyPreview, { property: usedImageProperty, propertyKey: imagePropertyKey, size: "small", value: usedImageValue }),
@@ -5590,11 +5590,11 @@ function EntityPreview({
       "maxWidth": "calc(100% - 96px)"
     }, children: [
       size !== "small" && includeId && (entity ? /* @__PURE__ */ jsx("div", { className: "block whitespace-nowrap overflow-hidden truncate", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "disabled", className: "font-mono", children: entity.id }) }) : /* @__PURE__ */ jsx(Skeleton, {})),
-      titleProperty && /* @__PURE__ */ jsx("div", { className: "my-0.5 text-sm font-medium", children: entity ? /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: titleProperty, value: getValueInPath(entity.values, titleProperty), property: resolvedCollection.properties[titleProperty], size: "large" }) : /* @__PURE__ */ jsx(SkeletonPropertyComponent, { property: resolvedCollection.properties[titleProperty], size: "large" }) }),
+      titleProperty && /* @__PURE__ */ jsx("div", { className: "truncate my-0.5 text-sm font-medium", children: entity ? /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: titleProperty, value: getValueInPath(entity.values, titleProperty), property: resolvedCollection.properties[titleProperty], size: "large" }) : /* @__PURE__ */ jsx(SkeletonPropertyComponent, { property: resolvedCollection.properties[titleProperty], size: "large" }) }),
       restProperties && restProperties.map((key) => {
         const childProperty = resolvedCollection.properties[key];
         if (!childProperty) return null;
-        return /* @__PURE__ */ jsx("div", { className: restProperties.length > 1 ? "my-0.5" : "my-0", children: entity ? /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: key, value: getValueInPath(entity.values, key), property: childProperty, size: "small" }) : /* @__PURE__ */ jsx(SkeletonPropertyComponent, { property: childProperty, size: "small" }) }, "ref_prev_" + key);
+        return /* @__PURE__ */ jsx("div", { className: cls("truncate", restProperties.length > 1 ? "my-0.5" : "my-0"), children: entity ? /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: key, value: getValueInPath(entity.values, key), property: childProperty, size: "small" }) : /* @__PURE__ */ jsx(SkeletonPropertyComponent, { property: childProperty, size: "small" }) }, "ref_prev_" + key);
       })
     ] }),
     entity && includeEntityLink && /* @__PURE__ */ jsx(Tooltip, { title: `See details for ${entity.id}`, className: "shrink-0", children: /* @__PURE__ */ jsx(IconButton, { color: "inherit", size: "medium", className: size !== "small" ? "self-start" : "", onClick: (e) => {
@@ -8852,7 +8852,6 @@ const EntityCollectionTable = function EntityCollectionTable2({
   const selectedEntities = (selectionController?.selectedEntities?.length > 0 ? selectionController?.selectedEntities : highlightedEntities)?.filter(Boolean);
   const context = useFireCMSContext();
   const [size, setSize] = React__default.useState(defaultSize ?? "m");
-  const selectedEntityIds = selectedEntities?.map((e) => e.id);
   const updateSize = useCallback((size_0) => {
     if (onSizeChanged) onSizeChanged(size_0);
     setSize(size_0);
@@ -8908,7 +8907,7 @@ const EntityCollectionTable = function EntityCollectionTable2({
       context
     })?.toString() });
     return /* @__PURE__ */ jsx(EntityTableCell, { width, size, value: value_0, selected: false, disabled: true, align: "left", allowScroll: false, showExpandIcon: false, disabledTooltip: "This column can't be edited directly", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: child }) }, `additional_table_cell_${entity_0.id}_${column_0.key}`);
-  }, [size, selectedEntityIds]);
+  }, [size]);
   const collectionColumns = (() => {
     const columnsResult = propertiesToColumns({
       properties,
@@ -8958,14 +8957,14 @@ const EntityCollectionTable = function EntityCollectionTable2({
       } else {
         throw Error("Internal: columns not mapped properly");
       }
-    } catch (e_0) {
-      console.error("Error rendering cell", e_0);
-      return /* @__PURE__ */ jsx(EntityTableCell, { size, width: column_1.width, saved: false, value: null, align: "left", fullHeight: false, disabled: true, children: /* @__PURE__ */ jsx(ErrorView, { error: e_0 }) });
+    } catch (e) {
+      console.error("Error rendering cell", e);
+      return /* @__PURE__ */ jsx(EntityTableCell, { size, width: column_1.width, saved: false, value: null, align: "left", fullHeight: false, disabled: true, children: /* @__PURE__ */ jsx(ErrorView, { error: e }) });
     }
   }, [tableRowActionsBuilder, additionalCellRenderer, propertyCellRenderer, size]);
   return /* @__PURE__ */ jsxs("div", { ref, style, className: cls("h-full w-full flex flex-col bg-white dark:bg-surface-950", className), children: [
     /* @__PURE__ */ jsx(CollectionTableToolbar, { onTextSearch: textSearchEnabled ? onTextSearch : void 0, textSearchLoading, onTextSearchClick: textSearchEnabled ? onTextSearchClick : void 0, size, onSizeChanged: updateSize, title, actionsStart, actions, loading: tableController.dataLoading }),
-    /* @__PURE__ */ jsx(SelectableTable, { columns, size, inlineEditing, cellRenderer, onEntityClick, highlightedRow: useCallback((entity_1) => selectedEntityIds?.includes(entity_1.id) ?? false, [selectedEntityIds]), tableController, onValueChange, onColumnResize, hoverRow, filterable, emptyComponent, endAdornment, AddColumnComponent })
+    /* @__PURE__ */ jsx(SelectableTable, { columns, size, inlineEditing, cellRenderer, onEntityClick, highlightedRow: (entity_1) => Boolean(selectedEntities?.find((e_0) => e_0.id === entity_1.id && e_0.path === entity_1.path)), tableController, onValueChange, onColumnResize, hoverRow, filterable, emptyComponent, endAdornment, AddColumnComponent })
   ] });
 };
 function useDataOrder({
@@ -9160,9 +9159,10 @@ function useSelectionController(onSelectionChange) {
   const toggleEntitySelection = useCallback((entity, newSelectedState) => {
     let newValue;
     if (newSelectedState === void 0) {
-      if (selectedEntities.map((e) => e.id).includes(entity.id)) {
+      const isSelected = Boolean(selectedEntities.find((e) => e.id === entity.id && e.path === entity.path));
+      if (isSelected) {
         onSelectionChange?.(entity, false);
-        newValue = selectedEntities.filter((item) => item.id !== entity.id);
+        newValue = selectedEntities.filter((item) => !(item.id === entity.id && item.path === entity.path));
       } else {
         onSelectionChange?.(entity, true);
         newValue = [...selectedEntities, entity];
@@ -9173,13 +9173,13 @@ function useSelectionController(onSelectionChange) {
         newValue = [...selectedEntities, entity];
       } else {
         onSelectionChange?.(entity, false);
-        newValue = selectedEntities.filter((item_0) => item_0.id !== entity.id);
+        newValue = selectedEntities.filter((item_0) => !(item_0.id === entity.id && item_0.path === entity.path));
       }
     }
     setSelectedEntities(newValue);
   }, [selectedEntities]);
   const isEntitySelected = useCallback((entity_0) => {
-    return selectedEntities.map((e_0) => e_0.id).includes(entity_0.id);
+    return Boolean(selectedEntities.find((e_0) => e_0.id === entity_0.id && e_0.path === entity_0.path));
   }, [selectedEntities]);
   return {
     selectedEntities,
@@ -11572,7 +11572,7 @@ function EntityEditViewInner({
       return /* @__PURE__ */ jsxs("div", { children: [
         /* @__PURE__ */ jsx(LabelWithIconAndTooltip, { propertyKey: key_0, icon: /* @__PURE__ */ jsx(NotesIcon, { size: "small" }), title: additionalField.name, className: "text-text-secondary dark:text-text-secondary-dark ml-3.5" }),
         /* @__PURE__ */ jsx("div", { className: cls(paperMixin, "min-h-14 p-4 md:p-6 overflow-x-scroll no-scrollbar"), children: /* @__PURE__ */ jsx(ErrorBoundary, { children: child }) })
-      ] });
+      ] }, `additional_${key_0}`);
     }
     console.warn(`Property ${key_0} not found in collection ${resolvedCollection.name} in properties or additional fields. Skipping.`);
     return null;
@@ -12389,7 +12389,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     width: width_0,
     frozen
   }) => {
-    const isSelected = usedSelectionController.selectedEntities.map((e_1) => e_1.id).includes(entity_6.id);
+    const isSelected = Boolean(usedSelectionController.selectedEntities.find((e_1) => e_1.id == entity_6.id && e_1.path == entity_6.path));
     const actions_0 = getActionsForEntity({
       entity: entity_6,
       customEntityActions: collection.entityActions
@@ -15867,7 +15867,7 @@ function _temp$8(t0) {
   return /* @__PURE__ */ jsxs("div", { className: cls(defaultBorderMixin, "last:border-b-0 border-b"), children: [
     /* @__PURE__ */ jsxs("div", { className: "flex flex-row pt-0.5 pb-0.5 gap-2", children: [
       /* @__PURE__ */ jsx("div", { className: "min-w-[140px] w-[25%] py-1", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "font-mono break-words", color: "secondary", children: key }) }, `table-cell-title-${key}-${key}`),
-      /* @__PURE__ */ jsx("div", { className: "flex-grow max-w-[75%]", children: childValue && "toString" in childValue && /* @__PURE__ */ jsx(Typography, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: childValue.toString() }) }) })
+      /* @__PURE__ */ jsx("div", { className: "flex-grow max-w-[75%]", children: childValue && /* @__PURE__ */ jsx(Typography, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: childValue.toString() }) }) })
     ] }),
     typeof childValue === "object" && /* @__PURE__ */ jsx("div", { className: cls(defaultBorderMixin, "border-l pl-4"), children: /* @__PURE__ */ jsx(KeyValuePreview, { value: childValue }) })
   ] }, `map_preview_table_${key}}`);