@firecms/collection_editor 3.0.0-alpha.18 → 3.0.0-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firecms/collection_editor",
-  "version": "3.0.0-alpha.18",
+  "version": "3.0.0-alpha.20",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "dist/index.d.ts",
@@ -10,11 +10,14 @@
       "import": "./dist/index.es.js",
       "require": "./dist/index.umd.js",
       "types": "./dist/index.d.ts"
-    }
+    },
+    "./package.json": "./package.json"
+  },
+  "dependencies": {
+    "@firecms/data_import": "^3.0.0-alpha.20",
+    "@firecms/schema_inference": "^3.0.0-alpha.20"
   },
   "peerDependencies": {
-    "@firecms/data_import": "^3.0.0-alpha.9",
-    "@firecms/schema_inference": "^3.0.0-alpha.9",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router": "^6.12.0",
@@ -72,5 +75,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ab75f612b0aa204b1a3f656367578b6ca65e8c5e"
+  "gitHead": "7b74c47b5ea9f490bd0ba3d2b479108484a19411"
 }

package/src/components/collection_editor/CollectionPropertiesEditorForm.tsx

@@ -10,9 +10,11 @@ import {
     DebouncedTextField,
     defaultBorderMixin,
     EntityCollection,
-    ErrorBoundary, FieldConfig,
+    ErrorBoundary,
+    FieldConfig,
     isPropertyBuilder,
     Paper,
+    Properties,
     Property,
     PropertyOrBuilder,
     Tooltip,
@@ -100,6 +102,11 @@ export function CollectionPropertiesEditorForm({
             // @ts-ignore
             doCollectionInference(values)
                 .then((newCollection) => {
+
+                    if (newCollection)
+                        makePropertiesEditable(newCollection.properties as Properties);
+                    console.log("newCollection", newCollection);
+
                     if (!newCollection) {
                         snackbarController.open({
                             type: "error",
@@ -448,3 +455,13 @@ export function CollectionPropertiesEditorForm({
         </>
     );
 }
+
+function makePropertiesEditable(properties: Properties) {
+    Object.keys(properties).forEach((key) => {
+        const property = properties[key];
+        property.editable = true;
+        if (property.dataType === "map" && property.properties) {
+            makePropertiesEditable(property.properties as Properties);
+        }
+    });
+}

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

@@ -28,13 +28,20 @@ import { PropertySelectItem } from "../PropertySelectItem";
 import { supportedFields } from "../utils/supported_fields";
 import { buildPropertyFromData } from "@firecms/schema_inference";
 
-export function CollectionEditorImportMapping({ importConfig, customFields }:
+export function CollectionEditorImportMapping({
+                                                  importConfig,
+                                                  customFields
+                                              }:
                                                   {
                                                       importConfig: ImportConfig,
                                                       customFields: Record<string, FieldConfig>
                                                   }) {
 
-    const { setFieldValue, setFieldTouched, values } = useFormikContext<PersistedCollection>();
+    const {
+        setFieldValue,
+        setFieldTouched,
+        values
+    } = useFormikContext<PersistedCollection>();
     const [selectedProperty, setSelectedProperty] = useState<PropertyWithId | undefined>(undefined);
 
     const currentPropertiesOrderRef = React.useRef<{
@@ -117,11 +124,17 @@ export function CollectionEditorImportMapping({ importConfig, customFields }:
 
         // we try to infer the rest of the properties of a property, from the type and the data
         const propertyData = importConfig.importData.map((d) => getIn(d, importKey));
-        const inferredNewProperty = buildPropertyFromData(propertyData, property, getInferenceType);
+        const inferredNewProperty = {
+            ...buildPropertyFromData(propertyData, property, getInferenceType),
+            editable: true
+        };
 
         if (propertyPath) {
             if (inferredNewProperty) {
-                console.log("updating inferredNewProperty", { property, inferredNewProperty })
+                console.log("updating inferredNewProperty", {
+                    property,
+                    inferredNewProperty
+                })
                 setFieldValue(propertyPath, inferredNewProperty, false);
             } else {
                 setFieldValue(propertyPath, property, false);
@@ -142,18 +155,29 @@ export function CollectionEditorImportMapping({ importConfig, customFields }:
                                           originProperties={importConfig.originProperties}
                                           destinationProperties={values.properties as Properties}
                                           onIdPropertyChanged={(value) => importConfig.setIdColumn(value)}
-                                          buildPropertyView={({ property, propertyKey, importKey }) => {
+                                          buildPropertyView={({
+                                                                  property,
+                                                                  propertyKey,
+                                                                  importKey
+                                                              }) => {
                                               return <ImportNewPropertyFieldPreview
                                                   property={property}
                                                   propertyKey={propertyKey}
                                                   onPropertyNameChanged={(propertyKey: string, value: string) => setFieldValue(`properties.${propertyKey}.name`, value, false)}
                                                   onEditClick={() => {
                                                       if (!propertyKey || !property) return;
-                                                      setSelectedProperty({ ...property, id: propertyKey, editable: true });
+                                                      setSelectedProperty({
+                                                          ...property,
+                                                          id: propertyKey,
+                                                          editable: true
+                                                      });
                                                   }}
                                                   propertyTypeView={<PropertySelect property={property}
                                                                                     disabled={false}
-                                                                                    onPropertyChanged={(props) => onPropertyTypeChanged({ ...props, importKey })}
+                                                                                    onPropertyChanged={(props) => onPropertyTypeChanged({
+                                                                                        ...props,
+                                                                                        importKey
+                                                                                    })}
                                                                                     propertyKey={propertyKey}
                                                                                     customFields={customFields}/>}
                                               />;
@@ -184,10 +208,21 @@ export function CollectionEditorImportMapping({ importConfig, customFields }:
 
 }
 
-function PropertySelect({ property, onPropertyChanged, propertyKey, customFields, disabled }: {
+function PropertySelect({
+                            property,
+                            onPropertyChanged,
+                            propertyKey,
+                            customFields,
+                            disabled
+                        }: {
     property: Property | null,
     propertyKey: string | null,
-    onPropertyChanged: ({ id, property, previousId, namespace }: OnPropertyChangedParams) => void,
+    onPropertyChanged: ({
+                            id,
+                            property,
+                            previousId,
+                            namespace
+                        }: OnPropertyChangedParams) => void,
     customFields: Record<string, FieldConfig>,
     disabled?: boolean
 }) {
@@ -218,7 +253,10 @@ function PropertySelect({ property, onPropertyChanged, propertyKey, customFields
                 const newProperty = updatePropertyFromWidget(property, newSelectedWidgetId, customFields)
                 if (!propertyKey) return;
                 onPropertyChanged({
-                    id: propertyKey, property: newProperty, previousId: propertyKey, namespace: undefined
+                    id: propertyKey,
+                    property: newProperty,
+                    previousId: propertyKey,
+                    namespace: undefined
                 });
                 console.log("newSelectedWidgetId", newSelectedWidgetId);
             }}>

package/src/utils/join_collections.ts

@@ -45,8 +45,6 @@ export function joinCollectionLists(storedCollections: PersistedCollection[], co
     const resultStoredCollections = resolvedFetchedCollections
         .filter((col) => !updatedCollections.map(c => c.path).includes(col.path) || !updatedCollections.map(c => c.alias).includes(col.alias));
 
-    console.log("Updated collections", { updatedCollections, resultStoredCollections });
-
     return [...updatedCollections, ...resultStoredCollections];
 }