refactor: group pr review

packages/snap-client/src/Client/apis/Abstract.ts

@@ -34,15 +34,15 @@ export class API {
 		return this.configuration.mode;
 	}
 
-	protected async request(context: RequestOpts, cacheKey?: string): Promise<Response> {
+	protected async request<T>(context: RequestOpts, cacheKey?: string): Promise<T> {
 		const { url, init } = this.createFetchParams(context);
 
 		if (cacheKey) {
 			const cachedResponse = this.cache.get(`${context.path}/${cacheKey}`) || this.cache.get(`${context.path}/*`);
 			if (cachedResponse) {
 				this.retryCount = 0; // reset count and delay incase rate limit occurs again before a page refresh
 				this.retryDelay = 1000;
-				return cachedResponse;
+				return cachedResponse as T;
 			}
 		}
 		let response;

packages/snap-client/src/Client/apis/Legacy.ts

@@ -31,7 +31,7 @@ export class LegacyAPI extends API {
 
 		headerParameters['Content-Type'] = 'application/json';
 
-		const response = await this.request(
+		const response = await this.request<MetaResponseModel>(
 			{
 				path: '/api/meta/meta.json',
 				method: 'POST',
@@ -41,13 +41,13 @@ export class LegacyAPI extends API {
 			JSON.stringify(requestParameters)
 		);
 
-		return response as MetaResponseModel;
+		return response;
 	}
 
 	async getMeta(queryParameters: MetaRequestModel): Promise<MetaResponseModel> {
 		const headerParameters: HTTPHeaders = {};
 
-		const response = await this.request(
+		const response = await this.request<MetaResponseModel>(
 			{
 				path: '/api/meta/meta.json',
 				method: 'GET',
@@ -57,7 +57,7 @@ export class LegacyAPI extends API {
 			JSON.stringify(queryParameters)
 		);
 
-		return response as MetaResponseModel;
+		return response;
 	}
 
 	async getSearch(queryParameters: any): Promise<any> {

packages/snap-client/src/Client/apis/Recommend.ts

@@ -40,7 +40,7 @@ export class RecommendAPI extends API {
 	async getProfile(queryParameters: ProfileRequestModel): Promise<ProfileResponseModel> {
 		const headerParameters: HTTPHeaders = {};
 
-		const response = await this.request(
+		const response = await this.request<ProfileResponseModel>(
 			{
 				path: '/api/personalized-recommendations/profile.json',
 				method: 'GET',
@@ -50,7 +50,7 @@ export class RecommendAPI extends API {
 			JSON.stringify(queryParameters)
 		);
 
-		return response as unknown as ProfileResponseModel;
+		return response;
 	}
 
 	async batchRecommendations(parameters: RecommendRequestModel): Promise<RecommendResponseModel> {
@@ -168,7 +168,7 @@ export class RecommendAPI extends API {
 		const siteId = requestParameters.siteId;
 		const path = `/boost/${siteId}/recommend`;
 
-		const response = await this.request(
+		const response = await this.request<RecommendResponseModel[]>(
 			{
 				path,
 				method: 'POST',
@@ -178,7 +178,7 @@ export class RecommendAPI extends API {
 			JSON.stringify(requestParameters)
 		);
 
-		return response as unknown as RecommendResponseModel[];
+		return response;
 	}
 }
 

packages/snap-client/src/Client/apis/Snap.ts

@@ -15,7 +15,7 @@ export class SnapAPI extends API {
 		const headerParameters: HTTPHeaders = {};
 		headerParameters['Content-Type'] = 'application/json';
 
-		const response = await this.request(
+		const response = await this.request<MetaResponseModel>(
 			{
 				path: '/api/v1/meta',
 				method: 'POST',
@@ -25,14 +25,14 @@ export class SnapAPI extends API {
 			JSON.stringify(requestParameters)
 		);
 
-		return response as MetaResponseModel;
+		return response;
 	}
 
 	async postSearch(requestParameters: SearchRequestModel): Promise<SearchResponseModel> {
 		const headerParameters: HTTPHeaders = {};
 		headerParameters['Content-Type'] = 'application/json';
 
-		const response = await this.request(
+		const response = await this.request<SearchResponseModel>(
 			{
 				path: '/api/v1/search',
 				method: 'POST',
@@ -42,14 +42,14 @@ export class SnapAPI extends API {
 			JSON.stringify(requestParameters)
 		);
 
-		return response as SearchResponseModel;
+		return response;
 	}
 
 	async postAutocomplete(requestParameters: AutocompleteRequestModel): Promise<AutocompleteResponseModel> {
 		const headerParameters: HTTPHeaders = {};
 		headerParameters['Content-Type'] = 'application/json';
 
-		const response = await this.request(
+		const response = await this.request<AutocompleteResponseModel>(
 			{
 				path: '/api/v1/autocomplete',
 				method: 'POST',
@@ -59,6 +59,6 @@ export class SnapAPI extends API {
 			JSON.stringify(requestParameters)
 		);
 
-		return response as AutocompleteResponseModel;
+		return response;
 	}
 }

packages/snap-client/src/Client/apis/Suggest.ts

@@ -5,7 +5,7 @@ export class SuggestAPI extends API {
 	async getSuggest(queryParameters: SuggestRequestModel): Promise<SuggestResponseModel> {
 		const headerParameters: HTTPHeaders = {};
 
-		const response = await this.request(
+		const response = await this.request<SuggestResponseModel>(
 			{
 				path: '/api/suggest/query',
 				method: 'GET',
@@ -15,14 +15,14 @@ export class SuggestAPI extends API {
 			JSON.stringify(queryParameters)
 		);
 
-		return response as unknown as SuggestResponseModel;
+		return response;
 	}
 
 	async postSuggest(requestParameters: SuggestRequestModel): Promise<SuggestResponseModel> {
 		const headerParameters: HTTPHeaders = {};
 		headerParameters['Content-Type'] = 'application/json';
 
-		const response = await this.request(
+		const response = await this.request<SuggestResponseModel>(
 			{
 				path: '/api/suggest/query',
 				method: 'POST',
@@ -32,13 +32,13 @@ export class SuggestAPI extends API {
 			JSON.stringify(requestParameters)
 		);
 
-		return response as unknown as SuggestResponseModel;
+		return response;
 	}
 
 	async getTrending(queryParameters: TrendingRequestModel): Promise<TrendingResponseModel> {
 		const headerParameters: HTTPHeaders = {};
 
-		const response = await this.request(
+		const response = await this.request<TrendingResponseModel>(
 			{
 				path: '/api/suggest/trending',
 				method: 'GET',
@@ -48,14 +48,14 @@ export class SuggestAPI extends API {
 			JSON.stringify(queryParameters)
 		);
 
-		return response as unknown as TrendingResponseModel;
+		return response;
 	}
 
 	async postTrending(requestParameters: TrendingRequestModel): Promise<TrendingResponseModel> {
 		const headerParameters: HTTPHeaders = {};
 		headerParameters['Content-Type'] = 'application/json';
 
-		const response = await this.request(
+		const response = await this.request<TrendingResponseModel>(
 			{
 				path: '/api/suggest/trending',
 				method: 'POST',
@@ -65,6 +65,6 @@ export class SuggestAPI extends API {
 			JSON.stringify(requestParameters)
 		);
 
-		return response as unknown as TrendingResponseModel;
+		return response;
 	}
 }

packages/snap-preact/components/src/components/Atoms/SearchHeader/SearchHeader.test.tsx

@@ -1,8 +1,7 @@
 import { h } from 'preact';
-import { render, waitFor } from '@testing-library/preact';
+import { render } from '@testing-library/preact';
 import { SearchHeader } from './SearchHeader';
-import { Theme, ThemeProvider } from '../../../providers';
-import type { SearchResultStore } from '@searchspring/snap-store-mobx';
+import { ThemeProvider } from '../../../providers';
 import { MockData } from '@searchspring/snap-shared';
 import { SearchMerchandisingStore, SearchPaginationStore, SearchQueryStore } from '@searchspring/snap-store-mobx';
 import { UrlManager, UrlTranslator } from '@searchspring/snap-url-manager';
@@ -22,14 +21,14 @@ describe('Search Header Component', () => {
 		config: searchConfig,
 		services,
 		data: {
-			search: data,
+			search: data.search,
 			meta: data.meta,
 		},
 	});
 	const queryStore = new SearchQueryStore({
 		services,
 		data: {
-			search: data,
+			search: data.search,
 		},
 	});
 
@@ -270,8 +269,8 @@ describe('Search Header Component', () => {
 		it('custom lang options', async () => {
 			//oq
 			const oqData = new MockData().searchMeta('oq');
-			const oqPaginationStore = new SearchPaginationStore({ config: searchConfig, services, data: { search: oqData, meta: oqData.meta } });
-			const oqQueryStore = new SearchQueryStore({ services, data: { search: oqData } });
+			const oqPaginationStore = new SearchPaginationStore({ config: searchConfig, services, data: { search: oqData.search, meta: oqData.meta } });
+			const oqQueryStore = new SearchQueryStore({ services, data: { search: oqData.search } });
 
 			const oqValue = 'oq value';
 			const oqAltText = 'oq alt';
@@ -310,9 +309,9 @@ describe('Search Header Component', () => {
 			const emptyPaginationStore = new SearchPaginationStore({
 				config: searchConfig,
 				services,
-				data: { search: noResultsdata, meta: noResultsdata.meta },
+				data: { search: noResultsdata.search, meta: noResultsdata.meta },
 			});
-			const emptyQueryStore = new SearchQueryStore({ services, data: { search: noResultsdata } });
+			const emptyQueryStore = new SearchQueryStore({ services, data: { search: noResultsdata.search } });
 
 			const emptyValue = 'empty value';
 			const emptyAltText = 'empty alt';
@@ -348,8 +347,8 @@ describe('Search Header Component', () => {
 
 			//did you mean
 			const dymData = new MockData().searchMeta('dym');
-			const dymPaginationStore = new SearchPaginationStore({ config: searchConfig, services, data: { search: dymData, meta: dymData.meta } });
-			const dymQueryStore = new SearchQueryStore({ services, data: { search: dymData } });
+			const dymPaginationStore = new SearchPaginationStore({ config: searchConfig, services, data: { search: dymData.search, meta: dymData.meta } });
+			const dymQueryStore = new SearchQueryStore({ services, data: { search: dymData.search } });
 
 			const dymValue = 'dym value';
 			const dymAltText = 'dym alt';
@@ -391,14 +390,14 @@ describe('Search Header Component', () => {
 			config: searchConfig,
 			services,
 			data: {
-				search: noResultsdata,
+				search: noResultsdata.search,
 				meta: noResultsdata.meta,
 			},
 		});
 		const emptyQueryStore = new SearchQueryStore({
 			services,
 			data: {
-				search: noResultsdata,
+				search: noResultsdata.search,
 			},
 		});
 
@@ -450,14 +449,14 @@ describe('Search Header Component', () => {
 			config: searchConfig,
 			services,
 			data: {
-				search: oqData,
+				search: oqData.search,
 				meta: oqData.meta,
 			},
 		});
 		const oqQueryStore = new SearchQueryStore({
 			services,
 			data: {
-				search: oqData,
+				search: oqData.search,
 			},
 		});
 
@@ -509,14 +508,14 @@ describe('Search Header Component', () => {
 			config: searchConfig,
 			services,
 			data: {
-				search: dymData,
+				search: dymData.search,
 				meta: dymData.meta,
 			},
 		});
 		const dymQueryStore = new SearchQueryStore({
 			services,
 			data: {
-				search: dymData,
+				search: dymData.search,
 			},
 		});
 
@@ -570,19 +569,19 @@ describe('Search Header Component', () => {
 			config: searchConfig,
 			services,
 			data: {
-				search: landingData,
+				search: landingData.search,
 				meta: landingData.meta,
 			},
 		});
 		const landingQueryStore = new SearchQueryStore({
 			services,
 			data: {
-				search: landingData,
+				search: landingData.search,
 			},
 		});
 		const merchandisingStore = new SearchMerchandisingStore({
 			data: {
-				search: landingData,
+				search: landingData.search,
 			},
 		});
 

packages/snap-preact/components/src/components/Molecules/Filter/Filter.test.tsx

@@ -47,7 +47,7 @@ describe('Filter Component', () => {
 		const filters = new SearchFilterStore({
 			services,
 			data: {
-				search: mockData,
+				search: mockData.search,
 				meta: mockData.meta,
 			},
 		});

packages/snap-preact/components/src/components/Molecules/LoadMore/LoadMore.test.tsx

@@ -25,7 +25,7 @@ describe('LoadMore Component', () => {
 		config: searchConfig,
 		services,
 		data: {
-			search: data,
+			search: data.search,
 			meta: data.meta,
 		},
 	});

packages/snap-preact/components/src/components/Molecules/OverlayBadge/OverlayBadge.tsx

@@ -79,6 +79,10 @@ export const OverlayBadge = observer((properties: OverlayBadgeProps): JSX.Elemen
 	}
 
 	const meta = controller?.store?.meta;
+	if (!meta) {
+		controller?.log?.warn('Controller must have a meta store');
+		return <Fragment>{children}</Fragment>;
+	}
 	const group = 'overlay';
 	const grid = meta?.badges?.groups?.[group]?.grid;
 	const badgeComponentMap = {

packages/snap-preact/components/src/components/Molecules/Pagination/Pagination.test.tsx

@@ -25,7 +25,7 @@ describe('Pagination Component', () => {
 		config: searchConfig,
 		services,
 		data: {
-			search: data,
+			search: data.search,
 			meta: data.meta,
 		},
 	});
@@ -87,7 +87,7 @@ describe('Lets test the Pagination Component optional props', () => {
 		config: searchConfig,
 		services,
 		data: {
-			search: data,
+			search: data.search,
 			meta: data.meta,
 		},
 	});
@@ -294,7 +294,7 @@ describe('Pagination theming works', () => {
 		config: searchConfig,
 		services,
 		data: {
-			search: data,
+			search: data.search,
 			meta: data.meta,
 		},
 	});