From c6e41dcaee567c4aa16703a5a747670029339062 Mon Sep 17 00:00:00 2001
From: calvin <calvin.lee@harness.io>
Date: Mon, 10 Apr 2023 15:00:23 -0600
Subject: [PATCH] Revert "feat: [code-218]: pr review button"

This reverts commit c55cb3ae0a8bd030ffc31c02a0a38d08fcf4c1fa.
---
 .../components/Changes/Changes.module.scss    |  42 ------
 .../Changes/Changes.module.scss.d.ts          |   6 -
 web/src/components/Changes/Changes.tsx        |  12 +-
 .../ReviewSplitButton/ReviewSplitButton.tsx   | 121 ----------------
 .../ThreadSection/ThreadSection.module.scss   |   6 +-
 web/src/framework/strings/stringTypes.ts      |   1 -
 web/src/i18n/strings.en.yaml                  |   1 -
 .../PullRequest/Conversation/Conversation.tsx |   2 +-
 .../PullRequestActionsBox.module.scss         |  14 --
 .../PullRequestActionsBox.module.scss.d.ts    |   1 -
 .../PullRequestActionsBox.tsx                 | 131 ++++++++----------
 .../GeneralSettingsContent.tsx                |   4 +-
 12 files changed, 68 insertions(+), 273 deletions(-)
 delete mode 100644 web/src/components/Changes/ReviewSplitButton/ReviewSplitButton.tsx

diff --git a/web/src/components/Changes/Changes.module.scss b/web/src/components/Changes/Changes.module.scss
index ed7d2530c..0a9be37ba 100644
--- a/web/src/components/Changes/Changes.module.scss
+++ b/web/src/components/Changes/Changes.module.scss
@@ -56,45 +56,3 @@
 .repeatBtn {
   margin-left: var(--spacing-xsmall) !important;
 }
-
-.popover {
-  transform: translateY(5px) !important;
-
-  .menuItem {
-    strong {
-      display: inline-block;
-      margin-left: 10px;
-    }
-
-    p {
-      font-size: 12px;
-      padding-left: 27px;
-      line-height: 16px;
-      margin: 5px 0;
-      max-width: 320px;
-    }
-  }
-  .menuReviewItem {
-    .reviewIcon {
-      margin-top: 2px;
-    }
-
-    strong {
-      display: inline-block;
-      margin-left: 10px;
-    }
-
-    p {
-      font-size: 12px;
-      padding-left: var(--spacing-small);
-      line-height: 16px;
-      max-width: 320px;
-    }
-  }
-}
-
-.btn {
-  &.hide {
-    visibility: hidden;
-  }
-}
diff --git a/web/src/components/Changes/Changes.module.scss.d.ts b/web/src/components/Changes/Changes.module.scss.d.ts
index 3b9603602..3aecf316b 100644
--- a/web/src/components/Changes/Changes.module.scss.d.ts
+++ b/web/src/components/Changes/Changes.module.scss.d.ts
@@ -11,11 +11,5 @@ declare const styles: {
   readonly hideBtn: string
   readonly refreshIcon: string
   readonly repeatBtn: string
-  readonly popover: string
-  readonly menuItem: string
-  readonly menuReviewItem: string
-  readonly reviewIcon: string
-  readonly btn: string
-  readonly hide: string
 }
 export default styles
diff --git a/web/src/components/Changes/Changes.tsx b/web/src/components/Changes/Changes.tsx
index eb1b2357c..77a46a1e9 100644
--- a/web/src/components/Changes/Changes.tsx
+++ b/web/src/components/Changes/Changes.tsx
@@ -35,7 +35,7 @@ import { useShowRequestError } from 'hooks/useShowRequestError'
 import { LoadingSpinner } from 'components/LoadingSpinner/LoadingSpinner'
 import { ChangesDropdown } from './ChangesDropdown'
 import { DiffViewConfiguration } from './DiffViewConfiguration'
-import ReviewSplitButton from './ReviewSplitButton/ReviewSplitButton'
+import { ReviewDecisionButton } from './ReviewDecisionButton/ReviewDecisionButton'
 import css from './Changes.module.scss'
 
 const STICKY_TOP_POSITION = 64
