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

Commit 4131629

Browse files
author
Anisha Swain
committed
adds progressbar to unseen results
1 parent 726941c commit 4131629

File tree

2 files changed

+40
-24
lines changed

2 files changed

+40
-24
lines changed

mock/overview.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const expirationLimit = 30;
1+
export const expirationLimit = 90;
22

33
// P.S: the key needs to be unique for this object
44
export const resultData = [
@@ -38,39 +38,39 @@ export const resultData = [
3838
key: 5,
3939
result: ['mock result -5', 'example.lab.eng.com'],
4040
end: '2020-12-10T11:52:34.552478',
41-
deletion: '2021-01-10T11:52:34.552478',
41+
deletion: '2021-02-10T11:52:34.552478',
4242
seen: true,
4343
description: 'More content can be added here',
4444
},
4545
{
4646
key: 6,
4747
result: ['mock result -6', ' example.lab.eng.com'],
4848
end: '2020-12-10T11:52:34.552478',
49-
deletion: '2021-01-10T11:52:34.552478',
49+
deletion: '2021-03-10T11:52:34.552478',
5050
seen: true,
5151
description: 'More content can be added here',
5252
},
5353
{
5454
key: 7,
5555
result: ['mock result -7', ' example.lab.eng.com'],
5656
end: '2021-01-10T11:52:34.552478',
57-
deletion: '2021-02-10T11:52:34.552478',
57+
deletion: '2021-04-10T11:52:34.552478',
5858
seen: true,
5959
description: 'More content can be added here',
6060
},
6161
{
6262
key: 8,
6363
result: ['mock result -8', ' example.lab.eng.com'],
6464
end: '2021-01-10T11:52:34.552478',
65-
deletion: '2021-02-10T11:52:34.552478',
65+
deletion: '2021-03-10T11:52:34.552478',
6666
seen: true,
6767
description: 'More content can be added here',
6868
},
6969
{
7070
key: 9,
7171
result: ['mock result -9', ' example.lab.eng.com'],
7272
end: '2021-01-20T11:52:34.552478',
73-
deletion: '2021-02-20T11:52:34.552478',
73+
deletion: '2021-04-20T11:52:34.552478',
7474
seen: true,
7575
description: 'More content can be added here',
7676
},

src/pages/Overview/index.js

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import {
99
Button,
1010
Tabs,
1111
Tab,
12+
Progress,
13+
ProgressSize,
14+
ProgressMeasureLocation,
15+
ProgressVariant,
1216
} from '@patternfly/react-core';
1317
import {
1418
Chart,
@@ -210,29 +214,41 @@ class Overview extends React.Component {
210214
render: text => {
211215
const deleteDate = moment(new Date(Date.parse(text)));
212216
const currDate = moment(new Date());
213-
const remainingDays = currDate.diff(deleteDate, 'days');
214-
console.log(remainingDays, expirationLimit);
215-
if (remainingDays < 0) {
217+
const remainingDays = deleteDate.diff(currDate, 'days');
218+
if (remainingDays > 60) {
216219
return (
217-
<Text>
218-
{moment(text)
219-
.add(7, 'days')
220-
.format('YYYY-MM-DDTHH:mm:ss:SSSSSS')}
221-
</Text>
220+
<div>
221+
<Text>
222+
{moment(text)
223+
.add(7, 'days')
224+
.format('YYYY-MM-DDTHH:mm:ss:SSSSSS')}
225+
</Text>
226+
<Progress
227+
min={0}
228+
max={expirationLimit}
229+
value={expirationLimit - remainingDays}
230+
size={ProgressSize.sm}
231+
measureLocation={ProgressMeasureLocation.none}
232+
/>
233+
</div>
222234
);
223235
}
224236
return (
225-
<span>
226-
{moment(text)
227-
.add(7, 'days')
228-
.format('YYYY-MM-DDTHH:mm:ss:SSSSSS')}
229-
<FontAwesomeIcon
230-
style={{ paddingLeft: '5px', width: '20px' }}
231-
icon={faExclamationCircle}
232-
color="red"
233-
className={styles.icons}
237+
<div>
238+
<span>
239+
{moment(text)
240+
.add(7, 'days')
241+
.format('YYYY-MM-DDTHH:mm:ss:SSSSSS')}
242+
</span>
243+
<Progress
244+
min={0}
245+
max={expirationLimit}
246+
value={expirationLimit - remainingDays}
247+
size={ProgressSize.sm}
248+
variant={ProgressVariant.danger}
249+
measureLocation={ProgressMeasureLocation.none}
234250
/>
235-
</span>
251+
</div>
236252
);
237253
},
238254
},

0 commit comments

Comments
 (0)