@oondemand/oon-core-front 0.4.2 → 0.4.4

package/dist/index.d.ts

@@ -1095,7 +1095,7 @@ interface AuthContextValue {
     status: AuthStatus;
     isAuthenticated: boolean;
     hasPermission: (permission?: string | string[]) => boolean;
-    login: (email: string, password: string) => Promise<void>;
+    login: (email: string, password: string, tenantId?: string) => Promise<void>;
     completeFirstAccess: (password: string) => Promise<void>;
     retry: () => Promise<void>;
     logout: () => void;

package/dist/index.js

@@ -539,11 +539,11 @@ var oonSystem = createOonSystem();
 
 // src/security/AuthProvider.tsx
 import {
-  createContext as createContext3,
-  useCallback as useCallback2,
-  useContext as useContext3,
+  createContext as createContext4,
+  useCallback as useCallback3,
+  useContext as useContext4,
   useEffect as useEffect4,
-  useState as useState4
+  useState as useState5
 } from "react";
 
 // src/security/ActivationProvider.tsx
@@ -598,9 +598,65 @@ function useActivation() {
   return context;
 }
 
-// src/security/AuthProvider.tsx
+// src/security/TenantProvider.tsx
+import {
+  createContext as createContext3,
+  useCallback as useCallback2,
+  useContext as useContext3,
+  useMemo as useMemo2,
+  useState as useState4
+} from "react";
+import { useQueryClient } from "@tanstack/react-query";
 import { jsx as jsx5 } from "react/jsx-runtime";
-var AuthContext = createContext3(null);
+var TenantContext = createContext3(null);
+function applyHeader(http, tenantId) {
+  if (tenantId) {
+    http.defaults.headers.common["x-oon-tenant-id"] = tenantId;
+    return;
+  }
+  delete http.defaults.headers.common["x-oon-tenant-id"];
+}
+function TenantProvider({ http, storage, children }) {
+  const queryClient = useQueryClient();
+  const [activeTenantId, setActiveTenantId] = useState4(() => storage.get());
+  const replaceTenant = useCallback2(
+    (tenantId) => {
+      const normalized2 = String(tenantId ?? "").trim() || null;
+      if (normalized2) storage.set(normalized2);
+      else storage.clear();
+      applyHeader(http, normalized2);
+      setActiveTenantId(normalized2);
+      queryClient.clear();
+    },
+    [http, queryClient, storage]
+  );
+  const value2 = useMemo2(
+    () => ({
+      activeTenantId,
+      switchTenant(tenantId) {
+        if (!tenantId?.trim()) throw new Error("tenantId \xE9 obrigat\xF3rio.");
+        replaceTenant(tenantId);
+      },
+      clearTenant() {
+        replaceTenant(null);
+      }
+    }),
+    [activeTenantId, replaceTenant]
+  );
+  return /* @__PURE__ */ jsx5(TenantContext.Provider, { value: value2, children });
+}
+function useOptionalOonTenant() {
+  return useContext3(TenantContext);
+}
+function useOonTenant() {
+  const value2 = useOptionalOonTenant();
+  if (!value2) throw new Error("useOonTenant deve ser usado dentro de TenantProvider.");
+  return value2;
+}
+
+// src/security/AuthProvider.tsx
+import { jsx as jsx6 } from "react/jsx-runtime";
+var AuthContext = createContext4(null);
 function errorStatus(error) {
   return error?.status;
 }
@@ -648,20 +704,26 @@ function can(user, permission) {
 function AuthProvider({ http, storage, auth, loginUrl, children }) {
   const tokenParam = auth?.tokenParam ?? "code";
   const devToken = auth?.devToken?.trim() || null;
-  const [user, setUser] = useState4(null);
-  const [status, setStatus] = useState4("loading");
+  const [user, setUser] = useState5(null);
+  const [status, setStatus] = useState5("loading");
   const activation = useOptionalActivation();
-  const redirectToExternalLogin = useCallback2(() => {
+  const tenantContext = useOptionalOonTenant();
+  const redirectToExternalLogin = useCallback3(() => {
     if (loginUrl) window.location.href = loginUrl;
   }, [loginUrl]);
-  const applyUser = useCallback2((next) => {
+  const applyUser = useCallback3((next) => {
     setUser(next);
+    const tenant = next.tenant;
+    const resolvedTenantId = String(next.tenantId || tenant?.id || "").trim();
+    if (resolvedTenantId && tenantContext?.activeTenantId !== resolvedTenantId) {
+      tenantContext?.switchTenant(resolvedTenantId);
+    }
     const firstAccess = Boolean(
       next.mustChangePassword || next.firstAccessPending
     );
     setStatus(firstAccess ? "first-access" : "authenticated");
-  }, []);
-  const applyValidationError = useCallback2(
+  }, [tenantContext]);
+  const applyValidationError = useCallback3(
     (error) => {
       const currentStatus = errorStatus(error);
       setUser(null);
@@ -679,11 +741,11 @@ function AuthProvider({ http, storage, auth, loginUrl, children }) {
     },
     [storage, redirectToExternalLogin]
   );
-  const validateSession = useCallback2(async () => {
+  const validateSession = useCallback3(async () => {
     const response = await http.get("/auth/validar-token");
     applyUser(response.data.usuario);
   }, [http, applyUser]);
-  const retry = useCallback2(async () => {
+  const retry = useCallback3(async () => {
     setStatus("loading");
     try {
       await validateSession();
@@ -692,15 +754,23 @@ function AuthProvider({ http, storage, auth, loginUrl, children }) {
       throw error;
     }
   }, [validateSession, applyValidationError]);
-  const login = useCallback2(
-    async (email, password) => {
+  const login = useCallback3(
+    async (email, password, tenantId) => {
       setStatus("loading");
       setUser(null);
       try {
+        const normalizedTenantId = String(tenantId || "").trim();
+        if (normalizedTenantId) tenantContext?.switchTenant(normalizedTenantId);
+        else tenantContext?.clearTenant();
         const response = await http.post(
           "/auth/autenticar",
           {},
-          { headers: { Authorization: `Basic ${encodeBasicCredentials(email, password)}` } }
+          {
+            headers: {
+              Authorization: `Basic ${encodeBasicCredentials(email, password)}`,
+              ...normalizedTenantId ? { "x-oon-tenant-id": normalizedTenantId } : {}
+            }
+          }
         );
         if (!response.data.token) {
           const error = { code: "AUTH_TOKEN_MISSING", message: "Token n\xE3o retornado pelo backend.", status: 502 };
@@ -709,22 +779,27 @@ function AuthProvider({ http, storage, auth, loginUrl, children }) {
         storage.set(response.data.token);
         await validateSession();
       } catch (error) {
-        applyValidationError(error);
+        if (error?.code === "TENANT_SELECTION_REQUIRED") {
+          setStatus("unauthenticated");
+        } else {
+          applyValidationError(error);
+        }
         throw error;
       }
     },
-    [http, storage, validateSession, applyValidationError]
+    [http, storage, validateSession, applyValidationError, tenantContext]
   );
-  const completeFirstAccess = useCallback2(async (password) => {
+  const completeFirstAccess = useCallback3(async (password) => {
     await http.post("/auth/first-access/password", { password });
     await validateSession();
   }, [http, validateSession]);
-  const logout = useCallback2(() => {
+  const logout = useCallback3(() => {
     storage.clear();
+    tenantContext?.clearTenant();
     setUser(null);
     setStatus("unauthenticated");
     redirectToExternalLogin();
-  }, [storage, redirectToExternalLogin]);
+  }, [storage, redirectToExternalLogin, tenantContext]);
   useEffect4(() => {
     let active = true;
     if (activation && !["active", "error"].includes(activation.status)) {
@@ -758,7 +833,7 @@ function AuthProvider({ http, storage, auth, loginUrl, children }) {
   const roles = roleCode ? [roleCode] : [];
   const capabilities = extractCapabilities(user);
   const permissions = explicitPermissions(user) ?? capabilities;
-  const hasPermission = useCallback2(
+  const hasPermission = useCallback3(
     (permission) => can(user, permission),
     [user]
   );
@@ -775,67 +850,14 @@ function AuthProvider({ http, storage, auth, loginUrl, children }) {
     retry,
     logout
   };
-  return /* @__PURE__ */ jsx5(AuthContext.Provider, { value: value2, children });
+  return /* @__PURE__ */ jsx6(AuthContext.Provider, { value: value2, children });
 }
 function useOonAuth() {
-  const context = useContext3(AuthContext);
+  const context = useContext4(AuthContext);
   if (!context) throw new Error("useOonAuth deve ser usado dentro de <AuthProvider> (oonCoreFront.start).");
   return context;
 }
 
-// src/security/TenantProvider.tsx
-import {
-  createContext as createContext4,
-  useCallback as useCallback3,
-  useContext as useContext4,
-  useMemo as useMemo2,
-  useState as useState5
-} from "react";
-import { useQueryClient } from "@tanstack/react-query";
-import { jsx as jsx6 } from "react/jsx-runtime";
-var TenantContext = createContext4(null);
-function applyHeader(http, tenantId) {
-  if (tenantId) {
-    http.defaults.headers.common["x-oon-tenant-id"] = tenantId;
-    return;
-  }
-  delete http.defaults.headers.common["x-oon-tenant-id"];
-}
-function TenantProvider({ http, storage, children }) {
-  const queryClient = useQueryClient();
-  const [activeTenantId, setActiveTenantId] = useState5(() => storage.get());
-  const replaceTenant = useCallback3(
-    (tenantId) => {
-      const normalized2 = String(tenantId ?? "").trim() || null;
-      if (normalized2) storage.set(normalized2);
-      else storage.clear();
-      applyHeader(http, normalized2);
-      setActiveTenantId(normalized2);
-      queryClient.clear();
-    },
-    [http, queryClient, storage]
-  );
-  const value2 = useMemo2(
-    () => ({
-      activeTenantId,
-      switchTenant(tenantId) {
-        if (!tenantId?.trim()) throw new Error("tenantId \xE9 obrigat\xF3rio.");
-        replaceTenant(tenantId);
-      },
-      clearTenant() {
-        replaceTenant(null);
-      }
-    }),
-    [activeTenantId, replaceTenant]
-  );
-  return /* @__PURE__ */ jsx6(TenantContext.Provider, { value: value2, children });
-}
-function useOonTenant() {
-  const value2 = useContext4(TenantContext);
-  if (!value2) throw new Error("useOonTenant deve ser usado dentro de TenantProvider.");
-  return value2;
-}
-
 // src/app/OonProviders.tsx
 import { jsx as jsx7 } from "react/jsx-runtime";
 function OonProviders({
@@ -2799,6 +2821,7 @@ function CoreRelatedGrid({
   onRefresh
 }) {
   const tab = rawTab;
+  const { http } = useOonApi();
   const relation = relationFrom(tab.relation, relations);
   const schemaQuery = useModelSchema(relation?.model ?? "");
   const schema = schemaQuery.data;
@@ -2852,11 +2875,21 @@ function CoreRelatedGrid({
     onError: setEditError
   });
   const createMutation = useMutation({
-    mutationFn: (values) => resource.create({
-      ...createInitialValues,
-      ...values,
-      ...relation && parentValue != null ? { [relation.foreignKey]: parentValue } : {}
-    }),
+    mutationFn: (values) => {
+      const payload = {
+        ...createInitialValues,
+        ...values,
+        ...relation && parentValue != null ? { [relation.foreignKey]: parentValue } : {}
+      };
+      if (tab.create?.endpoint) {
+        return http.request({
+          url: interpolateEndpoint(tab.create.endpoint, payload, parent),
+          method: tab.create.method ?? "POST",
+          data: payload
+        }).then((response) => response.data);
+      }
+      return resource.create(payload);
+    },
     onSuccess: async () => {
       await invalidate();
       setCreating(false);
@@ -4918,7 +4951,7 @@ function Sidebar({ app, menu, registry }) {
 // package.json
 var package_default = {
   name: "@oondemand/oon-core-front",
-  version: "0.4.2",
+  version: "0.4.4",
   repository: {
     type: "git",
     url: "git+https://github.com/oondemand/oon-platform.git",
@@ -5105,6 +5138,8 @@ function CoreTopbar({ app, menu }) {
   const settingsHref = resolveSettingsHref(
     menu.filter((item) => hasPermission(item.permissions))
   );
+  const tenant = user?.tenant;
+  const tenantLabel = String(tenant?.nome || tenant?.slug || "").trim();
   return /* @__PURE__ */ jsxs22(
     Flex14,
     {
@@ -5134,6 +5169,10 @@ function CoreTopbar({ app, menu }) {
             }
           ),
           /* @__PURE__ */ jsx31(Text22, { fontSize: "sm", fontWeight: "600", color: "#24323A", children: app.title ?? app.name }),
+          tenantLabel ? /* @__PURE__ */ jsxs22(Text22, { fontSize: "xs", fontWeight: "600", color: "brand.600", lineHeight: "1.4", children: [
+            "Tenant: ",
+            tenantLabel
+          ] }) : null,
           /* @__PURE__ */ jsxs22(Text22, { fontSize: "10px", color: "gray.600", lineHeight: "1.35", children: [
             "Central ",
             centralVersion,
@@ -5374,11 +5413,23 @@ import {
   Flex as Flex16,
   Heading as Heading12,
   Input as Input8,
+  SimpleGrid as SimpleGrid5,
   Text as Text24,
   VStack as VStack4
 } from "@chakra-ui/react";
 import { Navigate as Navigate2, useLocation as useLocation3 } from "react-router-dom";
 import { jsx as jsx35, jsxs as jsxs24 } from "react/jsx-runtime";
+function tenantOptions(error) {
+  const details = error.details;
+  if (!details || typeof details !== "object" || Array.isArray(details)) return [];
+  const tenants = details.tenants;
+  if (!Array.isArray(tenants)) return [];
+  return tenants.filter((tenant) => Boolean(tenant) && typeof tenant === "object").map((tenant) => ({
+    id: String(tenant.id || ""),
+    nome: String(tenant.nome || tenant.slug || tenant.id || ""),
+    slug: tenant.slug ? String(tenant.slug) : void 0
+  })).filter((tenant) => tenant.id && tenant.nome);
+}
 function safeRedirect(search) {
   const value2 = new URLSearchParams(search).get("redirect") || "/";
   if (!value2.startsWith("/") || value2.startsWith("//")) return "/";
@@ -5394,6 +5445,8 @@ function LoginPage({ app }) {
   const [password, setPassword] = useState16("");
   const [submitting, setSubmitting] = useState16(false);
   const [message, setMessage] = useState16(null);
+  const [tenants, setTenants] = useState16([]);
+  const [tenantId, setTenantId] = useState16("");
   const redirect = safeRedirect(location.search);
   if (status === "authenticated") {
     return /* @__PURE__ */ jsx35(Navigate2, { to: redirect, replace: true });
@@ -5406,9 +5459,22 @@ function LoginPage({ app }) {
     setSubmitting(true);
     setMessage(null);
     try {
-      await login(email.trim(), password);
+      if (tenants.length > 1 && !tenantId) {
+        setMessage("Selecione a organiza\xE7\xE3o para continuar.");
+        return;
+      }
+      await login(email.trim(), password, tenantId || void 0);
     } catch (error) {
       const authError = error;
+      if (authError.code === "TENANT_SELECTION_REQUIRED") {
+        const options = tenantOptions(authError);
+        if (options.length > 1) {
+          setTenants(options);
+          setTenantId("");
+          setMessage("Seu usu\xE1rio possui acesso a mais de uma organiza\xE7\xE3o. Selecione uma para continuar.");
+          return;
+        }
+      }
       if (authError.status === 403) return;
       setMessage(
         authError.status === 401 ? "E-mail ou senha inv\xE1lidos." : authError.message || "N\xE3o foi poss\xEDvel entrar. Tente novamente."
@@ -5421,7 +5487,7 @@ function LoginPage({ app }) {
     Box23,
     {
       width: "100%",
-      maxW: "440px",
+      maxW: tenants.length > 1 ? "680px" : "440px",
       bg: "white",
       borderWidth: "1px",
       borderColor: "#E4EBEF",
@@ -5452,7 +5518,11 @@ function LoginPage({ app }) {
               {
                 type: "email",
                 value: email,
-                onChange: (event) => setEmail(event.target.value),
+                onChange: (event) => {
+                  setEmail(event.target.value);
+                  setTenants([]);
+                  setTenantId("");
+                },
                 autoComplete: "email",
                 placeholder: "voce@empresa.com.br",
                 required: true
@@ -5472,7 +5542,40 @@ function LoginPage({ app }) {
                 required: true
               }
             )
-          ] })
+          ] }),
+          tenants.length > 1 ? /* @__PURE__ */ jsxs24(Box23, { children: [
+            /* @__PURE__ */ jsx35(Text24, { mb: 3, fontSize: "sm", fontWeight: "600", color: "#24323A", children: "Escolha o tenant para acessar" }),
+            /* @__PURE__ */ jsx35(SimpleGrid5, { columns: { base: 1, md: 2 }, gap: 3, children: tenants.map((tenant) => {
+              const selected = tenantId === tenant.id;
+              return /* @__PURE__ */ jsx35(
+                Button16,
+                {
+                  type: "button",
+                  variant: "outline",
+                  height: "auto",
+                  minH: "88px",
+                  justifyContent: "flex-start",
+                  whiteSpace: "normal",
+                  textAlign: "left",
+                  borderWidth: "2px",
+                  borderColor: selected ? "#39BFED" : "#D9E2E7",
+                  bg: selected ? "#EFFAFF" : "white",
+                  color: "#24323A",
+                  "aria-pressed": selected,
+                  onClick: () => {
+                    setTenantId(tenant.id);
+                    setMessage(null);
+                  },
+                  _hover: { borderColor: "#39BFED", bg: "#F6FCFE" },
+                  children: /* @__PURE__ */ jsxs24(VStack4, { align: "start", gap: 1, py: 3, children: [
+                    /* @__PURE__ */ jsx35(Text24, { fontWeight: "700", children: tenant.nome }),
+                    tenant.slug ? /* @__PURE__ */ jsx35(Text24, { fontSize: "xs", color: "gray.500", children: tenant.slug }) : null
+                  ] })
+                },
+                tenant.id
+              );
+            }) })
+          ] }) : null
         ] }),
         message ? /* @__PURE__ */ jsx35(
           Box23,
@@ -5494,7 +5597,7 @@ function LoginPage({ app }) {
             bg: "#07262E",
             color: "white",
             _hover: { bg: "#0B3843" },
-            disabled: submitting || !email.trim() || !password,
+            disabled: submitting || !email.trim() || !password || tenants.length > 1 && !tenantId,
             children: submitting ? "Validando acesso..." : "Entrar"
           }
         )