Local unit changes modal #1584

shreeyash07 · 2024-12-12T05:15:50Z

Addresses:

Update the Local Unit edit workflow #1495

Depends on:

Local Units Edit Process Flow Update go-api#2346

Changes

Add changes modal in the local unit form
find changes logic between the value change and local unit response

This PR doesn't introduce:

changeset-bot · 2024-12-12T05:15:54Z

⚠️ No Changeset found

Latest commit: 0c4bffc

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

- Add function to get changes name and value - Add new file for key and label of the field

… changes modal

app/src/utils/common.ts

...ewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

tnagorra · 2024-12-17T08:35:31Z

...ewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

+    const flattenedValues = flattenObject(newValues);
+    const flattenedOldValues = flattenObject(oldValues);


I am not sure if we can use this approach. This fails if/when we have array elements.

we will refactor this later. will add a TODO

tnagorra · 2024-12-17T08:37:15Z

...ewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

+                health: {
+                    affiliation: health?.affiliation,
+                    functionality: health?.functionality,
+                    health_facility_type: health?.health_facility_type,


Any reason to write these out individually? Why not just spread this out?

when we compare the value later, the comparison function checks for _display values. We don't need these values for form fields. So we didn't spread them out.

...ewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

.../NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/useLocalUnitFormFieldLabels.ts

AdityaKhatri · 2024-12-17T08:29:30Z

app/src/utils/common.ts

+export function compareArrays(newArray: unknown[], oldArray: unknown[]): boolean {
+    if (newArray.length !== oldArray.length) {
+        return false;
+    }
+    return newArray.every((id) => oldArray.includes(id));
+}
+
+export function flattenObject<T extends Record<string, unknown>>(
+    inputObject: T,
+    prefix?: string,
+): Record<string, unknown> {
+    return Object.entries(inputObject).reduce((acc, [key, value]) => {
+        const newKey = prefix ? `${prefix}.${key}` : key;
+        if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+            return { ...acc, ...flattenObject(value as Record<string, unknown>, newKey) };
+        }
+        return { ...acc, [newKey]: value };
+    }, {} as Record<string, unknown>);
+}
+
+export function getLastSegment(str: string, delimiter: string) {
+    const parts = str.split(delimiter);
+    return parts[parts.length - 1];
+}


write tests

Added a TODO comment.

app/src/utils/common.ts

AdityaKhatri · 2024-12-17T08:38:37Z

...ewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

