Skip login fix and reference widget updates

VisetDev · Jan 5, 2024 · 0023375 · 0023375
1 parent 04c920a
commit 0023375
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 35 deletions.
diff --git a/packages/collection_editor/package.json b/packages/collection_editor/package.json
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023"
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e"
 }
diff --git a/packages/create_firecms_app/package.json b/packages/create_firecms_app/package.json
@@ -44,5 +44,5 @@
     "node_modules",
     "template/node_modules"
   ],
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023"
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e"
 }
diff --git a/packages/data_import_export/package.json b/packages/data_import_export/package.json
@@ -99,5 +99,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023"
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e"
 }
diff --git a/packages/firebase_firecms/package.json b/packages/firebase_firecms/package.json
@@ -59,5 +59,5 @@
       "react-app/jest"
     ]
   },
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023"
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e"
 }
diff --git a/packages/firebase_firecms/src/hooks/useFirebaseAuthController.ts b/packages/firebase_firecms/src/hooks/useFirebaseAuthController.ts
@@ -212,6 +212,12 @@ export const useFirebaseAuthController = ({
         doOauthLogin(auth, provider);
     }, [doOauthLogin, getProviderOptions]);
 
+
+    const skipLogin = useCallback(() => {
+        setLoginSkipped(true);
+        setLoggedUser(null);
+    }, []);
+
     return {
         user: loggedUser ?? null,
         setUser: updateUser,
@@ -221,7 +227,8 @@ export const useFirebaseAuthController = ({
         signOut: onSignOut,
         getAuthToken,
         googleLogin,
-        loginSkipped: false,
+        skipLogin,
+        loginSkipped,
         userRoles,
         setUserRoles,
         emailPasswordLogin,

diff --git a/packages/firebase_firecms/src/types/auth.tsx b/packages/firebase_firecms/src/types/auth.tsx
@@ -62,7 +62,7 @@ export type FirebaseAuthController =
     /**
      * Skip login
      */
-    skipLogin?: () => void;
+    skipLogin: () => void;
 
     setUser: (user: FirebaseUser | null) => void;
 

diff --git a/packages/firebase_firecms_pro/package.json b/packages/firebase_firecms_pro/package.json
@@ -36,5 +36,5 @@
       "react-app/jest"
     ]
   },
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023"
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e"
 }
diff --git a/packages/firebase_firecms_pro/src/components/FirebaseLoginView.tsx b/packages/firebase_firecms_pro/src/components/FirebaseLoginView.tsx
@@ -203,7 +203,7 @@ export function FirebaseLoginView({
                              style={{
                                  height: "100%",
                                  width: "100%",
-                                 objectFit: "cover"
+                                 objectFit: "contain"
                              }}
                              alt={"Logo"}/>;
     } else {

diff --git a/packages/firecms/package.json b/packages/firecms/package.json
@@ -61,5 +61,5 @@
       "react-app/jest"
     ]
   },
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023"
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e"
 }
diff --git a/packages/firecms_cli/package.json b/packages/firecms_cli/package.json
@@ -64,5 +64,5 @@
     "node_modules",
     "template/node_modules"
   ],
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023"
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e"
 }
diff --git a/packages/firecms_core/package.json b/packages/firecms_core/package.json
@@ -116,7 +116,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023",
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e",
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/firecms_core/src/components/ReferenceWidget.tsx b/packages/firecms_core/src/components/ReferenceWidget.tsx
@@ -6,31 +6,16 @@ import { PreviewSize, ReferencePreview } from "../preview";
 import { useNavigationController, useReferenceDialog } from "../hooks";
 import { Button, cn } from "@firecms/ui";
 
-/**
- * This field allows selecting reference/s.
- */
-export function ReferenceWidget<M extends Record<string, any>>({
-                                                                   name,
-                                                                   multiselect = false,
-                                                                   path,
-                                                                   disabled,
-                                                                   value,
-                                                                   onReferenceSelected,
-                                                                   onMultipleReferenceSelected,
-                                                                   previewProperties,
-                                                                   forceFilter,
-                                                                   size,
-                                                                   className
-                                                               }: {
+export type ReferenceWidgetProps<M extends Record<string, any>> = {
     name?: string,
     multiselect?: boolean,
-    value: EntityReference | EntityReference[] | null,
+    value: EntityReference<M> | EntityReference<M>[] | null,
     onReferenceSelected?: (params: {
-        reference: EntityReference | null,
+        reference: EntityReference<M> | null,
         entity: Entity<M> | null
     }) => void,
     onMultipleReferenceSelected?: (params: {
-        references: EntityReference[] | null,
+        references: EntityReference<M>[] | null,
         entities: Entity<M>[] | null
     }) => void,
     path: string,
@@ -42,7 +27,24 @@ export function ReferenceWidget<M extends Record<string, any>>({
     forceFilter?: FilterValues<string>;
     size: PreviewSize;
     className?: string;
-}) {
+};
+
+/**
+ * This field allows selecting reference/s.
+ */
+export function ReferenceWidget<M extends Record<string, any>>({
+                                                                   name,
+                                                                   multiselect = false,
+                                                                   path,
+                                                                   disabled,
+                                                                   value,
+                                                                   onReferenceSelected,
+                                                                   onMultipleReferenceSelected,
+                                                                   previewProperties,
+                                                                   forceFilter,
+                                                                   size,
+                                                                   className
+                                                               }: ReferenceWidgetProps<M>) {
 
     const navigationController = useNavigationController();
 

diff --git a/packages/firecms_core/src/types/entities.ts b/packages/firecms_core/src/types/entities.ts
@@ -37,7 +37,7 @@ export type EntityValues<M extends object> = M;
 /**
  * Class used to create a reference to an entity in a different path
  */
-export class EntityReference {
+export class EntityReference<M extends Record<string, any> = any> {
     /**
      * ID of the entity
      */

diff --git a/packages/firecms_core/src/util/entities.ts b/packages/firecms_core/src/util/entities.ts
@@ -139,7 +139,7 @@ export function sanitizeData<M extends Record<string, any>>
     return result;
 }
 
-export function getReferenceFrom(entity: Entity<any>): EntityReference {
+export function getReferenceFrom<M extends Record<string, any>>(entity: Entity<M>): EntityReference<M> {
     return new EntityReference(entity.id, entity.path);
 }
 

diff --git a/packages/schema_inference/package.json b/packages/schema_inference/package.json
@@ -29,5 +29,5 @@
     "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
     "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
   },
-  "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023"
+  "gitHead": "04c920a874385714dd35f320256e6def346c2a9e"
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -115,7 +115,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "9d82460b4b28c7b31d097ff3e0e28f77c05b1023",
+    "gitHead": "04c920a874385714dd35f320256e6def346c2a9e",
     "publishConfig": {
         "access": "public"
     }