Update - Invoice

- added url to invoice detail when task from invoice is created

Small updates and fixes
- reset form after new account was added
- change button labels from cancel to close

app/[locale]/(routes)/crm/accounts/components/NewAccountForm.tsx

@@ -101,10 +101,6 @@ export function NewAccountForm({ industries, users }: Props) {
         title: "Success",
         description: "Account created successfully",
       });
-
-      /*     if (response.status === 200) {
-        router.push("/");
-      } */
     } catch (error: any) {
       toast({
         variant: "destructive",
@@ -114,7 +110,31 @@ export function NewAccountForm({ industries, users }: Props) {
     } finally {
       router.refresh();
       setIsLoading(false);
-      router.push("/crm/accounts");
+      form.reset({
+        name: "",
+        office_phone: "",
+        website: "",
+        fax: "",
+        company_id: "",
+        vat: "",
+        email: "",
+        billing_street: "",
+        billing_postal_code: "",
+        billing_city: "",
+        billing_state: "",
+        billing_country: "",
+        shipping_street: "",
+        shipping_postal_code: "",
+        shipping_city: "",
+        shipping_state: "",
+        shipping_country: "",
+        description: "",
+        assigned_to: "",
+        status: "",
+        annual_revenue: "",
+        member_of: "",
+        industry: "",
+      });
     }
   };
 

app/[locale]/(routes)/invoice/data-table/data-table-row-actions.tsx

@@ -47,7 +47,7 @@ export function DataTableRowActions<TData>({
   const [openRossumView, setOpenRossumView] = useState(false);
 
   //zustand
-  const { setIsOpen } = useAppStore();
+  const { setIsOpen, setNotionUrl } = useAppStore();
 
   const router = useRouter();
   const { toast } = useToast();
@@ -224,6 +224,9 @@ export function DataTableRowActions<TData>({
               <DropdownMenuItem
                 onClick={() => {
                   setIsOpen(true);
+                  setNotionUrl(
+                    `${process.env.NEXT_PUBLIC_APP_URL}/invoice/detail/${invoice.id}`
+                  );
                 }}
               >
                 <Edit className="mr-2 w-4 h-4" />

app/[locale]/(routes)/invoice/dialogs/NewTask.tsx

@@ -51,6 +51,8 @@ const NewTaskDialog = ({ users, boards }: Props) => {
 
   const [isMounted, setIsMounted] = useState(false);
 
+  const { notionUrl } = useAppStore();
+
   const router = useRouter();
   const { toast } = useToast();
 
@@ -60,6 +62,7 @@ const NewTaskDialog = ({ users, boards }: Props) => {
     board: z.string().min(3).max(255),
     priority: z.string().min(3).max(10),
     content: z.string().min(3).max(500),
+    notionUrl: z.string().min(3).max(500),
   });
 
   type NewAccountFormValues = z.infer<typeof formSchema>;
@@ -69,8 +72,9 @@ const NewTaskDialog = ({ users, boards }: Props) => {
   });
 
   useEffect(() => {
+    form.setValue("notionUrl", notionUrl);
     setIsMounted(true);
-  }, [form]);
+  }, [form, notionUrl]);
 
   if (!isMounted) {
     return null;

app/[locale]/(routes)/projects/dialogs/UpdateTask.tsx

@@ -251,7 +251,7 @@ const UpdateTaskDialog = ({ users, boards, initialData }: Props) => {
           </div>
           <div className="flex w-full justify-end space-x-2 pt-2">
             <DialogTrigger asChild>
-              <Button variant={"destructive"}>Cancel</Button>
+              <Button variant={"destructive"}>Close</Button>
             </DialogTrigger>
             <Button type="submit" disabled={isLoading}>
               {isLoading ? (

app/[locale]/(routes)/projects/tasks/viewtask/[taskId]/page.tsx

@@ -53,7 +53,7 @@ const TaskPage = async ({ params }: TaskPageProps) => {
     <div className="flex flex-col md:flex-row w-full px-2 space-x-2 ">
       <div className="flex flex-col w-full md:w-2/3">
         <div className="w-full border rounded-lg mb-5">
-          {/*      <pre>
+          {/*           <pre>
             <code>{JSON.stringify(task, null, 2)}</code>
           </pre> */}
           <Card>
@@ -133,6 +133,19 @@ const TaskPage = async ({ params }: TaskPageProps) => {
                     </p>
                   </div>
                 </div>
+                <div className="-mx-2 flex items-start space-x-4 rounded-md p-2 transition-all hover:bg-accent hover:text-accent-foreground">
+                  <User className="mt-px h-5 w-5" />
+                  <div className="space-y-1">
+                    <p className="text-sm font-medium leading-none">
+                      Created by
+                    </p>
+                    <p className="text-sm text-muted-foreground">
+                      {activeUsers.find(
+                        (user: any) => user.id === task.createdBy
+                      )?.name || "Unknown"}
+                    </p>
+                  </div>
+                </div>
               </div>
             </CardContent>
             <CardFooter className="space-x-2">

app/[locale]/(routes)/secondBrain/dialogs/NewTask.tsx

@@ -43,7 +43,6 @@ type Props = {
   boards: any;
   open: boolean;
   setOpen: (open: boolean) => void;
-
   notionUrl: string;
 };
 
@@ -52,7 +51,6 @@ const NewTaskDialog = ({
   boards,
   open,
   setOpen,
-
   notionUrl,
 }: Props) => {
   //const [open, setOpen] = useState(false);
@@ -80,7 +78,7 @@ const NewTaskDialog = ({
   });
 
   useEffect(() => {
-    form.setValue("notionUrl", notionUrl);
+    form.setValue("notionUrl", notionUrl); 
     setIsMounted(true);
   }, [notionUrl, form]);
 

app/[locale]/(routes)/secondBrain/page.tsx

@@ -5,6 +5,7 @@ import { getServerSession } from "next-auth";
 import Container from "../components/ui/Container";
 
 import NewTask from "./components/NewTask";
+
 import H4Title from "@/components/typography/h4";
 
 import { columns } from "./table-components/columns";