Merge pull request #521 from bcgov/5.6-prod-fixes

fix city dropdown issue
bcgov · Feb 19, 2025 · d60156a · d60156a
2 parents 8f52d14 + 9128e0e
commit d60156a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/client/src/features/lookups/Cities.jsx b/app/client/src/features/lookups/Cities.jsx
@@ -5,7 +5,7 @@ import { Form, Alert, Spinner } from "react-bootstrap";
 import { REQUEST_STATUS } from "../../utilities/constants";
 
 const Cities = React.forwardRef((props, ref) => {
-  const { cities, isInvalid, onChange, defaultValue } = props;
+  const { cities, isInvalid, onChange, value } = props;
 
   let control = (
     <div>
@@ -23,7 +23,7 @@ const Cities = React.forwardRef((props, ref) => {
         ref={ref}
         isInvalid={isInvalid}
         onChange={onChange}
-        value={defaultValue.toUpperCase()}
+        value={value || ""}
         custom
       >
         <option value={null} />

diff --git a/app/client/src/features/sites/SiteDetailsEdit.jsx b/app/client/src/features/sites/SiteDetailsEdit.jsx
@@ -98,7 +98,8 @@ export default function SiteDetailsEdit({ form, initialValues, licence }) {
           />
         </Col>
       </Row>
-      {licence.licenceTypeId === LICENCE_TYPE_ID_APIARY || licence.licenceTypeId === LICENCE_TYPE_ID_GAME_FARM ? (
+      {licence.licenceTypeId === LICENCE_TYPE_ID_APIARY ||
+      licence.licenceTypeId === LICENCE_TYPE_ID_GAME_FARM ? (
         <Row className="mt-3">
           <Col lg={4}>
             <Form.Group controlId="hiveCount">
@@ -172,7 +173,8 @@ export default function SiteDetailsEdit({ form, initialValues, licence }) {
             ) : (
               <Cities
                 cities={cities}
-                {...register("city")}
+                value={watch("city")}
+                onChange={(e) => setValue("city", e.target.value)}
                 defaultValue={initialValues.city ?? "BC"}
                 isInvalid={errors.city}
               />