From f8e9647ac60b86b0c42beac7fd37fd60625ca322 Mon Sep 17 00:00:00 2001
From: Gampa Sri Harsh <114745442+sriharsh05@users.noreply.github.com>
Date: Wed, 4 Oct 2023 09:58:28 +0530
Subject: [PATCH] Fixed bug in location picker in update facility page (#6377)

* add all cases for map rendering

* implement location pointer on searched location
---
 package-lock.json                         | 16 -------
 src/Components/Common/GLocationPicker.tsx | 55 +++++++++++++----------
 2 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4871fbe374b..2a9fe3f520f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14496,8 +14496,6 @@
     },
     "node_modules/npm/node_modules/cross-spawn/node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -15254,8 +15252,6 @@
     },
     "node_modules/npm/node_modules/minipass": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -16398,8 +16394,6 @@
     },
     "node_modules/npm/node_modules/tar": {
       "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
-      "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -16500,8 +16494,6 @@
     },
     "node_modules/npm/node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
@@ -16569,8 +16561,6 @@
     },
     "node_modules/npm/node_modules/wrap-ansi": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dev": true,
       "inBundle": true,
       "license": "MIT",
@@ -16589,8 +16579,6 @@
     "node_modules/npm/node_modules/wrap-ansi-cjs": {
       "name": "wrap-ansi",
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "inBundle": true,
       "license": "MIT",
@@ -16670,8 +16658,6 @@
     },
     "node_modules/npm/node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "inBundle": true,
       "license": "ISC"
@@ -16691,8 +16677,6 @@
     },
     "node_modules/npm/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true,
       "inBundle": true,
       "license": "ISC"
diff --git a/src/Components/Common/GLocationPicker.tsx b/src/Components/Common/GLocationPicker.tsx
index 5356d28fa2a..fc121b8519f 100644
--- a/src/Components/Common/GLocationPicker.tsx
+++ b/src/Components/Common/GLocationPicker.tsx
@@ -7,14 +7,6 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
 import useConfig from "../../Common/hooks/useConfig";
 import { Popover } from "@headlessui/react";
 
-const render = (status: Status) => {
-  if (status === "LOADING") {
-    return <Spinner />;
-  }
-
-  return <h1>{status}</h1>;
-};
-
 interface GLocationPickerProps {
   lat: number;
   lng: number;
@@ -67,22 +59,37 @@ const GLocationPicker = ({
     setCenter(m?.getCenter()?.toJSON());
   };
 
+  const render = (status: Status) => {
+    switch (status) {
+      case Status.LOADING:
+        return <Spinner />;
+      case Status.SUCCESS:
+        return (
+          <Map
+            center={center}
+            onClick={onClick}
+            onIdle={onIdle}
+            handleOnChange={handleOnChange}
+            handleOnClose={handleOnClose}
+            handleOnSelectCurrentLocation={handleOnSelectCurrentLocation}
+            zoom={zoom}
+            style={{ flexGrow: "1", height: "100%" }}
+          >
+            {location && <Marker position={location} />}
+          </Map>
+        );
+      default:
+        return <h1>{status}</h1>;
+    }
+  };
+
   return (
     <div className="flex h-80 w-80 sm:h-96 sm:w-96">
-      <Wrapper libraries={["places"]} apiKey={gmaps_api_key} render={render}>
-        <Map
-          center={center}
-          onClick={onClick}
-          onIdle={onIdle}
-          handleOnChange={handleOnChange}
-          handleOnClose={handleOnClose}
-          handleOnSelectCurrentLocation={handleOnSelectCurrentLocation}
-          zoom={zoom}
-          style={{ flexGrow: "1", height: "100%" }}
-        >
-          {location && <Marker position={location} />}
-        </Map>
-      </Wrapper>
+      <Wrapper
+        libraries={["places"]}
+        apiKey={gmaps_api_key}
+        render={render}
+      ></Wrapper>
     </div>
   );
 };
@@ -149,7 +156,9 @@ const Map: React.FC<MapProps> = ({
           places.length > 0 &&
           places[0].geometry?.location
         ) {
-          handleOnChange(places[0].geometry.location);
+          const selectedLocation = places[0].geometry.location;
+          handleOnChange(selectedLocation);
+          map?.setCenter(selectedLocation);
         }
       });
     }