Skip to content

Commit 23bb5fc

Browse files
shreeyash07frozenhelium
shreeyash07
authored and
frozenhelium
committed
feat(local-unit): Update the local unit Section
 - add Manage externally local unit section for super user. - add Bulk upload section for local unit - add upload history modal for bulk upload history - update permission in local unit - fix legend and map icon mismatch - add show changes while validating local unit - change in validation status
1 parent e81a93a commit 23bb5fc

File tree

53 files changed

+2898
-285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2898
-285
lines changed

‎app/src/components/DiffWrapper/i18n.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"namespace": "common",
3+
"strings": {
4+
"previousValueLabel":"Previous Value"
5+
}
6+
}

‎app/src/components/DiffWrapper/index.tsx‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,38 @@
11
import { useMemo } from 'react';
2+
import { TextOutput } from '@ifrc-go/ui';
3+
import { useTranslation } from '@ifrc-go/ui/hooks';
24
import { isNotDefined } from '@togglecorp/fujs';
35

4-
interface Props<T> {
6+
import i18n from './i18n.json';
7+
import styles from './styles.module.css';
8+
9+
interface Props<VALUE> {
510
diffContainerClassName?: string;
6-
value?: T;
7-
oldValue?: T;
11+
value?: VALUE | undefined;
12+
oldValue?: VALUE | undefined;
813
children: React.ReactNode;
914
enabled: boolean;
1015
showOnlyDiff?: boolean;
16+
showPreviousValue?: boolean;
1117
}
1218

13-
function DiffWrapper<T>(props: Props<T>) {
19+
function DiffWrapper<
20+
VALUE extends string | number | boolean | null
21+
>(
22+
props: Props<VALUE>,
23+
) {
1424
const {
1525
diffContainerClassName,
1626
oldValue,
1727
value,
1828
children,
1929
enabled = false,
2030
showOnlyDiff,
31+
showPreviousValue,
2132
} = props;
2233

34+
const strings = useTranslation(i18n);
35+
2336
const hasChanged = useMemo(() => {
2437
// NOTE: we consider `null` and `undefined` as same for
2538
// this scenario
@@ -45,6 +58,14 @@ function DiffWrapper<T>(props: Props<T>) {
4558
return (
4659
<div className={diffContainerClassName}>
4760
{children}
61+
{showPreviousValue
62+
&& (
63+
<TextOutput
64+
className={styles.previousValue}
65+
label={strings.previousValueLabel}
66+
value={oldValue}
67+
/>
68+
)}
4869
</div>
4970
);
5071
}

‎app/src/components/DiffWrapper/styles.module.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.previous-value {
2+
color: var(--go-ui-color-gray-70);
3+
}

‎app/src/components/MultiSelectDiffWrapper/i18n.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"namespace": "common",
3+
"strings": {
4+
"multiSelectPreviousValueLabel":"Previous Value"
5+
}
6+
}

‎app/src/components/MultiSelectDiffWrapper/index.tsx‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
import { useMemo } from 'react';
2+
import { useTranslation } from '@ifrc-go/ui/hooks';
3+
import { isNotDefined } from '@togglecorp/fujs';
4+
5+
import MultiSelectOutput from '../MultiSelectOutput';
6+
7+
import i18n from './i18n.json';
8+
import styles from './styles.module.css';
9+
10+
interface Props<VALUE, OPTION> {
11+
value: VALUE[] | undefined;
12+
oldValue: VALUE[] | undefined;
13+
options: OPTION[] | undefined;
14+
keySelector: (datum: OPTION) => VALUE;
15+
labelSelector: (datum: OPTION) => React.ReactNode;
16+
diffContainerClassName?: string;
17+
children: React.ReactNode;
18+
enabled: boolean;
19+
showOnlyDiff?: boolean;
20+
showPreviousValue?: boolean;
21+
}
22+
23+
function MultiSelectDiffWrapper<
24+
VALUE extends number | string, OPTION
25+
>(
26+
props: Props<VALUE, OPTION>,
27+
) {
28+
const {
29+
diffContainerClassName,
30+
oldValue,
31+
value,
32+
children,
33+
enabled = false,
34+
showOnlyDiff,
35+
showPreviousValue,
36+
options,
37+
keySelector,
38+
labelSelector,
39+
} = props;
40+
41+
const strings = useTranslation(i18n);
42+
43+
const hasChanged = useMemo(() => {
44+
// NOTE: we consider `null` and `undefined` as same for
45+
// this scenario
46+
if (isNotDefined(oldValue) && isNotDefined(value)) {
47+
return false;
48+
}
49+
50+
return JSON.stringify(oldValue) !== JSON.stringify(value);
51+
}, [oldValue, value]);
52+
53+
if (!enabled) {
54+
return children;
55+
}
56+
57+
if (!hasChanged && showOnlyDiff) {
58+
return null;
59+
}
60+
61+
if (!hasChanged) {
62+
return children;
63+
}
64+
65+
return (
66+
<div className={diffContainerClassName}>
67+
{children}
68+
{showPreviousValue
69+
&& (
70+
<MultiSelectOutput
71+
className={styles.previousValue}
72+
label={strings.multiSelectPreviousValueLabel}
73+
value={oldValue}
74+
options={options}
75+
keySelector={keySelector}
76+
labelSelector={labelSelector}
77+
/>
78+
)}
79+
</div>
80+
);
81+
}
82+
83+
export default MultiSelectDiffWrapper;

‎app/src/components/MultiSelectDiffWrapper/styles.module.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.previous-value {
2+
color: var(--go-ui-color-gray-70);
3+
}

‎app/src/components/MultiSelectOutput/index.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { TextOutput } from '@ifrc-go/ui';
33
import { listToMap } from '@togglecorp/fujs';
44

55
interface Props<VALUE, OPTION> {
6+
className?: string;
67
value: VALUE[] | undefined;
78
options: OPTION[] | undefined;
89
keySelector: (datum: OPTION) => VALUE;
@@ -12,6 +13,7 @@ interface Props<VALUE, OPTION> {
1213

1314
function MultiSelectOutput<VALUE extends string | number, OPTION>(props: Props<VALUE, OPTION>) {
1415
const {
16+
className,
1517
value,
1618
options,
1719
keySelector,
@@ -37,6 +39,7 @@ function MultiSelectOutput<VALUE extends string | number, OPTION>(props: Props<V
3739

3840
return (
3941
<TextOutput
42+
className={className}
4043
label={label}
4144
value={valueLabel}
4245
strongLabel

‎app/src/components/SelectDiffWrapper/i18n.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"namespace": "common",
3+
"strings": {
4+
"selectPreviousValueLabel":"Previous Value"
5+
}
6+
}

‎app/src/components/SelectDiffWrapper/index.tsx‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import { useMemo } from 'react';
2+
import { useTranslation } from '@ifrc-go/ui/hooks';
3+
import { isNotDefined } from '@togglecorp/fujs';
4+
5+
import SelectOutput from '#components/SelectOutput';
6+
7+
import i18n from './i18n.json';
8+
import styles from './styles.module.css';
9+
10+
interface Props<VALUE, OPTION> {
11+
diffContainerClassName?: string;
12+
value: VALUE | undefined;
13+
oldValue?: VALUE | undefined;
14+
options: OPTION[] | undefined;
15+
keySelector: (datum: OPTION) => VALUE;
16+
labelSelector: (datum: OPTION) => React.ReactNode;
17+
children: React.ReactNode;
18+
enabled: boolean;
19+
showOnlyDiff?: boolean;
20+
showPreviousValue?: boolean;
21+
}
22+
23+
function SelectDiffWrapper<
24+
VALUE, OPTION
25+
>(
26+
props: Props<VALUE, OPTION>,
27+
) {
28+
const {
29+
diffContainerClassName,
30+
oldValue,
31+
value,
32+
children,
33+
enabled = false,
34+
showOnlyDiff,
35+
showPreviousValue,
36+
options,
37+
keySelector,
38+
labelSelector,
39+
} = props;
40+
41+
const strings = useTranslation(i18n);
42+
43+
const hasChanged = useMemo(() => {
44+
// NOTE: we consider `null` and `undefined` as same for
45+
// this scenario
46+
if (isNotDefined(oldValue) && isNotDefined(value)) {
47+
return false;
48+
}
49+
50+
return JSON.stringify(oldValue) !== JSON.stringify(value);
51+
}, [oldValue, value]);
52+
53+
if (!enabled) {
54+
return children;
55+
}
56+
57+
if (!hasChanged && showOnlyDiff) {
58+
return null;
59+
}
60+
61+
if (!hasChanged) {
62+
return children;
63+
}
64+
65+
return (
66+
<div className={diffContainerClassName}>
67+
{children}
68+
{showPreviousValue && (
69+
<SelectOutput
70+
className={styles.selectPreviousValue}
71+
label={strings.selectPreviousValueLabel}
72+
value={oldValue}
73+
options={options}
74+
keySelector={keySelector}
75+
labelSelector={labelSelector}
76+
/>
77+
)}
78+
</div>
79+
);
80+
}
81+
82+
export default SelectDiffWrapper;

‎app/src/components/SelectDiffWrapper/styles.module.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.select-previous-value {
2+
color: var(--go-ui-color-gray-70);
3+
}

0 commit comments

Comments
 (0)