@firecms/collection_editor 3.0.0-alpha.70 → 3.0.0-alpha.72

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0-alpha.70",
+  "version": "3.0.0-alpha.72",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/data_import_export": "^3.0.0-alpha.70",
-    "@firecms/schema_inference": "^3.0.0-alpha.70",
-    "@firecms/ui": "^3.0.0-alpha.70",
+    "@firecms/data_import_export": "^3.0.0-alpha.72",
+    "@firecms/schema_inference": "^3.0.0-alpha.72",
+    "@firecms/ui": "^3.0.0-alpha.72",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.3.0"
   },
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "245fddde8eca08212aa7c83715cad3a4e3f80ed1"
+  "gitHead": "7f6599121c226abbb4fb4dccbe109b2c8ba6e23e"
 }

package/src/ui/EditorCollectionAction.tsx

@@ -7,13 +7,7 @@ import {
     useNavigationController,
     useSnackbarController
 } from "@firecms/core";
-import {
-    Button,
-    IconButton,
-    SaveIcon,
-    SettingsIcon,
-    Tooltip,
-} from "@firecms/ui";
+import { Button, IconButton, SaveIcon, SettingsIcon, Tooltip, } from "@firecms/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
 import { useCollectionsConfigController } from "../useCollectionsConfigController";
@@ -44,31 +38,49 @@ export function EditorCollectionAction({
     let saveDefaultFilterButton = null;
     if (!equal(getObjectOrNull(tableController.filterValues), getObjectOrNull(collection.initialFilter)) ||
         !equal(getObjectOrNull(tableController.sortBy), getObjectOrNull(collection.initialSort))) {
-        saveDefaultFilterButton = <Tooltip
-            title={tableController.sortBy || tableController.filterValues ? "Save default filter and sort" : "Clear default filter and sort"}>
-            <Button
-                color={"primary"}
-                size={"small"}
-                variant={"outlined"}
-                onClick={() => configController
-                    ?.saveCollection({
-                        id: collection.path,
-                        parentCollectionIds,
-                        collectionData: mergeDeep(collection as PersistedCollection,
-                            {
-                                initialFilter: tableController.filterValues ?? null,
-                                initialSort: tableController.sortBy ?? null
-                            })
-                    }).then(() => {
-                        snackbarController.open({
-                            type: "success",
-                            message: "Default config saved"
-                        });
-                    })}>
-                <SaveIcon/>
-                {/*{tableController.sortBy || tableController.filterValues ? "Save default filter and sort" : "Clear default filter and sort"}*/}
-            </Button>
-        </Tooltip>;
+        saveDefaultFilterButton = <>
+            {collection.initialFilter || collection.initialSort && <Tooltip
+                title={"Reset to default filter and sort"}>
+                <Button
+                    color={"primary"}
+                    size={"small"}
+                    variant={"text"}
+                    onClick={() => {
+                        tableController.clearFilter?.();
+                        if (collection?.initialFilter)
+                            tableController.setFilterValues?.(collection?.initialFilter);
+                        if (collection?.initialSort)
+                            tableController.setSortBy?.(collection?.initialSort);
+                    }}>
+                    <SaveIcon/>
+                </Button>
+            </Tooltip>}
+
+            <Tooltip
+                title={tableController.sortBy || tableController.filterValues ? "Save default filter and sort" : "Clear default filter and sort"}>
+                <Button
+                    color={"primary"}
+                    size={"small"}
+                    variant={"outlined"}
+                    onClick={() => configController
+                        ?.saveCollection({
+                            id: collection.path,
+                            parentCollectionIds,
+                            collectionData: mergeDeep(collection as PersistedCollection,
+                                {
+                                    initialFilter: tableController.filterValues ?? null,
+                                    initialSort: tableController.sortBy ?? null
+                                })
+                        }).then(() => {
+                            snackbarController.open({
+                                type: "success",
+                                message: "Default config saved"
+                            });
+                        })}>
+                    <SaveIcon/>
+                </Button>
+            </Tooltip>
+        </>;
     }
 
     const editorButton = <Tooltip

package/src/ui/collection_editor/CollectionDetailsForm.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { EntityCollection, getIconForView, singular, toSnakeCase, } from "@firecms/core";
+import { EntityCollection, getIconForView, SearchIconsView, singular, toSnakeCase, } from "@firecms/core";
 import {
     Autocomplete,
     AutocompleteItem,
@@ -21,8 +21,6 @@ import {
 } from "@firecms/ui";
 import { Field, getIn, useFormikContext } from "formik";
 
-//@ts-ignore
-import { SearchIcons } from "./SelectIcons";
 import { FieldHelperView } from "./properties/FieldHelperView";
 
 export function CollectionDetailsForm({
@@ -353,8 +351,8 @@ export function CollectionDetailsForm({
                     fullWidth
                 >
                     <div className={"p-4 overflow-auto min-h-[200px]"}>
-                        <SearchIcons selectedIcon={values.icon}
-                                     onIconSelected={(icon: string) => {
+                        <SearchIconsView selectedIcon={values.icon}
+                                         onIconSelected={(icon: string) => {
                                          setIconDialogOpen(false);
                                          setFieldValue("icon", icon);
                                      }}/>

package/src/ui/collection_editor/CollectionEditorWelcomeView.tsx

@@ -101,7 +101,7 @@ export function CollectionEditorWelcomeView({
                             </Chip>
                         ))}
 
-                        {!loadingPathSuggestions && filteredPathSuggestions?.length === 0 &&
+                        {!loadingPathSuggestions && (filteredPathSuggestions ?? [])?.length === 0 &&
                             <Typography variant={"caption"}>
                                 No suggestions
                             </Typography>

package/src/ui/collection_editor/PropertyEditView.tsx

@@ -335,7 +335,6 @@ function PropertyEditView({
             }
         }
     }, [deferredValues, includeIdAndTitle, onPropertyChanged, propertyNamespace]);
-    console.log({ errors })
 
     useEffect(() => {
         if (values?.id && onError && Object.keys(errors).length > 0) {

package/src/ui/collection_editor/utils/strings.ts

@@ -4,5 +4,5 @@ export function camelCase(str: string): string {
         .split(/[-_ ]/)
         .reduce((cur, acc) => {
             return cur + acc[0].toUpperCase() + acc.substring(1);
-        });
+        }, "");
 }

package/dist/ui/collection_editor/SelectIcons.d.ts

@@ -1,6 +0,0 @@
-interface SearchIconsProps {
-    selectedIcon?: string;
-    onIconSelected: (icon: string) => void;
-}
-export declare function SearchIcons({ selectedIcon, onIconSelected }: SearchIconsProps): import("react/jsx-runtime").JSX.Element;
-export {};

package/dist/utils/icons.d.ts

@@ -1 +0,0 @@
-export declare const iconsSearch: any;