From cc6a91647814f2deb7e08f08fd00cc2c60262c68 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Mon, 27 May 2024 19:52:33 +0530
Subject: [PATCH 01/13] fix: only display projects which have branches

---
 .../src/components/features/projects/ViewERDAppDialog.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dashboard/src/components/features/projects/ViewERDAppDialog.tsx b/dashboard/src/components/features/projects/ViewERDAppDialog.tsx
index 7d3f46a..d98b5e9 100644
--- a/dashboard/src/components/features/projects/ViewERDAppDialog.tsx
+++ b/dashboard/src/components/features/projects/ViewERDAppDialog.tsx
@@ -32,7 +32,7 @@ export const ViewERDDialogContent = ({ data }: { data: ProjectData[] }) => {
             </DialogHeader>
             <ul role="list" className="divide-y divide-gray-200">
                 {data?.map((org: ProjectData) => {
-                    return org.projects.map((project => {
+                    return org.projects?.filter((project) => project.branches?.length > 0)?.map((project => {
                         return (
                             <ViewERDProjectCard project={project} key={project.name} setApps={setApps} apps={apps} />
                         )
@@ -62,7 +62,7 @@ export const ViewERDProjectCard = ({ project, apps, setApps }: ViewERDProjectCar
     }, [project])
     return (
         <li className="w-full h-auto hover:shadow-sm">
-            <div className="py-2 flex flex-col justify-between">
+            <div className="py-2">
                 <div className="flex space-x-4 items-center justify-between">
                     <div className="flex space-x-3 items-center">
                         <Checkbox

From 5ed7fb6f3a78ee520c0547eafeb61522460a0747 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Tue, 28 May 2024 11:35:21 +0530
Subject: [PATCH 02/13] feat: add manage branch modal

---
 .../commit_project_branch.py                  |  6 +-
 .../projects/Branch/CreateBranchModal.tsx     |  6 +-
 .../projects/Branch/ManageBranchModal.tsx     | 90 +++++++++++++++++++
 .../components/features/projects/Projects.tsx | 53 ++++++-----
 dashboard/src/types/CommitProjectBranch.ts    | 25 ------
 5 files changed, 127 insertions(+), 53 deletions(-)
 create mode 100644 dashboard/src/components/features/projects/Branch/ManageBranchModal.tsx
 delete mode 100644 dashboard/src/types/CommitProjectBranch.ts

diff --git a/commit/commit/doctype/commit_project_branch/commit_project_branch.py b/commit/commit/doctype/commit_project_branch/commit_project_branch.py
index d78db59..88016ae 100644
--- a/commit/commit/doctype/commit_project_branch/commit_project_branch.py
+++ b/commit/commit/doctype/commit_project_branch/commit_project_branch.py
@@ -158,12 +158,10 @@ def background_fetch_process(project_branch):
                 'is_completed': True
             }, user=frappe.session.user)
 
-        
-    
-    except frappe.DoesNotExistError:
+    except e:
         # throw the error and delete the document
         frappe.throw("Project Branch not found")
-        frappe.delete_doc("Commit Project Branch", project_branch)
+        frappe.db.delete("Commit Project Branch", project_branch)
        
 
 @frappe.whitelist(allow_guest=True)
diff --git a/dashboard/src/components/features/projects/Branch/CreateBranchModal.tsx b/dashboard/src/components/features/projects/Branch/CreateBranchModal.tsx
index 2b212c8..de25e5f 100644
--- a/dashboard/src/components/features/projects/Branch/CreateBranchModal.tsx
+++ b/dashboard/src/components/features/projects/Branch/CreateBranchModal.tsx
@@ -110,11 +110,13 @@ const CreateBranchModal = ({ project, mutate, setBranch, setOpen }: BranchProps)
                         className="mb-3 p-3 w-full"
                     />
                     <DialogFooter>
-                        <Button type="submit" style={{ padding: '10px 20px', margin: '10px 0 0' }} disabled={loading || eventLoading}>
-                            {(loading || eventLoading) && <div
+                        <Button type="submit" disabled={loading || eventLoading}>
+                            {(loading || eventLoading) &&
+                                <div
                                 className="inline-block h-4 w-4 mr-2 animate-spin rounded-full border-2 border-solid border-current text-gray-200 border-e-transparent align-[-0.125em] text-surface motion-reduce:animate-[spin_1.5s_linear_infinite] dark:text-white"
                                 role="status">
                             </div>}
+                            Submit
                       </Button>
                     </DialogFooter>
                 </form>
diff --git a/dashboard/src/components/features/projects/Branch/ManageBranchModal.tsx b/dashboard/src/components/features/projects/Branch/ManageBranchModal.tsx
new file mode 100644
index 0000000..a893a70
--- /dev/null
+++ b/dashboard/src/components/features/projects/Branch/ManageBranchModal.tsx
@@ -0,0 +1,90 @@
+import { DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"
+import { ProjectData } from "../Projects"
+import { Button } from "@/components/ui/button"
+import { KeyedMutator } from "swr"
+import { Checkbox } from "@/components/ui/checkbox"
+import { useState } from "react"
+import { useFrappeDeleteDoc } from "frappe-react-sdk"
+import { CommitProjectBranch } from "@/types/commit/CommitProjectBranch"
+import { toast } from "@/components/ui/use-toast"
+
+export interface ManageBranchModalProps {
+    branches: CommitProjectBranch[]
+    mutate: KeyedMutator<{ message: ProjectData[]; }>
+    setOpenManageModal: React.Dispatch<React.SetStateAction<boolean>>
+}
+
+
+const ManageBranchModal = ({ branches, mutate, setOpenManageModal }: ManageBranchModalProps) => {
+
+
+    const [branchList, setBranchList] = useState<string[]>([])
+
+
+    const { deleteDoc, reset } = useFrappeDeleteDoc()
+
+    const handleDelete = (branchList: string[]) => {
+        branchList.map((branchListItem) => {
+            deleteDoc("Commit Project Branch", branchListItem)
+                .then(() => {
+                    setBranchList([])
+                    mutate()
+                    reset()
+                    setOpenManageModal(false)
+
+                }).then(() => toast({
+                    description: "Branch Deleted",
+                    variant: "destructive",
+                }))
+        })
+    }
+
+    return (
+        <DialogContent className="sm:max-w-[600px] sm:max-h-[800px] overflow-y-scroll">
+            <DialogHeader>
+                <DialogTitle>Manage Branches</DialogTitle>
+                <DialogDescription>
+                    Select Branches to delete.
+                </DialogDescription>
+            </DialogHeader>
+            <ul role="list" className="divide-y divide-gray-200">
+                {branches?.map((branch: CommitProjectBranch) => {
+                    return (
+                        <li className="pl-0 py-2 hover:shadow-sm">
+                            <div className="flex justify-between text-semibold">
+                                <div className="flex gap-3 justify-start items-center text-lg font-medium tracking-normal">
+                                    <Checkbox
+                                        id='checkbox'
+                                        className="border-gray-300 text-gray-600 shadow-sm"
+                                        checked={branchList.includes(branch.name)}
+                                        onCheckedChange={(checked) => {
+                                            if (checked) {
+                                                setBranchList([...branchList, branch.name])
+                                            } else {
+                                                setBranchList(branchList.filter((x) => x !== branch.name))
+                                            }
+                                        }}
+                                    >
+                                    </Checkbox>
+                                    <label htmlFor="checkbox">
+                                        {branch.branch_name}
+                                    </label>
+                                </div>
+                            </div>
+                        </li>
+                    )
+                }
+                )}
+
+            </ul>
+            <DialogFooter>
+                <Button variant="destructive" onClick={() => handleDelete(branchList)}>
+                    Delete
+                </Button>
+            </DialogFooter>
+        </DialogContent>
+    )
+}
+
+
+export default ManageBranchModal
\ No newline at end of file
diff --git a/dashboard/src/components/features/projects/Projects.tsx b/dashboard/src/components/features/projects/Projects.tsx
index c8309d7..fc97b92 100644
--- a/dashboard/src/components/features/projects/Projects.tsx
+++ b/dashboard/src/components/features/projects/Projects.tsx
@@ -2,10 +2,9 @@ import { FullPageLoader } from "@/components/common/FullPageLoader.tsx/FullPageL
 import { Avatar, AvatarFallback } from "@/components/ui/avatar"
 import { Button } from "@/components/ui/button"
 import { CardDescription } from "@/components/ui/card"
-import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog"
+import { Dialog, DialogTrigger } from "@/components/ui/dialog"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { CommitProject } from "@/types/commit/CommitProject"
-import { CommitProjectBranch } from "@/types/commit/CommitProjectBranch"
 import { AvatarImage } from "@radix-ui/react-avatar"
 import { useFrappeGetCall } from "frappe-react-sdk"
 import { useMemo, useState } from "react"
@@ -23,6 +22,8 @@ import { AiOutlineDelete } from "react-icons/ai";
 import DeleteOrgModal from "./Org/DeleteOrgModal"
 import { AlertDialog, AlertDialogTrigger } from "@/components/ui/alert-dialog"
 import { RxDragHandleDots1 } from "react-icons/rx";
+import ManageBranchModal from "./Branch/ManageBranchModal"
+import { CommitProjectBranch } from "@/types/commit/CommitProjectBranch"
 
 export interface ProjectWithBranch extends CommitProject {
     branches: CommitProjectBranch[]
@@ -67,12 +68,12 @@ export const Projects = () => {
 
                             {isCreateAccess &&
                                 <Dialog>
-                                <DialogTrigger asChild>
-                                    <Button size='sm'>
-                                        <MdAddBox className="mr-2" />
-                                        Add Organization
-                                    </Button>
-                                </DialogTrigger>
+                                    <DialogTrigger asChild>
+                                        <Button size='sm'>
+                                            <MdAddBox className="mr-2" />
+                                            Add Organization
+                                        </Button>
+                                    </DialogTrigger>
                                     <CreateOrgModal mutate={mutate} />
                                 </Dialog>}
                         </div>
@@ -127,7 +128,7 @@ export const OrgComponent = ({ org, mutate }: {
                     </div>}
             </div>
 
-            {org?.projects?.length === 0 && <div className="text-sm text-gray-500 pl-4 py-2">No Projects Found, Click <button className="text-blue-500 underline" onClick={() => setCreateProject(true)}>
+            {org?.projects?.length === 0 && <div className="text-sm text-gray-500 pl-4 py-2">No Projects Found. Click <button className="text-blue-500 underline" onClick={() => setCreateProject(true)}>
                 here</button> to add a new project.
             </div>}
             <div className="pl-4">
@@ -169,6 +170,8 @@ export const ProjectCard = ({ project, org, mutate }: ProjectCardProps) => {
 
     const [open, setOpen] = useState(false)
 
+    const [openManageModal, setOpenManageModal] = useState(false)
+
     const [selectOpen, setSelectOpen] = useState(false)
 
     return (
@@ -219,27 +222,33 @@ export const ProjectCard = ({ project, org, mutate }: ProjectCardProps) => {
                                         setOpen(true)
                                         setSelectOpen(false)
                                     }}>
-                                            <MdAdd className="h-4 w-4 mr-1" />
-                                            Add Branch
+                                        <MdAdd className="h-4 w-4 mr-1" />
+                                        Add Branch
                                     </Button>}
 
-                                {isCreateAccess && <Dialog>
-                                    <DialogTrigger asChild>
-                                        <Button variant="ghost" className="w-full h-8 font-normal text-sm left-0 flex justify-start pl-1">
-                                            <RxDragHandleDots1 className="h-4 w-4 mr-1" />
-                                            Manage Branches
-                                        </Button>
-                                    </DialogTrigger>
-                                    <DialogContent>
-                                        Manage Branch Modal..
-                                    </DialogContent>
-                                </Dialog>}
+                                {isCreateAccess &&
+                                    <Button variant="ghost" className="w-full h-8 font-normal text-sm left-0 flex justify-start pl-1" onClick={() => {
+                                        setOpenManageModal(true)
+                                        setSelectOpen(false)
+                                    }}>
+                                        <RxDragHandleDots1 className="h-4 w-4 mr-1" />
+                                        Manage Branches
+                                    </Button>
+                                }
 
                             </SelectContent>
                         </Select>
+
+
+
+                        <Dialog open={openManageModal} onOpenChange={setOpenManageModal}>
+                            <ManageBranchModal branches={project.branches} mutate={mutate} setOpenManageModal={setOpenManageModal} />
+                        </Dialog>
+
                         <Dialog open={open} onOpenChange={setOpen}>
                             <CreateBranchModal setBranch={setBranch} project={project} mutate={mutate} setOpen={setOpen} />
                         </Dialog>
+
                         <Button size='sm' onClick={onNavigate}>
                             <AiOutlineApi className="mr-2" />
                             API Explorer
diff --git a/dashboard/src/types/CommitProjectBranch.ts b/dashboard/src/types/CommitProjectBranch.ts
deleted file mode 100644
index 2deb7e4..0000000
--- a/dashboard/src/types/CommitProjectBranch.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-export interface CommitProjectBranch {
-    commit_project: string
-    branch_name: string
-    path_to_folder: string
-    commit_hash: string
-    app_name: string
-    last_fetched: string
-    modules: string
-    module_doctypes_map: string
-    doctype_module_map: string
-    whitelisted_apis: string
-}
-
-export interface ModuleData {
-    [key: string]: ModuleDataValue
-}
-
-export interface ModuleDataValue {
-    doctype_names: string[];
-    module: string;
-    number_of_doctypes: number;
-}
-export interface AppModuleData {
-    [key: string]: ModuleData
-}
\ No newline at end of file

From 8096432f906d143930195a30993eb57a1cb4fbee Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Tue, 28 May 2024 11:56:02 +0530
Subject: [PATCH 03/13] fix: update boot

---
 commit/public/dashboard/index.html | 8 ++++++--
 commit/www/dashboard.html          | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/commit/public/dashboard/index.html b/commit/public/dashboard/index.html
index 3ff2ee4..98685a3 100644
--- a/commit/public/dashboard/index.html
+++ b/commit/public/dashboard/index.html
@@ -12,13 +12,17 @@
   <meta name="msapplication-TileColor" content="#da532c">
   <meta name="theme-color" content="#ffffff">
   <title>Commit - Developer tooling for the Frappeverse</title>
-  <script type="module" crossorigin src="/assets/commit/dashboard/assets/index-2eacee2d.js"></script>
-  <link rel="stylesheet" href="/assets/commit/dashboard/assets/index-31456e03.css">
+  <script type="module" crossorigin src="/assets/commit/dashboard/assets/index-63f9cb36.js"></script>
+  <link rel="stylesheet" href="/assets/commit/dashboard/assets/index-4a5a43c3.css">
 </head>
 
 <body>
   <div id="root"></div>
   <script>window.csrf_token = '{{ frappe.session.csrf_token }}';</script>
+  <script>
+    if (!window.frappe) window.frappe = {};
+    frappe.boot = JSON.parse({{ boot }});
+  </script>
   
 </body>
 
diff --git a/commit/www/dashboard.html b/commit/www/dashboard.html
index 3ff2ee4..98685a3 100644
--- a/commit/www/dashboard.html
+++ b/commit/www/dashboard.html
@@ -12,13 +12,17 @@
   <meta name="msapplication-TileColor" content="#da532c">
   <meta name="theme-color" content="#ffffff">
   <title>Commit - Developer tooling for the Frappeverse</title>
-  <script type="module" crossorigin src="/assets/commit/dashboard/assets/index-2eacee2d.js"></script>
-  <link rel="stylesheet" href="/assets/commit/dashboard/assets/index-31456e03.css">
+  <script type="module" crossorigin src="/assets/commit/dashboard/assets/index-63f9cb36.js"></script>
+  <link rel="stylesheet" href="/assets/commit/dashboard/assets/index-4a5a43c3.css">
 </head>
 
 <body>
   <div id="root"></div>
   <script>window.csrf_token = '{{ frappe.session.csrf_token }}';</script>
+  <script>
+    if (!window.frappe) window.frappe = {};
+    frappe.boot = JSON.parse({{ boot }});
+  </script>
   
 </body>
 

From 45a2e4673d7aecfa6d0f8f3aa17bc31564d72169 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Thu, 30 May 2024 09:16:12 +0530
Subject: [PATCH 04/13] fix: fetch repo api

---
 .../commit_project_branch/commit_project_branch.py       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/commit/commit/doctype/commit_project_branch/commit_project_branch.py b/commit/commit/doctype/commit_project_branch/commit_project_branch.py
index 88016ae..94c80c7 100644
--- a/commit/commit/doctype/commit_project_branch/commit_project_branch.py
+++ b/commit/commit/doctype/commit_project_branch/commit_project_branch.py
@@ -165,9 +165,12 @@ def background_fetch_process(project_branch):
        
 
 @frappe.whitelist(allow_guest=True)
-def fetch_repo(doc):
-    doc = json.loads(doc)
-    project_branch = frappe.get_doc("Commit Project Branch", doc.get("name"))
+def fetch_repo(doc, name = None):
+    if name :
+        project_branch = frappe.get_doc("Commit Project Branch", name)
+    else:
+        doc = json.loads(doc)
+        project_branch = frappe.get_doc("Commit Project Branch", doc.get("name"))
     project_branch.fetch_repo()
     project_branch.save()
     return "Hello"

From e606a1e46ffb6d197d9a8fba02a88cdaf50c8b29 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Thu, 30 May 2024 09:21:32 +0530
Subject: [PATCH 05/13] fix: undo delete

---
 dashboard/src/types/CommitProjectBranch.ts | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 dashboard/src/types/CommitProjectBranch.ts

diff --git a/dashboard/src/types/CommitProjectBranch.ts b/dashboard/src/types/CommitProjectBranch.ts
new file mode 100644
index 0000000..2deb7e4
--- /dev/null
+++ b/dashboard/src/types/CommitProjectBranch.ts
@@ -0,0 +1,25 @@
+export interface CommitProjectBranch {
+    commit_project: string
+    branch_name: string
+    path_to_folder: string
+    commit_hash: string
+    app_name: string
+    last_fetched: string
+    modules: string
+    module_doctypes_map: string
+    doctype_module_map: string
+    whitelisted_apis: string
+}
+
+export interface ModuleData {
+    [key: string]: ModuleDataValue
+}
+
+export interface ModuleDataValue {
+    doctype_names: string[];
+    module: string;
+    number_of_doctypes: number;
+}
+export interface AppModuleData {
+    [key: string]: ModuleData
+}
\ No newline at end of file

From 5ff0ea7608b7bc292ad3d8893fdc55b781bb2d1e Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Fri, 31 May 2024 11:49:50 +0530
Subject: [PATCH 06/13] feat: handle exception while adding non existing branch

---
 .../features/projects/Branch/CreateBranchModal.tsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dashboard/src/components/features/projects/Branch/CreateBranchModal.tsx b/dashboard/src/components/features/projects/Branch/CreateBranchModal.tsx
index de25e5f..f7792f8 100644
--- a/dashboard/src/components/features/projects/Branch/CreateBranchModal.tsx
+++ b/dashboard/src/components/features/projects/Branch/CreateBranchModal.tsx
@@ -66,9 +66,22 @@ const CreateBranchModal = ({ project, mutate, setBranch, setOpen }: BranchProps)
         }
     })
 
+    useFrappeEventListener('commit_branch_creation_error', (data) => {
+        if (data.branch_name === branchName && data.project === project.name) {
+            setDesc("")
+            setCreationError(data.error)
+            setEventLoading(false)
+            setBranch("")
+        }
+    })
+
+    const [creationError, setCreationError] = useState(null)
+
+
     const handleClose = (name: string, branch_name: string) => {
         setEventLoading(false)
         setBranch(name)
+        setCreationError(null)
         methods.reset()
         toast({
             description: `Branch ${branch_name} added for ${project.app_name}`
@@ -99,6 +112,7 @@ const CreateBranchModal = ({ project, mutate, setBranch, setOpen }: BranchProps)
                 </DialogDescription>
             </DialogHeader>
             {error && <ErrorBanner error={error} />}
+            {creationError && <ErrorBanner error={creationError} />}
             <FormProvider {...methods}>
                 <form onSubmit={handleSubmit(onSubmit)}>
                     <Label htmlFor="branchname">Branch Name</Label>

From 648c8bae84ff53e0d47f225534745680fe7fc4b1 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Fri, 31 May 2024 11:50:31 +0530
Subject: [PATCH 07/13] feat : sync or delete branch

---
 .../projects/Branch/ManageBranchItem.tsx      | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx

diff --git a/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx b/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx
new file mode 100644
index 0000000..8ad272a
--- /dev/null
+++ b/dashboard/src/components/features/projects/Branch/ManageBranchItem.tsx
@@ -0,0 +1,69 @@
+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 { AiOutlineDelete } from 'react-icons/ai'
+import { IoMdSync } from 'react-icons/io'
+import { ProjectData } from '../Projects'
+import { KeyedMutator } from 'swr'
+
+
+const ManageBranchItem = ({ branch, mutate }: { branch: CommitProjectBranch, mutate: KeyedMutator<{ message: ProjectData[]; }> }) => {
+    const { call, loading, reset: callReset } = useFrappePostCall<{ message: any }>('commit.commit.doctype.commit_project_branch.commit_project_branch.fetch_repo')
+
+
+    const { deleteDoc, reset, loading: deleteLoading } = useFrappeDeleteDoc()
+
+    const handleDelete = () => {
+        deleteDoc("Commit Project Branch", branch.name)
+            .then(() => {
+                mutate()
+                reset()
+            }).then(() => toast({
+                description: "Branch Deleted Successfully",
+            }))
+    }
+
+    const handleSync = () => {
+        call({
+            doc: {},
+            name: branch.name,
+        }).then(() => {
+            mutate()
+            callReset()
+        }).then(() => toast({
+            description: "Branch Synced!",
+        }))
+    }
+
+    return (
+        <li className="pl-0 pt-2 hover:shadow-sm flex justify-between">
+            <div className="flex flex-col items-start text-lg tracking-normal">
+                {branch.branch_name}
+                <div className='text-xs text-gray-500 pl-0'>
+                    Last synced {convertFrappeTimestampToTimeAgo(branch.last_fetched)}
+                </div>
+            </div>
+            <div className="flex gap-2">
+                <Button
+                    className="flex gap-2 text-sm"
+                    variant="secondary"
+                    onClick={() => handleSync()}
+                    disabled={deleteLoading || loading}
+                >
+                    <IoMdSync className={loading ? 'animate-spin' : ''} />
+                    Sync
+                </Button>
+                <Button className="text-lg p-2" variant="destructive"
+                    onClick={() => handleDelete()}
+                    disabled={deleteLoading || loading}
+                >
+                    <AiOutlineDelete />
+                </Button>
+            </div>
+        </li >
+    )
+}
+
+export default ManageBranchItem
\ No newline at end of file

From 38748827f4318d923c9c573c1cf12b2c79c78f91 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Fri, 31 May 2024 11:51:54 +0530
Subject: [PATCH 08/13] feat: manage branch modal

---
 .../projects/Branch/ManageBranchModal.tsx     | 57 ++-----------------
 .../src/components/utils/dateconversion.ts    | 31 ++++++++++
 2 files changed, 36 insertions(+), 52 deletions(-)
 create mode 100644 dashboard/src/components/utils/dateconversion.ts

diff --git a/dashboard/src/components/features/projects/Branch/ManageBranchModal.tsx b/dashboard/src/components/features/projects/Branch/ManageBranchModal.tsx
index a893a70..625dcd7 100644
--- a/dashboard/src/components/features/projects/Branch/ManageBranchModal.tsx
+++ b/dashboard/src/components/features/projects/Branch/ManageBranchModal.tsx
@@ -2,11 +2,8 @@ import { DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTit
 import { ProjectData } from "../Projects"
 import { Button } from "@/components/ui/button"
 import { KeyedMutator } from "swr"
-import { Checkbox } from "@/components/ui/checkbox"
-import { useState } from "react"
-import { useFrappeDeleteDoc } from "frappe-react-sdk"
 import { CommitProjectBranch } from "@/types/commit/CommitProjectBranch"
-import { toast } from "@/components/ui/use-toast"
+import ManageBranchItem from "./ManageBranchItem"
 
 export interface ManageBranchModalProps {
     branches: CommitProjectBranch[]
@@ -17,69 +14,25 @@ export interface ManageBranchModalProps {
 
 const ManageBranchModal = ({ branches, mutate, setOpenManageModal }: ManageBranchModalProps) => {
 
-
-    const [branchList, setBranchList] = useState<string[]>([])
-
-
-    const { deleteDoc, reset } = useFrappeDeleteDoc()
-
-    const handleDelete = (branchList: string[]) => {
-        branchList.map((branchListItem) => {
-            deleteDoc("Commit Project Branch", branchListItem)
-                .then(() => {
-                    setBranchList([])
-                    mutate()
-                    reset()
-                    setOpenManageModal(false)
-
-                }).then(() => toast({
-                    description: "Branch Deleted",
-                    variant: "destructive",
-                }))
-        })
-    }
-
     return (
         <DialogContent className="sm:max-w-[600px] sm:max-h-[800px] overflow-y-scroll">
             <DialogHeader>
                 <DialogTitle>Manage Branches</DialogTitle>
                 <DialogDescription>
-                    Select Branches to delete.
+                    Update or Delete Branches
                 </DialogDescription>
             </DialogHeader>
             <ul role="list" className="divide-y divide-gray-200">
                 {branches?.map((branch: CommitProjectBranch) => {
                     return (
-                        <li className="pl-0 py-2 hover:shadow-sm">
-                            <div className="flex justify-between text-semibold">
-                                <div className="flex gap-3 justify-start items-center text-lg font-medium tracking-normal">
-                                    <Checkbox
-                                        id='checkbox'
-                                        className="border-gray-300 text-gray-600 shadow-sm"
-                                        checked={branchList.includes(branch.name)}
-                                        onCheckedChange={(checked) => {
-                                            if (checked) {
-                                                setBranchList([...branchList, branch.name])
-                                            } else {
-                                                setBranchList(branchList.filter((x) => x !== branch.name))
-                                            }
-                                        }}
-                                    >
-                                    </Checkbox>
-                                    <label htmlFor="checkbox">
-                                        {branch.branch_name}
-                                    </label>
-                                </div>
-                            </div>
-                        </li>
+                        <ManageBranchItem key={branch.name} branch={branch} mutate={mutate} />
                     )
                 }
                 )}
-
             </ul>
             <DialogFooter>
-                <Button variant="destructive" onClick={() => handleDelete(branchList)}>
-                    Delete
+                <Button variant="outline" onClick={() => setOpenManageModal(false)}>
+                    Close
                 </Button>
             </DialogFooter>
         </DialogContent>
diff --git a/dashboard/src/components/utils/dateconversion.ts b/dashboard/src/components/utils/dateconversion.ts
new file mode 100644
index 0000000..9bbb12d
--- /dev/null
+++ b/dashboard/src/components/utils/dateconversion.ts
@@ -0,0 +1,31 @@
+import moment from "moment"
+import { Moment } from "moment-timezone"
+
+/**
+ * Converts a Frappe timestamp to a readable time ago string
+ * @param timestamp A frappe timestamp string in the format YYYY-MM-DD HH:mm:ss
+ * @param withoutSuffix remove the suffix from the time ago string
+ * @returns 
+ */
+export const convertFrappeTimestampToTimeAgo = (timestamp?: string, withoutSuffix?: boolean) => {
+
+    if (timestamp) {
+        const date = convertFrappeTimestampToUserTimezone(timestamp)
+
+        return date.fromNow(withoutSuffix)
+    }
+    return ''
+}
+
+export const convertFrappeTimestampToUserTimezone = (timestamp: string): Moment => {
+    // @ts-ignore
+    const systemTimezone = window.frappe?.boot?.time_zone?.system
+    // @ts-ignore
+    const userTimezone = window.frappe?.boot?.time_zone?.user
+
+    if (systemTimezone && userTimezone) {
+        return moment.tz(timestamp, systemTimezone).clone().tz(userTimezone)
+    } else {
+        return moment(timestamp)
+    }
+}
\ No newline at end of file

From ae7175db848027305b02784953f1c42bd980a824 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Fri, 31 May 2024 11:55:34 +0530
Subject: [PATCH 09/13] refactor : add interface

---
 .../features/projects/Org/CreateOrgModal.tsx    | 12 ++++++------
 .../features/projects/Org/DeleteOrgModal.tsx    | 17 +++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dashboard/src/components/features/projects/Org/CreateOrgModal.tsx b/dashboard/src/components/features/projects/Org/CreateOrgModal.tsx
index beeeee6..d986e70 100644
--- a/dashboard/src/components/features/projects/Org/CreateOrgModal.tsx
+++ b/dashboard/src/components/features/projects/Org/CreateOrgModal.tsx
@@ -14,12 +14,12 @@ type FormFields = {
     about: string,
 }
 
+interface CreateOrgModalProps {
+    mutate: KeyedMutator<{ message: ProjectData[]; }>
+}
+
 
-const CreateOrgModal = ({ mutate }: {
-    mutate: KeyedMutator<{
-        message: ProjectData[];
-    }>
-}) => {
+const CreateOrgModal = ({ mutate }: CreateOrgModalProps) => {
     const { toast } = useToast()
     const methods = useForm<FormFields>()
 
@@ -71,7 +71,7 @@ const CreateOrgModal = ({ mutate }: {
                         className="mb-3 p-3 w-full"
                     />
                     <DialogFooter>
-                        <Button type="submit">
+                        <Button type="submit" >
                             Submit
                         </Button>
                     </DialogFooter>
diff --git a/dashboard/src/components/features/projects/Org/DeleteOrgModal.tsx b/dashboard/src/components/features/projects/Org/DeleteOrgModal.tsx
index 4caebea..9401027 100644
--- a/dashboard/src/components/features/projects/Org/DeleteOrgModal.tsx
+++ b/dashboard/src/components/features/projects/Org/DeleteOrgModal.tsx
@@ -1,15 +1,17 @@
-import { AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from '@/components/ui/alert-dialog'
+import { AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'
 import { Button } from '@/components/ui/button'
 import { ProjectData } from '../Projects'
 import { useFrappeDeleteDoc } from 'frappe-react-sdk'
 import { toast } from '@/components/ui/use-toast'
 import { KeyedMutator } from 'swr'
 
-const DeleteOrgModal = ({ org, mutate }: {
-    org: ProjectData, mutate: KeyedMutator<{
-        message: ProjectData[];
-    }>
-}) => {
+interface DeleteOrgModalProps {
+    org: ProjectData,
+    mutate: KeyedMutator<{ message: ProjectData[]; }>
+}
+
+
+const DeleteOrgModal = ({ org, mutate }: DeleteOrgModalProps) => {
 
     const { deleteDoc, reset } = useFrappeDeleteDoc()
 
@@ -21,7 +23,6 @@ const DeleteOrgModal = ({ org, mutate }: {
                 reset()
             }).then(() => toast({
                 description: `Organization ${org.organization_name} Deleted`,
-                variant: "destructive"
             }))
     }
     return (
@@ -36,7 +37,7 @@ const DeleteOrgModal = ({ org, mutate }: {
             <AlertDialogFooter className='!justify-end '>
                 <AlertDialogCancel>Cancel</AlertDialogCancel>
                 <Button variant="destructive" onClick={handleOrgDelete}>
-                        Delete
+                    Delete
                 </Button>
             </AlertDialogFooter>
         </AlertDialogContent>

From 5fb6e1899db9fc9304c3ef883156ceb001977526 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Fri, 31 May 2024 11:56:27 +0530
Subject: [PATCH 10/13] fix : handle exception for adding non existing branch

---
 .../commit_project_branch.py                  | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/commit/commit/doctype/commit_project_branch/commit_project_branch.py b/commit/commit/doctype/commit_project_branch/commit_project_branch.py
index 94c80c7..3b92539 100644
--- a/commit/commit/doctype/commit_project_branch/commit_project_branch.py
+++ b/commit/commit/doctype/commit_project_branch/commit_project_branch.py
@@ -10,6 +10,7 @@
 from commit.commit.code_analysis.apis import find_all_occurrences_of_whitelist
 from commit.commit.code_analysis.doctypes import get_doctypes_in_module, get_doctype_json
 from frappe.utils import now
+from frappe.app import handle_exception
 
 
 class CommitProjectBranch(Document):
@@ -46,8 +47,7 @@ def clone_repo(self):
         # print("Folder path", folder_path)
         # print("Repo url", repo_url)
         # print("Branch name", self.branch_name)
-        repo = git.Repo.clone_from(
-            repo_url, folder_path, branch=self.branch_name, single_branch=True)
+        repo = git.Repo.clone_from(repo_url, folder_path, branch=self.branch_name, single_branch=True)
         # print("Cloned repo")
         self.last_fetched = frappe.utils.now_datetime()
         self.commit_hash = repo.head.object.hexsha
@@ -158,10 +158,27 @@ def background_fetch_process(project_branch):
                 'is_completed': True
             }, user=frappe.session.user)
 
-    except e:
+    except Exception as e:
         # throw the error and delete the document
-        frappe.throw("Project Branch not found")
-        frappe.db.delete("Commit Project Branch", project_branch)
+        messages = [json.dumps({'message' :'There was an error while fetching branch repo.'})]
+        frappe.clear_messages()
+        frappe.publish_realtime('commit_branch_creation_error',
+            {
+                'branch_name': doc.branch_name,
+                'project': doc.project,
+                'error':{
+						"exception": frappe.get_traceback(),
+						"_server_messages": json.dumps(messages),
+						},
+                # 'response': handle_exception(e),
+                'is_completed': False
+            }, user=frappe.session.user)
+
+        frappe.delete_doc("Commit Project Branch", project_branch)
+        # frappe.throw("Project Branch not found")
+        frappe.log(frappe.get_traceback())
+        
+        # raise e
        
 
 @frappe.whitelist(allow_guest=True)

From 290e185a7d99d9a13c9182b0f1bec68fe5e5eced Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Fri, 31 May 2024 11:56:51 +0530
Subject: [PATCH 11/13] feat : add delete project modal

---
 .../projects/Projects/DeleteProjectModal.tsx  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 dashboard/src/components/features/projects/Projects/DeleteProjectModal.tsx

diff --git a/dashboard/src/components/features/projects/Projects/DeleteProjectModal.tsx b/dashboard/src/components/features/projects/Projects/DeleteProjectModal.tsx
new file mode 100644
index 0000000..81610a4
--- /dev/null
+++ b/dashboard/src/components/features/projects/Projects/DeleteProjectModal.tsx
@@ -0,0 +1,47 @@
+import { KeyedMutator } from "swr";
+import { ProjectData, ProjectWithBranch } from "../Projects"
+import { useFrappeDeleteDoc } from "frappe-react-sdk";
+import { toast } from "@/components/ui/use-toast";
+import { Button } from "@/components/ui/button";
+import { AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'
+
+
+interface DeleteProjectModalProps {
+    project: ProjectWithBranch,
+    mutate: KeyedMutator<{ message: ProjectData[]; }>
+}
+
+const DeleteProjectModal = ({ project, mutate }: DeleteProjectModalProps) => {
+
+    const { deleteDoc, reset } = useFrappeDeleteDoc()
+
+    const handleProjectDelete = () => {
+
+        deleteDoc("Commit Project", `${project.name}`)
+            .then(() => {
+                mutate()
+                reset()
+            }).then(() => toast({
+                description: `Project ${project.display_name} Deleted`,
+            }))
+    }
+    return (
+        <AlertDialogContent>
+            <AlertDialogHeader>
+                <AlertDialogTitle>Delete Project{' '}{project.display_name}?
+                </AlertDialogTitle>
+                <AlertDialogDescription>
+                    This will remove {project.display_name} from the list.
+                </AlertDialogDescription>
+            </AlertDialogHeader>
+            <AlertDialogFooter className='!justify-end'>
+                <AlertDialogCancel>Cancel</AlertDialogCancel>
+                <Button variant="destructive" onClick={handleProjectDelete}>
+                    Delete
+                </Button>
+            </AlertDialogFooter>
+        </AlertDialogContent>
+    )
+}
+
+export default DeleteProjectModal
\ No newline at end of file

From 46c2af6349a799af3b15f737f2189b9e7485c377 Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Fri, 31 May 2024 11:57:15 +0530
Subject: [PATCH 12/13] feat : add description while adding project

---
 .../projects/Projects/CreateProjectModal.tsx  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/dashboard/src/components/features/projects/Projects/CreateProjectModal.tsx b/dashboard/src/components/features/projects/Projects/CreateProjectModal.tsx
index 82c292e..01a81ec 100644
--- a/dashboard/src/components/features/projects/Projects/CreateProjectModal.tsx
+++ b/dashboard/src/components/features/projects/Projects/CreateProjectModal.tsx
@@ -12,14 +12,15 @@ export type FormFields = {
     org: string,
     repo_name: string,
     display_name: string,
+    description: string,
+}
+interface CreateProjectModalProps {
+    org: ProjectData,
+    mutate: KeyedMutator<{ message: ProjectData[]; }>,
+    onClose: VoidFunction
 }
 
-
-const CreateProjectModal = ({ org, mutate }: {
-    org: ProjectData, mutate: KeyedMutator<{
-        message: ProjectData[];
-    }>
-}) => {
+const CreateProjectModal = ({ org, mutate, onClose }: CreateProjectModalProps) => {
     const { toast } = useToast()
     const methods = useForm<FormFields>({
         defaultValues: {
@@ -34,7 +35,8 @@ const CreateProjectModal = ({ org, mutate }: {
             .then(() => {
                 reset()
             }).then(() => {
-                mutate();
+                mutate()
+                onClose()
                 return toast({
                     description: "Project Added",
                 })
@@ -69,6 +71,14 @@ const CreateProjectModal = ({ org, mutate }: {
                         placeholder="eg. lms"
                         className="mb-3 p-3 w-full"
                     />
+                    <Label htmlFor="description">Description</Label>
+                    <Input
+                        {...methods.register("description")}
+                        id='about'
+                        type="text"
+                        placeholder=""
+                        className="mb-3 p-3 w-full"
+                    />
                     <DialogFooter>
                         <Button type="submit">
                             Submit

From c921472bf9efb4c9a357c48c080820c78ba0b0cc Mon Sep 17 00:00:00 2001
From: Aditya <mailadityapardeshi@gmail.com>
Date: Fri, 31 May 2024 11:57:48 +0530
Subject: [PATCH 13/13] fix : refactor and add project delete button

---
 .../components/features/projects/Projects.tsx | 73 ++++++++++++-------
 1 file changed, 48 insertions(+), 25 deletions(-)

diff --git a/dashboard/src/components/features/projects/Projects.tsx b/dashboard/src/components/features/projects/Projects.tsx
index fc97b92..7dda410 100644
--- a/dashboard/src/components/features/projects/Projects.tsx
+++ b/dashboard/src/components/features/projects/Projects.tsx
@@ -24,6 +24,7 @@ import { AlertDialog, AlertDialogTrigger } from "@/components/ui/alert-dialog"
 import { RxDragHandleDots1 } from "react-icons/rx";
 import ManageBranchModal from "./Branch/ManageBranchModal"
 import { CommitProjectBranch } from "@/types/commit/CommitProjectBranch"
+import DeleteProjectModal from "./Projects/DeleteProjectModal"
 
 export interface ProjectWithBranch extends CommitProject {
     branches: CommitProjectBranch[]
@@ -49,6 +50,8 @@ export const Projects = () => {
         return <FullPageLoader />
     }
 
+    // const [createOrg, setCreateOrg] = useState<boolean>(false)
+
 
     if (data && data.message) {
         return (
@@ -90,16 +93,20 @@ export const Projects = () => {
 }
 
 
-export const OrgComponent = ({ org, mutate }: {
-    org: ProjectData, mutate: KeyedMutator<{
-        message: ProjectData[];
-    }>
-}) => {
+interface OrgComponentProps {
+    org: ProjectData, mutate: KeyedMutator<{ message: ProjectData[]; }>
+}
+
+export const OrgComponent = ({ org, mutate }: OrgComponentProps) => {
 
     const isCreateAccess = isSystemManager()
 
     const [createProject, setCreateProject] = useState<boolean>(false)
 
+    const handleClose = () => {
+        setCreateProject(false)
+    }
+
     return (
         <div>
 
@@ -109,23 +116,21 @@ export const OrgComponent = ({ org, mutate }: {
                 </h1>
                 {isCreateAccess &&
                     <div className="flex gap-1">
-                        <Dialog open={createProject} onOpenChange={setCreateProject}>
-                            <DialogTrigger asChild>
-                                <Button size="icon" className="h-7 w-7">
+                        <Button size="icon" onClick={() => setCreateProject(true)} className="h-7 w-7">
                                     <MdAdd className="h-4 w-4 " />
-                                </Button>
-                            </DialogTrigger>
-                            <CreateProjectModal org={org} mutate={mutate} />
-                        </Dialog>
+                        </Button>
                         <AlertDialog>
                             <AlertDialogTrigger asChild>
-                                <Button size="icon" className="h-7 w-7">
+                                <Button size="icon" variant="secondary" className="h-7 w-7">
                                     <AiOutlineDelete />
                                 </Button>
                             </AlertDialogTrigger>
                             <DeleteOrgModal org={org} mutate={mutate} />
                         </AlertDialog>
                     </div>}
+                <Dialog open={createProject} onOpenChange={setCreateProject}>
+                    <CreateProjectModal onClose={handleClose} org={org} mutate={mutate} />
+                </Dialog>
             </div>
 
             {org?.projects?.length === 0 && <div className="text-sm text-gray-500 pl-4 py-2">No Projects Found. Click <button className="text-blue-500 underline" onClick={() => setCreateProject(true)}>
@@ -203,6 +208,7 @@ export const ProjectCard = ({ project, org, mutate }: ProjectCardProps) => {
                             open={selectOpen}
                             onOpenChange={setSelectOpen}
                             onValueChange={(value) => setBranch(value)}
+                            value={branch}
                             defaultValue={project.branches[0]?.name}
                         >
                             <SelectTrigger className="h-8 w-40" onClick={() => setSelectOpen(!selectOpen)}>
@@ -214,26 +220,32 @@ export const ProjectCard = ({ project, org, mutate }: ProjectCardProps) => {
                                         <SelectItem value={branch.name} key={branch.name}>{branch.branch_name}</SelectItem>
                                     )
                                 })}
-                                {
-                                    project.branches.length > 0 && isCreateAccess &&
-                                    <div className="w-full h-[1px] bg-gray-200 shadow-sm my-1" />}
+
                                 {isCreateAccess &&
+                                    <>
+                                    {
+                                        project.branches.length > 0 &&
+                                        <div className="w-full h-[1px] bg-gray-200 shadow-sm my-1" />}
                                     <Button variant="ghost" className="w-full h-8 font-normal text-sm left-0 flex justify-start pl-1" onClick={() => {
                                         setOpen(true)
                                         setSelectOpen(false)
                                     }}>
                                         <MdAdd className="h-4 w-4 mr-1" />
                                         Add Branch
-                                    </Button>}
-
-                                {isCreateAccess &&
-                                    <Button variant="ghost" className="w-full h-8 font-normal text-sm left-0 flex justify-start pl-1" onClick={() => {
-                                        setOpenManageModal(true)
-                                        setSelectOpen(false)
-                                    }}>
-                                        <RxDragHandleDots1 className="h-4 w-4 mr-1" />
-                                        Manage Branches
                                     </Button>
+
+                                    {project.branches.length > 0 &&
+                                        <Button
+                                            variant="ghost"
+                                            className="w-full h-8 font-normal text-sm left-0 flex justify-start pl-1"
+                                            onClick={() => {
+                                                setOpenManageModal(true)
+                                                setSelectOpen(false)
+                                            }}>
+                                            <RxDragHandleDots1 className="h-4 w-4 mr-1" />
+                                            Manage Branches
+                                        </Button>}
+                                </>
                                 }
 
                             </SelectContent>
@@ -249,10 +261,21 @@ export const ProjectCard = ({ project, org, mutate }: ProjectCardProps) => {
                             <CreateBranchModal setBranch={setBranch} project={project} mutate={mutate} setOpen={setOpen} />
                         </Dialog>
 
+                        <div className="flex gap-1">
                         <Button size='sm' onClick={onNavigate}>
                             <AiOutlineApi className="mr-2" />
                             API Explorer
                         </Button>
+                            <AlertDialog>
+                                <AlertDialogTrigger asChild>
+                                    <Button size='icon' variant='secondary' className="h-7 w-7">
+                                        <AiOutlineDelete />
+                                    </Button>
+                                </AlertDialogTrigger>
+                                <DeleteProjectModal project={project} mutate={mutate} />
+                            </AlertDialog>
+                        </div>
+
                     </div>
                 </div>
             </div >