INFRA-2874 | fix pr comments

src/Pages/TeamRevamp/partials/SlackDetails/index.tsx

@@ -9,11 +9,16 @@ import { SelectPicker } from '@navi/web-ui/lib/components';
 import { AlertOutlineIcon } from '@navi/web-ui/lib/icons';
 import useOutsideClick from '@src/services/hooks/useOustideClick';
 import { useAuthData } from '@src/services/hooks/useAuth';
-import useTeamApis from '../../useTeamApis';
-import { actionTypes, initialState, reducer } from '../../constants';
-import { Member, TeamsDetail } from '../../types';
+import useTeamApis from '@src/Pages/TeamRevamp/useTeamApis';
+import {
+  actionTypes,
+  initialState,
+  reducer,
+} from '@src/Pages/TeamRevamp/constants';
 import { getBots } from '../Bots';
-import useGetTeamDetailsConstants, { isUserParticipant } from '../../util';
+import useGetTeamDetailsConstants, {
+  isUserParticipant,
+} from '@src/Pages/TeamRevamp/util';
 import styles from './Slack.module.scss';
 
 const TeamDetails: React.FC = () => {
@@ -146,6 +151,9 @@ const TeamDetails: React.FC = () => {
     ? styles['hint-text']
     : styles['hint-text-disabled'];
 
+  const isNeitherParticipantNorAdmin: boolean =
+    !isUserParticipant(teamMembers, userEmail) && !Role.includes('Admin');
+
   return (
     <div className={styles['team-details-wrapper']}>
       <Typography variant="h1" className={styles['team-name']}>
@@ -180,10 +188,7 @@ const TeamDetails: React.FC = () => {
             value={webChannelName ? webChannelName : webChannelId}
             hintTextClasses={hintClassName}
             hintMsg="Channel name populates after entering id"
-            disabled={
-              !isUserParticipant(teamMembers, userEmail) &&
-              !Role.includes('Admin')
-            }
+            disabled={isNeitherParticipantNorAdmin}
           />
         </div>
         <div className={styles['on-call-wrapper']}>
@@ -200,10 +205,7 @@ const TeamDetails: React.FC = () => {
                 placeholder="@oncall_handle"
                 containerClassName={styles['search-input']}
                 value={state.input || DEFAULT_TEAM_ONCALL}
-                disabled={
-                  !isUserParticipant(teamMembers, userEmail) &&
-                  !Role.includes('Admin')
-                }
+                disabled={isNeitherParticipantNorAdmin}
               ></BorderedInput>
             </div>
             {state.openOnCall && (
@@ -232,10 +234,7 @@ const TeamDetails: React.FC = () => {
                 placeholder="@psec_oncall_handle"
                 containerClassName={styles['search-input']}
                 value={state.psecInput || DEFAULT_PSEC_ONCALL}
-                disabled={
-                  !isUserParticipant(teamMembers, userEmail) &&
-                  !Role.includes('Admin')
-                }
+                disabled={isNeitherParticipantNorAdmin}
               ></BorderedInput>
             </div>
             {state.openPsecOnCall && (

src/Pages/TeamRevamp/partials/TeamMemberDetails/Modals/RemoveManager.tsx

@@ -4,7 +4,7 @@ import { Button, ModalDialog, Typography } from '@navi/web-ui/lib/primitives';
 import { actionTypes } from '@src/Pages/TeamRevamp/constants';
 import useTeamApis from '@src/Pages/TeamRevamp/useTeamApis';
 
-import { ReducerStateType } from '../../../types';
+import { ReducerStateType } from '@src/Pages/TeamRevamp/types';
 import styles from './RemoveManager.module.scss';
 
 const RemoveManager: FC<ReducerStateType> = (props: ReducerStateType) => {

src/Pages/TeamRevamp/partials/TeamMemberDetails/Modals/UpdateManager.tsx

@@ -4,7 +4,7 @@ import { ModalDialog, Typography } from '@navi/web-ui/lib/primitives';
 import { actionTypes } from '@src/Pages/TeamRevamp/constants';
 import useTeamApis from '@src/Pages/TeamRevamp/useTeamApis';
 
-import { ReducerStateType } from '../../../types';
+import { ReducerStateType } from '@src/Pages/TeamRevamp/types';
 
 const UpdateManager: FC<ReducerStateType> = (props: ReducerStateType) => {
   const { makeManager } = useTeamApis();

src/Pages/TeamRevamp/partials/TeamMemberDetails/Modals/UpdateSevList.module.scss

@@ -1,7 +1,7 @@
 .auto-complete-container {
   > div > div {
     span {
-      color: var(--blue-blue_base) !important;
+      color: var(--navi-color-blue-base) !important;
     }
   }
 }

src/Pages/TeamRevamp/partials/TeamMemberDetails/SevHeader.tsx

@@ -2,11 +2,10 @@ import { FC, useState } from 'react';
 
 import { Button, Typography } from '@navi/web-ui/lib/primitives';
 
-import styles from './TeamMemberDetails.module.scss';
-import { Member } from '../../types';
+import { Member } from '@src/Pages/TeamRevamp/types';
 import UpdateSevList from './Modals/UpdateSevList';
-import { SelectPickerOptionProps } from '@navi/web-ui/lib/components/SelectPicker/types';
-import { getSelectLabelOptionsForMember } from '../../util';
+import { getSelectLabelOptionsForMember } from '@src/Pages/TeamRevamp/util';
+import styles from './TeamMemberDetails.module.scss';
 
 interface HeaderProps {
   isDisabled: boolean;

src/Pages/TeamRevamp/partials/TeamMemberDetails/SeverityDropDown.tsx

@@ -8,8 +8,8 @@ import { FETCH_FILTER_CONFIG } from '@src/Pages/Dashboard/constants';
 import { transformFilterResponse } from '@src/Pages/Dashboard/utils';
 import { ApiService } from '@src/services/api';
 
-import { actionTypes, DEFAULT_SEVERITY } from '../../constants';
-import { ReducerStateType } from '../../types';
+import { actionTypes, DEFAULT_SEVERITY } from '@src/Pages/TeamRevamp/constants';
+import { ReducerStateType } from '@src/Pages/TeamRevamp/types';
 import styles from './TeamMemberDetails.module.scss';
 
 interface SeverityDropDownProps extends ReducerStateType {

src/Pages/TeamRevamp/partials/TeamMemberDetails/SeverityWiseList.tsx

@@ -8,8 +8,10 @@ import PersonIconFill from '@src/assets/PersonIconFill';
 import { actionTypes } from '@src/Pages/TeamRevamp/constants';
 import { useAuthData } from '@src/services/hooks/useAuth';
 
-import { Member, ReducerStateType } from '../../types';
-import useGetTeamDetailsConstants, { isUserParticipant } from '../../util';
+import { Member, ReducerStateType } from '@src/Pages/TeamRevamp/types';
+import useGetTeamDetailsConstants, {
+  isUserParticipant,
+} from '@src/Pages/TeamRevamp/util';
 import SevHeader from './SevHeader';
 import styles from './TeamMemberDetails.module.scss';
 

src/Pages/TeamRevamp/partials/TeamMemberDetails/TeamMember.tsx

@@ -1,16 +1,13 @@
 import { useReducer } from 'react';
 import { useAuthData } from '@src/services/hooks/useAuth';
 import {
-  actionTypes,
   initialState,
   reducer,
 } from '@src/Pages/TeamRevamp/constants';
 
-import useGetTeamDetailsConstants from '../../util';
-import styles from './TeamMemberDetails.module.scss';
+import useGetTeamDetailsConstants from '@src/Pages/TeamRevamp/util';
 import UpdateManager from './Modals/UpdateManager';
 import RemoveManager from './Modals/RemoveManager';
-import { Member } from '../../types';
 import SeverityWiseList from './SeverityWiseList';
 
 const TeamMember: React.FC = () => {

src/Pages/TeamRevamp/partials/TeamMemberDetails/TeamMemberDetails.module.scss

@@ -107,10 +107,10 @@
   border-radius: 8px 0px 0px 8px !important;
 
   > div {
-    color: var(--grayscale-2) !important;
+    color: var(--navi-color-gray-c2) !important;
     border-radius: 8px 0px 0px 8px !important;
     box-shadow: none !important;
-    border-color: var(--grey-border) !important;
+    border-color: var(--navi-color-gray-border) !important;
   }
   > :hover {
     border: 1px solid var(--blue-border) !important;
@@ -121,7 +121,7 @@
 }
 .dropdown {
   div {
-    color: var(--grayscale-2) !important;
+    color: var(--navi-color-gray-c2) !important;
   }
 }
 .no-member-present {
@@ -130,9 +130,9 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  background-color: var(--bg-secondary);
+  background-color: var(--navi-color-gray-bg-secondary);
   margin: 16px 0px;
-  color: var(--grayscale-3);
+  color: var(--navi-color-gray-c3);
 }
 .header {
   margin-bottom: 20px;

src/Pages/TeamRevamp/partials/TeamMemberDetails/index.tsx

@@ -15,7 +15,7 @@ import {
 } from '@src/Pages/TeamRevamp/util';
 import { useAuthData } from '@src/services/hooks/useAuth';
 
-import useTeamApis from '../../useTeamApis';
+import useTeamApis from '@src/Pages/TeamRevamp/useTeamApis';
 import SeverityDropDown from './SeverityDropDown';
 import TeamMember from './TeamMember';
 import styles from './TeamMemberDetails.module.scss';

src/variables.scss

@@ -3,20 +3,5 @@
   --bg-secondary: #f7f7f7;
   --navi-navbar-divider-color: #657384;
 
-  --grayscale-1: #1c1c1c;
-  --grayscale-2: #585757;
-  --grayscale-3: #969696;
-  --grayscale-4: #d8d5d5;
-
-  --grayscale-warm-1: #1d0b00;
-  --grayscale-warm-2: #564840;
-  --grayscale-warm-3: #99918c;
-
-  --grayscale-cold-1: #000f1d;
-  --grayscale-cold-2: #404b56;
-  --grayscale-cold-3: #8c9399;
-  --blue-blue_base: #0276fe;
-
   --blue-border: #1677ff;
-  --grey-border: #e8e8e8;
 }