refactor: labels

pixel-point · Feb 12, 2025 · 6f7f88d · 6f7f88d
1 parent 724d211
commit 6f7f88d
Show file tree

Hide file tree

Showing 45 changed files with 537 additions and 595 deletions.
diff --git a/apps/gitness/src/pages-v2/project/labels/project-label-form-container.tsx b/apps/gitness/src/pages-v2/project/labels/project-label-form-container.tsx
@@ -24,9 +24,7 @@ export const ProjectLabelFormContainer = () => {
     isLoading,
     error: createError
   } = useSaveSpaceLabelMutation(
-    {
-      space_ref: space_ref ?? ''
-    },
+    { space_ref: space_ref ?? '' },
     {
       onSuccess: () => {
         onFormCancel()
@@ -45,18 +43,12 @@ export const ProjectLabelFormContainer = () => {
   const onSubmit = (data: CreateLabelFormFields) => {
     const { values, ...rest } = data
 
-    mutate({
-      body: {
-        label: {
-          ...rest
-        },
-        values
-      }
-    })
+    mutate({ body: { label: { ...rest }, values } })
   }
 
   return (
     <LabelFormPage
+      className="mx-auto w-[610px]"
       useLabelsStore={useLabelsStore}
       useTranslationStore={useTranslationStore}
       isLoading={isLoading}

diff --git a/apps/gitness/src/pages-v2/project/labels/project-labels-list-container.tsx b/apps/gitness/src/pages-v2/project/labels/project-labels-list-container.tsx
@@ -32,9 +32,7 @@ export const ProjectLabelsList = () => {
   }
 
   const { mutate: deleteSpaceLabel, isLoading: isDeletingSpaceLabel } = useDeleteSpaceLabelMutation(
-    {
-      space_ref: space_ref ?? ''
-    },
+    { space_ref: space_ref ?? '' },
     {
       onSuccess: (_data, variables) => {
         setOpenAlertDeleteDialog(false)
@@ -48,22 +46,20 @@ export const ProjectLabelsList = () => {
   }
 
   const handleDeleteLabel = (identifier: string) => {
-    deleteSpaceLabel({
-      key: identifier
-    })
+    deleteSpaceLabel({ key: identifier })
   }
 
   return (
     <>
       <LabelsListPage
+        className="mx-auto max-w-[812px]"
         useTranslationStore={useTranslationStore}
         useLabelsStore={useLabelsStore}
         createdIn={space_ref}
-        handleEditLabel={handleEditLabel}
-        handleDeleteLabel={handleOpenDeleteDialog}
         searchQuery={query}
         setSearchQuery={setQuery}
         isLoading={isLoading}
+        labelsListViewProps={{ handleDeleteLabel: handleOpenDeleteDialog, handleEditLabel }}
       />
       <DeleteAlertDialog
         open={openAlertDeleteDialog}

diff --git a/apps/gitness/src/pages-v2/pull-request/pull-request-conversation.tsx b/apps/gitness/src/pages-v2/pull-request/pull-request-conversation.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react'
-import { useParams } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router-dom'
 
 import copy from 'clipboard-copy'
 import { isEmpty } from 'lodash-es'
@@ -64,6 +64,7 @@ import { usePullRequestProviderStore } from './stores/pull-request-provider-stor
 
 export default function PullRequestConversationPage() {
   const routes = useRoutes()
+  const navigate = useNavigate()
   const {
     pullReqMetadata,
     refetchPullReq,
@@ -139,6 +140,8 @@ export default function PullRequestConversationPage() {
       refetchData: refetchActivities
     })
 
+  const handleEditLabels = () => navigate(routes.toRepoLabels({ spaceId, repoId }))
+
   const { mutateAsync: restoreBranch } = useRestorePullReqSourceBranchMutation({})
   const onRestoreBranch = () => {
     restoreBranch({
@@ -217,33 +220,30 @@ export default function PullRequestConversationPage() {
   }, [sourceBranch, pullReqMetadata?.merged, pullReqMetadata?.closed])
 
   useEffect(() => {
-    if (branchError) {
-      if (pullReqMetadata?.merged || pullReqMetadata?.closed) {
-        setShowRestoreBranchButton(true)
-      } else {
-        setShowDeleteBranchButton(false)
-        createBranch({
-          repo_ref: repoRef,
-          body: {
-            name: pullReqMetadata?.source_branch || '',
-            target: pullReqMetadata?.source_sha,
-            bypass_rules: true,
-            dry_run_rules: true
-          }
-        }).then(res => {
-          if (res?.body?.rule_violations) {
-            const { checkIfBypassAllowed } = extractInfoFromRuleViolationArr(res.body?.rule_violations)
-            if (checkIfBypassAllowed) {
-              setShowRestoreBranchButton(true)
-            } else {
-              setShowRestoreBranchButton(false)
-            }
-          } else {
-            setShowRestoreBranchButton(true)
-          }
-        })
-      }
+    if (!branchError) return
+
+    if (pullReqMetadata?.merged || pullReqMetadata?.closed) {
+      return setShowRestoreBranchButton(true)
     }
+
+    setShowDeleteBranchButton(false)
+    createBranch({
+      repo_ref: repoRef,
+      body: {
+        name: pullReqMetadata?.source_branch || '',
+        target: pullReqMetadata?.source_sha,
+        bypass_rules: true,
+        dry_run_rules: true
+      }
+    }).then(res => {
+      if (res?.body?.rule_violations) {
+        const { checkIfBypassAllowed } = extractInfoFromRuleViolationArr(res.body?.rule_violations)
+
+        return setShowRestoreBranchButton(checkIfBypassAllowed)
+      }
+
+      setShowRestoreBranchButton(true)
+    })
   }, [branchError])
 
   const [activities, setActivities] = useState(activityData)
@@ -349,16 +349,12 @@ export default function PullRequestConversationPage() {
 
   const handleAddReviewer = (id?: number) => {
     reviewerAddPullReq({ repo_ref: repoRef, pullreq_number: prId, body: { reviewer_id: id } })
-      .then(() => {
-        refetchReviewers()
-      })
+      .then(() => refetchReviewers())
       .catch(error => setAddReviewerError(error.message))
   }
   const handleDeleteReviewer = (id: number) => {
     reviewerDeletePullReq({ repo_ref: repoRef, pullreq_number: prId, pullreq_reviewer_id: id })
-      .then(() => {
-        refetchReviewers()
-      })
+      .then(() => refetchReviewers())
       .catch(error => setRemoveReviewerError(error.message))
   }
   const onPRStateChanged = useCallback(() => {
@@ -525,14 +521,15 @@ export default function PullRequestConversationPage() {
         <SandboxLayout.Column>
           <SandboxLayout.Content className="pl-0 pt-0">
             {/* TODO: fix handleaction for comment section in panel */}
-            {rebaseErrorMessage ? (
+            {rebaseErrorMessage && (
               <Alert.Container closable variant="destructive" className="mb-5">
                 <Alert.Title>Cannot rebase branch</Alert.Title>
                 <Alert.Description>
                   <p>{rebaseErrorMessage}</p>
                 </Alert.Description>
               </Alert.Container>
-            ) : null}
+            )}
+
             <PullRequestPanel
               handleRebaseBranch={handleRebaseBranch}
               handlePrState={handlePrState}
@@ -683,6 +680,7 @@ export default function PullRequestConversationPage() {
               searchLabelQuery={searchLabel}
               setSearchLabelQuery={changeSearchLabel}
               addLabel={handleAddLabel}
+              editLabels={handleEditLabels}
               removeLabel={handleRemoveLabel}
               useTranslationStore={useTranslationStore}
             />

diff --git a/apps/gitness/src/pages-v2/repo/labels/label-form-container.tsx b/apps/gitness/src/pages-v2/repo/labels/label-form-container.tsx
@@ -24,9 +24,7 @@ export const RepoLabelFormContainer = () => {
     isLoading,
     error: createError
   } = useSaveRepoLabelMutation(
-    {
-      repo_ref
-    },
+    { repo_ref },
     {
       onSuccess: () => {
         onFormCancel()
@@ -41,18 +39,12 @@ export const RepoLabelFormContainer = () => {
   const onSubmit = (data: CreateLabelFormFields) => {
     const { values, ...rest } = data
 
-    mutate({
-      body: {
-        label: {
-          ...rest
-        },
-        values
-      }
-    })
+    mutate({ body: { label: { ...rest }, values } })
   }
 
   return (
     <LabelFormPage
+      className="w-[570px] px-0"
       useLabelsStore={useLabelsStore}
       useTranslationStore={useTranslationStore}
       isLoading={isLoading}

diff --git a/apps/gitness/src/pages-v2/repo/labels/labels-list-container.tsx b/apps/gitness/src/pages-v2/repo/labels/labels-list-container.tsx
@@ -34,9 +34,7 @@ export const RepoLabelsList = () => {
   }
 
   const { mutate: deleteRepoLabel, isLoading: isDeletingRepoLabel } = useDeleteRepoLabelMutation(
-    {
-      repo_ref: repo_ref ?? ''
-    },
+    { repo_ref: repo_ref ?? '' },
     {
       onSuccess: (_data, variables) => {
         setOpenAlertDeleteDialog(false)
@@ -46,9 +44,7 @@ export const RepoLabelsList = () => {
   )
 
   const { mutate: deleteSpaceLabel, isLoading: isDeletingSpaceLabel } = useDeleteSpaceLabelMutation(
-    {
-      space_ref: space_ref ?? ''
-    },
+    { space_ref: space_ref ?? '' },
     {
       onSuccess: (_data, variables) => {
         setOpenAlertDeleteDialog(false)
@@ -72,15 +68,15 @@ export const RepoLabelsList = () => {
   return (
     <>
       <LabelsListPage
+        className="max-w-[570px] px-0"
         useTranslationStore={useTranslationStore}
         useLabelsStore={useLabelsStore}
         createdIn={space_ref}
-        handleEditLabel={handleEditLabel}
-        handleDeleteLabel={handleOpenDeleteDialog}
         searchQuery={query}
         setSearchQuery={setQuery}
         isLoading={isLoading}
         isRepository
+        labelsListViewProps={{ widthType: 'small', handleDeleteLabel: handleOpenDeleteDialog, handleEditLabel }}
       />
       <DeleteAlertDialog
         open={openAlertDeleteDialog}

diff --git a/apps/gitness/src/routes.tsx b/apps/gitness/src/routes.tsx
@@ -1,6 +1,6 @@
 import { Navigate } from 'react-router-dom'
 
-import { Breadcrumb } from '@harnessio/ui/components'
+import { Breadcrumb, Text } from '@harnessio/ui/components'
 import {
   EmptyPage,
   ProfileSettingsLayout,

diff --git a/packages/ui/locales/en/views.json b/packages/ui/locales/en/views.json
@@ -10,7 +10,7 @@
     "pull-requests": "Pull Requests",
     "branches": "Branches",
     "settings": "Settings",
-    "descriptionPlaceholder": "Enter a description",
+    "descriptionPlaceholder": "Enter a short description for the label",
     "description": "Description",
     "error": "Error:",
     "saving": "Saving…",
@@ -288,12 +288,14 @@
     "compareChangesTabOverview": "Overview",
     "compareChangesTabCommits": "Commits",
     "compareChangesTabChanges": "Changes",
-    "findOrAddNewValue": "Search or add a new value",
+    "findOrAddNewValue": "Find or add a new value",
     "searchValue": "Search value",
     "addValue": "Add new value",
-    "noLabels": "No labels found",
+    "labelNotFound": "Label not found",
     "labels": "Labels",
     "searchLabels": "Search labels",
+    "noLabels": "No labels found",
+    "editLabels": "Edit labels",
     "deleted": "Deleted",
     "deletedComment": "This comment was deleted.",
     "reviewers": "Reviewers",

diff --git a/packages/ui/locales/es/views.json b/packages/ui/locales/es/views.json
@@ -10,7 +10,7 @@
     "pull-requests": "Pull Requests",
     "branches": "Branches",
     "settings": "Settings",
-    "descriptionPlaceholder": "Enter a description",
+    "descriptionPlaceholder": "Enter a short description for the label",
     "description": "Description",
     "error": "Error:",
     "saving": "Saving...",
@@ -288,12 +288,14 @@
     "compareChangesTabOverview": "Resumen",
     "compareChangesTabCommits": "Commits",
     "compareChangesTabChanges": "Cambios",
-    "findOrAddNewValue": "Search or add a new value",
+    "findOrAddNewValue": "Find or add a new value",
     "searchValue": "Search value",
     "addValue": "Add new value",
-    "noLabels": "No labels found",
+    "labelNotFound": "Label not found",
     "labels": "Labels",
     "searchLabels": "Search labels",
+    "noLabels": "No labels found",
+    "editLabels": "Edit labels",
     "deleted": "",
     "deletedComment": "",
     "reviewers": "",

diff --git a/packages/ui/locales/fr/views.json b/packages/ui/locales/fr/views.json
@@ -10,7 +10,7 @@
     "pull-requests": "Requêtes de tirage",
     "branches": "Branches",
     "settings": "Paramètres",
-    "descriptionPlaceholder": "Entrez une description",
+    "descriptionPlaceholder": "Enter a description",
     "description": "Description",
     "error": "Erreur :",
     "saving": "Enregistrement...",
@@ -291,9 +291,11 @@
     "findOrAddNewValue": "Find or add a new value",
     "searchValue": "Search value",
     "addValue": "Add new value",
-    "noLabels": "Aucune étiquette trouvée.",
+    "labelNotFound": "Label not found",
     "labels": "Étiquettes",
     "searchLabels": "Rechercher des étiquettes..",
+    "noLabels": "No labels found",
+    "editLabels": "Edit labels",
     "deleted": "Supprimé",
     "deletedComment": "Ce commentaire a été supprimé.",
     "reviewers": "Réviseurs",

diff --git a/packages/ui/src/components/chat/chat-diff-viewer.tsx b/packages/ui/src/components/chat/chat-diff-viewer.tsx
@@ -65,16 +65,16 @@ export const ChatDiffViewer = ({ data, mode = 4, lang = 'go', fileName }: ChatDi
   }, [data, lang, setDiffInstanceCb])
 
   return (
-    <div className="border-borders-1 bg-background-1 mr-7 mt-3 flex flex-col rounded-md border">
+    <div className="mr-7 mt-3 flex flex-col rounded-md border border-borders-1 bg-background-1">
       {fileName && (
-        <span className="bg-background-2 text-foreground-1 text-14 rounded-[inherit] p-4 font-medium">{fileName}</span>
+        <span className="rounded-[inherit] bg-background-2 p-4 text-14 font-medium text-foreground-1">{fileName}</span>
       )}
       {diffFileInstance && (
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         <DiffView
           style={{ '--diff-plain-lineNumber--': 'hsl(var(--canary-background-01))' } as CSSProperties}
-          className="text-foreground-8 w-full"
+          className="w-full text-foreground-8"
           diffFile={diffFileInstance}
           diffViewFontSize={14}
           diffViewHighlight={true}

diff --git a/packages/ui/src/components/chat/chat-empty-preview-wrapper.tsx b/packages/ui/src/components/chat/chat-empty-preview-wrapper.tsx
@@ -4,7 +4,7 @@ import { Chat } from '@/components'
 
 export const ChatEmptyPreviewWrapper: FC = () => {
   return (
-    <div className="border-borders-4 h-[calc(100vh-100px)] border-r">
+    <div className="h-[calc(100vh-100px)] border-r border-borders-4">
       <Chat.Root>
         <Chat.Body>
           <Chat.EmptyState />