From 29fc01ba75d9dffe7978060837e7c0f167769877 Mon Sep 17 00:00:00 2001
From: Pardeshi-Aditya <mailadityapardeshi@gmail.com>
Date: Thu, 27 Jun 2024 12:38:45 +0530
Subject: [PATCH 1/3] fix : update component name.

---
 dashboard/src/components/features/projects/AddMenuButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/src/components/features/projects/AddMenuButton.tsx b/dashboard/src/components/features/projects/AddMenuButton.tsx
index 43bcda3..9dbd797 100644
--- a/dashboard/src/components/features/projects/AddMenuButton.tsx
+++ b/dashboard/src/components/features/projects/AddMenuButton.tsx
@@ -16,7 +16,7 @@ import { ProjectData } from "./Projects"
 import CreateProjectModal from "./Projects/CreateProjectModal"
 import CreateBranchModal from "./Branch/CreateBranchModal"
 
-export const DropdownMenuDemo = ({ mutate }: {
+export const AddMenuButton = ({ mutate }: {
     mutate: KeyedMutator<{
         message: ProjectData[];
     }>

From e30ab517aadce62bb506f3ace21bc038f7c312bf Mon Sep 17 00:00:00 2001
From: Pardeshi-Aditya <mailadityapardeshi@gmail.com>
Date: Thu, 27 Jun 2024 14:51:33 +0530
Subject: [PATCH 2/3] feat : add options to set frequency of auto updating
 branch of projects

---
 .../commit_project_branch.json                |  9 ++-
 .../projects/Branch/ManageBranchItem.tsx      | 68 ++++++++++++++++++-
 .../components/features/projects/Projects.tsx |  5 +-
 .../src/types/commit/CommitProjectBranch.ts   |  1 +
 4 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/commit/commit/doctype/commit_project_branch/commit_project_branch.json b/commit/commit/doctype/commit_project_branch/commit_project_branch.json
index 285091a..1eac118 100644
--- a/commit/commit/doctype/commit_project_branch/commit_project_branch.json
+++ b/commit/commit/doctype/commit_project_branch/commit_project_branch.json
@@ -20,6 +20,7 @@
   "commit_hash",
   "app_name",
   "last_fetched",
+  "frequency",
   "modules_and_doctypes_tab",
   "modules",
   "module_doctypes_map",
@@ -100,11 +101,17 @@
    "fieldname": "doctype_module_map",
    "fieldtype": "JSON",
    "label": "Doctype - Module Map"
+  },
+  {
+   "fieldname": "frequency",
+   "fieldtype": "Select",
+   "label": "Frequency",
+   "options": "\nDaily\nWeekly\nMonthly"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-09-07 18:12:30.540281",
+ "modified": "2024-06-26 15:17:43.807200",
  "modified_by": "Administrator",
  "module": "commit",
  "name": "Commit Project Branch",
diff --git a/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx b/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx
index 2046581..9f79a10 100644
--- a/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx
+++ b/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx
@@ -2,11 +2,16 @@ import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { convertFrappeTimestampToTimeAgo } from '@/components/utils/dateconversion'
 import { CommitProjectBranch } from '@/types/commit/CommitProjectBranch'
-import { useFrappeDeleteDoc, useFrappePostCall } from 'frappe-react-sdk'
+import { useFrappeDeleteDoc, useFrappePostCall, useFrappeUpdateDoc } from 'frappe-react-sdk'
 import { AiOutlineDelete } from 'react-icons/ai'
 import { IoMdSync } from 'react-icons/io'
 import { ProjectData } from '../Projects'
 import { KeyedMutator } from 'swr'
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Controller, FormProvider, useForm } from 'react-hook-form'
+import { Label } from '@/components/ui/label'
+import { useState } from 'react'
 
 
 const ManageBranchItem = ({ branch, mutate }: { branch: CommitProjectBranch, mutate: KeyedMutator<{ message: ProjectData[]; }> }) => {
@@ -39,6 +44,25 @@ const ManageBranchItem = ({ branch, mutate }: { branch: CommitProjectBranch, mut
         }))
     }
 
+    const methods = useForm<CommitProjectBranch>({
+        defaultValues: {
+            frequency: branch.frequency
+        }
+    })
+
+    const { control } = methods
+
+    const { updateDoc } = useFrappeUpdateDoc()
+
+    const onSubmit = (data: CommitProjectBranch) => {
+        updateDoc("Commit Project Branch", branch.name, data)
+            .then(() => {
+
+            })
+    }
+
+    const [freqLabel, setFreqLabel] = useState("Select Frequency")
+
     return (
         <li className="pl-0 pt-2 hover:shadow-sm flex justify-between">
             <div className="flex flex-col items-start text-md tracking-normal">
@@ -58,6 +82,44 @@ const ManageBranchItem = ({ branch, mutate }: { branch: CommitProjectBranch, mut
                     <IoMdSync className={loading ? 'animate-spin' : ''} />
                     Fetch latest code
                 </Button>
+                <Popover>
+                    <PopoverTrigger asChild>
+                        <Button
+                            className="text-sm"
+                            variant="outline"
+                            size={'sm'}>{freqLabel}</Button>
+                    </PopoverTrigger>
+                    <PopoverContent className="w-80">
+                        <FormProvider {...methods}>
+                            <form onSubmit={methods.handleSubmit(onSubmit)}>
+                                <div className="flex flex-col items-start p-1">
+                                    <Label>Select frequency for updating Branch</Label>
+                                    <Controller
+                                        control={control}
+                                        name='frequency'
+                                        render={({ field }) => (
+                                            <Select onValueChange={field.onChange} value={field.value}>
+                                                <SelectTrigger className="h-8 w-full mt-4 p-2">
+                                                    <SelectValue placeholder="Select Frequency" />
+                                                </SelectTrigger>
+                                                <SelectContent >
+                                                    <SelectItem value="Daily">Daily</SelectItem>
+                                                    <SelectItem value="Weekly">Weekly</SelectItem>
+                                                    <SelectItem value="Monthly">Monthly</SelectItem>
+                                                </SelectContent>
+                                            </Select>
+                                        )}
+                                    />
+                                </div>
+                                <div className='flex justify-end items-end w-full'>
+                                        <Button type="submit" className='mt-4 px-4 py-[0px]'>
+                                            Set
+                                        </Button>
+                                    </div>
+                            </form>
+                        </FormProvider>
+                    </PopoverContent>
+                </Popover>
                 <Button
                     size={'sm'}
                     className="text-lg p-2" variant="destructive"
@@ -71,4 +133,6 @@ const ManageBranchItem = ({ branch, mutate }: { branch: CommitProjectBranch, mut
     )
 }
 
-export default ManageBranchItem
\ No newline at end of file
+export default ManageBranchItem
+
+
diff --git a/dashboard/src/components/features/projects/Projects.tsx b/dashboard/src/components/features/projects/Projects.tsx
index 46746d7..6be8e44 100644
--- a/dashboard/src/components/features/projects/Projects.tsx
+++ b/dashboard/src/components/features/projects/Projects.tsx
@@ -7,7 +7,7 @@ import { BsDatabase } from "react-icons/bs";
 import { ViewERDDialogContent } from "./ViewERDAppDialog";
 import { isSystemManager } from "@/utils/roles";
 import { CommitProjectBranch } from "@/types/commit/CommitProjectBranch";
-import { DropdownMenuDemo } from "./AddMenuButton";
+import { AddMenuButton } from "./AddMenuButton";
 import { APIExplorer } from "./APIExplorer";
 import ProjectCard from "./Projects/ProjectCard";
 
@@ -51,7 +51,7 @@ export const Projects = () => {
             <div className="mx-auto pl-2 pr-4 h-[calc(100vh-4rem)]">
                 <div className="h-full">
                     <div className="flex gap-2 flex-row items-center justify-end">
-                        {isCreateAccess && <DropdownMenuDemo mutate={mutate} />}
+                        {isCreateAccess && <AddMenuButton mutate={mutate} />}
                         <APIExplorer />
                         <Dialog>
                             <DialogTrigger asChild>
@@ -75,7 +75,6 @@ export const Projects = () => {
                             ));
                         })}
                     </div>
-
                 </div>
             </div>
         );
diff --git a/dashboard/src/types/commit/CommitProjectBranch.ts b/dashboard/src/types/commit/CommitProjectBranch.ts
index 5410bfb..e31880e 100644
--- a/dashboard/src/types/commit/CommitProjectBranch.ts
+++ b/dashboard/src/types/commit/CommitProjectBranch.ts
@@ -30,4 +30,5 @@ export interface CommitProjectBranch{
 	doctype_module_map?: any
 	/**	Whitelisted APIs : JSON	*/
 	whitelisted_apis?: any
+	frequency?: "Daily" | "Weekly" | "Monthly" 
 }
\ No newline at end of file

From 1f6ca3c24ff4943eea1b4481d456492ec9114bcf Mon Sep 17 00:00:00 2001
From: Pardeshi-Aditya <mailadityapardeshi@gmail.com>
Date: Thu, 27 Jun 2024 22:50:15 +0530
Subject: [PATCH 3/3] fix : update api and select dropdown for branch update
 frequency.

---
 commit/api/commit_project/commit_project.py   |  2 +-
 .../projects/Branch/ManageBranchItem.tsx      | 37 +++++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/commit/api/commit_project/commit_project.py b/commit/api/commit_project/commit_project.py
index 4b45ff5..95f568b 100644
--- a/commit/api/commit_project/commit_project.py
+++ b/commit/api/commit_project/commit_project.py
@@ -15,7 +15,7 @@ def get_project_list_with_branches():
         # organization["projects"] = projects
         for project in projects:
             branches = frappe.get_all("Commit Project Branch", filters={"project": project.get(
-                "name")}, fields=["branch_name", "last_fetched", "modules", "whitelisted_apis", "name"])
+                "name")}, fields=["branch_name", "last_fetched", "modules", "whitelisted_apis", "name", "frequency"])
             project["branches"] = branches
         organization["projects"] = projects
 
