Cleanup and more tests added

src/applications/facility-locator/components/MobileMapSearchResult.jsx

@@ -7,12 +7,11 @@ const MobileMapSearchResult = ({ mobileMapPinSelected, query }) => {
 
   return (
     <>
-      {!mobileMapPinSelected && (
+      {!mobileMapPinSelected ? (
         <p className="vads-u-margin-y--3">
           Select a number to show information about that location.
         </p>
-      )}
-      {mobileMapPinSelected && (
+      ) : (
         <div className="mobile-search-result">
           {ResultMapper(mobileMapPinSelected, query, 0, headerRef)}
         </div>

src/applications/facility-locator/components/SearchControls.jsx

@@ -25,6 +25,8 @@ const SearchControls = props => {
     clearSearchText,
     currentQuery,
     geolocateUser,
+    isMobile,
+    mobileMapUpdateEnabled,
     onChange,
     onSubmit,
     selectMobileMapPin,
@@ -122,7 +124,10 @@ const SearchControls = props => {
       'fl-current-zoom-depth': zoomLevel,
     });
 
-    selectMobileMapPin(null);
+    if (isMobile && mobileMapUpdateEnabled) {
+      selectMobileMapPin(null);
+    }
+
     onSubmit();
   };
 

src/applications/facility-locator/components/search-results-items/Covid19Result.jsx

@@ -47,12 +47,7 @@ const Covid19Result = ({ location, index, query, headerRef = null }) => {
   );
 
   return (
-    <div
-      data-testid="covid-19-result"
-      className="facility-result"
-      id={location.id}
-      key={location.id}
-    >
+    <div className="facility-result" id={location.id} key={location.id}>
       <>
         <LocationMarker markerText={location.markerText} />
         {isVADomain(website) ? (
@@ -125,7 +120,6 @@ Covid19Result.propTypes = {
     PropTypes.shape({ current: PropTypes.object }),
   ]),
   index: PropTypes.number,
-  isMobileCard: PropTypes.bool,
   location: PropTypes.object,
   query: PropTypes.object,
 };

src/applications/facility-locator/containers/FacilitiesMap.jsx

@@ -445,15 +445,17 @@ const FacilitiesMap = props => {
           />
         )}
         <SearchControls
-          geolocateUser={props.geolocateUser}
           clearGeocodeError={props.clearGeocodeError}
+          clearSearchText={props.clearSearchText}
           currentQuery={currentQuery}
+          geolocateUser={props.geolocateUser}
+          isMobile={isMobile}
+          mobileMapUpdateEnabled={mobileMapUpdateEnabled}
           onChange={props.updateSearchQuery}
           onSubmit={handleSearch}
           selectMobileMapPin={props.selectMobileMapPin}
           suppressPPMS={props.suppressPPMS}
           suppressPharmacies={props.suppressPharmacies}
-          clearSearchText={props.clearSearchText}
         />
         {(isEmergencyCareType || isCppEmergencyCareTypes) && (
           <VaAlert

src/applications/facility-locator/tests/utils/phoneNumbers.unit.spec.js

@@ -0,0 +1,74 @@
+import { expect } from 'chai';
+import { isHealthAndHealthConnect } from '../../utils/phoneNumbers';
+
+describe('phone number utils', () => {
+  describe('isHealthAndHealthConnect', () => {
+    it('should return true for VA health if the health connect number exists', () => {
+      expect(
+        isHealthAndHealthConnect(
+          {
+            attributes: {
+              phone: {
+                healthConnect: '123-456-7890',
+              },
+            },
+          },
+          {
+            facilityType: 'health',
+          },
+        ),
+      ).to.be.true;
+    });
+
+    it('should return false for VA health if the health connect number does not exist', () => {
+      expect(
+        isHealthAndHealthConnect(
+          {
+            attributes: {
+              phone: {
+                fax: '123-456-7890',
+              },
+            },
+          },
+          {
+            facilityType: 'health',
+          },
+        ),
+      ).to.be.false;
+    });
+
+    it('should return false for VA health if the health connect number is empty', () => {
+      expect(
+        isHealthAndHealthConnect(
+          {
+            attributes: {
+              phone: {
+                healthConnect: '',
+              },
+            },
+          },
+          {
+            facilityType: 'health',
+          },
+        ),
+      ).to.be.false;
+    });
+
+    it('should return false for Vet Centers', () => {
+      expect(
+        isHealthAndHealthConnect(
+          {
+            attributes: {
+              phone: {
+                healthConnect: '123-456-7890',
+              },
+            },
+          },
+          {
+            facilityType: 'vet_center',
+          },
+        ),
+      ).to.be.false;
+    });
+  });
+});

src/applications/facility-locator/utils/phoneNumbers.js

@@ -61,14 +61,8 @@ export const parsePhoneNumber = phone => {
 };
 
 export const isHealthAndHealthConnect = (apiResult, searchQuery) => {
-  let final = false;
-
-  if (
+  return !!(
     searchQuery?.facilityType === 'health' &&
-    apiResult?.attributes?.phone?.healthConnect !== null
-  ) {
-    final = true;
-  }
-
-  return final;
+    apiResult?.attributes?.phone?.healthConnect
+  );
 };