@carlonicora/nextjs-jsonapi 1.62.0 → 1.64.0

package/src/features/company/components/forms/CompanyConfigurationEditor.tsx

@@ -3,8 +3,8 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Settings2Icon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { useEffect, useMemo, useState } from "react";
-import { SubmitHandler, useForm } from "react-hook-form";
+import { ReactNode, useEffect, useState } from "react";
+import { SubmitHandler, UseFormReturn, useForm } from "react-hook-form";
 import { showToast } from "../../../../utils/toast";
 import z from "zod";
 import { CommonEditorButtons, errorToast } from "../../../../components";
@@ -18,44 +18,37 @@ import {
   DialogTitle,
   DialogTrigger,
   Form,
-  Tabs,
-  TabsContent,
-  TabsList,
-  TabsTrigger,
 } from "../../../../shadcnui";
 import { UserInterface } from "../../../user";
 import { useCurrentUserContext } from "../../../user/contexts";
 import { UserService } from "../../../user/data/user.service";
 import { CompanyInput, CompanyInterface } from "../../data";
 import { CompanyService } from "../../data/company.service";
-import { CompanyConfigurationSecurityForm } from "./CompanyConfigurationSecurityForm";
 
 type CompanyConfigurationEditorProps = {
   company: CompanyInterface;
+  formSchema: z.ZodObject<any>;
+  defaultValues: Record<string, any>;
+  buildPayload: (values: Record<string, any>) => Partial<CompanyInput["configurations"]>;
+  children: (form: UseFormReturn<any>) => ReactNode;
 };
 
