feat(commerce): exclude unused location facets properties

packages/headless/src/controllers/commerce/core/breadcrumb-manager/headless-core-breadcrumb-manager.test.ts

@@ -18,10 +18,7 @@ import {
   NumericFacetValue,
   RegularFacetValue,
 } from '../../../../features/commerce/facets/facet-set/interfaces/response.js';
-import {
-  toggleExcludeLocationFacetValue,
-  toggleSelectLocationFacetValue,
-} from '../../../../features/commerce/facets/location-facet/location-facet-actions.js';
+import {toggleSelectLocationFacetValue} from '../../../../features/commerce/facets/location-facet/location-facet-actions.js';
 import {
   toggleExcludeNumericFacetValue,
   toggleSelectNumericFacetValue,
@@ -270,10 +267,23 @@ describe('core breadcrumb manager', () => {
       expectBreadcrumbToBePresentInState(breadcrumb);
     });
 
-    describe.each([
-      ['selected', toggleSelectLocationFacetValue],
-      ['excluded', toggleExcludeLocationFacetValue],
-    ])('#deselect when facet is %s', generateDeselectionTestCases(breadcrumb));
+    describe('#deselect when facet is selected', () => {
+      beforeEach(() => {
+        breadcrumb.state = 'selected';
+        deselectBreadcrumb();
+      });
+
+      it('dispatches #toggleSelectActionCreator', () => {
+        expect(toggleSelectLocationFacetValue).toHaveBeenCalledWith({
+          facetId,
+          selection: breadcrumb,
+        });
+      });
+
+      it('dispatches #fetchProductsActionCreator', () => {
+        expect(fetchProductsActionCreator).toHaveBeenCalled();
+      });
+    });
   });
 
   describe('numeric facet breadcrumbs', () => {

packages/headless/src/controllers/commerce/core/breadcrumb-manager/headless-core-breadcrumb-manager.ts

@@ -25,10 +25,7 @@ import {
   NumericFacetResponse,
   RegularFacetResponse,
 } from '../../../../features/commerce/facets/facet-set/interfaces/response.js';
-import {
-  toggleExcludeLocationFacetValue,
-  toggleSelectLocationFacetValue,
-} from '../../../../features/commerce/facets/location-facet/location-facet-actions.js';
+import {toggleSelectLocationFacetValue} from '../../../../features/commerce/facets/location-facet/location-facet-actions.js';
 import {
   toggleExcludeNumericFacetValue,
   toggleSelectNumericFacetValue,
@@ -119,17 +116,11 @@ interface ActionCreators {
   toggleExcludeActionCreator?: ToggleActionCreator;
 }
 
-const facetTypeWithoutExcludeAction: FacetType = 'hierarchical';
-
 const actions: Record<FacetType, ActionCreators> = {
   regular: {
     toggleSelectActionCreator: toggleSelectFacetValue,
     toggleExcludeActionCreator: toggleExcludeFacetValue,
   },
-  location: {
-    toggleSelectActionCreator: toggleSelectLocationFacetValue,
-    toggleExcludeActionCreator: toggleExcludeLocationFacetValue,
-  },
   numericalRange: {
     toggleSelectActionCreator: toggleSelectNumericFacetValue,
     toggleExcludeActionCreator: toggleExcludeNumericFacetValue,
@@ -138,7 +129,10 @@ const actions: Record<FacetType, ActionCreators> = {
     toggleSelectActionCreator: toggleSelectDateFacetValue,
     toggleExcludeActionCreator: toggleExcludeDateFacetValue,
   },
-  [facetTypeWithoutExcludeAction]: {
+  location: {
+    toggleSelectActionCreator: toggleSelectLocationFacetValue,
+  },
+  hierarchical: {
     toggleSelectActionCreator: deselectAllValuesInCoreFacet,
   },
 };
@@ -192,16 +186,19 @@ export function buildCoreBreadcrumbManager(
                 selection,
               })
             );
-            dispatch(
-              updateCoreFacetFreezeCurrentValues({
-                facetId: facet.facetId,
-                freezeCurrentValues: false,
-              })
-            );
+
+            if (facet.type !== 'location') {
+              dispatch(
+                updateCoreFacetFreezeCurrentValues({
+                  facetId: facet.facetId,
+                  freezeCurrentValues: false,
+                })
+              );
+            }
             dispatch(options.fetchProductsActionCreator());
           } else if (
             selection.state === 'excluded' &&
-            facet.type !== facetTypeWithoutExcludeAction
+            facet.type !== 'location'
           ) {
             dispatch(
               actions[facet.type].toggleExcludeActionCreator!({

packages/headless/src/controllers/commerce/core/facets/location/headless-commerce-location-facet.test.ts

@@ -1,8 +1,5 @@
 import {LocationFacetRequest} from '../../../../../features/commerce/facets/facet-set/interfaces/request.js';
-import {
-  toggleExcludeLocationFacetValue,
-  toggleSelectLocationFacetValue,
-} from '../../../../../features/commerce/facets/location-facet/location-facet-actions.js';
+import {toggleSelectLocationFacetValue} from '../../../../../features/commerce/facets/location-facet/location-facet-actions.js';
 import {CommerceAppState} from '../../../../../state/commerce-app-state.js';
 import {buildMockCommerceFacetRequest} from '../../../../../test/mock-commerce-facet-request.js';
 import {buildMockCommerceLocationFacetResponse} from '../../../../../test/mock-commerce-facet-response.js';
@@ -88,16 +85,6 @@ describe('LocationFacet', () => {
     });
   });
 
-  it('#toggleExclude dispatches #toggleExcludeLocationFacetValue with correct payload', () => {
-    const facetValue = buildMockCommerceLocationFacetValue({value: 'TED'});
-    facet.toggleExclude(facetValue);
-
-    expect(toggleExcludeLocationFacetValue).toHaveBeenCalledWith({
-      facetId,
-      selection: facetValue,
-    });
-  });
-
   it('#type returns "location"', () => {
     expect(facet.type).toBe('location');
   });

packages/headless/src/controllers/commerce/core/facets/location/headless-commerce-location-facet.ts

@@ -1,9 +1,6 @@
 import {CommerceEngine} from '../../../../../app/commerce-engine/commerce-engine.js';
 import {LocationFacetValue} from '../../../../../features/commerce/facets/facet-set/interfaces/response.js';
-import {
-  toggleExcludeLocationFacetValue,
-  toggleSelectLocationFacetValue,
-} from '../../../../../features/commerce/facets/location-facet/location-facet-actions.js';
+import {toggleSelectLocationFacetValue} from '../../../../../features/commerce/facets/location-facet/location-facet-actions.js';
 import {
   CoreCommerceFacet,
   CoreCommerceFacetOptions,
@@ -29,9 +26,9 @@ export type LocationFacetState = Omit<
  * The `LocationFacet` sub-controller offers a high-level programming interface for implementing a location commerce
  * facet UI component.
  */
-export type LocationFacet = CoreCommerceFacet<
-  FacetValueRequest,
-  LocationFacetValue
+export type LocationFacet = Omit<
+  CoreCommerceFacet<FacetValueRequest, LocationFacetValue>,
+  'isValueExcluded' | 'toggleExclude' | 'toggleSingleExclude'
 > & {
   state: LocationFacetState;
 } & FacetControllerType<'location'>;
@@ -52,14 +49,15 @@ export function buildCommerceLocationFacet(
   engine: CommerceEngine,
   options: LocationFacetOptions
 ): LocationFacet {
-  const coreController = buildCoreCommerceFacet<
-    FacetValueRequest,
-    LocationFacetValue
-  >(engine, {
+  const {
+    toggleSingleExclude,
+    toggleExclude,
+    isValueExcluded,
+    ...coreController
+  } = buildCoreCommerceFacet<FacetValueRequest, LocationFacetValue>(engine, {
     options: {
       ...options,
       toggleSelectActionCreator: toggleSelectLocationFacetValue,
-      toggleExcludeActionCreator: toggleExcludeLocationFacetValue,
     },
   });
 

packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.test.ts

@@ -67,10 +67,7 @@ import {
   updateDateFacetValues,
 } from '../date-facet/date-facet-actions.js';
 import {getFacetIdWithCommerceFieldSuggestionNamespace} from '../facet-search-set/commerce-facet-search-actions.js';
-import {
-  toggleExcludeLocationFacetValue,
-  toggleSelectLocationFacetValue,
-} from '../location-facet/location-facet-actions.js';
+import {toggleSelectLocationFacetValue} from '../location-facet/location-facet-actions.js';
 import {
   toggleExcludeNumericFacetValue,
   toggleSelectNumericFacetValue,
@@ -1005,12 +1002,6 @@ describe('commerceFacetSetReducer', () => {
         facetValueState: 'selected' as FacetValueState,
         toggleAction: toggleSelectLocationFacetValue,
       },
-      {
-        title:
-          'dispatching #toggleExcludeLocationFacetValue with a registered facet id',
-        facetValueState: 'excluded' as FacetValueState,
-        toggleAction: toggleExcludeLocationFacetValue,
-      },
     ])(
       '$title',
       ({
@@ -1104,63 +1095,13 @@ describe('commerceFacetSetReducer', () => {
             ).find((req) => req.value === facetValue.value);
             expect(targetValue?.state).toBe('idle');
           });
-
-          it('sets #preventAutoSelect to true', () => {
-            const facetValue = buildMockCommerceLocationFacetValue({
-              value: 'TED',
-            });
-            const facetValueRequest =
-              convertLocationFacetValueToRequest(facetValue);
-
-            state[facetId] = buildMockCommerceFacetSlice({
-              request: buildMockCommerceFacetRequest({
-                values: [facetValueRequest],
-                type: 'location',
-              }),
-            });
-
-            const action = toggleAction({
-              facetId,
-              selection: facetValue,
-            });
-            const finalState = commerceFacetSetReducer(state, action);
-
-            expect(finalState[facetId]?.request.preventAutoSelect).toBe(true);
-          });
-
-          it('sets #freezeCurrentValues to true', () => {
-            const facetValue = buildMockCommerceLocationFacetValue({
-              value: 'TED',
-            });
-            const facetValueRequest =
-              convertLocationFacetValueToRequest(facetValue);
-
-            state[facetId] = buildMockCommerceFacetSlice({
-              request: buildMockCommerceFacetRequest({
-                values: [facetValueRequest],
-                type: 'location',
-              }),
-            });
-
-            const action = toggleAction({
-              facetId,
-              selection: facetValue,
-            });
-            const finalState = commerceFacetSetReducer(state, action);
-
-            expect(finalState[facetId]?.request.freezeCurrentValues).toBe(true);
-          });
         });
 
         describe.each([
           {
             facetValueState: 'selected' as FacetValueState,
             toggleAction: toggleSelectLocationFacetValue,
           },
-          {
-            facetValueState: 'excluded' as FacetValueState,
-            toggleAction: toggleExcludeLocationFacetValue,
-          },
         ])(
           'when the facet value does not exist',
           ({
@@ -1214,20 +1155,6 @@ describe('commerceFacetSetReducer', () => {
               ).toBe(2);
               expect(finalState[facetId]?.request.values.length).toBe(4);
             });
-
-            it('sets #preventAutoSelect to true', () => {
-              state[facetId] = buildMockCommerceFacetSlice({
-                request: buildMockCommerceFacetRequest({type: 'location'}),
-              });
-
-              const action = toggleAction({
-                facetId,
-                selection: buildMockCommerceLocationFacetValue({value: 'TED'}),
-              });
-              const finalState = commerceFacetSetReducer(state, action);
-
-              expect(finalState[facetId]?.request.preventAutoSelect).toBe(true);
-            });
           }
         );
       }
@@ -1258,33 +1185,6 @@ describe('commerceFacetSetReducer', () => {
 
       expect(() => commerceFacetSetReducer(state, action)).not.toThrow();
     });
-
-    it('dispatching #toggleExcludeLocationFacetValue with an invalid id does not throw', () => {
-      const facetValue = buildMockCommerceLocationFacetValue({value: 'TED'});
-      const action = toggleExcludeLocationFacetValue({
-        facetId: '1',
-        selection: facetValue,
-      });
-
-      expect(() => commerceFacetSetReducer(state, action)).not.toThrow();
-    });
-
-    it('dispatching #toggleExcludeLocationFacetValue with an invalid facet type does not throw', () => {
-      const facetValue = buildMockCommerceLocationFacetValue({value: 'TED'});
-      const facet = buildMockCommerceFacetRequest({
-        type: 'numericalRange',
-        values: [facetValue],
-      });
-      state[facet.facetId] = buildMockCommerceFacetSlice({
-        request: facet,
-      });
-      const action = toggleExcludeLocationFacetValue({
-        facetId: facet.facetId,
-        selection: facetValue,
-      });
-
-      expect(() => commerceFacetSetReducer(state, action)).not.toThrow();
-    });
   });
 
   describe('for numericalRange facets', () => {

packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.ts

@@ -44,10 +44,7 @@ import {
   executeCommerceFieldSuggest,
   getFacetIdWithCommerceFieldSuggestionNamespace,
 } from '../facet-search-set/commerce-facet-search-actions.js';
-import {
-  toggleExcludeLocationFacetValue,
-  toggleSelectLocationFacetValue,
-} from '../location-facet/location-facet-actions.js';
+import {toggleSelectLocationFacetValue} from '../location-facet/location-facet-actions.js';
 import {
   toggleExcludeNumericFacetValue,
   toggleSelectNumericFacetValue,
@@ -136,8 +133,6 @@ export const commerceFacetSetReducer = createReducer(
           return;
         }
 
-        facetRequest.preventAutoSelect = true;
-
         const existingValue = facetRequest.values.find(
           (req) => req.value === selection.value
         );
@@ -147,7 +142,6 @@ export const commerceFacetSetReducer = createReducer(
         }
 
         updateExistingFacetValueState(existingValue, 'select');
-        facetRequest.freezeCurrentValues = true;
       })
       .addCase(toggleSelectNumericFacetValue, (state, action) => {
         const {facetId, selection} = action.payload;
@@ -250,27 +244,6 @@ export const commerceFacetSetReducer = createReducer(
         updateExistingFacetValueState(existingValue, 'exclude');
         facetRequest.freezeCurrentValues = true;
       })
-      .addCase(toggleExcludeLocationFacetValue, (state, action) => {
-        const {facetId, selection} = action.payload;
-        const facetRequest = state[facetId]?.request;
-
-        if (!facetRequest || !ensureLocationFacetRequest(facetRequest)) {
-          return;
-        }
-
-        facetRequest.preventAutoSelect = true;
-
-        const existingValue = facetRequest.values.find(
-          (req) => req.value === selection.value
-        );
-        if (!existingValue) {
-          insertNewValue(facetRequest, selection);
-          return;
-        }
-
-        updateExistingFacetValueState(existingValue, 'exclude');
-        facetRequest.freezeCurrentValues = true;
-      })
       .addCase(toggleExcludeNumericFacetValue, (state, action) => {
         const {facetId, selection} = action.payload;
         const facetRequest = state[facetId]?.request;