From 0145ffbbde98b446b383be9f3e98fbdd8b0204b6 Mon Sep 17 00:00:00 2001 From: eat_code_sleep <141677292+i0am0arunava@users.noreply.github.com> Date: Sun, 19 Jan 2025 21:40:14 +0530 Subject: [PATCH 1/6] Text Overflow in Search Results Causes UI Distortion --- package-lock.json | 4 ++-- src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 2 +- src/pages/Organization/OrganizationView.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f03acbcaef..5beaa28bdca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -145,8 +145,8 @@ "node": ">=22.8.0" }, "optionalDependencies": { - "@esbuild/linux-arm64": "*", - "@esbuild/linux-x64": "*", + "@esbuild/linux-arm64": "latest", + "@esbuild/linux-x64": "latest", "@rollup/rollup-linux-arm64-gnu": "4.30.1", "@rollup/rollup-linux-x64-gnu": "4.30.1" } diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx index 2859d6ec99e..ffef1baafaf 100644 --- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx +++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx @@ -134,7 +134,7 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) { )) ) : ( - + {searchQuery ? t("no_organizations_found_matching", { searchQuery }) : t("no_sub_organizations_found")} diff --git a/src/pages/Organization/OrganizationView.tsx b/src/pages/Organization/OrganizationView.tsx index 3a0f140f250..c1b2e85f595 100644 --- a/src/pages/Organization/OrganizationView.tsx +++ b/src/pages/Organization/OrganizationView.tsx @@ -129,7 +129,7 @@ export default function OrganizationView({ id, navOrganizationId }: Props) { )) ) : ( - + {searchQuery ? t("no_organizations_found_matching", { searchQuery }) : t("no_sub_organizations_found")} From 6be7c01a4fabcb9296f4ca746f516de0d7bc328b Mon Sep 17 00:00:00 2001 From: eat_code_sleep <141677292+i0am0arunava@users.noreply.github.com> Date: Sun, 19 Jan 2025 22:41:19 +0530 Subject: [PATCH 2/6] requested changes are done --- public/locale/en.json | 2 +- src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 4 ++-- src/pages/Organization/OrganizationView.tsx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/locale/en.json b/public/locale/en.json index 10486c83b99..b1b8cf06969 100644 --- a/public/locale/en.json +++ b/public/locale/en.json @@ -1392,7 +1392,7 @@ "no_notices_for_you": "No notices for you.", "no_observations": "No Observations", "no_ongoing_medications": "No Ongoing Medications", - "no_organizations_found": "No organizations found", + "no_organizations_found": "No Organizations Found", "no_organizations_found_matching": "No organizations found matching {{searchQuery}}", "no_organizations_selected": "No organizations selected", "no_patient_record_found": "No Patient Records Found", diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx index ffef1baafaf..9fc4a58c019 100644 --- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx +++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx @@ -134,9 +134,9 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) { )) ) : ( - + {searchQuery - ? t("no_organizations_found_matching", { searchQuery }) + ? t("no_organizations_found") : t("no_sub_organizations_found")} diff --git a/src/pages/Organization/OrganizationView.tsx b/src/pages/Organization/OrganizationView.tsx index c1b2e85f595..18460d92d76 100644 --- a/src/pages/Organization/OrganizationView.tsx +++ b/src/pages/Organization/OrganizationView.tsx @@ -129,9 +129,9 @@ export default function OrganizationView({ id, navOrganizationId }: Props) { )) ) : ( - + {searchQuery - ? t("no_organizations_found_matching", { searchQuery }) + ? t("no_organizations_found") : t("no_sub_organizations_found")} From 31a80cbfcb587e4e1a853e71f14c5b554b2645a6 Mon Sep 17 00:00:00 2001 From: eat_code_sleep <141677292+i0am0arunava@users.noreply.github.com> Date: Mon, 20 Jan 2025 00:32:01 +0530 Subject: [PATCH 3/6] Update public/locale/en.json Co-authored-by: Rithvik Nishad --- public/locale/en.json | 1 - 1 file changed, 1 deletion(-) diff --git a/public/locale/en.json b/public/locale/en.json index b1b8cf06969..eaaf6701ed7 100644 --- a/public/locale/en.json +++ b/public/locale/en.json @@ -1393,7 +1393,6 @@ "no_observations": "No Observations", "no_ongoing_medications": "No Ongoing Medications", "no_organizations_found": "No Organizations Found", - "no_organizations_found_matching": "No organizations found matching {{searchQuery}}", "no_organizations_selected": "No organizations selected", "no_patient_record_found": "No Patient Records Found", "no_patient_record_text": "No existing records found with this phone number. Would you like to register a new patient?", From 60a7e682692ee1574aafeb2a1fef3ab27bfd7ee2 Mon Sep 17 00:00:00 2001 From: eat_code_sleep <141677292+i0am0arunava@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:01:23 +0530 Subject: [PATCH 4/6] Update src/pages/Organization/OrganizationView.tsx Co-authored-by: Rithvik Nishad --- src/pages/Organization/OrganizationView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Organization/OrganizationView.tsx b/src/pages/Organization/OrganizationView.tsx index 18460d92d76..cedf500fe33 100644 --- a/src/pages/Organization/OrganizationView.tsx +++ b/src/pages/Organization/OrganizationView.tsx @@ -129,7 +129,7 @@ export default function OrganizationView({ id, navOrganizationId }: Props) { )) ) : ( - + {searchQuery ? t("no_organizations_found") : t("no_sub_organizations_found")} From f7f8a719f64004f4d4043d82d846d6e04051c063 Mon Sep 17 00:00:00 2001 From: eat_code_sleep <141677292+i0am0arunava@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:01:40 +0530 Subject: [PATCH 5/6] Update src/pages/FacilityOrganization/FacilityOrganizationView.tsx Co-authored-by: Rithvik Nishad --- src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx index 9fc4a58c019..c49087ef6f4 100644 --- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx +++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx @@ -134,7 +134,7 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) { )) ) : ( - + {searchQuery ? t("no_organizations_found") : t("no_sub_organizations_found")} From d2f48b8d3e586e56b39cb94ada18cb02e134959e Mon Sep 17 00:00:00 2001 From: eat_code_sleep <141677292+i0am0arunava@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:44:04 +0530 Subject: [PATCH 6/6] discard lockfile changes --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5beaa28bdca..2f03acbcaef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -145,8 +145,8 @@ "node": ">=22.8.0" }, "optionalDependencies": { - "@esbuild/linux-arm64": "latest", - "@esbuild/linux-x64": "latest", + "@esbuild/linux-arm64": "*", + "@esbuild/linux-x64": "*", "@rollup/rollup-linux-arm64-gnu": "4.30.1", "@rollup/rollup-linux-x64-gnu": "4.30.1" }