Refactored condition of Different Districts in External Result (#7339)

* Refactored condition of Different Districts in External Result * minor corrections * Added permission for StateLabAdmin as well
coronasafe · Mar 19, 2024 · a77ff8b · a77ff8b
1 parent a7e139d
commit a77ff8b
Showing 1 changed file with 25 additions and 9 deletions.
diff --git a/src/Components/ExternalResult/ExternalResultUpload.tsx b/src/Components/ExternalResult/ExternalResultUpload.tsx
@@ -2,16 +2,16 @@ import _ from "lodash-es";
 import { navigate } from "raviger";
 import { lazy, useEffect, useState } from "react";
 import CSVReader from "react-csv-reader";
-import useConfig from "../../Common/hooks/useConfig";
-import * as Notification from "../../Utils/Notifications.js";
-const PageTitle = lazy(() => import("../Common/PageTitle"));
 import { useTranslation } from "react-i18next";
-import { Cancel, Submit } from "../Common/components/ButtonV2";
+import CareIcon from "../../CAREUI/icons/CareIcon";
 import useAppHistory from "../../Common/hooks/useAppHistory";
-import request from "../../Utils/request/request";
+import useConfig from "../../Common/hooks/useConfig";
 import routes from "../../Redux/api";
+import * as Notification from "../../Utils/Notifications.js";
+import request from "../../Utils/request/request";
+import { Cancel, Submit } from "../Common/components/ButtonV2";
 import { IExternalResult } from "./models";
-import CareIcon from "../../CAREUI/icons/CareIcon";
+const PageTitle = lazy(() => import("../Common/PageTitle"));
 
 export default function ExternalResultUpload() {
   const { sample_format_external_result_import } = useConfig();
@@ -26,7 +26,12 @@ export default function ExternalResultUpload() {
     setValidationErrorCount(
       data.filter(
         (result: IExternalResult) =>
-          result.district !== user.district_object.name
+          ((user.user_type === "StateAdmin" ||
+            user.user_type === "StateLabAdmin") &&
+            result.address.split(",").pop()?.trim() !==
+              user.state_object.name) ||
+          (user.user_type !== "StateAdmin" &&
+            result.district !== user.district_object.name)
       ).length
     );
   };
@@ -67,7 +72,12 @@ export default function ExternalResultUpload() {
               sample_tests: validationErrorCount
                 ? csvData.filter(
                     (data: IExternalResult) =>
-                      data.district === user.district_object.name
+                      ((user.user_type === "StateAdmin" ||
+                        user.user_type === "StateLabAdmin") &&
+                        data.address.split(",").pop()?.trim() !==
+                          user.state_object.name) ||
+                      (user.user_type !== "StateAdmin" &&
+                        data.district !== user.district_object.name)
                   )
                 : csvData,
             },
@@ -179,7 +189,13 @@ export default function ExternalResultUpload() {
                       : null}
                   </div>
                   <div>
-                    {data.district !== user.district_object.name && (
+                    {(((user.user_type === "StateAdmin" ||
+                      user.user_type === "StateLabAdmin") &&
+                      data.address.split(",").pop()?.trim() !==
+                        user.state_object.name) ||
+                      (user.user_type !== "StateAdmin" &&
+                        user.user_type !== "StateLabAdmin" &&
+                        data.district !== user.district_object.name)) && (
                       <p className="mt-2 flex items-center justify-center gap-1 text-red-500">
                         <CareIcon icon="l-exclamation-triangle" /> Different
                         districts