@firecms/collection_editor 3.0.0-alpha.50 → 3.0.0-alpha.52

package/dist/ui/collection_editor/utils/supported_fields.d.ts

@@ -1,3 +1,3 @@
-import { FieldConfigId } from "@firecms/core";
+import { FieldConfigId, PropertyConfig } from "@firecms/core";
 export declare const supportedFieldsIds: FieldConfigId[];
-export declare const supportedFields: [string, import("@firecms/core").PropertyConfig<any>][];
+export declare const supportedFields: Record<string, PropertyConfig>;

package/dist/useCollectionEditorPlugin.d.ts

@@ -30,6 +30,7 @@ export interface CollectionConfigControllerProps<EC extends PersistedCollection
     collectionInference?: CollectionInference;
     getData?: (path: string) => Promise<object[]>;
     getUser: (uid: string) => UserType | null;
+    onAnalyticsEvent?: (event: string, params?: object) => void;
 }
 /**
  * Use this hook to initialise the Collection Editor plugin.
@@ -42,4 +43,4 @@ export interface CollectionConfigControllerProps<EC extends PersistedCollection
  * @param getUser
  * @param collectionInference
  */
-export declare function useCollectionEditorPlugin<EC extends PersistedCollection = PersistedCollection, UserType extends User = User>({ collectionConfigController, modifyCollection, configPermissions, reservedGroups, extraView, pathSuggestions, getUser, collectionInference, getData }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin<any, any, PersistedCollection>;
+export declare function useCollectionEditorPlugin<EC extends PersistedCollection = PersistedCollection, UserType extends User = User>({ collectionConfigController, modifyCollection, configPermissions, reservedGroups, extraView, pathSuggestions, getUser, collectionInference, getData, onAnalyticsEvent }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin<any, any, PersistedCollection>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firecms/collection_editor",
-  "version": "3.0.0-alpha.50",
+  "version": "3.0.0-alpha.52",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "dist/index.d.ts",
@@ -14,8 +14,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@firecms/data_import_export": "^3.0.0-alpha.50",
-    "@firecms/schema_inference": "^3.0.0-alpha.50",
+    "@firecms/data_import_export": "^3.0.0-alpha.52",
+    "@firecms/schema_inference": "^3.0.0-alpha.52",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.3.0"
   },
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2e2d454587689100ef33374e2340fc0df62481cb"
+  "gitHead": "347fb05aab3d2c4399ba9370f10c6d142c4721f6"
 }

package/src/ConfigControllerProvider.tsx

