@firecms/core 3.0.0-canary.170 → 3.0.0-canary.172

package/dist/components/SelectableTable/filters/ReferenceFilterField.d.ts

@@ -11,5 +11,5 @@ interface ReferenceFilterFieldProps {
     hidden: boolean;
     setHidden: (hidden: boolean) => void;
 }
-export declare function ReferenceFilterField({ name, value, setValue, isArray, path, title, includeId, previewProperties, setHidden }: ReferenceFilterFieldProps): import("react/jsx-runtime").JSX.Element;
+export declare function ReferenceFilterField({ value, setValue, isArray, path, includeId, previewProperties, setHidden }: ReferenceFilterFieldProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/index.es.js

@@ -8358,18 +8358,20 @@ const operationLabels$2 = {
 };
 const multipleSelectOperations$2 = ["array-contains-any", "in", "not-in"];
 function ReferenceFilterField({
-  name,
   value,
   setValue,
   isArray,
   path,
-  title,
   includeId = true,
   previewProperties,
   setHidden
 }) {
   const possibleOperations = isArray ? ["array-contains"] : ["==", "!=", ">", "<", ">=", "<="];
-  isArray ? possibleOperations.push("array-contains-any") : possibleOperations.push("in", "not-in");
+  if (isArray) {
+    possibleOperations.push("array-contains-any");
+  } else {
+    possibleOperations.push("in", "not-in");
+  }
   const [fieldOperation, fieldValue] = value || [possibleOperations[0], void 0];
   const [operation, setOperation] = useState(fieldOperation);
   const [internalValue, setInternalValue] = useState(fieldValue);
@@ -8424,11 +8426,11 @@ function ReferenceFilterField({
   const buildEntry = (reference) => {
     return /* @__PURE__ */ jsx(ReferencePreview, { disabled: !path, previewProperties, size: "medium", onClick: doOpenDialog, reference, hover: true, includeId, includeEntityLink: false });
   };
-  return /* @__PURE__ */ jsxs("div", { className: "flex w-[440px] flex-row", children: [
+  return /* @__PURE__ */ jsxs("div", { className: "flex w-[480px] flex-row", children: [
     /* @__PURE__ */ jsx("div", { className: "w-[140px]", children: /* @__PURE__ */ jsx(Select, { value: operation, size: "large", fullWidth: true, onValueChange: (value_0) => {
       updateFilter(value_0, internalValue);
     }, renderValue: (op_0) => operationLabels$2[op_0], children: possibleOperations.map((op_1) => /* @__PURE__ */ jsx(SelectItem, { value: op_1, children: operationLabels$2[op_1] }, op_1)) }) }),
-    /* @__PURE__ */ jsxs("div", { className: "flex-grow ml-2 h-full gap-2 flex flex-col", children: [
+    /* @__PURE__ */ jsxs("div", { className: "flex-grow ml-2 h-full gap-2 flex flex-col w-[340px]", children: [
       internalValue && Array.isArray(internalValue) && /* @__PURE__ */ jsx("div", { children: internalValue.map((ref_0, index) => buildEntry(ref_0)) }),
       internalValue && !Array.isArray(internalValue) && /* @__PURE__ */ jsx("div", { children: buildEntry(internalValue) }),
       (!internalValue || Array.isArray(internalValue) && internalValue.length === 0) && /* @__PURE__ */ jsx(Button, { onClick: doOpenDialog, variant: "outlined", size: "large", className: "h-full w-full", children: multiple ? "Select references" : "Select reference" }),
@@ -9273,10 +9275,10 @@ function useDataSourceTableController({
     return initialSort;
   }, [initialSort, forceFilter]);
   const {
-    filterValues: initialFilteUrl,
+    filterValues: initialFilterUrl,
     sortBy: initialSortUrl
   } = parseFilterAndSort(window.location.search);
-  const [filterValues_0, setFilterValues] = React__default.useState(forceFilter ?? initialFilteUrl ?? initialFilter ?? void 0);
+  const [filterValues_0, setFilterValues] = React__default.useState(forceFilter ?? (updateUrl ? initialFilterUrl : void 0) ?? initialFilter ?? void 0);
   const [sortBy_0, setSortBy] = React__default.useState(initialSortUrl ?? initialSortInternal);
   useUpdateUrl(filterValues_0, sortBy_0, searchString, updateUrl);
   const collectionScroll = scrollRestoration?.getCollectionScroll(fullPath, filterValues_0);
@@ -9441,8 +9443,30 @@ function encodeFilterAndSort(filterValues, sortBy) {
   if (filterValues) {
     Object.entries(filterValues).forEach(([key, value]) => {
       if (value) {
-        entries[encodeURIComponent(`${key}_op`)] = encodeURIComponent(value[0]);
-        entries[encodeURIComponent(`${key}_value`)] = encodeURIComponent(value[1]);
+        const [op, val] = value;
+        let encodedValue = val;
+        try {
+          if (typeof val === "object") {
+            if (val instanceof Date) {
+              encodedValue = val.toISOString();
+            } else if (Array.isArray(val)) {
+              encodedValue = JSON.stringify(val, (key2, value2) => {
+                if (value2 instanceof EntityReference) {
+                  return encodeRef(value2);
+                }
+                return value2;
+              });
+            } else if (val instanceof EntityReference) {
+              encodedValue = encodeRef(val);
+            }
+          }
+        } catch (e) {
+          encodedValue = val;
+        }
+        if (encodedValue !== void 0) {
+          entries[encodeURIComponent(`${key}_op`)] = encodeURIComponent(op);
+          entries[encodeURIComponent(`${key}_value`)] = encodeURIComponent(encodedValue.toString());
+        }
       }
     });
   }
@@ -9457,10 +9481,14 @@ function parseFilterAndSort(search) {
   let sortBy = void 0;
   entries.forEach((value, key) => {
     if (key === "__sort") {
-      sortBy = [value, entries.get("__sort_order")];
+      sortBy = [decodeURIComponent(value), entries.get("__sort_order")];
     } else if (key.endsWith("_op")) {
-      const filterValue = entries.get(`${key.replace("_op", "_value")}`);
-      filterValues[key.replace("_op", "")] = [value, filterValue];
+      const field = key.replace("_op", "");
+      const filterOp = decodeURIComponent(value);
+      const filterValStr = entries.get(`${field}_value`);
+      if (filterValStr !== null) {
+        filterValues[field] = [filterOp, decodeString(filterValStr)];
+      }
     }
   });
   return {
@@ -9468,6 +9496,43 @@ function parseFilterAndSort(search) {
     sortBy
   };
 }
+function isDate(dateString) {
+  const regexPattern = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+  if (!regexPattern.test(dateString)) {
+    return false;
+  }
+  const date = new Date(dateString);
+  return date.toISOString() === dateString;
+}
+function encodeRef(val) {
+  return `ref::${val.path}/${val.id}`;
+}
+function decodeString(val) {
+  let parsedFilterVal = val;
+  if (isDate(val)) {
+    try {
+      parsedFilterVal = new Date(val);
+    } catch (e) {
+    }
+  }
+  if (typeof parsedFilterVal === "string") {
+    try {
+      parsedFilterVal = JSON.parse(parsedFilterVal, (key, value) => {
+        if (typeof value === "string" && value.startsWith("ref::")) {
+          const [path, id] = value.substring(5).split("/");
+          return new EntityReference(id, path);
+        }
+        return value;
+      });
+    } catch (e) {
+    }
+  }
+  if (typeof parsedFilterVal === "string" && parsedFilterVal.startsWith("ref::")) {
+    const [path, id] = parsedFilterVal.substring(5).split("/");
+    return new EntityReference(id, path);
+  }
+  return parsedFilterVal;
+}
 function useSelectionController(onSelectionChange) {
   const [selectedEntities, setSelectedEntities] = useState([]);
   const toggleEntitySelection = useCallback((entity, newSelectedState) => {
@@ -10008,7 +10073,8 @@ function ReferenceSelectionTable({
     fullPath,
     collection,
     entitiesDisplayedFirst,
-    forceFilter
+    forceFilter,
+    updateUrl: false
   });
   const {
     textSearchLoading,
@@ -13705,7 +13771,7 @@ function ArrayContainer({
       return /* @__PURE__ */ jsx(Draggable, { draggableId: `array_field_${internalId_1}`, isDragDisabled: disabled, index: index_4, children: (provided_0, snapshot_0) => /* @__PURE__ */ jsx(ArrayContainerItem, { provided: provided_0, internalId: internalId_1, index: index_4, size, disabled, buildEntry, remove, copy, isDragging: snapshot_0.isDragging, storedProps: itemCustomPropsRef.current[internalId_1], updateItemCustomProps, addInIndex, includeAddButton }) }, `array_field_${internalId_1}`);
     }),
     droppableProvided.placeholder,
-    includeAddButton && /* @__PURE__ */ jsx("div", { className: "my-4 justify-center text-left", children: /* @__PURE__ */ jsx(Button, { variant: "text", size: size === "small" ? "small" : "medium", color: "primary", disabled: disabled || value.length >= max, startIcon: /* @__PURE__ */ jsx(AddIcon, {}), onClick: insertInEnd, children: addLabel ?? "Add" }) })
+    includeAddButton && /* @__PURE__ */ jsx("div", { className: "my-4 justify-center text-left", children: /* @__PURE__ */ jsx(Button, { variant: "text", size: size === "small" ? "small" : "medium", color: "primary", disabled: disabled || value?.length >= max, startIcon: /* @__PURE__ */ jsx(AddIcon, {}), onClick: insertInEnd, children: addLabel ?? "Add" }) })
   ] }) }) });
 }
 function ArrayContainerItem(t0) {
@@ -22967,8 +23033,10 @@ function EntityFullScreenRoute({
   const collectionPath = navigation.resolveIdsFrom(isNew ? lastCollectionEntry.path : lastEntityEntry.path);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, collection, layout: "full_screen", path: collectionPath, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
+      console.log("EntityEditView Saved", params);
       updateUrl(params.entityId, params.selectedTab, true, params.path, isNew);
     }, onTabChange: (params_0) => {
+      console.log("EntityEditView onTabChange", params_0);
       updateUrl(params_0.entityId, params_0.selectedTab, !isNew, params_0.path, isNew);
       setSelectedTab(params_0.selectedTab);
     }, parentCollectionIds }, collection.id + "_" + (isNew ? "new" : entityId)),