@rebasepro/app 0.21.1 → 0.22.0

package/dist/collections/form-layout.d.ts

@@ -6,9 +6,9 @@
  *
  * The reason this is a pure function rather than logic inside the form is that
  * the *defaults* are the interesting part. A collection that never writes an
- * `admin.form` block still has to get a two-column layout out of this — the flat
- * run of full-width fields it produced before was the single biggest cost in the
- * form, and no amount of config would have fixed it for collections nobody
+ * `admin.form` block still has to get a two-column layout out of this once it is
+ * long enough to need one — the flat run of full-width fields it produced before
+ * was the single biggest cost in the form, and no amount of config would have fixed it for collections nobody
  * hand-tunes. Deriving it here means it is testable in isolation, which matters
  * because "what span does a date get" is exactly the kind of rule that rots.
  */

package/dist/components/LoginView/auth-error-message.d.ts

@@ -0,0 +1,16 @@
+/**
+ * What the login screen says about a refused sign-in.
+ *
+ * The server's message is written for whoever reads the API response, and some
+ * of them are instructions for a developer. A Google sign-in onto an address
+ * that already has an unverified password account used to put this in front of
+ * the visitor:
+ *
+ *     … Sign in with your existing method, then POST to /auth/link/google to
+ *     link google to your account.
+ *
+ * So the codes a person can act on get the screen's own, translated words, and
+ * every other error keeps the server's message, which is still the most
+ * specific thing there is to show.
+ */
+export declare function authErrorMessage(error: unknown, t: (key: string) => string): string;

package/dist/index.es.js

