Skip to content
This repository was archived by the owner on Aug 31, 2022. It is now read-only.

Commit bee2f53

Browse files
author
Anisha Swain
committed
fixes on mark as seen and delete reseult features
1 parent 7783eba commit bee2f53

File tree

3 files changed

+38
-24
lines changed

3 files changed

+38
-24
lines changed

mock/overview.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,67 @@ export const expirationLimit = 20;
44
export const resultData = [
55
{
66
key: 1,
7-
result: ['fio_2020.09.10T12.42.11', ' virtual506.virt.lab.eng.bos.redhat.com'],
7+
result: ['mock result -1', ' virtual506.virt.lab.eng.bos.redhat.com'],
88
end: '2020-09-10T 11:52:34.552478',
99
seen: false,
1010
description: 'More content can be added here',
1111
},
1212
{
1313
key: 2,
14-
result: ['fio_2020.09.10T12.42.12', ' virtual506.virt.lab.eng.bos.redhat.com'],
14+
result: ['mock result -2', ' virtual506.virt.lab.eng.bos.redhat.com'],
1515
end: '2020-09-10T11:52:34.552478',
1616
seen: false,
1717
description: 'More content can be added here',
1818
},
1919
{
2020
key: 3,
21-
result: ['fio_2020.09.10T12.42.13', ' virtual506.virt.lab.eng.bos.redhat.com'],
21+
result: ['mock result -3', ' virtual506.virt.lab.eng.bos.redhat.com'],
2222
end: '2020-09-10T11:52:34.552478',
2323
seen: false,
2424
description: 'More content can be added here',
2525
},
2626
{
2727
key: 4,
28-
result: ['fio_2020.09.10T12.42.14', ' virtual506.virt.lab.eng.bos.redhat.com'],
28+
result: ['mock result -4', ' virtual506.virt.lab.eng.bos.redhat.com'],
2929
end: '2020-09-10T11:52:34.552478',
3030
seen: false,
3131
description: 'More content can be added here',
3232
},
3333
{
3434
key: 5,
35-
result: ['fio_2020.09.10T12.42.11', 'virtual506.virt.lab.eng.bos.redhat.com'],
35+
result: ['mock result -5', 'virtual506.virt.lab.eng.bos.redhat.com'],
3636
end: '2020-11-13T11:52:34.552478',
3737
deletion: '2020-11-13T11:52:34.552478',
3838
seen: true,
3939
description: 'More content can be added here',
4040
},
4141
{
4242
key: 6,
43-
result: ['fio_2020.09.10T12.42.12', ' virtual506.virt.lab.eng.bos.redhat.com'],
43+
result: ['mock result -6', ' virtual506.virt.lab.eng.bos.redhat.com'],
4444
end: '2020-11-20T11:52:34.552478',
4545
deletion: '2020-11-20T11:52:34.552478',
4646
seen: true,
4747
description: 'More content can be added here',
4848
},
4949
{
5050
key: 7,
51-
result: ['fio_2020.09.10T12.42.13', ' virtual506.virt.lab.eng.bos.redhat.com'],
51+
result: ['mock result -7', ' virtual506.virt.lab.eng.bos.redhat.com'],
5252
end: '2020-11-15T11:52:34.552478',
5353
deletion: '2020-11-15T11:52:34.552478',
5454
seen: true,
5555
description: 'More content can be added here',
5656
},
5757
{
5858
key: 8,
59-
result: ['fio_2020.09.10T12.42.14', ' virtual506.virt.lab.eng.bos.redhat.com'],
59+
result: ['mock result -8', ' virtual506.virt.lab.eng.bos.redhat.com'],
6060
end: '2020-11-25T11:52:34.552478',
6161
deletion: '2020-11-25T11:52:34.552478',
6262
seen: true,
6363
description: 'More content can be added here',
6464
},
6565
{
6666
key: 9,
67-
result: ['fio_2020.09.10T12.42.14', ' virtual506.virt.lab.eng.bos.redhat.com'],
67+
result: ['mock result -9', ' virtual506.virt.lab.eng.bos.redhat.com'],
6868
end: '2020-11-25T11:52:34.552478',
6969
deletion: '2020-11-25T11:52:34.552478',
7070
seen: true,

src/pages/Overview/index.js

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ class Overview extends React.Component {
5757
this.getSeperatedResults();
5858
}
5959

60-
getSeperatedResults = () => {
60+
getSeperatedResults() {
6161
const { totalResultData } = this.state;
6262
const unlabledData = totalResultData.filter(x => x.seen === true);
6363
const newData = totalResultData.filter(x => x.seen !== true);
6464
this.setState({
6565
newData,
6666
unlabledData,
6767
});
68-
};
68+
}
6969

7070
onCollapse = (event, rowKey, isOpen) => {
7171
const { rows } = this.state;
@@ -79,12 +79,6 @@ class Overview extends React.Component {
7979
console.log(e);
8080
};
8181

82-
handleTabClick = (event, tabIndex) => {
83-
this.setState({
84-
activeTabKey: tabIndex,
85-
});
86-
};
87-
8882
showDrowpdown = id => {
8983
const dropdownElem = document.getElementById(id);
9084
if (dropdownElem.style.display === 'none') {
@@ -95,16 +89,36 @@ class Overview extends React.Component {
9589
};
9690

9791
markSeen = row => {
98-
console.log(row);
92+
const { totalResultData } = this.state;
93+
const objIndex = totalResultData.findIndex(x => x.key === row.key);
94+
totalResultData[objIndex].seen = true;
95+
this.setState(
96+
{
97+
totalResultData,
98+
},
99+
() => {
100+
this.getSeperatedResults();
101+
}
102+
);
99103
};
100104

101105
deleteResult = row => {
102106
const { totalResultData } = this.state;
103107
const updatedResult = totalResultData.filter(x => x.key !== row.key);
108+
this.setState(
109+
{
110+
totalResultData: updatedResult,
111+
},
112+
() => {
113+
this.getSeperatedResults();
114+
}
115+
);
116+
};
117+
118+
handleTabClick = (event, tabIndex) => {
104119
this.setState({
105-
totalResultData: updatedResult,
120+
activeTabKey: tabIndex,
106121
});
107-
this.getSeperatedResults();
108122
};
109123

110124
render() {
@@ -154,7 +168,7 @@ class Overview extends React.Component {
154168
<div className={styles.dropdownLink} onClick={() => this.markSeen(row)}>
155169
Mark as seen
156170
</div>
157-
<div className={styles.dropdownLink} href="#delete">
171+
<div className={styles.dropdownLink} onClick={() => this.deleteResult(row)}>
158172
Delete
159173
</div>
160174
</div>

src/pages/PrivateRoute/index.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { shallow, configure } from 'enzyme';
33
import Adapter from 'enzyme-adapter-react-16';
4-
import AuthLayout from '@/components/AuthLayout';
4+
import LoginModal from '@/components/LoginModal';
55
import PrivateRoute from './index';
66

77
const mockProps = {
@@ -20,7 +20,7 @@ describe('test Login page component', () => {
2020
expect(wrapper).toMatchSnapshot();
2121
});
2222

23-
it('render AuthLayout component', () => {
24-
expect(wrapper.find(AuthLayout).length).toBe(1);
23+
it('render LoginModal component', () => {
24+
expect(wrapper.find(LoginModal).length).toBe(1);
2525
});
2626
});

0 commit comments

Comments
 (0)