-function CompanyConfigurationEditorInternal({ company }: CompanyConfigurationEditorProps) {
+function CompanyConfigurationEditorInternal({
+  company,
+  formSchema,
+  defaultValues,
+  buildPayload,
+  children,
+}: CompanyConfigurationEditorProps) {
   const [open, setOpen] = useState<boolean>(false);
   const t = useTranslations();
   const { setUser } = useCurrentUserContext<UserInterface>();
 
-  const defaultValues = useMemo(() => {
-    return {
-      isManagedKnowledge: company.configurations?.isManagedKnowledge ?? false,
-      allowPublicBot: company.configurations?.allowPublicBot ?? false,
-    };
-  }, [company.configurations]);
-
   const close = () => {
     setOpen(false);
     form.reset();
   };
 
-  const formSchema = z.object({
-    isManagedKnowledge: z.boolean().optional(),
-    allowPublicBot: z.boolean().optional(),
-  });
-
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
     defaultValues: defaultValues,
@@ -64,33 +57,26 @@ function CompanyConfigurationEditorInternal({ company }: CompanyConfigurationEdi
 
   useEffect(() => {
     if (open) {
-      form.reset({
-        isManagedKnowledge: company.configurations?.isManagedKnowledge ?? false,
-        allowPublicBot: company.configurations?.allowPublicBot ?? false,
-      });
+      form.reset(defaultValues);
     }
   }, [company, open]);
 
   const onSubmit: SubmitHandler<z.infer<typeof formSchema>> = async (values) => {
     const payload: CompanyInput = {
       id: company.id,
-      configurations: {
-        isManagedKnowledge: values.isManagedKnowledge ?? false,
-        allowPublicBot: values.allowPublicBot ?? false,
-      },
+      configurations: buildPayload(values),
     };
 
     try {
       await CompanyService.updateConfigurations(payload);
 
-      // Refresh user data to update localStorage with new company configurations
       const fullUser = await UserService.findFullUser();
       if (fullUser) {
         setUser(fullUser);
       }
 
-      showToast("Configurations Updated", {
-        description: `The system configurations have been updated successfully.`,
+      showToast(t("features.configuration.updated_title"), {
+        description: t("features.configuration.updated_description"),
       });
       close();
     } catch (error) {
@@ -104,7 +90,7 @@ function CompanyConfigurationEditorInternal({ company }: CompanyConfigurationEdi
   return (
     <Dialog open={open} onOpenChange={setOpen}>
       <DialogTrigger>
-        <Button size="sm" variant={`ghost`} className="cursor-pointer">
+        <Button render={<div />} nativeButton={false} size="sm" variant={`ghost`} className="cursor-pointer">
           <Settings2Icon className="h-3.5 w-3.5" />
         </Button>
       </DialogTrigger>
@@ -117,25 +103,7 @@ function CompanyConfigurationEditorInternal({ company }: CompanyConfigurationEdi
         </DialogHeader>
         <Form {...form}>
           <form onSubmit={form.handleSubmit(onSubmit)} className={`flex w-full flex-col gap-y-4`}>
-            <div className={`flex flex-row gap-x-4`}>
-              <div className={`flex w-full flex-col justify-start gap-y-4`}>
-                <Tabs defaultValue={process.env.NEXT_PUBLIC_PRIVATE_INSTALLATION ? "security" : "ai"}>
-                  <TabsList>
-                    <TabsTrigger value="security">Privacy & Security</TabsTrigger>
-                  </TabsList>
-                  <TabsContent value="features">
-                    <div className="space-y-4">
-                      <p className="text-muted-foreground text-sm">
-                        Feature configuration will be implemented in future updates.
-                      </p>
-                    </div>
-                  </TabsContent>
-                  <TabsContent value="security">
-                    <CompanyConfigurationSecurityForm form={form} />
-                  </TabsContent>
-                </Tabs>
-              </div>
-            </div>
+            {children(form)}
             <CommonEditorButtons form={form} setOpen={setOpen} isEdit={true} />
           </form>
         </Form>

package/src/features/company/components/forms/index.ts

@@ -1,4 +1,3 @@
 export * from "./CompanyConfigurationEditor";
-export * from "./CompanyConfigurationSecurityForm";
 export * from "./CompanyDeleter";
 export * from "./CompanyEditor";

package/src/features/company/contexts/CompanyContext.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useTranslations } from "next-intl";
-import { createContext, ReactNode, useContext, useState } from "react";
+import { Fragment, createContext, ReactNode, useContext, useState } from "react";
 import { SharedProvider } from "../../../contexts";
 import { JsonApiHydratedDataInterface, Modules, rehydrate } from "../../../core";
 import { usePageUrlGenerator } from "../../../hooks";
@@ -23,6 +23,7 @@ const CompanyContext = createContext<CompanyContextType | undefined>(undefined);
 type CompanyProviderProps = {
   children: ReactNode;
   dehydratedCompany?: JsonApiHydratedDataInterface;
+  configurationEditorSlot?: ReactNode;
 };
 
 const defaultContextValue: CompanyContextType = {
@@ -30,7 +31,7 @@ const defaultContextValue: CompanyContextType = {
   setCompany: () => {},
 };
 
-export const CompanyProvider = ({ children, dehydratedCompany }: CompanyProviderProps) => {
+export const CompanyProvider = ({ children, dehydratedCompany, configurationEditorSlot }: CompanyProviderProps) => {
   const generateUrl = usePageUrlGenerator();
   const t = useTranslations();
   const { hasPermissionToModule, hasRole } = useCurrentUserContext<UserInterface>();
@@ -71,7 +72,8 @@ export const CompanyProvider = ({ children, dehydratedCompany }: CompanyProvider
       hasRole(getRoleId().Administrator) ||
       hasPermissionToModule({ module: Modules.Company, action: Action.Update })
     ) {
-      // if (company) functions.push(<CompanyConfigurationEditor key="companyConfigurationEditor" company={company} />);
+      if (company && configurationEditorSlot)
+        functions.push(<Fragment key="configurationEditorSlot">{configurationEditorSlot}</Fragment>);
       functions.push(<CompanyEditor key="companyEditor" company={company} propagateChanges={setCompany} />);
     }
 

package/src/features/user/user.module.ts

@@ -1,6 +1,7 @@
-import { User } from "./data/user";
+import { UsersIcon } from "lucide-react";
 import { createJsonApiInclusion } from "../../core";
 import { ModuleFactory } from "../../permissions";
+import { User } from "./data/user";
 
 export const UserModule = (factory: ModuleFactory) =>
   factory({
@@ -8,6 +9,7 @@ export const UserModule = (factory: ModuleFactory) =>
     name: "users",
     model: User,
     moduleId: "04cfc677-0fd2-4f5e-adf4-2483a00c0277",
+    icon: UsersIcon,
     inclusions: {
       lists: {
         fields: [