feat(commerce): mark v2 listings as non-v2 and non-v2 listings as old (…

…#4087)

This is somewhat of an overdue rename. Generally, I've renamed
"ProductListingV2" to "ProductListing", and the v1 listings from
"ProductListing" to "OldProductListing".

The renamed classes or file names do not affect the API surface of
neither the product-listing sub-package, or the commerce sub-package.
I've however deleted the v2 facet analytics actions, and removed them
from the `product-listing-actions-loader.ts` action loader, which is a
breaking change. I don't expect anyone to have been using these though.

[CAPI-763]

[CAPI-763]:
https://coveord.atlassian.net/browse/CAPI-763?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

packages/headless/src/api/analytics/product-listing-analytics.ts

@@ -6,13 +6,13 @@ import {
 import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events';
 import {Logger} from 'pino';
 import {SectionNeededForFacetMetadata} from '../../features/facets/facet-set/facet-set-analytics-actions-utils';
+import {getProductListingInitialState} from '../../features/product-listing/old-product-listing-state';
 import {
   ConfigurationSection,
-  ProductListingSection,
+  OldProductListingSection,
   SearchHubSection,
 } from '../../state/state-sections';
 import {PreprocessRequest} from '../preprocess-request';
-import {getProductListingInitialState} from './../../features/product-listing/product-listing-state';
 import {BaseAnalyticsProvider} from './base-analytics';
 import {
   wrapAnalyticsClientSendEventHook,
@@ -21,7 +21,7 @@ import {
 
 export type StateNeededByProductListingAnalyticsProvider =
   ConfigurationSection &
-    ProductListingSection &
+    OldProductListingSection &
     Partial<SearchHubSection & SectionNeededForFacetMetadata>;
 
 export class ProductListingAnalyticsProvider

packages/headless/src/app/commerce-engine/commerce-engine.ts

@@ -10,7 +10,7 @@ import {contextReducer} from '../../features/commerce/context/context-slice';
 import {didYouMeanReducer} from '../../features/commerce/did-you-mean/did-you-mean-slice';
 import {commerceFacetSetReducer} from '../../features/commerce/facets/facet-set/facet-set-slice';
 import {paginationReducer} from '../../features/commerce/pagination/pagination-slice';
-import {productListingV2Reducer} from '../../features/commerce/product-listing/product-listing-slice';
+import {productListingReducer} from '../../features/commerce/product-listing/product-listing-slice';
 import {queryReducer} from '../../features/commerce/query/query-slice';
 import {recommendationsReducer} from '../../features/commerce/recommendations/recommendations-slice';
 import {executeSearch} from '../../features/commerce/search/search-actions';
@@ -39,7 +39,7 @@ import {
 export type {CommerceEngineConfiguration};
 
 const commerceEngineReducers = {
-  productListing: productListingV2Reducer,
+  productListing: productListingReducer,
   recommendations: recommendationsReducer,
   commerceSearch: commerceSearchReducer,
   commercePagination: paginationReducer,

packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-options.ts

@@ -1,11 +1,11 @@
 import {isFacetResponse} from '../../../../features/commerce/facets/facet-set/facet-set-selector';
 import {
   CommerceFacetSetSection,
-  ProductListingV2Section,
+  ProductListingSection,
 } from '../../../../state/state-sections';
 
 export const facetResponseSelector = (
-  state: ProductListingV2Section & CommerceFacetSetSection,
+  state: ProductListingSection & CommerceFacetSetSection,
   facetId: string
 ) => {
   const response = state.productListing.facets.find(
@@ -18,6 +18,5 @@ export const facetResponseSelector = (
   return undefined;
 };
 
-export const isFacetLoadingResponseSelector = (
-  state: ProductListingV2Section
-) => state.productListing.isLoading;
+export const isFacetLoadingResponseSelector = (state: ProductListingSection) =>
+  state.productListing.isLoading;

packages/headless/src/controllers/commerce/product-listing/headless-product-listing.test.ts

@@ -12,7 +12,7 @@ import {
   requestIdSelector,
   responseIdSelector,
 } from '../../../features/commerce/product-listing/product-listing-selectors';
-import {productListingV2Reducer} from '../../../features/commerce/product-listing/product-listing-slice';
+import {productListingReducer} from '../../../features/commerce/product-listing/product-listing-slice';
 import {buildMockCommerceState} from '../../../test/mock-commerce-state';
 import {
   MockedCommerceEngine,
@@ -63,7 +63,7 @@ describe('headless product-listing', () => {
 
   it('adds the correct reducers to engine', () => {
     expect(engine.addReducers).toHaveBeenCalledWith({
-      productListing: productListingV2Reducer,
+      productListing: productListingReducer,
       commerceContext: contextReducer,
       configuration,
     });

packages/headless/src/controllers/commerce/product-listing/headless-product-listing.ts

@@ -21,7 +21,7 @@ import {
   requestIdSelector,
   responseIdSelector,
 } from '../../../features/commerce/product-listing/product-listing-selectors';
-import {productListingV2Reducer as productListing} from '../../../features/commerce/product-listing/product-listing-slice';
+import {productListingReducer as productListing} from '../../../features/commerce/product-listing/product-listing-slice';
 import {loadReducerError} from '../../../utils/errors';
 import {
   buildController,

packages/headless/src/controllers/commerce/product-listing/utils/load-product-listing-reducers.ts

@@ -1,10 +1,10 @@
 import {CommerceEngine} from '../../../../app/commerce-engine/commerce-engine';
-import {productListingV2Reducer as productListing} from '../../../../features/commerce/product-listing/product-listing-slice';
-import {ProductListingV2Section} from '../../../../state/state-sections';
+import {productListingReducer as productListing} from '../../../../features/commerce/product-listing/product-listing-slice';
+import {ProductListingSection} from '../../../../state/state-sections';
 
 export function loadProductListingReducer(
   engine: CommerceEngine
-): engine is CommerceEngine<ProductListingV2Section> {
+): engine is CommerceEngine<ProductListingSection> {
   engine.addReducers({productListing});
   return true;
 }

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

@@ -39,7 +39,7 @@ import {
   FacetOptionsSection,
   FacetSearchSection,
   FacetSection,
-  ProductListingSection,
+  OldProductListingSection,
   SearchSection,
 } from '../../../../state/state-sections';
 import {loadReducerError} from '../../../../utils/errors';
@@ -511,7 +511,7 @@ function loadFacetReducers(
     FacetOptionsSection &
     ConfigurationSection &
     FacetSearchSection &
-    (SearchSection | ProductListingSection),
+    (SearchSection | OldProductListingSection),
   SearchThunkExtraArguments
 > {
   engine.addReducers({facetSet, facetOptions, configuration, facetSearchSet});

packages/headless/src/controllers/product-listing/category-facet/headless-product-listing-category-facet.ts

@@ -24,7 +24,7 @@ import {
   CategoryFacetSearchSection,
   CategoryFacetSection,
   ConfigurationSection,
-  ProductListingSection,
+  OldProductListingSection,
 } from '../../../state/state-sections';
 import {loadReducerError} from '../../../utils/errors';
 import {
@@ -145,7 +145,7 @@ function loadCategoryFacetReducers(
   CategoryFacetSection &
     CategoryFacetSearchSection &
     ConfigurationSection &
-    ProductListingSection
+    OldProductListingSection
 > {
   engine.addReducers({
     categoryFacetSet,

packages/headless/src/controllers/product-listing/facet/headless-product-listing-facet-manager.ts

@@ -1,7 +1,7 @@
 import {ProductListingEngine} from '../../../app/product-listing-engine/product-listing-engine';
 import {facetOptionsReducer as facetOptions} from '../../../features/facet-options/facet-options-slice';
 import {productListingReducer as productListing} from '../../../features/product-listing/product-listing-slice';
-import {ProductListingSection} from '../../../state/state-sections';
+import {OldProductListingSection} from '../../../state/state-sections';
 import {loadReducerError} from '../../../utils/errors';
 import {sortFacets} from '../../../utils/facet-utils';
 import {buildController} from '../../controller/headless-controller';
@@ -46,7 +46,7 @@ export function buildFacetManager(
 
 function loadFacetManagerReducers(
   productListingEngine: ProductListingEngine
-): productListingEngine is ProductListingEngine<ProductListingSection> {
+): productListingEngine is ProductListingEngine<OldProductListingSection> {
   productListingEngine.addReducers({productListing, facetOptions});
   return true;
 }

packages/headless/src/features/analytics/analytics-utils.ts

@@ -33,11 +33,6 @@ import {
   configureCaseAssistAnalytics,
   StateNeededByCaseAssistAnalytics,
 } from '../../api/analytics/case-assist-analytics';
-import {
-  StateNeededByCommerceAnalyticsProvider,
-  CommerceAnalyticsProvider,
-  configureCommerceAnalytics,
-} from '../../api/analytics/commerce-analytics';
 import {
   configureInsightAnalytics,
   InsightAnalyticsProvider,
@@ -145,9 +140,6 @@ export type ProductRecommendationAction =
 export type ProductListingAction =
   PreparableAnalyticsAction<StateNeededByProductListingAnalyticsProvider>;
 
-export type ProductListingV2Action =
-  PreparableAnalyticsAction<StateNeededByCommerceAnalyticsProvider>;
-
 export interface AsyncThunkAnalyticsOptions<
   T extends StateNeededBySearchAnalyticsProvider,
 > {
@@ -600,17 +592,6 @@ export const makeInsightAnalyticsActionFactory = (actionCause: string) => {
   return makeInsightAnalyticsAction;
 };
 
-export const makeCommerceAnalyticsAction = makeAnalyticsActionFactory<
-  StateNeededByCommerceAnalyticsProvider,
-  StateNeededByCommerceAnalyticsProvider,
-  CoveoSearchPageClient,
-  CommerceAnalyticsProvider
->(
-  configureCommerceAnalytics,
-  (original) => original,
-  CommerceAnalyticsProvider
-);
-
 export const makeProductListingAnalyticsAction = makeAnalyticsActionFactory<
   StateNeededByProductListingAnalyticsProvider,
   StateNeededByProductListingAnalyticsProvider,

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

@@ -22,7 +22,7 @@ import {
 import {buildSearchResponse} from '../../../../test/mock-commerce-search';
 import {buildMockDateFacetValue} from '../../../../test/mock-date-facet-value';
 import {buildMockFacetSearchResult} from '../../../../test/mock-facet-search-result';
-import {buildFetchProductListingV2Response} from '../../../../test/mock-product-listing-v2';
+import {buildFetchProductListingResponse} from '../../../../test/mock-product-listing';
 import {deselectAllBreadcrumbs} from '../../../breadcrumb/breadcrumb-actions';
 import {
   defaultNumberOfValuesIncrement,
@@ -99,7 +99,7 @@ describe('commerceFacetSetReducer', () => {
     {
       actionName: '#fetchProductListing.fulfilled',
       action: fetchProductListing.fulfilled,
-      responseBuilder: buildFetchProductListingV2Response,
+      responseBuilder: buildFetchProductListingResponse,
     },
     {
       actionName: '#executeSearch.fulfilled',
@@ -116,7 +116,7 @@ describe('commerceFacetSetReducer', () => {
         | typeof fetchProductListing.fulfilled
         | typeof executeSearch.fulfilled;
       responseBuilder: () => ReturnType<
-        typeof buildSearchResponse | typeof buildFetchProductListingV2Response
+        typeof buildSearchResponse | typeof buildFetchProductListingResponse
       >;
     }) => {
       const facetId = '1';

packages/headless/src/features/commerce/pagination/pagination-slice.test.ts

@@ -1,5 +1,5 @@
 import {buildSearchResponse} from '../../../test/mock-commerce-search';
-import {buildFetchProductListingV2Response} from '../../../test/mock-product-listing-v2';
+import {buildFetchProductListingResponse} from '../../../test/mock-product-listing';
 import {buildMockRecommendationsResponse} from '../../../test/mock-recommendations';
 import {deselectAllBreadcrumbs} from '../../breadcrumb/breadcrumb-actions';
 import {
@@ -176,7 +176,7 @@ describe('pagination slice', () => {
   );
 
   it('sets the principal pagination on #fetchProductListing.fulfilled', () => {
-    const response = buildFetchProductListingV2Response({
+    const response = buildFetchProductListingResponse({
       pagination,
     });