@oondemand/oon-core-front 0.4.1 → 0.4.3

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

@@ -693,14 +693,20 @@ function AuthProvider({ http, storage, auth, loginUrl, children }) {
     }
   }, [validateSession, applyValidationError]);
   const login = useCallback2(
-    async (email, password) => {
+    async (email, password, tenantId) => {
       setStatus("loading");
       setUser(null);
       try {
+        const normalizedTenantId = String(tenantId || "").trim();
         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,7 +715,11 @@ 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;
       }
     },
@@ -2799,6 +2809,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 +2863,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 +4939,7 @@ function Sidebar({ app, menu, registry }) {
 // package.json
 var package_default = {
   name: "@oondemand/oon-core-front",
-  version: "0.4.1",
+  version: "0.4.3",
   repository: {
     type: "git",
     url: "git+https://github.com/oondemand/oon-platform.git",
@@ -5379,6 +5400,17 @@ import {
 } 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 +5426,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 +5440,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."
@@ -5452,7 +5499,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 +5523,38 @@ function LoginPage({ app }) {
                 required: true
               }
             )
-          ] })
+          ] }),
+          tenants.length > 1 ? /* @__PURE__ */ jsxs24(Box23, { children: [
+            /* @__PURE__ */ jsx35(Text24, { mb: 2, fontSize: "sm", fontWeight: "600", color: "#24323A", children: "Organiza\xE7\xE3o" }),
+            /* @__PURE__ */ jsxs24(
+              "select",
+              {
+                "aria-label": "Organiza\xE7\xE3o",
+                value: tenantId,
+                onChange: (event) => {
+                  setTenantId(event.target.value);
+                  setMessage(null);
+                },
+                required: true,
+                style: {
+                  width: "100%",
+                  minHeight: "40px",
+                  padding: "0 12px",
+                  border: "1px solid #CDD5DF",
+                  borderRadius: "6px",
+                  background: "white",
+                  color: "#24323A"
+                },
+                children: [
+                  /* @__PURE__ */ jsx35("option", { value: "", children: "Selecione uma organiza\xE7\xE3o" }),
+                  tenants.map((tenant) => /* @__PURE__ */ jsxs24("option", { value: tenant.id, children: [
+                    tenant.nome,
+                    tenant.slug ? ` \u2014 ${tenant.slug}` : ""
+                  ] }, tenant.id))
+                ]
+              }
+            )
+          ] }) : null
         ] }),
         message ? /* @__PURE__ */ jsx35(
           Box23,
@@ -5494,7 +5576,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"
           }
         )
@@ -5858,7 +5940,7 @@ function ActivationPage() {
             )
           ] }) : /* @__PURE__ */ jsxs26(Fragment6, { children: [
             /* @__PURE__ */ jsx37(Heading14, { size: "md", children: "Ativa\xE7\xE3o conclu\xEDda" }),
-            /* @__PURE__ */ jsx37(Text26, { children: "Usu\xE1rio, tenant, aplicativo, licen\xE7a e permiss\xF5es foram preparados. Redirecionando para o primeiro login..." })
+            /* @__PURE__ */ jsx37(Text26, { children: "Usu\xE1rio, acesso do sistema e aplicativo root foram preparados. Redirecionando para o primeiro login..." })
           ] })
         ]
       }
@@ -5889,7 +5971,7 @@ function ActivationPage() {
         error ? /* @__PURE__ */ jsx37(Text26, { color: "red.600", children: error }) : null,
         step === 1 && isDevelopmentMember && !showCodeFlow ? renderDevLocalActivation() : null,
         step === 1 && (!isDevelopmentMember || showCodeFlow) && /* @__PURE__ */ jsxs26(Fragment6, { children: [
-          /* @__PURE__ */ jsx37(Text26, { children: "Informe o c\xF3digo de ativa\xE7\xE3o para validar tenant, aplicativo e licen\xE7a antes de consumir o c\xF3digo." }),
+          /* @__PURE__ */ jsx37(Text26, { children: "Informe o c\xF3digo de ativa\xE7\xE3o para validar Tenant, App, Entitlement e Deployment. A licen\xE7a ser\xE1 validada somente para Apps comerciais." }),
           /* @__PURE__ */ jsx37(
             Input10,
             {
@@ -5934,7 +6016,7 @@ function ActivationPage() {
           /* @__PURE__ */ jsx37(Button18, { onClick: () => setStep(5), children: "Revisar" })
         ] }),
         step === 5 && /* @__PURE__ */ jsxs26(Fragment6, { children: [
-          /* @__PURE__ */ jsx37(Text26, { children: "Ao confirmar, o c\xF3digo ser\xE1 consumido e a inst\xE2ncia ser\xE1 registrada no Ecossistema Oon." }),
+          /* @__PURE__ */ jsx37(Text26, { children: "Ao confirmar, o c\xF3digo ser\xE1 consumido e este runtime ser\xE1 vinculado ao Deployment do Ecossistema Oon." }),
           /* @__PURE__ */ jsx37(
             Button18,
             {