UHF-X: Fix triggering re-render even when no params present

src/js/react/apps/health-station-search/containers/FormContainer.tsx

@@ -8,7 +8,7 @@ type SubmitFormType = HTMLFormElement & {
   address: HTMLInputElement;
 };
 
-const ProximityFormContainer = ({ initialParams }: { initialParams?: SearchParams }) => {
+const ProximityFormContainer = ({ initialParams }: { initialParams?: SearchParams|null }) => {
   const stagedParams = useAtomValue(stagedParamsAtom);
   const setParams = useSetAtom(paramsAtom);
   const setStagedParams = useSetAtom(stagedParamsAtom);

src/js/react/apps/health-station-search/containers/ResultsContainer.tsx

@@ -7,6 +7,7 @@ import ResultsList from '../components/ResultsList';
 const ProximityResultsContainer = () => {
   const params = useAtomValue(paramsAtom);
   const setParams = useSetAtom(updateParamsAtom);
+
   const updatePage = (page: number) => {
     setParams({
       ...params,

src/js/react/apps/health-station-search/containers/SearchContainer.tsx

@@ -17,7 +17,7 @@ const SearchContainer = () => {
     if (initialParams) {
       setParams(initialParams);
     }
-  }, [initialParams, setParams]);
+  }, []);
 
   return (
     <Suspense fallback={

src/js/react/apps/maternity-and-child-health-clinic-search/containers/FormContainer.tsx

@@ -8,7 +8,7 @@ type SubmitFormType = HTMLFormElement & {
   address: HTMLInputElement;
 };
 
-const ProximityFormContainer = ({ initialParams }: {initialParams: SearchParams}) => {
+const ProximityFormContainer = ({ initialParams }: {initialParams: SearchParams|null}) => {
   const stagedParams = useAtomValue(stagedParamsAtom);
   const setParams = useSetAtom(paramsAtom);
   const setStagedParams = useSetAtom(stagedParamsAtom);

src/js/react/apps/ploughing-schedule/containers/FormContainer.tsx

@@ -10,7 +10,7 @@ type SuggestionItemType = {
   value: string;
 };
 
-const FormContainer = ({ initialParams }: { initialParams?: SearchParams}) => {
+const FormContainer = ({ initialParams }: { initialParams?: SearchParams|null}) => {
   const setParams = useSetAtom(paramsAtom);
   const [address, setAddress] = useState(initialParams?.address);
   const { baseUrl, index } = useAtomValue(configurationsAtom);
@@ -22,8 +22,6 @@ const FormContainer = ({ initialParams }: { initialParams?: SearchParams}) => {
     setParams(params);
   };
 
-  console.log(address, initialParams);
-
   const getSuggestions = (searchString: string) => new Promise<SuggestionItemType[]>((resolve, reject) => {
     const suggestions = fetch(`${baseUrl}/${index}/_search`, {
       method: 'POST',

src/js/react/apps/school-search/containers/SearchContainer.tsx

@@ -38,7 +38,7 @@ const SearchContainer = () => {
   };
 
   useEffect(() => {
-    if (initialParams.address) {
+    if (initialParams?.address) {
       setParams({
         keyword: initialParams.address
       });

src/js/react/common/hooks/useInitialParams.ts

@@ -1,4 +1,3 @@
-
 const coerce = (value: string, type: string) => {
   switch (type) {
     case 'boolean':
@@ -14,19 +13,21 @@ const useInitialParams = <T extends Record<string, any>>(params: T) => {
   const initialParams = new URLSearchParams(window.location.search);
   const entries = initialParams.entries();
   let result = entries.next();
+  let hits = 0;
 
   while (!result.done) {
     const [key, value] = result.value;
 
     if (value && key in params) {
+      hits++;
       // @ts-ignore
       params[key as keyof T] = coerce(value, typeof params[key as keyof T]);
     }
 
     result = entries.next();
   }
 
-  return params;
+  return hits ? params : null;
 };
 
 export default useInitialParams;