@@ -48,6 +48,8 @@ export interface ConfigControllerProviderProps {
 
     getData?: (path: string) => Promise<object[]>;
 
+    onAnalyticsEvent?: (event: string, params?: object) => void;
+
 }
 
 export const ConfigControllerProvider = React.memo(
@@ -60,7 +62,8 @@ export const ConfigControllerProvider = React.memo(
                                           extraView,
                                           pathSuggestions,
                                           getUser,
-                                          getData
+                                          getData,
+                                          onAnalyticsEvent
                                       }: PropsWithChildren<ConfigControllerProviderProps>) {
 
         const navigation = useNavigationController();
@@ -125,6 +128,8 @@ export const ConfigControllerProvider = React.memo(
             parentCollectionIds: string[],
             parentCollection?: PersistedCollection
         }) => {
+            console.debug("edit collection", path, fullPath, parentCollectionIds, parentCollection);
+            onAnalyticsEvent?.("edit_collection", { path, fullPath });
             setCurrentDialog({
                 editedCollectionPath: path,
                 fullPath,
@@ -150,6 +155,8 @@ export const ConfigControllerProvider = React.memo(
             parentCollectionIds: string[],
             collection: PersistedCollection,
         }) => {
+            console.debug("edit property", propertyKey, property, editedCollectionPath, currentPropertiesOrder, parentCollectionIds, collection);
+            onAnalyticsEvent?.("edit_property", { propertyKey, editedCollectionPath });
             // namespace is all the path until the last dot
             const namespace = propertyKey && propertyKey.includes(".")
                 ? propertyKey.substring(0, propertyKey.lastIndexOf("."))
@@ -184,6 +191,8 @@ export const ConfigControllerProvider = React.memo(
             },
             redirect: boolean
         }) => {
+            console.debug("create collection", parentCollectionIds, parentCollection, initialValues, redirect);
+            onAnalyticsEvent?.("create_collection", { parentCollectionIds, parentCollection, initialValues, redirect });
             setCurrentDialog({
                 isNewCollection: true,
                 parentCollectionIds,

package/src/ui/collection_editor/PropertyEditView.tsx

@@ -42,6 +42,7 @@ import { KeyValuePropertyField } from "./properties/KeyValuePropertyField";
 import { updatePropertyFromWidget } from "./utils/update_property_for_widget";
 import { PropertySelectItem } from "./PropertySelectItem";
 import { UrlPropertyField } from "./properties/UrlPropertyField";
+import { supportedFields } from "./utils/supported_fields";
 
 export type PropertyWithId = Property & {
     id?: string
@@ -302,7 +303,7 @@ function PropertyEditView({
     const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
     const [selectedFieldConfigId, setSelectedFieldConfigId] = useState<string | undefined>(values?.dataType ? getFieldId(values) : undefined);
 
-    const allSupportedFields = Object.entries(DEFAULT_FIELD_CONFIGS).concat(Object.entries(propertyConfigs));
+    const allSupportedFields = Object.entries(supportedFields).concat(Object.entries(propertyConfigs));
 
     const displayedWidgets = inArray
         ? allSupportedFields.filter(([_, propertyConfig]) => !isPropertyBuilder(propertyConfig.property) && propertyConfig.property?.dataType !== "array")

package/src/ui/collection_editor/import/CollectionEditorImportMapping.tsx

@@ -261,7 +261,7 @@ function PropertySelect({
                 });
                 console.log("newSelectedWidgetId", newSelectedWidgetId);
             }}>
-            {supportedFields.map(([key, widget]) => {
+            {Object.entries(supportedFields).map(([key, widget]) => {
                 return <PropertySelectItem
                     key={key}
                     value={key}

package/src/ui/collection_editor/utils/supported_fields.tsx

@@ -1,4 +1,4 @@
-import { DEFAULT_FIELD_CONFIGS, FieldConfigId } from "@firecms/core";
+import { DEFAULT_FIELD_CONFIGS, FieldConfigId, PropertyConfig } from "@firecms/core";
 
 export const supportedFieldsIds: FieldConfigId[] = [
     "text_field",
@@ -13,16 +13,17 @@ export const supportedFieldsIds: FieldConfigId[] = [
     "multi_number_select",
     "file_upload",
     "multi_file_upload",
-    "group",
-    "key_value",
     "reference",
     "multi_references",
     "switch",
     "date_time",
+    "group",
+    "key_value",
     "repeat",
     "block"
 ];
 
-export const supportedFields = Object.entries(DEFAULT_FIELD_CONFIGS).filter(([id]) =>
-    supportedFieldsIds.includes(id as FieldConfigId)
-);
+export const supportedFields: Record<string, PropertyConfig> = Object.entries(DEFAULT_FIELD_CONFIGS)
+    .filter(([id]) => supportedFieldsIds.includes(id as FieldConfigId))
+    .map(([id, config]) => ({ [id]: config }))
+    .reduce((a, b) => ({ ...a, ...b }), {});

package/src/useCollectionEditorPlugin.tsx

@@ -56,8 +56,9 @@ export interface CollectionConfigControllerProps<EC extends PersistedCollection
 
     getUser: (uid: string) => UserType | null;
 
-}
+    onAnalyticsEvent?: (event: string, params?: object) => void;
 
+}
 
 /**
  * Use this hook to initialise the Collection Editor plugin.
@@ -73,14 +74,15 @@ export interface CollectionConfigControllerProps<EC extends PersistedCollection
 export function useCollectionEditorPlugin<EC extends PersistedCollection = PersistedCollection, UserType extends User = User>
 ({
      collectionConfigController,
-    modifyCollection,
+     modifyCollection,
      configPermissions,
      reservedGroups,
      extraView,
      pathSuggestions,
      getUser,
      collectionInference,
-     getData
+     getData,
+     onAnalyticsEvent
  }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin<any, any, PersistedCollection> {
 
     const injectCollections = useCallback(
@@ -112,7 +114,8 @@ export function useCollectionEditorPlugin<EC extends PersistedCollection = Persi
                 extraView,
                 pathSuggestions,
                 getUser,
-                getData
+                getData,
+                onAnalyticsEvent
             }
         },
         homePage: {