+function getChangedFormFields(
+    newValues: PartialLocalUnits,
+    oldValues: LocalUnitResponse,
+    formFieldOptions: LocalUnitOptions,
+) {


Write return type

Suggested change

function getChangedFormFields(

newValues: PartialLocalUnits,

oldValues: LocalUnitResponse,

formFieldOptions: LocalUnitOptions,

) {

function getChangedFormFields(

newValues: PartialLocalUnits,

oldValues: LocalUnitResponse,

formFieldOptions: LocalUnitOptions,

): { key: string; value: string }[] {

AdityaKhatri · 2024-12-17T08:44:43Z

...ewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

+        const actualKey = getLastSegment(key, '.');
+        if (Array.isArray(newValue) && Array.isArray(oldValue)) {
+            if (!compareArrays(newValue, oldValue)) {
+                const options: Option[] = formFieldOptions?.[actualKey as keyof LocalUnitOptions];
+                const valuesLabels = newValue.map(
+                    (v: number) => options.find((option: Option) => option.id === v),
+                ).filter(isDefined).map((option) => option.name).join(', ');
+                changedValues.push({ key, value: valuesLabels });
+            }
+        } else if (newValue !== oldValue) {
+            const options: Option[] = formFieldOptions?.[actualKey as keyof LocalUnitOptions];
+            if (isDefined(options)) {
+                const valueLabel = options.find(
+                    (option: Option) => option.id === newValue,
+                )?.name;
+                changedValues.push({ key, value: valueLabel });
+            } else if (typeof newValue === 'boolean') {
+                changedValues.push({ key, value: newValue ? 'Yes' : 'No' }); // TODO: use translations
+            } else {
+                changedValues.push({ key, value: newValue as string });
+            }
+        }


add few comments on what is being done to make it more readable

...ewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

shreeyash07 requested a review from samshara December 12, 2024 05:15

shreeyash07 temporarily deployed to test December 12, 2024 05:15 — with GitHub Actions Inactive

shreeyash07 temporarily deployed to test December 12, 2024 05:16 — with GitHub Actions Inactive

shreeyash07 temporarily deployed to test December 12, 2024 05:17 — with GitHub Actions Inactive

samshara temporarily deployed to test December 13, 2024 08:51 — with GitHub Actions Inactive

samshara temporarily deployed to test December 13, 2024 08:52 — with GitHub Actions Inactive

samshara force-pushed the feature/changes-modal branch from 11f0b07 to 05aaf87 Compare December 13, 2024 09:20

samshara temporarily deployed to test December 13, 2024 09:20 — with GitHub Actions Inactive

samshara temporarily deployed to test December 13, 2024 09:21 — with GitHub Actions Inactive

samshara temporarily deployed to test December 13, 2024 09:22 — with GitHub Actions Inactive

samshara force-pushed the feature/changes-modal branch from 05aaf87 to 3e9dde2 Compare December 13, 2024 09:37

samshara temporarily deployed to test December 13, 2024 09:37 — with GitHub Actions Inactive

samshara temporarily deployed to test December 13, 2024 09:38 — with GitHub Actions Inactive

samshara temporarily deployed to test December 13, 2024 09:39 — with GitHub Actions Inactive

samshara force-pushed the feature/changes-modal branch from 3e9dde2 to 7a862f1 Compare December 13, 2024 10:01

samshara temporarily deployed to test December 13, 2024 10:01 — with GitHub Actions Inactive

samshara temporarily deployed to test December 13, 2024 10:02 — with GitHub Actions Inactive

samshara temporarily deployed to test December 13, 2024 10:03 — with GitHub Actions Inactive

shreeyash07 mentioned this pull request Dec 15, 2024

Add revert changes button in local unit form #1588

Merged

6 tasks

shreeyash07 and others added 2 commits December 17, 2024 10:49

Add local unit changes modal

65aeaac

- Add function to get changes name and value - Add new file for key and label of the field

feat: display updated local units in modal after editing

a2f6b58

samshara force-pushed the feature/changes-modal branch from 7a862f1 to 2aefe40 Compare December 17, 2024 06:48

samshara temporarily deployed to test December 17, 2024 06:48 — with GitHub Actions Inactive

samshara requested a review from tnagorra December 17, 2024 06:49

samshara self-assigned this Dec 17, 2024

samshara temporarily deployed to test December 17, 2024 06:49 — with GitHub Actions Inactive

samshara temporarily deployed to test December 17, 2024 06:50 — with GitHub Actions Inactive

feat(local-units): use translation strings for field names in confirm…

153f5c4

… changes modal

samshara force-pushed the feature/changes-modal branch from 2aefe40 to 153f5c4 Compare December 17, 2024 07:49

samshara temporarily deployed to test December 17, 2024 07:49 — with GitHub Actions Inactive

samshara temporarily deployed to test December 17, 2024 07:50 — with GitHub Actions Inactive

samshara temporarily deployed to test December 17, 2024 07:52 — with GitHub Actions Inactive

shreeyash07 requested a review from frozenhelium December 17, 2024 08:06

shreeyash07 marked this pull request as ready for review December 17, 2024 08:06

tnagorra requested changes Dec 17, 2024

View reviewed changes

AdityaKhatri requested changes Dec 17, 2024

View reviewed changes

samshara temporarily deployed to test December 17, 2024 14:01 — with GitHub Actions Inactive

samshara requested review from AdityaKhatri and tnagorra December 17, 2024 14:01

samshara temporarily deployed to test December 17, 2024 14:02 — with GitHub Actions Inactive

samshara temporarily deployed to test December 17, 2024 14:03 — with GitHub Actions Inactive

fix: use better naming, improve type

0c4bffc

samshara force-pushed the feature/changes-modal branch from 36763c9 to 0c4bffc Compare December 17, 2024 14:20

samshara temporarily deployed to test December 17, 2024 14:21 — with GitHub Actions Inactive

samshara temporarily deployed to test December 17, 2024 14:22 — with GitHub Actions Inactive

AdityaKhatri approved these changes Dec 18, 2024

View reviewed changes

samshara merged commit 3a0cd23 into project/local-unit-v2 Dec 18, 2024
9 of 10 checks passed

samshara deleted the feature/changes-modal branch December 18, 2024 05:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Local unit changes modal #1584

Local unit changes modal #1584

shreeyash07 commented Dec 12, 2024 •

edited by samshara

Loading

changeset-bot bot commented Dec 12, 2024 •

edited

Loading

tnagorra Dec 17, 2024

shreeyash07 Dec 17, 2024

tnagorra Dec 17, 2024

shreeyash07 Dec 17, 2024

AdityaKhatri Dec 17, 2024

samshara Dec 17, 2024

AdityaKhatri Dec 17, 2024

AdityaKhatri Dec 17, 2024

		const flattenedValues = flattenObject(newValues);
		const flattenedOldValues = flattenObject(oldValues);

Local unit changes modal #1584

Local unit changes modal #1584

Conversation

shreeyash07 commented Dec 12, 2024 • edited by samshara Loading

Addresses:

Depends on:

Changes

This PR doesn't introduce:

changeset-bot bot commented Dec 12, 2024 • edited Loading

⚠️ No Changeset found

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shreeyash07 commented Dec 12, 2024 •

edited by samshara

Loading

changeset-bot bot commented Dec 12, 2024 •

edited

Loading