@@ -2614,8 +2614,9 @@ function useComponentOverride(name, DefaultComponent) {
 	return useMemo(() => {
 		const override = collectionOverrides[name] ?? globalOverrides[name];
 		if (!override) return DefaultComponent;
+		const UserComponent = resolveComponentRef(override.Component);
+		if (!UserComponent) return DefaultComponent;
 		if (override.wrap) {
-			const UserComponent = override.Component;
 			const Wrapper = (props) => /* @__PURE__ */ jsx(UserComponent, {
 				...props,
 				OriginalComponent: DefaultComponent
@@ -2623,7 +2624,7 @@ function useComponentOverride(name, DefaultComponent) {
 			Wrapper.displayName = `Wrapped(${name})`;
 			return Wrapper;
 		}
-		return override.Component;
+		return UserComponent;
 	}, [
 		collectionOverrides,
 		globalOverrides,
@@ -4430,7 +4431,7 @@ function UserRow({ user, isSelected, isSelf, onClick }) {
 			}) : /* @__PURE__ */ jsx("div", {
 				className: "w-7 h-7 rounded-full bg-surface-raised flex items-center justify-center shrink-0",
 				children: /* @__PURE__ */ jsx(CircleUserIcon, {
-					size: "smallest",
+					size: iconSize.smallest,
 					className: "text-text-disabled dark:text-text-disabled-dark"
 				})
 			}),
@@ -4634,6 +4635,27 @@ function consumeOAuthCallback(search, storage = defaultStorage(), now = Date.now
 	};
 }
 //#endregion
+//#region src/components/LoginView/auth-error-message.ts
+/**
+* What the login screen says about a refused sign-in.
+*
+* The server's message is written for whoever reads the API response, and some
+* of them are instructions for a developer. A Google sign-in onto an address
+* that already has an unverified password account used to put this in front of
+* the visitor:
+*
+*     … Sign in with your existing method, then POST to /auth/link/google to
+*     link google to your account.
+*
+* So the codes a person can act on get the screen's own, translated words, and
+* every other error keeps the server's message, which is still the most
+* specific thing there is to show.
+*/
+function authErrorMessage(error, t) {
+	if (error instanceof Error && "code" in error && error.code === "EMAIL_NOT_VERIFIED") return ("details" in error && typeof error.details === "object" && error.details !== null && "reason" in error.details ? error.details.reason : void 0) === "local-account-unverified" ? t("auth_account_exists_sign_in_with_password") : t("auth_account_exists_with_different_credential");
+	return error instanceof Error ? error.message : String(error);
+}
+//#endregion
 //#region src/components/LoginView/LoginView.tsx
 /**
 * The shared field background mixin (`dark:bg-black/30`) is invisible on the
@@ -4768,7 +4790,7 @@ function LoginView({ logo, authController, noUserComponent, disableSignupScreen
 		alt: "Logo"
 	});
 	else logoComponent = /* @__PURE__ */ jsx(RebaseLogo, {});
-	const controllerError = authController.authProviderError && !authController.user ? authController.authProviderError instanceof Error ? authController.authProviderError.message : String(authController.authProviderError) : null;
+	const controllerError = authController.authProviderError && !authController.user ? authErrorMessage(authController.authProviderError, t) : null;
 	const buttonsErrorMessage = providerError ?? controllerError;
 	let notAllowedMessage;
 	if (notAllowedError) if (typeof notAllowedError === "string") notAllowedMessage = notAllowedError;
@@ -5141,7 +5163,7 @@ function LoginForm({ onClose, onForgotPassword, authController, registrationMode
 				if (!err || authController.user) return null;
 				return /* @__PURE__ */ jsx("div", {
 					className: "w-full mb-2",
-					children: /* @__PURE__ */ jsx(ErrorView, { error: err instanceof Error ? err.message : String(err) })
+					children: /* @__PURE__ */ jsx(ErrorView, { error: authErrorMessage(err, t) })
 				});
 			})(),
 			/* @__PURE__ */ jsx(Typography, {
@@ -6013,7 +6035,8 @@ var en = {
 	auth_user_not_found: "User not found",
 	auth_wrong_password: "Wrong password. Please try again.",
 	auth_user_disabled: "User disabled. Please contact support.",
-	auth_account_exists_with_different_credential: "Account exists with different sign in method",
+	auth_account_exists_with_different_credential: "An account with this email already exists. Sign in the way you did before.",
+	auth_account_exists_sign_in_with_password: "An account with this email already exists. Sign in with your email and password instead.",
 	auth_email_already_in_use: "The email is already in use",
 	auth_google_permissions_required: "You need to grant additional permissions in order to manage your Google Cloud projects",
 	auth_invalid_email_password: "Please enter both email and password",
@@ -7029,7 +7052,8 @@ var es = {
 	auth_user_not_found: "Usuario no encontrado",
 	auth_wrong_password: "Contraseña incorrecta. Por favor, inténtalo de nuevo.",
 	auth_user_disabled: "Usuario deshabilitado. Por favor, contacta con soporte.",
-	auth_account_exists_with_different_credential: "Ya existe una cuenta con un método de inicio de sesión diferente",
+	auth_account_exists_with_different_credential: "Ya existe una cuenta con este correo electrónico. Inicia sesión como lo hiciste la última vez.",
+	auth_account_exists_sign_in_with_password: "Ya existe una cuenta con este correo electrónico. Inicia sesión con tu correo electrónico y contraseña.",
 	auth_email_already_in_use: "El correo electrónico ya está en uso",
 	auth_google_permissions_required: "Necesitas conceder permisos adicionales para gestionar tus proyectos de Google Cloud",
 	auth_invalid_email_password: "Por favor introduce tanto el correo electrónico como la contraseña",
@@ -8037,7 +8061,8 @@ var de = {
 	auth_user_not_found: "Benutzer nicht gefunden",
 	auth_wrong_password: "Falsches Passwort. Bitte versuchen Sie es erneut.",
 	auth_user_disabled: "Benutzer deaktiviert. Bitte kontaktieren Sie den Support.",
-	auth_account_exists_with_different_credential: "Konto existiert mit anderer Anmeldemethode",
+	auth_account_exists_with_different_credential: "Mit dieser E-Mail-Adresse existiert bereits ein Konto. Melden Sie sich so an wie beim letzten Mal.",
+	auth_account_exists_sign_in_with_password: "Mit dieser E-Mail-Adresse existiert bereits ein Konto. Melden Sie sich stattdessen mit E-Mail und Passwort an.",
 	auth_email_already_in_use: "Die E-Mail wird bereits verwendet",
 	auth_google_permissions_required: "Sie müssen zusätzliche Berechtigungen erteilen, um Ihre Google Cloud-Projekte verwalten zu können",
 	auth_invalid_email_password: "Bitte geben Sie sowohl E-Mail als auch Passwort ein",
@@ -9045,7 +9070,8 @@ var fr = {
 	auth_user_not_found: "Utilisateur non trouvé",
 	auth_wrong_password: "Mot de passe erroné. Veuillez réessayer.",
 	auth_user_disabled: "Utilisateur désactivé. Veuillez contacter le support.",
-	auth_account_exists_with_different_credential: "Un compte existe avec une méthode de connexion différente",
+	auth_account_exists_with_different_credential: "Un compte existe déjà avec cet e-mail. Connectez-vous comme la dernière fois.",
+	auth_account_exists_sign_in_with_password: "Un compte existe déjà avec cet e-mail. Connectez-vous plutôt avec votre e-mail et votre mot de passe.",
 	auth_email_already_in_use: "L'e-mail est déjà utilisé",
 	auth_google_permissions_required: "Vous devez accorder des autorisations supplémentaires afin de gérer vos projets Google Cloud",
 	auth_invalid_email_password: "Veuillez entrer l'e-mail et le mot de passe",
@@ -10053,7 +10079,8 @@ var it = {
 	auth_user_not_found: "Utente non trovato",
 	auth_wrong_password: "Password errata",
 	auth_user_disabled: "Account disabilitato",
-	auth_account_exists_with_different_credential: "Esiste già un account con questo indirizzo email ma con credenziali diverse",
+	auth_account_exists_with_different_credential: "Esiste già un account con questo indirizzo email. Accedi come hai fatto l'ultima volta.",
+	auth_account_exists_sign_in_with_password: "Esiste già un account con questo indirizzo email. Accedi con email e password.",
 	auth_email_already_in_use: "Questo indirizzo email è già in uso",
 	auth_google_permissions_required: "Sono necessarie le autorizzazioni di Google",
 	auth_invalid_email_password: "Email o password non valide",
@@ -11061,7 +11088,8 @@ var hi = {
 	auth_user_not_found: "उपयोगकर्ता नहीं मिला",
 	auth_wrong_password: "गलत पासवर्ड। कृपया पुनः प्रयास करें।",
 	auth_user_disabled: "उपयोगकर्ता अक्षम है। कृपया समर्थन से संपर्क करें।",
-	auth_account_exists_with_different_credential: "विभिन्न साइन-इन विधि के साथ खाता मौजूद है",
+	auth_account_exists_with_different_credential: "इस ईमेल से एक खाता पहले से मौजूद है। पिछली बार की तरह साइन इन करें।",
+	auth_account_exists_sign_in_with_password: "इस ईमेल से एक खाता पहले से मौजूद है। इसके बजाय अपने ईमेल और पासवर्ड से साइन इन करें।",
 	auth_email_already_in_use: "ईमेल पहले से ही उपयोग में है",
 	auth_google_permissions_required: "अपने Google Cloud प्रोजेक्ट प्रबंधित करने के लिए आपको अतिरिक्त अनुमतियाँ देने की आवश्यकता है",
 	auth_invalid_email_password: "कृपया ईमेल और पासवर्ड दोनों दर्ज करें",
@@ -12074,7 +12102,8 @@ var pt = {
 	auth_user_not_found: "Utilizador não encontrado",
 	auth_wrong_password: "Palavra-passe incorreta. Por favor tente novamente.",
 	auth_user_disabled: "Utilizador desativado. Por favor contacte o suporte.",
-	auth_account_exists_with_different_credential: "Conta existente com método de início de sessão diferente",
+	auth_account_exists_with_different_credential: "Já existe uma conta com este email. Inicie sessão como fez da última vez.",
+	auth_account_exists_sign_in_with_password: "Já existe uma conta com este email. Inicie sessão com o seu email e palavra-passe.",
 	auth_email_already_in_use: "O email já está em uso",
 	auth_google_permissions_required: "Precisa de conceder permissões adicionais para gerir os seus projetos Google Cloud",
 	auth_invalid_email_password: "Por favor introduza o email e a palavra-passe",
@@ -14530,6 +14559,17 @@ function resolveFilterOperators({ property, isArray, engine }) {
 * number by definition.
 */
 var GRID_COLUMNS = 4;
+/**
+* The most fields a form can hold and still be laid out as one column.
+*
+* Columns are a density tool: they buy back height on a form long enough to
+* scroll. A form this short fits on any surface without scrolling, so pairing
+* its fields buys nothing and costs the reading order — the eye zig-zags across
+* values that are next to each other only because of their types. The users
+* form was the case that showed it: Email beside Name, then Roles alone on the
+* row below, in a dialog with room to spare.
+*/
+var SINGLE_COLUMN_MAX_FIELDS = 4;
 /** Does this property's editor need the full width of the column? */
 function needsFullWidth(property) {
 	switch (property.type) {
@@ -14718,10 +14758,14 @@ function resolveFormLayout({ collection, fieldKeys, status }) {
 		collapsed: false,
 		fields: leftovers
 	});
+	const singleColumn = sections.reduce((sum, section) => sum + section.fields.length, 0) <= SINGLE_COLUMN_MAX_FIELDS;
 	return {
 		sections: sections.filter((s) => s.fields.length > 0).map((s) => ({
 			...s,
-			fields: fillRows(s.fields)
+			fields: fillRows(singleColumn ? s.fields.map((f) => f.spanExplicit ? f : {
+				...f,
+				span: GRID_COLUMNS
+			}) : s.fields)
 		})),
 		sidebar,
 		showRecordMeta,