From c3b945623be2636c45bec9051aff858a889c197d Mon Sep 17 00:00:00 2001
From: calvin <calvin.lee@harness.io>
Date: Thu, 1 Jun 2023 11:15:27 -0600
Subject: [PATCH] fix: [code-411]: addressed comments

---
 .../RepositoryContent/FileContent/FileContent.tsx     |  9 +++++----
 .../RepositoryContent/FolderContent/Readme.tsx        | 11 +++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
index eb12c6909..ae5090d43 100644
--- a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
+++ b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
@@ -92,7 +92,7 @@ export function FileContent({
     },
     [space]
   )
-  function checkPermTagTooltip(): { disabled: boolean; tooltip: JSX.Element | string | undefined } {
+  const permsFinal = useMemo(() => {
     const perms = permissionProps(permPushResult, standalone)
     if (isRefATag(gitRef) && perms) {
       return { tooltip: perms.tooltip, disabled: true }
@@ -103,8 +103,8 @@ export function FileContent({
     } else if (perms?.disabled) {
       return { disabled: perms.disabled, tooltip: perms.tooltip }
     }
-    return { disabled: isRefATag(gitRef), tooltip: undefined }
-  }
+    return { disabled: isRefATag(gitRef) || false, tooltip: undefined }
+  }, [permPushResult, gitRef])
 
   return (
     <Container className={css.tabsContainer}>
@@ -139,7 +139,8 @@ export function FileContent({
                           text={getString('edit')}
                           icon="code-edit"
                           tooltipProps={{ isDark: true }}
-                          {...checkPermTagTooltip()}
+                          tooltip={permsFinal.tooltip}
+                          disabled={permsFinal.disabled}
                           onClick={() => {
                             history.push(
                               routes.toCODEFileEdit({
diff --git a/web/src/pages/Repository/RepositoryContent/FolderContent/Readme.tsx b/web/src/pages/Repository/RepositoryContent/FolderContent/Readme.tsx
index 1aff44b9a..f2af5ded9 100644
--- a/web/src/pages/Repository/RepositoryContent/FolderContent/Readme.tsx
+++ b/web/src/pages/Repository/RepositoryContent/FolderContent/Readme.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useMemo } from 'react'
 import { Container, Color, Layout, FlexExpander, ButtonVariation, Heading, Icon, ButtonSize } from '@harness/uicore'
 import { Render } from 'react-jsx-match'
 import { useHistory } from 'react-router-dom'
@@ -51,7 +51,8 @@ function ReadmeViewer({ metadata, gitRef, readmeInfo, contentOnly, maxWidth }: F
     },
     [space]
   )
-  function checkPermTagTooltip(): { disabled: boolean; tooltip: JSX.Element | string | undefined } {
+
+  const permsFinal = useMemo(() => {
     const perms = permissionProps(permPushResult, standalone)
     if (gitRef && isRefATag(gitRef) && perms) {
       return { tooltip: perms.tooltip, disabled: true }
@@ -63,7 +64,8 @@ function ReadmeViewer({ metadata, gitRef, readmeInfo, contentOnly, maxWidth }: F
       return { disabled: perms.disabled, tooltip: perms.tooltip }
     }
     return { disabled: (gitRef && isRefATag(gitRef)) || false, tooltip: undefined }
-  }
+  }, [permPushResult, gitRef])
+
   return (
     <Container
       className={cx(css.readmeContainer, { [css.contentOnly]: contentOnly })}
@@ -81,7 +83,8 @@ function ReadmeViewer({ metadata, gitRef, readmeInfo, contentOnly, maxWidth }: F
             iconProps={{ size: 16 }}
             text={getString('edit')}
             icon="code-edit"
-            {...checkPermTagTooltip()}
+            tooltip={permsFinal.tooltip}
+            disabled={permsFinal.disabled}
             onClick={() => {
               history.push(
                 routes.toCODEFileEdit({