@evenicanpm/storefront-core 1.3.0 → 1.4.0

package/src/api-manager/datasources/e4/order/e4-order.remaps.ts

@@ -55,7 +55,7 @@ const salesLinesProduct = {
 	selectedDimensions: {
 		key: "Dimensions",
 		transform: (dimensions: SelectedDimension[]) => {
-			if (!(dimensions && dimensions.length)) return [];
+			if (!dimensions?.length) return [];
 
 			const typeMap: Record<string, number> = {
 				Color: 1,
@@ -81,7 +81,7 @@ export const orderDetailsMap = {
 	lines: {
 		key: "SalesLines",
 		transform: (lines: OrderLine[]) => {
-			if (!(lines && lines.length)) return [];
+			if (!lines?.length) return [];
 			return lines.map((line) => {
 				return {
 					Product: merge(line, salesLinesProduct),

package/src/api-manager/datasources/e4/organization/e4-organization.datasource.ts

@@ -1,17 +1,11 @@
-/* eslint-disable */
-
 import type { ChannelConfiguration } from "@evenicanpm/storefront-core/src/api-manager/schemas/organization.schema";
 import type { OrganizationApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 
-// Todo: implement these stubs
-
 const organization: OrganizationApi = {
 	getChannelConfiguration: async (): Promise<ChannelConfiguration> => {
-		// @ts-expect-error: Stub implementation, to be implemented later
-		return {};
+		return {} as ChannelConfiguration;
 	},
-	// @ts-expect-error: Stub implementation, to be implemented later
-	getStoresList(input) {
+	async getStoresList(input) {
 		console.log(input);
 		return [];
 	},

package/src/api-manager/datasources/e4/product/e4-product.remaps.ts

@@ -34,7 +34,7 @@ export const productMap = {
 		{
 			key: "RecordId",
 			transform: (id: string) => {
-				if (id !== null) return parseInt(id);
+				if (id !== null) return Number.parseInt(id);
 			},
 		},
 	],
@@ -54,13 +54,13 @@ export const productPricesMap = {
 		{
 			key: "ProductId",
 			transform: (id: string) => {
-				if (id !== null) return parseInt(id);
+				if (id !== null) return Number.parseInt(id);
 			},
 		},
 		{
 			key: "ListingId",
 			transform: (id: string) => {
-				if (id !== null) return parseInt(id);
+				if (id !== null) return Number.parseInt(id);
 			},
 		},
 	],

package/src/api-manager/datasources/e4/product/e4-product.translator.ts

@@ -88,7 +88,7 @@ export const generateCategoryFilterString = async (
 
 	const categoryMap = new Map<string, E4Category>();
 	e4Categories.forEach((cat) => {
-		if (cat && cat.id) {
+		if (cat?.id) {
 			categoryMap.set(cat.id, cat);
 		}
 	});
@@ -160,21 +160,22 @@ export const productListInputTransform = async (
 	let sortName =
 		input?.searchState?.queryResultSettings?.Sorting?.Columns?.[0]?.ColumnName?.toLowerCase();
 	// No relevance sort in e4 API.
-	sortName =
-		sortName === "relevance"
-			? ""
-			: sortDesc
-				? `${sortName}-hl`
-				: `${sortName}-lh`;
+	if (sortName === "relevance") {
+		sortName = "";
+	} else if (sortDesc) {
+		sortName = `${sortName}-hl`;
+	} else {
+		sortName = `${sortName}-lh`;
+	}
 
 	return {
 		categoryId: input?.categoryId ? String(input?.categoryId) : "1",
 		categoryFilter,
 		top: input?.searchState?.queryResultSettings?.Paging?.Top || 20,
 		skip: input?.searchState?.queryResultSettings?.Paging?.Skip || 0,
-		sort: sortName ? sortName : null,
+		sort: sortName || null,
 		sortDesc,
-		filters: filters && filters.length ? filters : [],
+		filters: filters?.length ? filters : [],
 		search: input?.searchState?.searchTerm,
 	};
 };
@@ -198,7 +199,7 @@ export const refinersTransformValidate = (
 		"#Microsoft.Dynamics.Commerce.Runtime.DataModel.ProductRefiner";
 	const ODATA_TYPE_REFINER_VALUE =
 		"#Microsoft.Dynamics.Commerce.Runtime.DataModel.ProductRefinerValue";
-	const DIMENSION_ATTRIBUTE_IDS = ["size", "color", "style"];
+	const DIMENSION_ATTRIBUTE_IDS = new Set(["size", "color", "style"]);
 
 	// Treat price filter as list filter (DisplayTemplateValue as 0) for now, until e4 API supports price bar filtering.
 	return rawFilters
@@ -253,7 +254,7 @@ export const refinersTransformValidate = (
 				})
 				.filter((value): value is TransformedRefinerValue => value !== null);
 
-			const isDimension = DIMENSION_ATTRIBUTE_IDS.includes(
+			const isDimension = DIMENSION_ATTRIBUTE_IDS.has(
 				rawRefiner.AttributeId?.toLowerCase() ?? "",
 			);
 
@@ -310,7 +311,7 @@ export const productPricesTransformValidate = (
 		(p) => merge(p, productPricesMap) as ProductPrice,
 	);
 	try {
-		translatedData.map((pp: ProductPrice) => productPriceSchema.parse(pp));
+		translatedData.forEach((pp: ProductPrice) => productPriceSchema.parse(pp));
 	} catch (e) {
 		console.warn("ProductPrice data does not match retail-proxy schema", e);
 	}
@@ -325,22 +326,5 @@ export const productWithCategoryTransformValidate = (
 		productMap,
 	) as ProductSearchResult;
 
-	// const productWithCategory = {
-	//   ...productTransform,
-	//   // Category: categoryTransformValidate([
-	//   //   productData?.category?.[0],
-	//   // ] as E4Category[]),
-	// } as unknown as ProductSearchResult;
-
-	// try {
-	//   productWCategorySchema.parse(productWithCategory);
-	// } catch (e) {
-	//   console.warn(
-	//     "Product data with category does not match retail-proxy schema",
-	//     e
-	//   );
-	//   throw e;
-	// }
-
 	return productTransform;
 };

package/src/api-manager/datasources/e4/session/e4-session.datasource.ts

@@ -34,9 +34,7 @@ const session = {
 		return !!data?.customerLogout?.success;
 	},
 	async getSession(): Promise<Session> {
-		if (true) {
-			throw new Error("Error reading e4 session");
-		}
+		throw new Error("Error reading e4 session");
 	},
 };
 

package/src/api-manager/datasources/e4/user/e4-user.remaps.ts

@@ -19,9 +19,7 @@ import { merge } from "object-mapper";
 export const userMap = {
 	id: {
 		key: "RecordId",
-		transform: (id: string) => {
-			return Number(id);
-		},
+		transform: Number,
 	},
 	code: {
 		// we don't need AccountNumber in e4 storefront,
@@ -38,7 +36,7 @@ export const userMap = {
 	addresses: {
 		key: "Addresses",
 		transform: (addresses: E4Address[], source: Me) => {
-			if (!(addresses && addresses?.length)) return [];
+			if (!addresses?.length) return [];
 			const mapped = merge(addresses || [], addressMap) as Address[];
 			return mapped.map((address: Address) => ({
 				...address,

package/src/api-manager/datasources/e4/utils/unwrap-e4-variants.ts

@@ -27,7 +27,7 @@ type UnwrappedAttribute = {
 export default function unwrapE4Variants(
 	variants: Variants[],
 ): UnwrappedAttribute[][] {
-	if (!(variants && variants?.length)) return [];
+	if (!variants?.length) return [];
 	const attrs: UnwrappedAttribute[] = variants.flatMap(
 		(v) =>
 			v.Attributes?.map((attr: Maybe<Attributes>) => {
@@ -47,9 +47,7 @@ export default function unwrapE4Variants(
 			(group) => group[0]?.DimensionTypeValue === item.DimensionTypeValue,
 		);
 
-		if (!group) {
-			acc.push([item]);
-		} else {
+		if (group) {
 			const existingDimension = group.find(
 				(attribute) =>
 					attribute.DimensionValue.Value === item.DimensionValue.Value,
@@ -60,6 +58,8 @@ export default function unwrapE4Variants(
 			} else if (!existingDimension.ProductIds.includes(item.ProductIds[0])) {
 				existingDimension.ProductIds.push(item.ProductIds[0]);
 			}
+		} else {
+			acc.push([item]);
 		}
 
 		return acc;

package/src/api-manager/index.ts

@@ -53,7 +53,7 @@ async function createApiManager() {
 		Config.parse(rawConfig);
 	} catch (error) {
 		if (error instanceof z.ZodError) {
-			error.issues;
+			console.error("Config validation failed:", error.issues);
 		}
 	}
 

package/src/api-manager/lib/category-helpers.ts

@@ -86,7 +86,8 @@ const generateUrl = (
 		);
 	}
 	categoryNames.unshift(currentCategory.RecordId.toString());
-	return categoryNames.reverse().join("/");
+
+	return categoryNames.slice().reverse().join("/");
 };
 
 const getFriendlyName = (
@@ -99,7 +100,7 @@ const getFriendlyName = (
 			(item) => item?.Language?.toLowerCase() === locale?.toLowerCase(),
 		);
 	}
-	return nameTranslation && nameTranslation.Text;
+	return nameTranslation?.Text;
 };
 
 const normalizeCategoryName = (string_: string) =>

package/src/api-manager/lib/get-graphql-client.ts

@@ -4,7 +4,6 @@ import { getSdk } from "@evenicanpm/storefront-core/src/api-manager/datasources/
 import { GraphQLClient } from "graphql-request";
 import { cookies } from "next/headers";
 import { getServerSession } from "next-auth/next";
-// TODO: Get auth inside client packages
 import authOptions from "@/auth/auth-options";
 
 /**
@@ -30,7 +29,7 @@ const getGraphQLClient = async (withAuth = false) => {
 
 	if (withAuth) {
 		const session = await getServerSession(authOptions());
-		if (session && session?.accessToken) {
+		if (session?.accessToken) {
 			headers["Authorization"] = `Bearer ${session.accessToken}`;
 		}
 	}

package/src/api-manager/services/cart/mutations/add-discount-code.ts

@@ -16,8 +16,8 @@ const useAddDiscountCode = () => {
 	const { setNotification } = useNotification();
 	const t = useTranslations("Cart.Messages");
 	return useCreateMutation<ManageDiscountCodeInput, Cart>(apiPath, {
-		onSuccess: async (result) => {
-			await getCart.setQueryData(queryClient, result);
+		onSuccess: (result) => {
+			getCart.setQueryData(queryClient, result);
 		},
 		onError: () => {
 			setNotification({

package/src/api-manager/services/cart/mutations/add-to-cart.ts

@@ -17,8 +17,8 @@ const useAddToCart = () => {
 	const queryClient = useQueryClient();
 
 	return useCreateMutation<AddToCartInput, Cart>(apiPath, {
-		onSuccess: async (result, input) => {
-			await getCart.setQueryData(queryClient, result);
+		onSuccess: (result, input) => {
+			getCart.setQueryData(queryClient, result);
 
 			// Handle single cart line
 			if (input.cartLine.length === 1) {

package/src/api-manager/services/product/server/product.server.ts

@@ -11,6 +11,6 @@ export const searchProductsServer = async (
 	const apiManager = await createApiManager();
 	const searchProducts = apiManager.product.searchProducts
 		? apiManager.product.searchProducts(input)
-		: Promise.reject("product.searchProducts() is not defined");
+		: Promise.reject(new Error("product.searchProducts() is not defined"));
 	return parseObject(searchProducts);
 };

package/src/api-manager/types/Datasource.ts

@@ -23,10 +23,6 @@ import type {
 	SessionInitInput,
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/session.schema";
 import type * as userSchemas from "@evenicanpm/storefront-core/src/api-manager/schemas/user.schema";
-import type {
-	User,
-	UserCounts,
-} from "@evenicanpm/storefront-core/src/api-manager/schemas/user.schema";
 import type {
 	CardPaymentAcceptPoint,
 	CardPaymentAcceptResult,
@@ -92,7 +88,7 @@ export interface OrganizationApi {
 export interface UserApi {
 	updateUser(user: userSchemas.User): Promise<userSchemas.User>;
 	getUser(): Promise<userSchemas.User | null>;
-	getUserCounts(userId: string): Promise<UserCounts>;
+	getUserCounts(userId: string): Promise<userSchemas.UserCounts>;
 	// wishlists
 	getWishlists(): Promise<userSchemas.Wishlist[]>;
 	getWishlistDetails(
@@ -115,9 +111,9 @@ export interface UserApi {
 	copyCartToWishlist(
 		input: userSchemas.CopyCartToWishlistInput,
 	): Promise<userSchemas.Wishlist>;
-	updateUser(user: User): Promise<User>;
-	getUser(): Promise<User | null>;
-	getUserCounts(userId: string): Promise<UserCounts>;
+	updateUser(user: userSchemas.User): Promise<userSchemas.User>;
+	getUser(): Promise<userSchemas.User | null>;
+	getUserCounts(userId: string): Promise<userSchemas.UserCounts>;
 }
 
 /**
@@ -129,7 +125,6 @@ export interface SessionApi {
 	getSession(): Promise<Session>;
 }
 
-// export interface Datasource extends Datasource {};
 /**
  * Cart Data Actions
  */

package/src/auth/auth-options.test.ts

@@ -3,15 +3,6 @@ import type { JWT } from "next-auth/jwt";
 import { describe, expect, it } from "vitest";
 import authOptions, { type ExtendedJwtToken } from "@/auth/auth-options";
 
-// vi.mock("./aadb2c-provider", () => ({
-//     azureADB2CProvider: {},
-//     refreshAccessToken: vi.fn(async (token) => ({
-//         ...token,
-//         accessToken: "newAccessToken",
-//         accessTokenExpiresAt: Date.now() + 3600 * 1000,
-//     })),
-// }));
-
 describe("next-auth option callbacks", () => {
 	describe("jwt callback", () => {
 		it("should store accessToken and refreshToken when account and profile are available", async () => {
@@ -33,11 +24,7 @@ describe("next-auth option callbacks", () => {
 			};
 
 			let newToken;
-			if (
-				authOptions &&
-				authOptions().callbacks &&
-				authOptions().callbacks.jwt
-			) {
+			if (authOptions()?.callbacks?.jwt) {
 				newToken = await authOptions().callbacks.jwt({
 					token,
 					user: { id: "123" },
@@ -51,45 +38,6 @@ describe("next-auth option callbacks", () => {
 			expect(newToken?.accessTokenExpiresAt).toBe(token.accessTokenExpiresAt); // We're not setting this or using it anymore
 			expect(newToken?.refreshTokenExpiresAt).toBe(token.refreshTokenExpiresAt); // We're not setting this or using it anymore);
 		});
-
-		// it("should return token if access token is not expired", async () => {
-		//     const token: JWT = {
-		//         accessToken: "validToken",
-		//         accessTokenExpiresAt: Date.now() + 3600 * 1000,
-		//         refreshToken: "",
-		//         refreshTokenExpiresAt: 0
-		//     };
-
-		//     let newToken;
-		//     if (authOptions && authOptions.callbacks && authOptions.callbacks.jwt) {
-		//         newToken = await authOptions.callbacks.jwt({ token, user: { id: '123' }, account: null });
-		//     }
-
-		//     expect(newToken).toEqual(token);
-		// });
-
-		// it("should return error if refresh token is expired", async () => {
-		//     const token = { accessTokenExpiresAt: Date.now() - 1000, refreshTokenExpiresAt: Date.now() - 1000 };
-
-		//     let newToken;
-		//     if (authOptions && authOptions.callbacks && authOptions.callbacks.jwt) {
-		//         newToken = await authOptions.callbacks.jwt({ token, user: { id: '123' }, account: null });
-		//     }
-
-		//     expect(newToken?.error).toBe("RefreshTokenExpired");
-		// });
-
-		// it("should refresh access token if access token is expired but refresh token is valid", async () => {
-		//     const token = { accessToken: "oldToken", accessTokenExpiresAt: Date.now() - 1000, refreshToken: "validRefreshToken", refreshTokenExpiresAt: Date.now() + 3600 * 1000 };
-
-		//     let newToken;
-		//     if (authOptions && authOptions.callbacks && authOptions.callbacks.jwt) {
-		//         newToken = await authOptions.callbacks.jwt({ token, user: { id: '123' }, account: null });
-		//     }
-
-		//     // expect(refreshAccessToken).toHaveBeenCalledWith(token);
-		//     expect(newToken?.accessToken).toBe("newAccessToken");
-		// });
 	});
 
 	describe("session callback", () => {
@@ -103,11 +51,7 @@ describe("next-auth option callbacks", () => {
 				error: "SomeError",
 			};
 			let newSession: Session | null;
-			if (
-				authOptions &&
-				authOptions().callbacks &&
-				authOptions().callbacks.session
-			) {
+			if (authOptions()?.callbacks?.session) {
 				newSession = await authOptions().callbacks.session({
 					session,
 					token,

package/src/auth/auth-options.ts

@@ -1,4 +1,3 @@
-// import { getSecret } from "@evenicanpm/common-core/src/lib/keyvault";
 import { deleteCartCookie } from "@evenicanpm/storefront-core/src/lib/cart-cookie-handler";
 import type {
 	GetServerSidePropsContext,
@@ -20,7 +19,7 @@ export type ExtendedSession = Session & { token?: JWT };
 
 const createAuthOptions = (): NextAuthOptions => {
 	const providers = getProviders();
-	const secret = process.env.NEXTAUTH_SECRET; //getSecret("NEXTAUTH_SECRET");
+	const secret = process.env.NEXTAUTH_SECRET; // internally used by next-auth, shouldn't be from key vault.
 	return {
 		providers,
 		secret,

package/src/auth/next-auth-cookie-manager.ts

@@ -7,8 +7,6 @@ import type { ExtendedJwtToken } from "@/auth/auth-options";
 const NEXT_AUTH_COOKIE_NAME = "next-auth.session-token";
 const SECURE_COOKIE_PREFIX = "__Secure-";
 
-// import { getSecret } from "@evenicanpm/common-core/src/lib/keyvault";
-
 /**
  * Retrieves and decodes the NextAuth session cookie from the request.
  *

package/src/auth/refresh-token.ts

@@ -1,11 +1,7 @@
 "use server";
 import jwt from "jsonwebtoken";
 import type { JWT } from "next-auth/jwt";
-// TODO: what is going on here?
-import type {
-	AuthorizationEndpointHandler,
-	OAuthConfig,
-} from "next-auth/providers";
+import type { AuthorizationEndpointHandler } from "next-auth/providers";
 import type { ExtendedJwtToken } from "@/auth/auth-options";
 import { getProviders } from "@/auth/providers";
 
@@ -23,8 +19,7 @@ const checkAccessTokenExpiry = async (
 		token.error = "Token Invalid";
 		return { token, isRefreshed: false };
 	}
-	// console.log('Token Expires:', new Date(decryptedToken.exp! * 1000).toLocaleString());
-	// console.log('Time now', new Date(Date.now()).toLocaleString());
+
 	if (!decryptedToken.exp) {
 		token.error = "noExpiryOnToken";
 		return {
@@ -57,7 +52,7 @@ const checkAccessTokenExpiry = async (
 	//Find the provider that matches the provider cookie
 	const matchedProvider = providers.find(
 		(p) => p.id.toLowerCase() === token.provider.toLowerCase(),
-	) as OAuthConfig<Record<string, unknown>> | undefined;
+	);
 	if (!matchedProvider) {
 		token.error = "NoProviderMatch";
 		return {

package/src/auth/signout.ts

@@ -37,7 +37,7 @@ const signOut = async (): Promise<void> => {
 			throw new Error(`Failed to sign out: ${response.statusText}`);
 		}
 
-		window.location.href = "/";
+		globalThis.location.href = "/";
 	} catch (error) {
 		console.error(error);
 	}

package/src/cms/blocks/block-manager.tsx

@@ -37,11 +37,11 @@ const componentMap = {
 const getBlockComponent: <B extends Block>(
 	block: B,
 	idx: number,
-) => JSX.Element | null = (block: Block, idx: number) => {
+) => JSX.Element | null = (block: Block) => {
 	const Component = componentMap[
 		block.__component as keyof typeof componentMap
 	] as React.ComponentType<Block>;
-	return <Component key={`block-${idx}`} {...block} />;
+	return <Component key={`block-${block.id}`} {...block} />;
 };
 
 interface BlockManagerProps {
@@ -55,7 +55,7 @@ const BlockManager: React.FC<BlockManagerProps> = ({ blocks }) => {
 			{blocks.map((block, idx) => {
 				const isLast = idx === blocks.length - 1;
 				return (
-					<Box key={`block-wrapper-${idx}`} mb={isLast ? 0 : 6}>
+					<Box key={`block-wrapper-${block.id}`} mb={isLast ? 0 : 6}>
 						{getBlockComponent(block, idx)}
 					</Box>
 				);

package/src/cms/blocks/components/category-card.tsx

@@ -11,7 +11,7 @@ interface Props {
 	imgUrl: string;
 }
 
-export default function CategoryCard({ name, imgUrl }: Props) {
+export default function CategoryCard({ name, imgUrl }: Readonly<Props>) {
 	return (
 		<Card sx={{ width: "100%", boxShadow: 10 }}>
 			<Box

package/src/cms/blocks/components/category-carousel/index.tsx

@@ -13,7 +13,9 @@ import CategoryIcon from "@/cms/blocks/icons/components/category";
 import type { CategoryCarouselBlock } from "@/cms/blocks/interfaces";
 import { getImageUrl } from "@/cms/endpoints";
 
-export default function CategoryCarousel(data: CategoryCarouselBlock) {
+export default function CategoryCarousel(
+	data: Readonly<CategoryCarouselBlock>,
+) {
 	const responsive = [
 		{ breakpoint: 959, settings: { slidesToShow: 2 } },
 		{ breakpoint: 650, settings: { slidesToShow: 1 } },

package/src/cms/blocks/components/footer/index.tsx

@@ -59,7 +59,7 @@ const Footer = async () => {
 	const data = await fetchFooterData();
 	const sections = data?.data?.sections;
 
-	if (!(sections && sections.length)) {
+	if (!sections?.length) {
 		return null;
 	}
 
@@ -77,7 +77,7 @@ const Footer = async () => {
 				py={{ sm: 10, xs: 4 }}
 			>
 				<Grid container spacing={6}>
-					{sections.map(getBlockComponent)}
+					{sections.map((block, index) => getBlockComponent(block, index))}
 				</Grid>
 			</Box>
 		</Box>

package/src/cms/blocks/components/footer/sections/footer-links.tsx

@@ -18,8 +18,8 @@ const Links = (props: Props) => {
 		<Grid size={{ lg: 3, md: 6, sm: 6, xs: 12 }}>
 			<Heading>{props.title}</Heading>
 			<Box>
-				{props?.links?.map((item, ind) => (
-					<Fragment key={ind}>
+				{props?.links?.map((item) => (
+					<Fragment key={item.slug}>
 						<StyledLink isDark={props.isDark} href={`pages/${item.slug}`}>
 							{item.title}
 						</StyledLink>

package/src/cms/blocks/components/footer/sections/footer-logo.tsx

@@ -11,7 +11,7 @@ interface Props {
 	description: string;
 }
 
-export default function LogoSection(props: Props) {
+export default function LogoSection(props: Readonly<Props>) {
 	const theme = useTheme();
 	const downMd = useMediaQuery(theme.breakpoints.down(1150)); // same like in header
 	return (

package/src/cms/blocks/components/footer/sections/footer-social-links.tsx

@@ -36,7 +36,10 @@ interface Props {
 	socials?: SocialLink[];
 }
 
-export default function SocialLinks({ variant = "light", socials }: Props) {
+export default function SocialLinks({
+	variant = "light",
+	socials,
+}: Readonly<Props>) {
 	return (
 		<FlexBox className="flex" mx={-0.625}>
 			{socials?.map(({ name, link }, i) => {
@@ -58,7 +61,12 @@ export default function SocialLinks({ variant = "light", socials }: Props) {
 				}
 
 				return (
-					<a href={link} target="_blank" rel="noreferrer noopenner" key={i}>
+					<a
+						href={link}
+						target="_blank"
+						rel="noreferrer noopenner"
+						key={name + i}
+					>
 						<StyledIconButton variant={variant}>
 							{Icon && <Icon fontSize="inherit" className="icon" />}
 						</StyledIconButton>