TP-40366 | resolved PR reviews

This commit is contained in:
pooja
2023-09-13 17:21:22 +05:30
parent b44b8cbd70
commit 41fe55c863
6 changed files with 16 additions and 20 deletions

View File

@@ -31,8 +31,6 @@
]
},
"dependencies": {
"@headlessui/react": "^1.7.17",
"@heroicons/react": "^2.0.18",
"@navi/web-ui": "^1.49.8",
"@super-app/dark-knight": "^1.0.6",
"axios": "^1.3.4",

11
src/Pages/Team/Hook.tsx Normal file
View File

@@ -0,0 +1,11 @@
import { useState, useEffect } from 'react';
export const Hook = () => {
const [userRole, setUserRole] = useState<string>('');
useEffect(() => {
const userData = JSON.parse(localStorage.getItem('user-data') || '{}');
setUserRole(userData?.roles || []);
}, []);
return userRole;
};

View File

@@ -110,7 +110,6 @@
align-items: center;
gap: 0 8px;
margin-bottom: 24px;
// margin: 8px 0px;
}
.email-wrapper {

View File

@@ -13,14 +13,6 @@ export const regularExpression = /^[a-zA-Z][a-zA-Z0-9_ -]{1,48}[a-zA-Z0-9]$/;
export const emailRegularExpression = /^[a-zA-Z]+\.[a-zA-Z]+@navi\.com$/;
//TODO: change this to mock server
export const ADD_TEAM_DATA = (): string => {
return ``;
};
export const ADD_TEAM = `${window?.config?.BASE_API_URL}/teams/add`;
export interface TeamsData {
id: string;
name: string;

View File

@@ -1,8 +1,6 @@
import { FC, useEffect, useState } from 'react';
import Typography from '@navi/web-ui/lib/primitives/Typography';
import { toast } from '@navi/web-ui/lib/primitives/Toast';
import FallbackComponent from '@src/components/Fallback';
import { ApiService } from '@src/services/api';
import { FETCH_TEAM_DATA } from './constants';
@@ -11,12 +9,14 @@ import CreateTeam from './partials/CreateTeam';
import styles from './Team.module.scss';
import Button from '@navi/web-ui/lib/primitives/Button';
import { AddIcon } from '@navi/web-ui/lib/icons';
import { Hook } from './Hook';
const Team: FC = () => {
const [data, setData] = useState<any>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [open, setOpen] = useState<boolean>(false);
const Role = Hook();
const startTeamSearch = (): void => {
const endPoint = FETCH_TEAM_DATA;
setIsLoading(true);
@@ -37,9 +37,6 @@ const Team: FC = () => {
});
};
const userData = JSON.parse(localStorage.getItem('user-data') || '{}');
const userRole = userData.roles || [];
useEffect(() => {
startTeamSearch();
}, []);
@@ -74,7 +71,7 @@ const Team: FC = () => {
{data?.length} teams{' '}
</Typography>
<div className={styles['create-team-btn-wrapper']}>
{userRole.includes('Admin') && (
{Role.includes('Admin') && (
<Button
startAdornment={<AddIcon color="white" />}
fullWidth

View File

@@ -1,4 +1,4 @@
import { Button, Typography } from '@navi/web-ui/lib/primitives';
import { Typography } from '@navi/web-ui/lib/primitives';
import HelpIcon from '@src/assets/HelpIcon';
import styles from './Footer.module.scss';
@@ -22,7 +22,6 @@ const Footer = ({ isExpanded }) => {
>
Get help on Slack
</a>
{/* <Button>See user list </Button> */}
</Typography>
</div>
);