Merge branch 'master' into reenable-skipped-test

coveo · Aug 22, 2024 · 6203697 · 6203697
2 parents 2740cdf + 7508e78
commit 6203697
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/.github/workflows/prbot.yml b/.github/workflows/prbot.yml
@@ -328,7 +328,7 @@ jobs:
       SFDX_AUTH_CLIENT_ID: ${{ secrets.SFDX_AUTH_CLIENT_ID }}
       SFDX_AUTH_JWT_KEY: ${{ secrets.SFDX_AUTH_JWT_KEY }}
   is-valid-pr:
-    name: 'Confirm build is valid'
+    name: 'Confirm build is valid (PR)'
     if: ${{ always() && github.event_name == 'pull_request'}}
     needs:
       - 'build'
@@ -363,7 +363,7 @@ jobs:
             exit 1
           fi
   is-valid-merge-queue:
-    name: 'Confirm build is valid'
+    name: 'Confirm build is valid (merge group)'
     if: ${{ always() && github.event_name == 'merge_group'}}
     needs:
       - 'build'
@@ -395,3 +395,20 @@ jobs:
             echo "Build is invalid"
             exit 1
           fi
+  is-valid:
+    name: 'Confirm build is valid'
+    if: ${{ always() }}
+    needs:
+      - 'is-valid-pr'
+      - 'is-valid-merge-queue'
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          success="${{ contains(needs.*.result, 'success')}}"
+          if [[ $success == "true" ]]; then
+            echo "Build is valid"
+            exit 0
+          else
+            echo "Build is invalid"
+            exit 1
+          fi
diff --git a/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.test.ts b/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.test.ts
@@ -692,12 +692,14 @@ describe('commerceFacetSetReducer', () => {
         [getFacetIdWithCommerceFieldSuggestionNamespace('regular_field')]: {
           request: {
             initialNumberOfValues: 10,
+            values: [],
           },
         },
         [getFacetIdWithCommerceFieldSuggestionNamespace('hierarchical_field')]:
           {
             request: {
               initialNumberOfValues: 10,
+              values: [],
             },
           },
       });

diff --git a/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.ts b/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.ts
@@ -494,6 +494,7 @@ function handleFieldSuggestionsFulfilled(
     state[facetId] = {request: {} as AnyFacetRequest};
     facetRequest = state[facetId].request;
     facetRequest.initialNumberOfValues = 10;
+    facetRequest.values = [];
   }
 }