@firecms/collection_editor 3.0.0-canary.42 → 3.0.0-canary.43

package/dist/useCollectionEditorPlugin.d.ts

@@ -43,6 +43,4 @@ export interface CollectionConfigControllerProps<EC extends PersistedCollection
  * @param collectionInference
  */
 export declare function useCollectionEditorPlugin<EC extends PersistedCollection = PersistedCollection, UserType extends User = User>({ collectionConfigController, configPermissions, reservedGroups, extraView, getPathSuggestions, getUser, collectionInference, getData, onAnalyticsEvent }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin<any, any, PersistedCollection>;
-export declare function IntroWidget({ introMode }: {
-    introMode?: "new_project" | "existing_project";
-}): import("react/jsx-runtime").JSX.Element | null;
+export declare function IntroWidget({}: {}): import("react/jsx-runtime").JSX.Element | null;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0-canary.42",
+  "version": "3.0.0-canary.43",
   "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-canary.42",
-    "@firecms/formex": "^3.0.0-canary.42",
-    "@firecms/schema_inference": "^3.0.0-canary.42",
-    "@firecms/ui": "^3.0.0-canary.42",
+    "@firecms/data_import_export": "^3.0.0-canary.43",
+    "@firecms/formex": "^3.0.0-canary.43",
+    "@firecms/schema_inference": "^3.0.0-canary.43",
+    "@firecms/ui": "^3.0.0-canary.43",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.3.1"
   },
@@ -54,10 +54,10 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/react": "^18.2.67",
-    "@types/react-dom": "^18.2.22",
-    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/parser": "^7.3.1",
+    "@types/react": "^18.2.79",
+    "@types/react-dom": "^18.2.25",
+    "@typescript-eslint/eslint-plugin": "^7.7.0",
+    "@typescript-eslint/parser": "^7.7.0",
     "@vitejs/plugin-react": "^4.2.1",
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
@@ -67,11 +67,11 @@
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^29.7.0",
-    "react-router": "^6.22.0",
-    "react-router-dom": "^6.22.0",
+    "react-router": "^6.22.3",
+    "react-router-dom": "^6.22.3",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.4.2",
-    "vite": "^5.2.3",
+    "typescript": "^5.4.5",
+    "vite": "^5.2.9",
     "vite-plugin-fonts": "^0.7.0"
   },
   "files": [
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d6a2f28e93d3c532dd6efacfccffb91383d5330e"
+  "gitHead": "fedcb0d43c504245dd76b702e4ab4479fa8592df"
 }

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

@@ -1,4 +1,4 @@
-import { convertDataToEntity, getPropertiesMapping, ImportConfig } from "@firecms/data_import_export";
+import { convertDataToEntity, ImportConfig } from "@firecms/data_import_export";
 import { CircularProgressCenter, EntityCollectionTable, Properties, useSelectionController } from "@firecms/core";
 import { useEffect, useState } from "react";
 import { Typography } from "@firecms/ui";
@@ -16,8 +16,8 @@ export function CollectionEditorImportDataPreview({
     const [loading, setLoading] = useState<boolean>(false);
 
     async function loadEntities() {
-        const propertiesMapping = getPropertiesMapping(importConfig.originProperties, properties);
-        const mappedData = importConfig.importData.map(d => convertDataToEntity(d, importConfig.idColumn, importConfig.headersMapping, properties, propertiesMapping, "TEMP_PATH"));
+        // const propertiesMapping = getPropertiesMapping(importConfig.originProperties, properties, importConfig.headersMapping);
+        const mappedData = importConfig.importData.map(d => convertDataToEntity(d, importConfig.idColumn, importConfig.headersMapping, properties, "TEMP_PATH", importConfig.defaultValues));
         importConfig.setEntities(mappedData);
     }
 

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

@@ -145,12 +145,8 @@ export function CollectionEditorImportMapping({
 
                 <Typography variant="h6" className={"my-4 ml-3.5"}>Data property mapping</Typography>
 
-                <DataNewPropertiesMapping headersMapping={importConfig.headersMapping}
-                                          headingsOrder={importConfig.headingsOrder}
-                                          idColumn={importConfig.idColumn}
-                                          originProperties={importConfig.originProperties}
+                <DataNewPropertiesMapping importConfig={importConfig}
                                           destinationProperties={values.properties as Properties}
-                                          onIdPropertyChanged={(value) => importConfig.setIdColumn(value ?? undefined)}
                                           buildPropertyView={({
                                                                   property,
                                                                   propertyKey,

package/src/useCollectionEditorPlugin.tsx

@@ -110,9 +110,7 @@ export function useCollectionEditorPlugin<EC extends PersistedCollection = Persi
     };
 }
 
-export function IntroWidget({ introMode }: {
-    introMode?: "new_project" | "existing_project";
-}) {
+export function IntroWidget({}: {}) {
 
     const navigation = useNavigationController();
     if (!navigation.topLevelNavigation)
@@ -127,7 +125,7 @@ export function IntroWidget({ introMode }: {
         }).createCollections
         : true;
 
-    if ((navigation.collections ?? []).length > 0) {
+    if (!navigation.initialised || navigation.collections === undefined || (navigation.collections ?? []).length > 0) {
         return null;
     }