@@ -73,7 +73,6 @@ export const Changes: React.FC<ChangesProps> = ({
   const [lineBreaks, setLineBreaks] = useUserPreference(UserPreference.DIFF_LINE_BREAKS, false)
   const [diffs, setDiffs] = useState<DiffFileEntry[]>([])
   const [isSticky, setSticky] = useState(false)
-
   const {
     data: rawDiff,
     error,
@@ -210,16 +209,11 @@ export const Changes: React.FC<ChangesProps> = ({
                   </Container>
                   <FlexExpander />
 
-                  <ReviewSplitButton
-                    shouldHide={readOnly || pullRequestMetadata?.state === 'merged'}
+                  <ReviewDecisionButton
                     repoMetadata={repoMetadata}
                     pullRequestMetadata={pullRequestMetadata}
+                    shouldHide={readOnly || pullRequestMetadata?.state === 'merged'}
                   />
-                  {/* <ReviewDecisionButton
-                    repoMetadata={repoMetadata}
-                    pullRequestMetadata={pullRequestMetadata}
-                    shouldHide={readOnly || pullRequestMetadata?.state === 'merged'}
-                  /> */}
                 </Layout.Horizontal>
               </Container>
 
diff --git a/web/src/components/Changes/ReviewSplitButton/ReviewSplitButton.tsx b/web/src/components/Changes/ReviewSplitButton/ReviewSplitButton.tsx
deleted file mode 100644
index f133627fa..000000000
--- a/web/src/components/Changes/ReviewSplitButton/ReviewSplitButton.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import {
-  ButtonVariation,
-  Color,
-  Container,
-  Icon,
-  IconName,
-  SplitButton,
-  useToaster,
-  Text,
-  FontVariation,
-  Layout
-} from '@harness/uicore'
-import { Menu, PopoverPosition } from '@blueprintjs/core'
-import cx from 'classnames'
-import { useMutate } from 'restful-react'
-import React, { useCallback, useState } from 'react'
-import { useStrings } from 'framework/strings'
-import type { EnumPullReqReviewDecision, TypesPullReq } from 'services/code'
-import type { GitInfoProps } from 'utils/GitUtils'
-import { getErrorMessage } from 'utils/Utils'
-import css from '../Changes.module.scss'
-
-interface PrReviewOption {
-  method: EnumPullReqReviewDecision | 'reject'
-  title: string
-  disabled?: boolean
-  icon: IconName
-  color: Color
-}
-
-interface ReviewSplitButtonProps extends Pick<GitInfoProps, 'repoMetadata'> {
-  shouldHide: boolean
-  pullRequestMetadata?: TypesPullReq
-}
-const ReviewSplitButton = (props: ReviewSplitButtonProps) => {
-  const { pullRequestMetadata, repoMetadata, shouldHide } = props
-  const { getString } = useStrings()
-  const { showError, showSuccess } = useToaster()
-
-  const prDecisionOptions: PrReviewOption[] = [
-    {
-      method: 'approved',
-      title: getString('approve'),
-      icon: 'tick-circle' as IconName,
-      color: Color.GREEN_700
-    },
-    {
-      method: 'changereq',
-      title: getString('requestChanges'),
-      icon: 'error' as IconName,
-      color: Color.ORANGE_700
-    },
-    {
-      method: 'reject',
-      title: getString('reject'),
-      disabled: true,
-      icon: 'danger-icon' as IconName,
-      color: Color.RED_700
-    }
-  ]
-
-  const [decisionOption, setDecisionOption] = useState<PrReviewOption>(prDecisionOptions[0])
-  const { mutate, loading } = useMutate({
-    verb: 'POST',
-    path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata?.number}/reviews`
-  })
-  const submitReview = useCallback(() => {
-    mutate({ decision: decisionOption.method })
-      .then(() => {
-        // setReset(true)
-        showSuccess(getString('pr.reviewSubmitted'))
-      })
-      .catch(exception => showError(getErrorMessage(exception)))
-  }, [decisionOption, mutate, showError, showSuccess, getString])
-  return (
-    <Container className={cx(css.btn, { [css.hide]: shouldHide })}>
-      <SplitButton
-        text={decisionOption.title}
-        disabled={loading}
-        variation={ButtonVariation.SECONDARY}
-        popoverProps={{
-          interactionKind: 'click',
-          usePortal: true,
-          popoverClassName: css.popover,
-          position: PopoverPosition.BOTTOM_RIGHT,
-          transitionDuration: 1000
-        }}
-        onClick={() => {
-          submitReview()
-        }}>
-        {prDecisionOptions.map(option => {
-          return (
-            <Menu.Item
-              key={option.method}
-              className={css.menuReviewItem}
-              disabled={option.disabled}
-              text={
-                <Layout.Horizontal>
-                  <Icon
-                    className={css.reviewIcon}
-                    {...(option.icon === 'danger-icon' ? null : { color: option.color })}
-                    size={16}
-                    name={option.icon}
-                  />
-                  <Text flex width={'fit-content'} font={{ variation: FontVariation.BODY }}>
-                    {option.title}
-                  </Text>
-                </Layout.Horizontal>
-              }
-              onClick={() => {
-                setDecisionOption(option)
-              }}
-            />
-          )
-        })}
-      </SplitButton>
-    </Container>
-  )
-}
-
-export default ReviewSplitButton
diff --git a/web/src/components/ThreadSection/ThreadSection.module.scss b/web/src/components/ThreadSection/ThreadSection.module.scss
index a01e2e00e..f0ca3772e 100644
--- a/web/src/components/ThreadSection/ThreadSection.module.scss
+++ b/web/src/components/ThreadSection/ThreadSection.module.scss
@@ -29,11 +29,11 @@
 
   > ::before {
     position: absolute;
-    top: 28px;
+    top: 34px;
     left: 15px;
     content: '';
     width: 1px;
-    height: 25px;
+    height: 28px;
     border: 1px dashed var(--grey-200);
     opacity: 0.7;
     z-index: 2;
@@ -45,7 +45,7 @@
 
   > ::after {
     position: absolute;
-    bottom: -10px;
+    bottom: -12px;
     left: 15px;
     content: '';
     width: 1px;
diff --git a/web/src/framework/strings/stringTypes.ts b/web/src/framework/strings/stringTypes.ts
index a1db8aa55..7f3a62c85 100644
--- a/web/src/framework/strings/stringTypes.ts
+++ b/web/src/framework/strings/stringTypes.ts
@@ -241,7 +241,6 @@ export interface StringsMap {
   quote: string
   readMe: string
   refresh: string
-  reject: string
   rejected: string
   remove: string
   renameFile: string
diff --git a/web/src/i18n/strings.en.yaml b/web/src/i18n/strings.en.yaml
index 3fafda07d..6ad58663f 100644
--- a/web/src/i18n/strings.en.yaml
+++ b/web/src/i18n/strings.en.yaml
@@ -224,7 +224,6 @@ open: Open
 merged: Merged
 enabled: Enabled
 closed: Closed
-reject: Reject
 rejected: Rejected
 yours: Yours
 all: All
diff --git a/web/src/pages/PullRequest/Conversation/Conversation.tsx b/web/src/pages/PullRequest/Conversation/Conversation.tsx
index ce24a1083..82f51000e 100644
--- a/web/src/pages/PullRequest/Conversation/Conversation.tsx
+++ b/web/src/pages/PullRequest/Conversation/Conversation.tsx
@@ -538,7 +538,7 @@ const SystemBox: React.FC<SystemBoxProps> = ({ pullRequestMetadata, commentItems
       return (
         <Container>
           <Layout.Horizontal spacing="small" style={{ alignItems: 'center' }} className={css.mergedBox}>
-            <Container margin={{ left: 'xsmall' }} width={24} height={24} className={css.mergeContainer}>
+            <Container width={24} height={24} className={css.mergeContainer}>
               <Icon name={CodeIcon.Merged} size={16} color={Color.PURPLE_700} />
             </Container>
 
diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss
index 1b79c9985..2bb607a09 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss
+++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss
@@ -63,20 +63,6 @@
       max-width: 320px;
     }
   }
-  .menuReviewItem {
-    strong {
-      display: inline-block;
-      margin-left: 10px;
-    }
-
-    p {
-      font-size: 12px;
-      padding-left: 2px;
-      line-height: 16px;
-      margin: 0px 1px;
-      max-width: 320px;
-    }
-  }
 }
 
 .btnWrapper {
diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss.d.ts b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss.d.ts
index 1f5752eaa..590173b3a 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss.d.ts
+++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.module.scss.d.ts
@@ -11,7 +11,6 @@ declare const styles: {
   readonly sub: string
   readonly popover: string
   readonly menuItem: string
-  readonly menuReviewItem: string
   readonly btnWrapper: string
   readonly hasError: string
   readonly mergeContainer: string
diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
index 923e9b4c6..b9951cb9b 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
+++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
@@ -17,17 +17,10 @@ import { Case, Else, Match, Render, Truthy } from 'react-jsx-match'
 import { Menu, PopoverPosition, Icon as BIcon } from '@blueprintjs/core'
 import cx from 'classnames'
 import ReactTimeago from 'react-timeago'
-import type {
-  EnumMergeMethod,
-  EnumPullReqState,
-  OpenapiMergePullReq,
-  OpenapiStatePullReqRequest,
-  TypesPullReq
-} from 'services/code'
+import type { EnumMergeMethod, OpenapiMergePullReq, OpenapiStatePullReqRequest, TypesPullReq } from 'services/code'
 import { useStrings } from 'framework/strings'
 import { CodeIcon, GitInfoProps, PullRequestFilterOption, PullRequestState } from 'utils/GitUtils'
 import { getErrorMessage } from 'utils/Utils'
-import ReviewSplitButton from 'components/Changes/ReviewSplitButton/ReviewSplitButton'
 import css from './PullRequestActionsBox.module.scss'
 
 interface PullRequestActionsBoxProps extends Pick<GitInfoProps, 'repoMetadata' | 'pullRequestMetadata'> {
@@ -142,53 +135,46 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
                       />
                     </Case>
                     <Case val={PullRequestState.OPEN}>
-                      <Layout.Horizontal>
-                        <ReviewSplitButton
-                          shouldHide={(pullRequestMetadata?.state as EnumPullReqState) === 'merged'}
-                          repoMetadata={repoMetadata}
-                          pullRequestMetadata={pullRequestMetadata}
-                        />
-                        <Container
-                          inline
-                          padding={{ left: 'medium' }}
+                      <Container
+                        inline
+                        className={cx({
+                          [css.btnWrapper]: mergeOption.method !== 'close',
+                          [css.hasError]: mergeable === false
+                        })}>
+                        <SplitButton
+                          text={mergeOption.title}
+                          disabled={loading}
                           className={cx({
-                            [css.btnWrapper]: mergeOption.method !== 'close',
-                            [css.hasError]: mergeable === false
-                          })}>
-                          <SplitButton
-                            text={mergeOption.title}
-                            disabled={loading}
-                            className={cx({
-                              [css.secondaryButton]: mergeOption.method === 'close' || mergeable === false
-                            })}
-                            variation={
-                              mergeOption.method === 'close' || mergeable === false
-                                ? ButtonVariation.TERTIARY
-                                : ButtonVariation.PRIMARY
+                            [css.secondaryButton]: mergeOption.method === 'close' || mergeable === false
+                          })}
+                          variation={
+                            mergeOption.method === 'close' || mergeable === false
+                              ? ButtonVariation.TERTIARY
+                              : ButtonVariation.PRIMARY
+                          }
+                          popoverProps={{
+                            interactionKind: 'click',
+                            usePortal: true,
+                            popoverClassName: css.popover,
+                            position: PopoverPosition.BOTTOM_RIGHT,
+                            transitionDuration: 1000
+                          }}
+                          onClick={() => {
+                            if (mergeOption.method !== 'close') {
+                              const payload: OpenapiMergePullReq = { method: mergeOption.method }
+
+                              mergePR(payload)
+                                .then(onPRStateChanged)
+                                .catch(exception => showError(getErrorMessage(exception)))
+                            } else {
+                              const payload: OpenapiStatePullReqRequest = { state: 'closed' }
+
+                              updatePRState(payload)
+                                .then(onPRStateChanged)
+                                .catch(exception => showError(getErrorMessage(exception)))
                             }
-                            popoverProps={{
-                              interactionKind: 'click',
-                              usePortal: true,
-                              popoverClassName: css.popover,
-                              position: PopoverPosition.BOTTOM_RIGHT,
-                              transitionDuration: 1000
-                            }}
-                            onClick={() => {
-                              if (mergeOption.method !== 'close') {
-                                const payload: OpenapiMergePullReq = { method: mergeOption.method }
-
-                                mergePR(payload)
-                                  .then(onPRStateChanged)
-                                  .catch(exception => showError(getErrorMessage(exception)))
-                              } else {
-                                const payload: OpenapiStatePullReqRequest = { state: 'closed' }
-
-                                updatePRState(payload)
-                                  .then(onPRStateChanged)
-                                  .catch(exception => showError(getErrorMessage(exception)))
-                              }
-                            }}>
-                            {/* TODO: These two items are used for creating a PR
+                          }}>
+                          {/* TODO: These two items are used for creating a PR
                           <Menu.Item
                         className={css.menuItem}
                         text={
@@ -211,26 +197,25 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
                           </>
                         }
                       /> */}
-                            {mergeOptions.map(option => {
-                              return (
-                                <Menu.Item
-                                  key={option.method}
-                                  className={css.menuItem}
-                                  disabled={option.disabled}
-                                  text={
-                                    <>
-                                      <BIcon icon={mergeOption.method === option.method ? 'tick' : 'blank'} />
-                                      <strong>{option.title}</strong>
-                                      <p>{option.desc}</p>
-                                    </>
-                                  }
-                                  onClick={() => setMergeOption(option)}
-                                />
-                              )
-                            })}
-                          </SplitButton>
-                        </Container>
-                      </Layout.Horizontal>
+                          {mergeOptions.map(option => {
+                            return (
+                              <Menu.Item
+                                key={option.method}
+                                className={css.menuItem}
+                                disabled={option.disabled}
+                                text={
+                                  <>
+                                    <BIcon icon={mergeOption.method === option.method ? 'tick' : 'blank'} />
+                                    <strong>{option.title}</strong>
+                                    <p>{option.desc}</p>
+                                  </>
+                                }
+                                onClick={() => setMergeOption(option)}
+                              />
+                            )
+                          })}
+                        </SplitButton>
+                      </Container>
                     </Case>
                   </Match>
                 </Container>
diff --git a/web/src/pages/RepositorySettings/GeneralSettingsContent/GeneralSettingsContent.tsx b/web/src/pages/RepositorySettings/GeneralSettingsContent/GeneralSettingsContent.tsx
index 1b27df255..dffcc1f43 100644
--- a/web/src/pages/RepositorySettings/GeneralSettingsContent/GeneralSettingsContent.tsx
+++ b/web/src/pages/RepositorySettings/GeneralSettingsContent/GeneralSettingsContent.tsx
@@ -172,6 +172,7 @@ const GeneralSettingsContent = (props: GeneralSettingsProps) => {
                           setEditDesc(ACCESS_MODES.EDIT)
                         }}
                         {...permissionProps(permEditResult, standalone)}
+
                       />
                     </Text>
                   )}
@@ -190,7 +191,8 @@ const GeneralSettingsContent = (props: GeneralSettingsProps) => {
                   }}
                   variation={ButtonVariation.SECONDARY}
                   text={getString('delete')}
-                  {...permissionProps(permDeleteResult, standalone)}></Button>
+                  {...permissionProps(permDeleteResult, standalone)}
+                  ></Button>
               </Container>
             </Container>
           </Layout.Vertical>