@rebasepro/app 0.11.1-canary.gfadf355 → 0.12.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/app",
   "type": "module",
-  "version": "0.11.1-canary.gfadf355",
+  "version": "0.12.0",
   "description": "Rebase core — framework-agnostic runtime for data-driven admin panels",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -52,12 +52,12 @@
     "magic-string": "^0.30.0",
     "notistack": "^3.0.2",
     "react-i18next": "^17.0.8",
-    "@rebasepro/admin-types": "0.11.1-canary.gfadf355",
-    "@rebasepro/common": "0.11.1-canary.gfadf355",
-    "@rebasepro/forms": "0.11.1-canary.gfadf355",
-    "@rebasepro/ui": "0.11.1-canary.gfadf355",
-    "@rebasepro/types": "0.11.1-canary.gfadf355",
-    "@rebasepro/utils": "0.11.1-canary.gfadf355"
+    "@rebasepro/admin-types": "0.12.0",
+    "@rebasepro/types": "0.12.0",
+    "@rebasepro/ui": "0.12.0",
+    "@rebasepro/forms": "0.12.0",
+    "@rebasepro/utils": "0.12.0",
+    "@rebasepro/common": "0.12.0"
   },
   "peerDependencies": {
     "react": ">=19.0.0",

package/src/collections/property_presentation.ts

@@ -14,7 +14,8 @@
  * declarative conditions feature is authored and stored, never applied. It lives
  * here now because here is where it would be called from once it is wired up.
  */
-import type { ArrayProperty, ConditionContext, EnumValueConfig, Property, PropertyConditions, ReferenceProperty } from "@rebasepro/types";
+import type { ConditionContext, EnumValueConfig, Property, PropertyConditions, ReferenceProperty } from "@rebasepro/types";
+import type { AdminArrayOptions, AdminReferenceOptions } from "@rebasepro/admin-types";
 import { evaluateCondition } from "@rebasepro/common";
 
 export function isReadOnly(property: Property): boolean {
@@ -126,7 +127,9 @@ export function applyPropertyConditions(
             (result as ReferenceProperty).path = evaluateCondition(conditions.referencePath, context) as string;
         }
         if (conditions.referenceFilter) {
-            (result as ReferenceProperty).fixedFilter = evaluateCondition(conditions.referenceFilter, context) as ReferenceProperty["fixedFilter"];
+            result.admin = result.admin || {};
+            (result.admin as AdminReferenceOptions).fixedFilter =
+                evaluateCondition(conditions.referenceFilter, context) as AdminReferenceOptions["fixedFilter"];
         }
     }
 
@@ -136,10 +139,12 @@ export function applyPropertyConditions(
 
     if (result.type === "array") {
         if (conditions.canAddElements !== undefined) {
-            (result as ArrayProperty).canAddElements = evaluateCondition(conditions.canAddElements, context) as boolean;
+            result.admin = result.admin || {};
+            (result.admin as AdminArrayOptions).canAddElements = evaluateCondition(conditions.canAddElements, context) as boolean;
         }
         if (conditions.sortable !== undefined) {
-            (result as ArrayProperty).sortable = evaluateCondition(conditions.sortable, context) as boolean;
+            result.admin = result.admin || {};
+            (result.admin as AdminArrayOptions).sortable = evaluateCondition(conditions.sortable, context) as boolean;
         }
     }
 

package/src/collections/title-property.ts

@@ -1,4 +1,4 @@
-import type { Property, Relation } from "@rebasepro/types";
+import { isRelationalCollectionConfig, type Property, type Relation } from "@rebasepro/types";
 import { generateForeignKeyName } from "@rebasepro/utils";
 import type { AdminCollection } from "@rebasepro/admin-types";
 import { getPrimaryKeys, isPropertyBuilder } from "@rebasepro/common";
@@ -104,7 +104,7 @@ function getForeignKeyColumns<M extends Record<string, unknown>>(collection: Adm
         }
     };
 
-    for (const relation of collection.relations ?? []) {
+    for (const relation of (isRelationalCollectionConfig(collection) ? collection.relations : undefined) ?? []) {
         addRelationKeys(relation);
     }
 

package/src/components/LoginView/LoginView.tsx

@@ -21,6 +21,7 @@ declare global {
 import {
     ArrowLeftIcon,
     Button,
+    Checkbox,
     cls,
     IconButton,
     iconSize,
@@ -141,6 +142,15 @@ export interface LoginViewProps {
      * Pre-fill the password field (e.g. for demo or testing environments).
      */
     defaultPassword?: string;
+
+    /**
+     * When set, the email/password forms render a "Join the newsletter"
+     * opt-in checkbox. Called with the address that just authenticated —
+     * sign-in or registration — if the box was ticked. Wire it to whatever
+     * stores the subscription; failures are the callback's problem, the
+     * login flow never waits on it.
+     */
+    onNewsletterOptIn?: (email: string) => void;
 }
 
 type AuthMode = "buttons" | "login" | "register" | "forgot";
@@ -203,7 +213,8 @@ export function LoginView({
     additionalComponent,
     topComponent,
     defaultEmail,
-    defaultPassword
+    defaultPassword,
+    onNewsletterOptIn
 }: LoginViewProps) {
 
     const modeState = useModeController();
@@ -213,6 +224,9 @@ export function LoginView({
     const [mode, setMode] = useState<AuthMode>("buttons");
     const [fadeIn, setFadeIn] = useState(false);
     const [viewVisible, setViewVisible] = useState(true);
+    // Lives here, not in LoginForm: the form unmounts on every login↔register
+    // switch, and losing the tick on a mode change would silently drop opt-ins.
+    const [newsletterOptIn, setNewsletterOptIn] = useState(false);
 
     const switchMode = (newMode: AuthMode) => {
         setViewVisible(false);
@@ -360,6 +374,9 @@ export function LoginView({
                             bootstrapMode={true}
                             defaultEmail={defaultEmail}
                             defaultPassword={defaultPassword}
+                            onNewsletterOptIn={onNewsletterOptIn}
+                            newsletterOptIn={newsletterOptIn}
+                            setNewsletterOptIn={setNewsletterOptIn}
                         />
                     )}
 
@@ -442,6 +459,9 @@ export function LoginView({
                                     switchToRegister={showRegistration ? () => switchMode("register") : undefined}
                                     defaultEmail={defaultEmail}
                                     defaultPassword={defaultPassword}
+                                    onNewsletterOptIn={onNewsletterOptIn}
+                                    newsletterOptIn={newsletterOptIn}
+                                    setNewsletterOptIn={setNewsletterOptIn}
                                 />
                             )}
 
@@ -457,6 +477,9 @@ export function LoginView({
                                     switchToLogin={() => switchMode("login")}
                                     defaultEmail={defaultEmail}
                                     defaultPassword={defaultPassword}
+                                    onNewsletterOptIn={onNewsletterOptIn}
+                                    newsletterOptIn={newsletterOptIn}
+                                    setNewsletterOptIn={setNewsletterOptIn}
                                 />
                             )}
 
@@ -646,7 +669,10 @@ function LoginForm({
     switchToRegister,
     switchToLogin,
     defaultEmail,
-    defaultPassword
+    defaultPassword,
+    onNewsletterOptIn,
+    newsletterOptIn = false,
+    setNewsletterOptIn
 }: {
     onClose: () => void,
     onForgotPassword?: () => void,
@@ -658,9 +684,13 @@ function LoginForm({
     switchToRegister?: () => void,
     switchToLogin?: () => void,
     defaultEmail?: string,
-    defaultPassword?: string
+    defaultPassword?: string,
+    onNewsletterOptIn?: (email: string) => void,
+    newsletterOptIn?: boolean,
+    setNewsletterOptIn?: (checked: boolean) => void
 }) {
     const passwordRef = useRef<HTMLInputElement | null>(null);
+    const { t } = useTranslation();
 
     const [email, setEmail] = useState<string | undefined>(defaultEmail);
     const [password, setPassword] = useState<string | undefined>(defaultPassword);
@@ -684,15 +714,28 @@ function LoginForm({
     // is not one of those: without a catch here every rejected sign-in becomes an
     // unhandled rejection, reported as a crash by anything listening for one,
     // while the user has already been shown the error.
+    // Fires only on the resolution path, i.e. after the controller accepted
+    // the credentials — a ticked box on a failed attempt must not subscribe
+    // an address its owner never proved they control.
+    function subscribeIfOptedIn(email: string) {
+        if (newsletterOptIn && onNewsletterOptIn) {
+            onNewsletterOptIn(email);
+        }
+    }
+
     function handleEnterPassword() {
         if (email && password && authController.emailPasswordLogin) {
-            void Promise.resolve(authController.emailPasswordLogin(email, password)).catch(() => undefined);
+            void Promise.resolve(authController.emailPasswordLogin(email, password))
+                .then(() => subscribeIfOptedIn(email))
+                .catch(() => undefined);
         }
     }
 
     function handleRegistration() {
         if (email && password && authController.register) {
-            void Promise.resolve(authController.register(email, password, displayName)).catch(() => undefined);
+            void Promise.resolve(authController.register(email, password, displayName))
+                .then(() => subscribeIfOptedIn(email))
+                .catch(() => undefined);
         }
     }
 
@@ -813,6 +856,19 @@ function LoginForm({
                 </div>
             )}
 
+            {onNewsletterOptIn && (
+                <label className="flex items-center gap-2 cursor-pointer mt-1 mb-1">
+                    <Checkbox
+                        checked={newsletterOptIn}
+                        onCheckedChange={(checked) => setNewsletterOptIn?.(checked === true)}
+                        size="small"
+                    />
+                    <Typography variant="caption" color="secondary" className="select-none">
+                        {t("join_newsletter")}
+                    </Typography>
+                </label>
+            )}
+
             <LoadingButton
                 type="submit"
                 variant="filled"

package/src/components/RebaseAuth.tsx

@@ -1,6 +1,6 @@
 import React, { useLayoutEffect, useRef } from "react";
 import { useRebaseRegistryDispatch } from "../hooks";
-import type { RebaseAuthConfig } from "@rebasepro/admin-types";
+import type { RebaseAuthViewConfig } from "@rebasepro/admin-types";
 
 /**
  * Declarative component to configure authentication in Rebase.
@@ -10,7 +10,7 @@ import type { RebaseAuthConfig } from "@rebasepro/admin-types";
  * authentication is cross-cutting (admin, Studio, any app area).
  * @group Core
  */
-export function RebaseAuth({ loginView }: RebaseAuthConfig) {
+export function RebaseAuth({ loginView }: RebaseAuthViewConfig) {
     const dispatch = useRebaseRegistryDispatch();
     const registeredRef = useRef(false);
 

package/src/core/RebaseProps.tsx

@@ -47,10 +47,8 @@ type DeepPartial<T> = T extends object
  * Controller to simulate different roles when dev mode is active.
  * @group Models
  */
-export interface EffectiveRoleController {
-    effectiveRole: string | null;
-    setEffectiveRole: (role: string | null) => void;
-}
+export type { EffectiveRoleController } from "@rebasepro/types";
+import type { EffectiveRoleController } from "@rebasepro/types";
 
 
 /**

package/src/hooks/useRebaseRegistry.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useContext, useState, useCallback, useMemo, useRef } from "react";
-import type { RebaseRegistryController, RebaseAdminConfig, RebaseStudioConfig, RebaseAuthConfig } from "@rebasepro/admin-types";
+import type { RebaseRegistryController, RebaseAdminConfig, RebaseStudioConfig, RebaseAuthViewConfig } from "@rebasepro/admin-types";
 
 /**
  * Split into two contexts to prevent infinite re-render loops:
@@ -16,14 +16,14 @@ interface RegistryDispatch {
     unregisterAdmin: () => void;
     registerStudio: (config: RebaseStudioConfig) => void;
     unregisterStudio: () => void;
-    registerAuth: (config: RebaseAuthConfig) => void;
+    registerAuth: (config: RebaseAuthViewConfig) => void;
     unregisterAuth: () => void;
 }
 
 interface RegistryState {
     cmsConfig: RebaseAdminConfig | null;
     studioConfig: RebaseStudioConfig | null;
-    authConfig: RebaseAuthConfig | null;
+    authConfig: RebaseAuthViewConfig | null;
 }
 
 const RegistryDispatchContext = createContext<RegistryDispatch | undefined>(undefined);
@@ -36,7 +36,7 @@ const RegistryStateContext = createContext<RegistryState>({
 export function RebaseRegistryProvider({ children }: { children: React.ReactNode }) {
     const [cmsConfig, setCmsConfig] = useState<RebaseAdminConfig | null>(null);
     const [studioConfig, setStudioConfig] = useState<RebaseStudioConfig | null>(null);
-    const [authConfig, setAuthConfig] = useState<RebaseAuthConfig | null>(null);
+    const [authConfig, setAuthConfig] = useState<RebaseAuthViewConfig | null>(null);
 
     // Dispatch functions are stable — never change identity
     const dispatch = useMemo<RegistryDispatch>(() => ({
@@ -44,7 +44,7 @@ export function RebaseRegistryProvider({ children }: { children: React.ReactNode
         unregisterAdmin: () => setCmsConfig(null),
         registerStudio: (config: RebaseStudioConfig) => setStudioConfig(config),
         unregisterStudio: () => setStudioConfig(null),
-        registerAuth: (config: RebaseAuthConfig) => setAuthConfig(config),
+        registerAuth: (config: RebaseAuthViewConfig) => setAuthConfig(config),
         unregisterAuth: () => setAuthConfig(null)
     }), []);
 

package/src/locales/de.ts

@@ -58,6 +58,7 @@ export const de: RebaseTranslations = {
     dark_mode: "Dunkel",
     light_mode: "Hell",
     system_mode: "System",
+    join_newsletter: "Newsletter abonnieren, kein Spam",
     ok: "Ok",
     save_collection_config: "Sammlungsstruktur speichern",
     search_for_more_icons: "Nach weiteren Symbolen suchen…",

package/src/locales/en.ts

@@ -68,6 +68,7 @@ export const en: RebaseTranslations = {
     dark_mode: "Dark",
     light_mode: "Light",
     system_mode: "System",
+    join_newsletter: "Join the newsletter, no spam",
     ok: "Ok",
     save_collection_config: "Save collection structure",
     search_for_more_icons: "Search for more icons…",

package/src/locales/es.ts

@@ -66,6 +66,7 @@ export const es: RebaseTranslations = {
     dark_mode: "Oscuro",
     light_mode: "Claro",
     system_mode: "Sistema",
+    join_newsletter: "Únete a la newsletter, sin spam",
     ok: "Aceptar",
     save_collection_config: "Guardar la estructura de la colección",
     search_for_more_icons: "Buscar más iconos…",

package/src/locales/fr.ts

@@ -58,6 +58,7 @@ export const fr: RebaseTranslations = {
     dark_mode: "Sombre",
     light_mode: "Clair",
     system_mode: "Système",
+    join_newsletter: "Rejoignez la newsletter, pas de spam",
     ok: "Ok",
     save_collection_config: "Enregistrer la structure de la collection",
     search_for_more_icons: "Rechercher d'autres icônes…",

package/src/locales/hi.ts

@@ -58,6 +58,7 @@ export const hi: RebaseTranslations = {
     dark_mode: "डार्क",
     light_mode: "लाइट",
     system_mode: "सिस्टम",
+    join_newsletter: "न्यूज़लेटर से जुड़ें, कोई स्पैम नहीं",
     ok: "ठीक है",
     save_collection_config: "संग्रह संरचना सहेजें",
     search_for_more_icons: "और आइकन खोजें…",

package/src/locales/it.ts

@@ -58,6 +58,7 @@ export const it: RebaseTranslations = {
     dark_mode: "Scuro",
     light_mode: "Chiaro",
     system_mode: "Sistema",
+    join_newsletter: "Iscriviti alla newsletter, niente spam",
     ok: "Ok",
     save_collection_config: "Salva struttura della collezione",
     search_for_more_icons: "Cerca altre icone…",

package/src/locales/pt.ts

@@ -63,6 +63,7 @@ export const pt: RebaseTranslations = {
     dark_mode: "Escuro",
     light_mode: "Claro",
     system_mode: "Sistema",
+    join_newsletter: "Assine a newsletter, sem spam",
     ok: "Ok",
     save_collection_config: "Guardar estrutura da coleção",
     search_for_more_icons: "Pesquisar mais ícones…",