From d6c7f41dd4cb42c3349b51b83e4e6e33a84d6ca1 Mon Sep 17 00:00:00 2001
From: Calvin Lee <calvin.lee@harness.io>
Date: Thu, 29 Jun 2023 19:52:43 +0000
Subject: [PATCH] fix: [code-574]: active stale filter not working (#173)

---
 .../PullRequestSideBar/PullRequestSideBar.tsx | 27 ++++++++----------
 .../BranchesContentHeader.tsx                 | 28 +++++++++----------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx b/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx
index 38b8ab93f..37339d546 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx
+++ b/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx
@@ -4,13 +4,10 @@ import {
   Container,
   Layout,
   Text,
-  Button,
   FontVariation,
-  ButtonVariation,
   Icon,
   Avatar,
   FlexExpander,
-  ButtonSize,
   Color,
   IconName,
   useToaster
@@ -35,7 +32,7 @@ const PullRequestSideBar = (props: PullRequestSideBarProps) => {
   // const [searchTerm, setSearchTerm] = useState('')
   // const [page] = usePageIndex(1)
   const { getString } = useStrings()
-  const tagArr = []
+  // const tagArr = []
   const { showError } = useToaster()
 
   const generateReviewDecisionIcon = (
@@ -198,15 +195,15 @@ const PullRequestSideBar = (props: PullRequestSideBarProps) => {
                         width="100px"
                         height="24px"
                         items={[
-                          {
-                            text: getString('makeOptional'),
-                            onClick: noop
-                          },
-                          {
-                            text: getString('makeRequired'),
-                            onClick: noop
-                          },
-                          '-',
+                          // {
+                          //   text: getString('makeOptional'),
+                          //   onClick: noop
+                          // },
+                          // {
+                          //   text: getString('makeRequired'),
+                          //   onClick: noop
+                          // },
+                          // '-',
                           {
                             isDanger: true,
                             text: getString('remove'),
@@ -284,7 +281,7 @@ const PullRequestSideBar = (props: PullRequestSideBarProps) => {
               </Text>
             )} */}
           </Container>
-          <Layout.Horizontal>
+          {/* <Layout.Horizontal>
             <Text style={{ lineHeight: '24px' }} font={{ variation: FontVariation.H6 }}>
               {getString('tags')}
             </Text>
@@ -299,7 +296,7 @@ const PullRequestSideBar = (props: PullRequestSideBarProps) => {
               padding={{ top: 'large', bottom: 'large' }}>
               {getString('noneYet')}
             </Text>
-          )}
+          )} */}
         </Layout.Vertical>
       </Container>
     </Container>
diff --git a/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx b/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx
index 0b714c574..f0224f3e6 100644
--- a/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx
+++ b/web/src/pages/RepositoryBranches/RepositoryBranchesContent/BranchesContentHeader/BranchesContentHeader.tsx
@@ -15,30 +15,30 @@ interface BranchesContentHeaderProps extends Pick<GitInfoProps, 'repoMetadata'>
 }
 
 export function BranchesContentHeader({
-  onBranchTypeSwitched,
+  // onBranchTypeSwitched,
   onSearchTermChanged,
-  activeBranchType = GitBranchType.ALL,
+  // activeBranchType = GitBranchType.ALL,
   repoMetadata,
   onNewBranchCreated,
   loading
 }: BranchesContentHeaderProps) {
   const { getString } = useStrings()
-  const [branchType, setBranchType] = useState(activeBranchType)
+  // const [branchType, setBranchType] = useState(activeBranchType)
   const [searchTerm, setSearchTerm] = useState('')
-  const items = useMemo(
-    () => [
-      { label: getString('activeBranches'), value: GitBranchType.ACTIVE },
-      { label: getString('inactiveBranches'), value: GitBranchType.INACTIVE },
-      // { label: getString('yourBranches'), value: GitBranchType.YOURS },
-      { label: getString('allBranches'), value: GitBranchType.ALL }
-    ],
-    [getString]
-  )
+  // const items = useMemo(
+  //   () => [
+  //     { label: getString('activeBranches'), value: GitBranchType.ACTIVE },
+  //     { label: getString('inactiveBranches'), value: GitBranchType.INACTIVE },
+  //     // { label: getString('yourBranches'), value: GitBranchType.YOURS },
+  //     { label: getString('allBranches'), value: GitBranchType.ALL }
+  //   ],
+  //   [getString]
+  // )
 
   return (
     <Container className={css.main}>
       <Layout.Horizontal spacing="medium">
-        <DropDown
+        {/* <DropDown
           value={branchType}
           items={items}
           onChange={({ value }) => {
@@ -46,7 +46,7 @@ export function BranchesContentHeader({
             onBranchTypeSwitched(value as GitBranchType)
           }}
           popoverClassName={css.branchDropdown}
-        />
+        /> */}
         <FlexExpander />
         <SearchInputWithSpinner
           loading={loading}