Skip to content

Commit ea1e1e3

Browse files
authored
fix(trainee dashboard) remove performance details field (#436)
1 parent 40ddd61 commit ea1e1e3

File tree

5 files changed

+83
-105
lines changed

5 files changed

+83
-105
lines changed

src/components/Sidebar.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
MoonIcon,
1919
MailIcon,
2020
} from '@heroicons/react/solid';
21-
import { FaEnvelopeOpenText } from "react-icons/fa6";
21+
import { FaEnvelopeOpenText } from 'react-icons/fa6';
2222
import {
2323
AcademicCapIcon,
2424
BookOpenIcon,
@@ -37,8 +37,9 @@ function Sidebar({ style, toggle }: { style: string; toggle: () => void }) {
3737
const { logout } = useContext(UserContext);
3838
return (
3939
<div
40-
className={`${showNav ? 'block' : 'hidden'
41-
} lg:block page-sideNav fixed lg:static top-16 bottom-0 font-serif`}
40+
className={`${
41+
showNav ? 'block' : 'hidden'
42+
} lg:block page-sideNav fixed lg:static top-16 bottom-0 font-serif`}
4243
>
4344
<div
4445
className={`${style} overflow-auto flex-col h-[100%] pt-2 bg-indigo-100 dark:bg-dark-bg shadow-lg lg:shadow-none dark:shadow-border-dark`}
@@ -80,7 +81,7 @@ function Sidebar({ style, toggle }: { style: string; toggle: () => void }) {
8081
<UserGroupIcon className="w-5" />
8182
</SideNavLink>
8283
</CheckRole>
83-
{/* INVITATION*/}
84+
{/* INVITATION */}
8485
<CheckRole roles={['admin', 'coordinator']}>
8586
<SideNavLink onClick={toggle} to="/invitation" name="Invitation">
8687
<FaEnvelopeOpenText className="w-5" />
@@ -195,4 +196,4 @@ function Sidebar({ style, toggle }: { style: string; toggle: () => void }) {
195196
);
196197
}
197198

198-
export default Sidebar;
199+
export default Sidebar;

src/components/TraineePerformance.tsx

+37-57
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { toast } from 'react-toastify';
55
import Pagination from './Pagination';
66
import PerformanceData from '../dummyData/performance.json';
77
import { TRAINEE_RATING } from '../Mutations/Ratings';
8-
import Button from './Buttons';
98
import RemarksModal from '../pages/ratings/CoordinatorRemarks';
109
import { UserContext } from '../hook/useAuth';
1110
import { rowsType } from '../pages/ratings/frame';
@@ -63,7 +62,7 @@ export const GET_RATINGS_DATA = gql`
6362
`;
6463

6564
function TraineePerfomance() {
66-
const [usedata, setUserdata] = React.useState([]);
65+
const [usedata, setUserdata] = useState([]);
6766
const { data, loading, error } = useQuery(GET_RATINGS_DATA, {});
6867
const { user } = useContext(UserContext);
6968
const [row, setRow] = useState<rowsType>({
@@ -121,14 +120,11 @@ function TraineePerfomance() {
121120
useEffect(() => {
122121
getRatings({
123122
fetchPolicy: 'network-only',
124-
onCompleted: /* istanbul ignore next */ (data) => {
125-
/* istanbul ignore next */
123+
onCompleted: (data) => {
126124
setRatings(data?.fetchRatingsTrainee);
127-
/* istanbul ignore next */
128125
sessionStorage.removeItem('data');
129126
},
130-
onError: /* istanbul ignore next */ (error) => {
131-
/* istanbul ignore next */
127+
onError: (error) => {
132128
toast.error(error?.message || 'Something went wrong');
133129
},
134130
});
@@ -152,6 +148,7 @@ function TraineePerfomance() {
152148
const closeFeeds = () => {
153149
setToggle(false);
154150
};
151+
155152
if (loading) {
156153
return (
157154
<>
@@ -171,6 +168,7 @@ function TraineePerfomance() {
171168
</>
172169
);
173170
}
171+
174172
if (ratings?.length === 0) {
175173
return (
176174
<>
@@ -240,14 +238,10 @@ function TraineePerfomance() {
240238
<th className="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 dark:bg-neutral-600 text-center text-xs font-semibold text-gray-600 dark:text-white uppercase tracking-wider">
241239
{t('Average')}
242240
</th>
243-
<th className="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 dark:bg-neutral-600 text-center text-xs font-semibold text-gray-600 dark:text-white uppercase tracking-wider">
244-
{t('Actions')}
245-
</th>
246241
</tr>
247-
{ratings?.slice(firstContentIndex, lastContentIndex).map(
248-
/* istanbul ignore next */
249-
(item: any) => (
250-
/* istanbul ignore next */
242+
{ratings
243+
?.slice(firstContentIndex, lastContentIndex)
244+
.map((item: any) => (
251245
<tr key={item.sprint}>
252246
<td className="px-5 py-5 border-b border-gray-200 bg-white dark:bg-dark-bg text-sm">
253247
<div className="flex justify-center items-center">
@@ -280,29 +274,13 @@ function TraineePerfomance() {
280274
</td>
281275
<td className="px-5 py-5 border-b border-gray-200 bg-white dark:bg-dark-bg text-sm">
282276
<p className="text-gray-900 dark:text-white whitespace-no-wrap text-center">
283-
{item.average % 1 === 0 ? item.average : Number(item.average).toFixed(2)}
277+
{item.average % 1 === 0
278+
? item.average
279+
: Number(item.average).toFixed(2)}
284280
</p>
285281
</td>
286-
287-
<td className="px-0 py-5 border-b border-gray-200 bg-white dark:bg-dark-bg text-sm">
288-
<Button
289-
variant="primary"
290-
size="sm"
291-
style="px-4 py-1 text-sm"
292-
onClick={
293-
/* istanbul ignore next */
294-
() => {
295-
/* istanbul ignore next */
296-
openFeed(item);
297-
}
298-
}
299-
>
300-
{t('Details')}
301-
</Button>
302-
</td>
303282
</tr>
304-
),
305-
)}
283+
))}
306284
</tbody>
307285
</table>
308286
</div>
@@ -314,50 +292,52 @@ function TraineePerfomance() {
314292
onClick={prevPage}
315293
data-testid="prev"
316294
type="button"
317-
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${page === 1 && 'disabled'
318-
}`}
295+
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${
296+
page === 1 && 'disabled'
297+
}`}
319298
>
320299
&larr;
321300
</button>
322301
<button
323302
onClick={() => setPage(1)}
324303
data-testid="page1"
325304
type="button"
326-
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${page === 1 && 'disabled'
327-
}`}
305+
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${
306+
page === 1 && 'disabled'
307+
}`}
328308
>
329309
1
330310
</button>
331-
{/* @ts-ignore */}
332-
{gaps.paginationGroup.map(
333-
/* istanbul ignore next */(el) => (
334-
<button
335-
onClick={/* istanbul ignore next */ () => setPage(el)}
336-
data-testid="page"
337-
key={el}
338-
type="button"
339-
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${page === el ? 'active' : ''
340-
}`}
341-
>
342-
{el}
343-
</button>
344-
),
345-
)}
311+
{gaps.paginationGroup.map((el) => (
312+
<button
313+
onClick={() => setPage(el)}
314+
data-testid="page"
315+
key={el}
316+
type="button"
317+
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${
318+
page === el ? 'active' : ''
319+
}`}
320+
>
321+
{el}
322+
</button>
323+
))}
346324
<button
347325
onClick={() => setPage(totalPages)}
348326
data-testid="page3"
349327
type="button"
350-
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${page === totalPages && 'disabled'
351-
}`}
328+
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${
329+
page === totalPages && 'disabled'
330+
}`}
352331
>
353332
{totalPages}
354333
</button>
355334
<button
356335
onClick={nextPage}
357336
data-testid="next"
358337
type="button"
359-
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${page === totalPages && 'disabled'
360-
}`}
338+
className={`page flex text-white h-12 w-12 items-center justify-center border-solid cursor-pointer bg-transparent ${
339+
page === totalPages && 'disabled'
340+
}`}
361341
>
362342
&rarr;
363343
</button>

src/containers/admin-dashBoard/tests/Sessions.test.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import '@testing-library/jest-dom';
22
import React from 'react';
33
import { render, screen, fireEvent, waitFor } from '@testing-library/react';
4-
import '@testing-library/jest-dom';
4+
55
import { MockedProvider } from '@apollo/client/testing';
66
import { act } from 'react-dom/test-utils';
77
import AdminSission from '../Sessions';
@@ -123,12 +123,12 @@ describe('AdminSission Component', () => {
123123
await waitFor(async () => {
124124
fireEvent.click(screen.getAllByTestId('deleteIcon')[0]);
125125
expect(screen.getByTestId('delete-section')).toBeInTheDocument();
126-
expect(screen.getByTestId('delete-section')).toHaveClass("block");
126+
expect(screen.getByTestId('delete-section')).toHaveClass('block');
127127

128128
fireEvent.click(screen.getByTestId('delete'));
129-
await waitFor(()=>{
130-
expect(screen.queryByTestId('delete-section')).toHaveClass("hidden");
131-
})
129+
await waitFor(() => {
130+
expect(screen.queryByTestId('delete-section')).toHaveClass('hidden');
131+
});
132132
});
133133
});
134134

@@ -163,7 +163,7 @@ describe('AdminSission Component', () => {
163163
</MockedProvider>,
164164
);
165165

166-
await waitFor(async() => {
166+
await waitFor(async () => {
167167
fireEvent.click(screen.getAllByTestId('updateIcon')[0]);
168168
expect(screen.getByTestId('update-section')).toBeInTheDocument();
169169

@@ -176,9 +176,9 @@ describe('AdminSission Component', () => {
176176
});
177177

178178
fireEvent.click(screen.getByTestId('save'));
179-
await waitFor(()=>{
179+
await waitFor(() => {
180180
expect(screen.queryByText('update-section')).toBeNull();
181-
})
181+
});
182182
});
183183
});
184184
});

src/pages/tests/About.test.tsx

+18-20
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
import React from "react";
2-
import { MemoryRouter } from "react-router-dom";
3-
import renderer from "react-test-renderer"
4-
import "@testing-library/jest-dom"
5-
import { About } from '../About'
6-
import { MockedProvider as ApolloProvider } from "@apollo/client/testing";
1+
import React from 'react';
2+
import { MemoryRouter } from 'react-router-dom';
3+
import renderer from 'react-test-renderer';
4+
import '@testing-library/jest-dom';
5+
import { MockedProvider as ApolloProvider } from '@apollo/client/testing';
6+
import { About } from '../About';
77

8-
describe('About page',()=>{
8+
describe('About page', () => {
9+
it('renders the about page', () => {
10+
const elem = renderer.create(
11+
<MemoryRouter>
12+
<ApolloProvider>
13+
<About />
14+
</ApolloProvider>
15+
</MemoryRouter>,
16+
);
917

10-
it('renders the about page',()=>{
11-
const elem = renderer.create(
12-
<MemoryRouter>
13-
<ApolloProvider>
14-
<About/>
15-
</ApolloProvider>
16-
</MemoryRouter>
17-
)
18-
19-
expect(elem.toJSON()).toMatchSnapshot()
20-
})
21-
22-
})
18+
expect(elem.toJSON()).toMatchSnapshot();
19+
});
20+
});

src/tests/about.test.tsx

+14-15
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@ import React from 'react';
22
import { render, screen } from '@testing-library/react';
33
import '@testing-library/jest-dom';
44
import { MemoryRouter } from 'react-router-dom';
5-
import { About } from '../pages/About';
65
import { I18nextProvider } from 'react-i18next';
6+
import { About } from '../pages/About';
77

88
// Mock i18next
99
jest.mock('react-i18next', () => ({
1010
// this mock makes sure any components using the translate hook can use it without a warning being shown
11-
useTranslation: () => {
12-
return {
13-
t: (str: string) => str,
14-
i18n: {
15-
changeLanguage: () => new Promise(() => {}),
16-
},
17-
};
18-
},
11+
useTranslation: () => ({
12+
t: (str: string) => str,
13+
i18n: {
14+
changeLanguage: () => new Promise(() => {}),
15+
},
16+
}),
1917
initReactI18next: {
2018
type: '3rdParty',
2119
init: () => {},
@@ -48,13 +46,12 @@ jest.mock('../assets/person2.png', () => 'mock-person2-image');
4846
jest.mock('../assets/ur.png', () => 'mock-ur-image');
4947

5048
describe('About Component', () => {
51-
const renderComponent = () => {
52-
return render(
49+
const renderComponent = () =>
50+
render(
5351
<MemoryRouter>
5452
<About />
55-
</MemoryRouter>
53+
</MemoryRouter>,
5654
);
57-
};
5855

5956
it('renders the main heading', () => {
6057
renderComponent();
@@ -89,6 +86,8 @@ describe('About Component', () => {
8986

9087
it('renders the final heading', () => {
9188
renderComponent();
92-
expect(screen.getByText('Come shape the future together')).toBeInTheDocument();
89+
expect(
90+
screen.getByText('Come shape the future together'),
91+
).toBeInTheDocument();
9392
});
94-
});
93+
});

0 commit comments

Comments
 (0)