Merge branch 'release/2022.3.2' into main

Author: mmcfarland

docs/overview/changelog.md

@@ -24,7 +24,7 @@ This release includes several new datasets in our STAC API. Each of these links
 
 - [Deltares Floods](https://planetarycomputer.microsoft.com/dataset/deltares-floods)
 - [Deltares Water Availability](https://planetarycomputer.microsoft.com/dataset/deltares-water-availability)
-- [Microsoft Buildings Footprint](https://planetarycomputer.microsoft.com/dataset/ms-buildings)
+- [Microsoft Building Footprints](https://planetarycomputer.microsoft.com/dataset/ms-buildings)
 - [Kwando & Upper Zambezi Rivers HydroForecast](https://planetarycomputer.microsoft.com/dataset/kaza-hydroforecast)
 
 ## May 2022

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pc-datacatalog",
-  "version": "2022.3.1",
+  "version": "2022.3.2",
   "private": true,
   "proxy": "http://api:7071/",
   "dependencies": {

src/pages/Explore/utils/hooks/useStacFilter.ts

@@ -17,9 +17,13 @@ export const makeFilterBody = (
   limit: number | undefined = undefined
 ): IStacFilter => {
   const optimizedCql = optimizeCqlExpressions(cql);
+
+  // Combine base filters with any selected filters, removing any nulls
+  const filterBody = [...baseFilter, ...optimizedCql].filter(Boolean);
+
   return {
     "filter-lang": "cql2-json",
-    filter: { op: "and", args: [...baseFilter, ...optimizedCql] },
+    filter: { op: "and", args: filterBody },
     sortby: query.sortby || undefined,
     limit: limit,
   } as IStacFilter;