diff --git a/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx b/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx
index 9f79a10..3fa105c 100644
--- a/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx
+++ b/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx
@@ -46,28 +46,38 @@ const ManageBranchItem = ({ branch, mutate }: { branch: CommitProjectBranch, mut
 
     const methods = useForm<CommitProjectBranch>({
         defaultValues: {
-            frequency: branch.frequency
+            frequency : branch.frequency
         }
     })
 
-    const { control } = methods
+    const { control, reset: formReset } = methods
 
     const { updateDoc } = useFrappeUpdateDoc()
 
     const onSubmit = (data: CommitProjectBranch) => {
         updateDoc("Commit Project Branch", branch.name, data)
             .then(() => {
+                mutate()
+                formReset({ frequency: data.frequency })
+            }).then(() => {
+                toast({
+                    description: `Branch ${branch.branch_name} will be updated ${data.frequency}`,
+                    duration: 2000
+                })
+                setOpen(false)
+            }
+            )
 
-            })
     }
 
-    const [freqLabel, setFreqLabel] = useState("Select Frequency")
+
+    const [open, setOpen] = useState(false);
 
     return (
         <li className="pl-0 pt-2 hover:shadow-sm flex justify-between">
             <div className="flex flex-col items-start text-md tracking-normal">
                 {branch.branch_name}
-                <div className='text-xs text-gray-500 pl-0'>
+                <div className='text-xs text-gray-500'>
                     Last synced {convertFrappeTimestampToTimeAgo(branch.last_fetched)}
                 </div>
             </div>
@@ -82,18 +92,19 @@ const ManageBranchItem = ({ branch, mutate }: { branch: CommitProjectBranch, mut
                     <IoMdSync className={loading ? 'animate-spin' : ''} />
                     Fetch latest code
                 </Button>
-                <Popover>
+                <Popover open={open}>
                     <PopoverTrigger asChild>
                         <Button
                             className="text-sm"
                             variant="outline"
-                            size={'sm'}>{freqLabel}</Button>
+                            onClick={() => setOpen(true)}
+                            size={'sm'}>{branch.frequency ?? "Select Frequency" }</Button>
                     </PopoverTrigger>
                     <PopoverContent className="w-80">
                         <FormProvider {...methods}>
                             <form onSubmit={methods.handleSubmit(onSubmit)}>
                                 <div className="flex flex-col items-start p-1">
-                                    <Label>Select frequency for updating Branch</Label>
+                                    <Label className='text-normal text-gray-700'>Select frequency for updating Branch</Label>
                                     <Controller
                                         control={control}
                                         name='frequency'
@@ -112,10 +123,12 @@ const ManageBranchItem = ({ branch, mutate }: { branch: CommitProjectBranch, mut
                                     />
                                 </div>
                                 <div className='flex justify-end items-end w-full'>
-                                        <Button type="submit" className='mt-4 px-4 py-[0px]'>
-                                            Set
-                                        </Button>
-                                    </div>
+                                    <Button
+                                        type="submit"
+                                        className='mt-3'
+                                    >Set
+                                    </Button>
+                                </div>
                             </form>
                         </FormProvider>
                     </PopoverContent>