feat: make find api backward compatible

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
wanglam · Mar 4, 2024 · 1cd4c2d · 1cd4c2d
1 parent 77de5b9
commit 1cd4c2d
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts
@@ -290,7 +290,7 @@ export function getQueryParams({
       shouldClause.push(permissionDSL.query);
     }
 
-    if (ACLSearchParams.workspaces) {
+    if (ACLSearchParams.workspaces?.length) {
       shouldClause.push({
         terms: {
           workspaces: ACLSearchParams.workspaces,
@@ -301,7 +301,28 @@ export function getQueryParams({
     if (shouldClause.length) {
       bool.filter.push({
         bool: {
-          should: shouldClause,
+          should: [
+            /**
+             * Return those objects without workspaces field and permissions field to keep find find API backward compatible
+             */
+            {
+              bool: {
+                must_not: [
+                  {
+                    exists: {
+                      field: 'workspaces',
+                    },
+                  },
+                  {
+                    exists: {
+                      field: 'permissions',
+                    },
+                  },
+                ],
+              },
+            },
+            ...shouldClause,
+          ],
         },
       });
     }