Skip to content

Commit 7b38a4b

Browse files
committed
Update isNewLocalUnit logic
1 parent dbbe0cf commit 7b38a4b

File tree

2 files changed

+5
-11
lines changed
  • app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits

2 files changed

+5
-11
lines changed

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitView/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { useMemo } from 'react';
12
import {
23
Container,
34
TextOutput,
@@ -18,6 +19,7 @@ import MultiSelectOutput from '#components/MultiSelectOutput';
1819
import SelectOutput from '#components/SelectOutput';
1920
import useCountry from '#hooks/domain/useCountry';
2021
import useGlobalEnums from '#hooks/domain/useGlobalEnums';
22+
import hasDifferences, { getFormFields } from '#utils/localUnits';
2123
import {
2224
type GoApiResponse,
2325
useRequest,
@@ -29,8 +31,6 @@ import {
2931
} from '../LocalUnitsFormModal/LocalUnitsForm/schema';
3032

3133
import i18n from './i18n.json';
32-
import { useMemo } from 'react';
33-
import hasDifferences, { getFormFields } from '#utils/localUnits';
3434

3535
type VisibilityOptions = NonNullable<GoApiResponse<'/api/v2/global-enums/'>['api_visibility_choices']>[number]
3636
type LocalUnitResponse = NonNullable<GoApiResponse<'/api/v2/local-units/{id}/'>>;

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
import {
3333
isDefined,
3434
isNotDefined,
35-
isObject,
3635
} from '@togglecorp/fujs';
3736
import {
3837
createSubmitHandler,
@@ -437,14 +436,9 @@ function LocalUnitsForm(props: Props) {
437436
const previousData = (
438437
localUnitPreviousResponse?.previous_data_details as unknown as LocalUnitResponse
439438
);
440-
const isNewLocalUnit = useMemo(() => {
441-
if (isObject(previousData)) {
442-
if (Object.keys(previousData).length <= 0) {
443-
return true;
444-
}
445-
}
446-
return false;
447-
}, [previousData]);
439+
const isNewLocalUnit = useMemo(() => (
440+
isNotDefined(previousData) || Object.keys(previousData).length === 0
441+
), [previousData]);
448442

449443
const showChanges = !isNewLocalUnit && !!localUnitDetailsResponse?.is_locked;
450444

0 commit comments

Comments
 (0)