@evenicanpm/storefront-core 1.2.1 → 1.3.0

package/.storybook/main.ts

@@ -1,6 +1,6 @@
 import type { StorybookConfig } from "@storybook/react-webpack5";
 
-import { resolve, join, dirname } from "path";
+import { dirname, join, resolve } from "path";
 
 /**
  * This function is used to resolve the absolute path of a package.

package/.storybook/preview.tsx

@@ -1,12 +1,13 @@
 import type { Preview } from "@storybook/react-webpack5";
-import React from "react";
-import ThemeProvider from "../src/theme/theme-provider";
 import { QueryClientProvider } from "@tanstack/react-query";
 import { NextIntlClientProvider } from "next-intl";
-import { NotificationProvider } from "../src/providers/notifications/notification-context.tsx";
-import { queryClient } from "../__mocks__/query-client.ts";
+import React from "react";
 import { sb } from "storybook/test";
 import messages from "../../../../../storefront/messages/en-US.json";
+import { queryClient } from "../__mocks__/query-client.ts";
+import { NotificationProvider } from "../src/providers/notifications/notification-context.tsx";
+import ThemeProvider from "../src/theme/theme-provider";
+
 // Mock messages or import your actual ones
 
 if (typeof global.process === "undefined") {

package/__mocks__/countries.ts

@@ -1,4 +1,4 @@
-import { CountryRegionInfo } from "@msdyn365-commerce/retail-proxy";
+import type { CountryRegionInfo } from "@msdyn365-commerce/retail-proxy";
 
 export const countries: CountryRegionInfo[] = [
 	{ ShortName: "Canada", CountryRegionId: "CA", ISOCode: "CA" },

package/__mocks__/create-query.ts

@@ -1,7 +1,8 @@
 import { useQuery } from "@tanstack/react-query";
-import wishlists from "../__mocks__/wishlists.json";
 import categories from "../__mocks__/data/categories.json";
 import { data as products } from "../__mocks__/products";
+import wishlists from "../__mocks__/wishlists.json";
+
 const cartBase = {
 	Id: "cart-123",
 	Version: 1,
@@ -13,7 +14,7 @@ const cartBase = {
 		},
 	],
 };
-let cart = cartBase;
+const cart = cartBase;
 
 const shippingInventoryData = {
 	AggregatedProductInventoryAvailabilities: [

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evenicanpm/storefront-core",
-	"version": "1.2.1",
+	"version": "1.3.0",
 	"description": "Core module for D365/e4 Headless Storefront",
 	"type": "module",
 	"scripts": {
@@ -15,6 +15,9 @@
 	},
 	"author": "Evenica",
 	"license": "ISC",
+	"dependencies": {
+		"@evenicanpm/ui": "^1.3.0"
+	},
 	"devDependencies": {
 		"@storybook/addon-docs": "^9.1.6",
 		"@storybook/addon-webpack5-compiler-swc": "^4.0.1",
@@ -41,5 +44,10 @@
 		"typescript": "^5.8.3",
 		"zod": "^3.25.25"
 	},
-	"gitHead": "05e037ddd9e776f5f41bbd487d16a1c1bb2a179b"
+	"overrides": {
+		"@storybook/builder-manager": {
+			"esbuild": "0.19.11"
+		}
+	},
+	"gitHead": "074f33378006dfc21ceb49456806a18dbb6e91ad"
 }

package/src/api-manager/datasources/d365/d365-address.datasource.ts

@@ -1,28 +1,30 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { AddressApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
+
+import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+import { getContextFromCookie } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/utils/get-context-cookie";
+import type { AddressApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
-	CountryRegionInfo,
-	DeliveryOption,
+	type CountryRegionInfo,
+	type DeliveryOption,
 	FilterDeliveryModeOption,
-	StateProvinceInfo,
+	type StateProvinceInfo,
 } from "@msdyn365-commerce/retail-proxy";
 import { getDeliveryOptionsAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CartsDataActions.g";
+import {
+	readAsync,
+	updateAsync,
+} from "@msdyn365-commerce/retail-proxy/dist/DataActions/CustomersDataActions.g";
 import {
 	getCountryRegionsByLanguageIdAsync,
 	getStateProvincesAsync,
 } from "@msdyn365-commerce/retail-proxy/dist/DataActions/StoreOperationsDataActions.g";
-import {
+import type {
 	Address,
 	GetCountriesInput,
 	GetDeliveryOptionsInput,
 	GetStatesInput,
 } from "@/schemas/address.schema";
-import { getContextFromCookie } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/utils/get-context-cookie";
-import {
-	readAsync,
-	updateAsync,
-} from "@msdyn365-commerce/retail-proxy/dist/DataActions/CustomersDataActions.g";
-import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+
 class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
 	async createAddress(address: Address): Promise<Address> {
 		const context = await getContextFromCookie();

package/src/api-manager/datasources/d365/d365-base.datasource.ts

@@ -1,4 +1,4 @@
-import { ICallerContext } from "@msdyn365-commerce/retail-proxy";
+import type { ICallerContext } from "@msdyn365-commerce/retail-proxy";
 
 export abstract class D365DatasourceBase {
 	context: ICallerContext;

package/src/api-manager/datasources/d365/d365-cart.datasource.ts

@@ -1,61 +1,61 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { CartApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
+import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+import D365OrganizationDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-organization.datasource";
+import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
+import type { CartApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
+import { getCartCookie } from "@evenicanpm/storefront-core/src/lib/cart-cookie-handler";
 import {
-	CartType,
-	Cart as DynCart,
-	CardPaymentAcceptPoint,
-	CardPaymentAcceptSettings,
-	CardPaymentAcceptResult,
+	type CardPaymentAcceptPoint,
+	type CardPaymentAcceptResult,
+	type CardPaymentAcceptSettings,
+	type CartLine,
+	type CartSearchCriteria,
 	// SalesOrder,
-	CartTenderLine,
-	QueryResultSettings,
-	CartSearchCriteria,
-	ICallerContext,
-	CartLine,
-	ProductWarehouse,
-	ProductWarehouseInventoryInformation,
-	InventoryAvailabilitySearchCriteria,
+	type CartTenderLine,
+	CartType,
+	type Cart as DynCart,
+	type ICallerContext,
+	type InventoryAvailabilitySearchCriteria,
+	type ProductWarehouse,
+	type ProductWarehouseInventoryInformation,
+	type QueryResultSettings,
 } from "@msdyn365-commerce/retail-proxy";
 import {
 	addCartLinesAsync,
+	addDiscountCodeAsync,
+	checkoutAsync,
 	createCartAsync,
+	getCardPaymentAcceptPointAsync,
 	readAsync,
 	removeCartLinesAsync,
-	updateCartLinesAsync,
-	updateAsync,
-	addDiscountCodeAsync,
 	removeDiscountCodesAsync,
-	updateLineDeliverySpecificationsAsync,
-	getCardPaymentAcceptPointAsync,
 	retrieveCardPaymentAcceptResultAsync,
-	checkoutAsync,
 	searchAsync,
+	updateAsync,
+	updateCartLinesAsync,
+	updateLineDeliverySpecificationsAsync,
 } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CartsDataActions.g";
 import {
-	ManageDiscountCodeInput,
+	getEstimatedAvailabilityAsync,
+	getEstimatedProductWarehouseAvailabilityAsync,
+} from "@msdyn365-commerce/retail-proxy/dist/DataActions/ProductsDataActions.g";
+import { omit, uniq } from "lodash";
+import type {
 	AddToCartInput,
 	Cart,
+	CheckoutInput,
 	DeleteCartLineInput,
-	UpdateCartInput,
-	UpdateCartLineInput,
-	UpdateCartLineDeliveryModeInput,
-	RemoveCartLineDeliveryModeInput,
 	GetCardPaymentAcceptPointInput,
-	RetrieveCardPaymentAcceptResultInput,
-	CheckoutInput,
 	InventorySearchCartLinesCriteriaInput,
+	ManageDiscountCodeInput,
+	RemoveCartLineDeliveryModeInput,
+	RetrieveCardPaymentAcceptResultInput,
+	UpdateCartInput,
+	UpdateCartLineDeliveryModeInput,
+	UpdateCartLineInput,
 } from "@/schemas/cart.schema";
-import { uniq, omit } from "lodash";
-import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
-import { getCartCookie } from "@evenicanpm/storefront-core/src/lib/cart-cookie-handler";
-import { SalesOrder } from "@/schemas/order.schema";
-import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
-import D365OrganizationDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-organization.datasource";
-import {
-	getEstimatedAvailabilityAsync,
-	getEstimatedProductWarehouseAvailabilityAsync,
-} from "@msdyn365-commerce/retail-proxy/dist/DataActions/ProductsDataActions.g";
+import type { SalesOrder } from "@/schemas/order.schema";
 
 export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 	async checkout(input: CheckoutInput): Promise<SalesOrder> {

package/src/api-manager/datasources/d365/d365-categories.datasource.ts

@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { CategoryApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
+import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+import type { CategoryApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
-	CategoryHierarchy,
+	type CategoryHierarchy,
 	mapCategoryToHierarchy,
 } from "@evenicanpm/storefront-core/src/lib/category-helpers";
 import { getCategoriesAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CategoriesDataActions.g";
-import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
 
 class D365CategoriesDatasource
 	extends D365DatasourceBase

package/src/api-manager/datasources/d365/d365-order.datasource.ts

@@ -1,19 +1,20 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { OrderApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
+import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
+import type {
+	GetSalesOrderDetailsInput,
+	SalesOrder,
+} from "@evenicanpm/storefront-core/src/api-manager/schemas/order.schema";
+import type { OrderApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
-	SalesOrder as DynSalesOrder,
+	type SalesOrder as DynSalesOrder,
+	type ICallerContext,
 	SearchLocation,
-	ICallerContext,
 } from "@msdyn365-commerce/retail-proxy";
 import { getSalesOrderDetailsByTransactionIdAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/SalesOrdersDataActions.g";
-import {
-	GetSalesOrderDetailsInput,
-	SalesOrder,
-} from "@evenicanpm/storefront-core/src/api-manager/schemas/order.schema";
-import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
 import uniq from "lodash/uniq";
-import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+
 class D365OrderDatasource extends D365DatasourceBase implements OrderApi {
 	getSalesOrders(): Promise<any> {
 		throw new Error("Method not implemented.");

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

@@ -1,23 +1,23 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { OrganizationApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
-import {
-	getChannelDeliveryOptionsAsync,
-	getOrgUnitConfigurationAsync,
-	getStoreHoursAsync,
-} from "@msdyn365-commerce/retail-proxy/dist/DataActions/OrgUnitsDataActions.g";
-import {
+import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+import type {
 	ChannelConfiguration,
 	GetOrgUnitLocationsByAreaInput,
 	OrgUnitLocation,
 	OrgUnitLocationReturnType,
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/organization.schema";
-import { getOrgUnitLocationsByAreaAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/OrgUnitsDataActions.g";
-import {
+import type { OrganizationApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
+import type {
 	ChannelDeliveryOption,
 	ICallerContext,
 } from "@msdyn365-commerce/retail-proxy";
-import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+import {
+	getChannelDeliveryOptionsAsync,
+	getOrgUnitConfigurationAsync,
+	getOrgUnitLocationsByAreaAsync,
+	getStoreHoursAsync,
+} from "@msdyn365-commerce/retail-proxy/dist/DataActions/OrgUnitsDataActions.g";
 
 class D365OrganizationDatasource
 	extends D365DatasourceBase

package/src/api-manager/datasources/d365/d365-product.datasource.ts

@@ -1,44 +1,43 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { ProductApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
-import {
-	InventoryAvailabilitySearchCriteria,
-	IQueryResultSettings,
-	ProductPrice,
-	ProductRefinerSource,
-	ProductSearchCriteria,
-	ProductSearchResult,
-	SimpleProduct,
-} from "@msdyn365-commerce/retail-proxy";
-import {
-	getByIdAsync,
-	getByIdsAsync,
-	searchByCriteriaAsync,
-	getRelatedProductsAsync,
-	getDimensionValuesWithEstimatedAvailabilitiesAsync,
-	getAttributeValuesAsync,
-	getProductSearchRefinersAsync,
-	getEstimatedAvailabilityAsync,
-	getActivePricesAsync,
-} from "@msdyn365-commerce/retail-proxy/dist/DataActions/ProductsDataActions.g";
+import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+import D365CategoriesDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-categories.datasource";
+import { createDimSearchCriteria } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/utils/create-search-criteria";
 import {
+	testMedia,
+	validateAndSetMediaUrls,
+} from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/utils/product-images-utils";
+import type {
 	GetProductByIdInput,
 	GetProductByIdsInput,
 	GetRelatedProductsInput,
+	InventorySearchCriteriaInput,
 	ProductPriceInput,
 	SearchByCriteriaInput,
 	SearchByCriteriaResponse,
 	searchProductsInput,
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
-import { createDimSearchCriteria } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/utils/create-search-criteria";
+import type { ProductApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
-	testMedia,
-	validateAndSetMediaUrls,
-} from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/utils/product-images-utils";
-import D365CategoriesDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-categories.datasource";
-import { InventorySearchCriteriaInput } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
-
-import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+	type InventoryAvailabilitySearchCriteria,
+	type IQueryResultSettings,
+	type ProductPrice,
+	ProductRefinerSource,
+	type ProductSearchCriteria,
+	type ProductSearchResult,
+	type SimpleProduct,
+} from "@msdyn365-commerce/retail-proxy";
+import {
+	getActivePricesAsync,
+	getAttributeValuesAsync,
+	getByIdAsync,
+	getByIdsAsync,
+	getDimensionValuesWithEstimatedAvailabilitiesAsync,
+	getEstimatedAvailabilityAsync,
+	getProductSearchRefinersAsync,
+	getRelatedProductsAsync,
+	searchByCriteriaAsync,
+} from "@msdyn365-commerce/retail-proxy/dist/DataActions/ProductsDataActions.g";
 
 const setFullProductImgUrl = async (
 	product: SimpleProduct | ProductSearchResult,

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

@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { SessionApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
-//import { Customer, ICallerContext } from "@msdyn365-commerce/retail-proxy";
-//import { readAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CustomersDataActions.g";
-import { Session } from "@evenicanpm/storefront-core/src/api-manager/schemas/session.schema";
 //import { getContextFromCookie } from "./utils/get-context-cookie";
 import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+//import { Customer, ICallerContext } from "@msdyn365-commerce/retail-proxy";
+//import { readAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CustomersDataActions.g";
+import type { Session } from "@evenicanpm/storefront-core/src/api-manager/schemas/session.schema";
+import type { SessionApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 
 class D365SessionDatasource extends D365DatasourceBase implements SessionApi {
 	async sessionInit(): Promise<Session> {

package/src/api-manager/datasources/d365/d365-user.datasource.ts

@@ -1,30 +1,21 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { UserApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
-import {
-	CopyCartToWishlistInput,
-	ExtendedWishlist,
-	User,
-	UserCounts,
-	Wishlist,
-	WishlistCreateInput,
-	WishlistDetailInput,
-	WishlistLinesInput,
-} from "@/schemas/user.schema";
+
+import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
+import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
+import type { UserApi } from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
 import {
-	Customer,
-	CommerceProperty,
+	type CommerceProperty,
+	type Customer,
+	type ProductList,
+	type ProductListSearchCriteria,
 	ProductListType,
-	ProductListSearchCriteria,
-	SimpleProduct,
-	ProductList,
+	type SimpleProduct,
 } from "@msdyn365-commerce/retail-proxy";
 import {
 	createCustomerAsync,
 	readAsync,
 	updateAsync,
 } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CustomersDataActions.g";
-import jwt from "jsonwebtoken";
-import { D365DatasourceBase } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-base.datasource";
 import {
 	addProductListLinesAsync,
 	copyCartToProductListAsync,
@@ -33,10 +24,21 @@ import {
 	removeProductListLinesAsync,
 	searchAsync,
 	updateProductListLinesAsync,
+	readAsync as wishlistReadAsync,
 } from "@msdyn365-commerce/retail-proxy/dist/DataActions/ProductListsDataActions.g";
-import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
+import jwt from "jsonwebtoken";
 import { uniq } from "lodash";
-import { readAsync as wishlistReadAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/ProductListsDataActions.g";
+import type {
+	CopyCartToWishlistInput,
+	ExtendedWishlist,
+	User,
+	UserCounts,
+	Wishlist,
+	WishlistCreateInput,
+	WishlistDetailInput,
+	WishlistLinesInput,
+} from "@/schemas/user.schema";
+
 class D365UserDatasource extends D365DatasourceBase implements UserApi {
 	async updateUser(user: User): Promise<User> {
 		const context = this.context;

package/src/api-manager/datasources/d365/d365.datasource.ts

@@ -1,23 +1,23 @@
-import {
-	AddressApi,
-	CategoryApi,
-	Datasource,
-	OrderApi,
-	OrganizationApi,
-	PrimaryDatasource,
-	ProductApi,
-	SessionApi,
-	UserApi,
-} from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
-import { D365ProductDatasource } from ".";
-import { D365CartDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-cart.datasource";
 import D365AddressDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-address.datasource";
+import { D365CartDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-cart.datasource";
 import D365CategoriesDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-categories.datasource";
-import D365OrganizationDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-organization.datasource";
 import D365OrderDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-order.datasource";
+import D365OrganizationDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-organization.datasource";
 import D365SessionDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-session.datasource";
 import D365UserDatasource from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-user.datasource";
-import { ICallerContext } from "@msdyn365-commerce/retail-proxy";
+import {
+	type AddressApi,
+	type CategoryApi,
+	Datasource,
+	type OrderApi,
+	type OrganizationApi,
+	type PrimaryDatasource,
+	type ProductApi,
+	type SessionApi,
+	type UserApi,
+} from "@evenicanpm/storefront-core/src/api-manager/types/Datasource";
+import type { ICallerContext } from "@msdyn365-commerce/retail-proxy";
+import { D365ProductDatasource } from ".";
 
 export class D365Datasource extends Datasource implements PrimaryDatasource {
 	user: UserApi;

package/src/api-manager/datasources/d365/index.ts

@@ -1,4 +1,4 @@
-import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
 import { D365Datasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365.datasource";
+import { D365ProductDatasource } from "@evenicanpm/storefront-core/src/api-manager/datasources/d365/d365-product.datasource";
 
 export { D365ProductDatasource, D365Datasource };

package/src/api-manager/datasources/d365/test-context.ts

@@ -1,4 +1,4 @@
-import { IQueryResultSettings } from "@msdyn365-commerce/retail-proxy";
+import type { IQueryResultSettings } from "@msdyn365-commerce/retail-proxy";
 
 const defaultQueryResultSettings: IQueryResultSettings = {
 	Paging: {

package/src/api-manager/datasources/d365/utils/create-search-criteria.ts

@@ -1,4 +1,4 @@
-import { ProductDimensionAvailabilitySearchCriteria } from "@msdyn365-commerce/retail-proxy";
+import type { ProductDimensionAvailabilitySearchCriteria } from "@msdyn365-commerce/retail-proxy";
 /**
  * Helper: Create search criteria for product dimension availability.
  * @param dimensionTypeValue

package/src/api-manager/datasources/d365/utils/decode-jwt.ts

@@ -1,6 +1,6 @@
 "use server";
+import { getSecret } from "@evenicanpm/common-core/src/lib/keyvault";
 import { decode } from "next-auth/jwt";
-import { getSecret } from "@evenicanpm/common-core/keyvault";
 
 export async function decodeToken(token: string) {
 	const secret = getSecret("NEXTAUTH_SECRET");

package/src/api-manager/datasources/d365/utils/get-context-cookie.ts

@@ -1,8 +1,8 @@
 "use server";
-import { manuallyRetrieveSessionCookie } from "@/auth/next-auth-cookie-manager";
-import { ICallerContext } from "@msdyn365-commerce/retail-proxy";
-import { getLocale } from "next-intl/server";
+import type { ICallerContext } from "@msdyn365-commerce/retail-proxy";
 import { cookies } from "next/headers";
+import { getLocale } from "next-intl/server";
+import { manuallyRetrieveSessionCookie } from "@/auth/next-auth-cookie-manager";
 
 /**
  * Retrieves the D365 context from the "D365Context" cookie, enriches it with the current session token,

package/src/api-manager/datasources/d365/utils/product-images-utils.ts

@@ -1,4 +1,4 @@
-import { SimpleProduct } from "@msdyn365-commerce/retail-proxy";
+import type { SimpleProduct } from "@msdyn365-commerce/retail-proxy";
 
 const testImageUrl = (url: string) => {
 	return new Promise<[string, boolean]>((resolve) => {
@@ -28,16 +28,35 @@ export const validateAndSetMediaUrls = async (
 	productData: SimpleProduct,
 	baseUrl: string,
 ) => {
-	const product = productData;
-	const primaryImageUrl = product?.PrimaryImageUrl;
+	const product = { ...productData };
+
+	let primaryImageUrl = product.PrimaryImageUrl;
+
 	if (!primaryImageUrl) {
-		return;
+		primaryImageUrl = `Products/${product.ItemId}_000_001.png`;
 	}
-	const urls = [];
-	for (let index = 1; index < 6; index++) {
-		const nextUrl = baseUrl + primaryImageUrl.replace("001", `00${index}`);
-		urls.push(nextUrl);
+
+	let fullPrimaryUrl = `${baseUrl}${primaryImageUrl}`;
+
+	// Validate the primary image
+	const isPrimaryValid = (await testMedia([fullPrimaryUrl])).length > 0;
+	if (!isPrimaryValid) {
+		fullPrimaryUrl = `${baseUrl}Products/${product.ItemId}_000_001.png`;
 	}
-	const validUrls = await testMedia(urls);
-	return validUrls;
+
+	product.PrimaryImageUrl = fullPrimaryUrl;
+
+	const candidateUrls: string[] = [];
+	for (let index = 2; index <= 5; index++) {
+		const candidateUrl = fullPrimaryUrl.replace(
+			/001(\.[a-z]+)$/i,
+			`${String(index).padStart(3, "0")}$1`,
+		);
+		candidateUrls.push(candidateUrl);
+	}
+
+	// Validate which URLs exist
+	const validUrls = await testMedia(candidateUrls);
+
+	return [product.PrimaryImageUrl, ...validUrls];
 };

package/src/api-manager/datasources/d365/utils/product-inventory-utils.ts

@@ -1,4 +1,4 @@
-import {
+import type {
 	InventoryAvailabilitySearchCriteria,
 	SearchArea,
 } from "@msdyn365-commerce/retail-proxy";

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

@@ -1,17 +1,17 @@
+import { addressMap } from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/address/e4-address.remaps";
+import * as addressTranslator from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/address/e4-address.translator";
+import type { Shipping } from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/graphqlRequestSdk";
 import getGraphqlClient from "@evenicanpm/storefront-core/src/api-manager/lib/get-graphql-client";
-import {
+import type {
 	Address,
 	GetDeliveryOptionsInput,
 	GetStatesInput,
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/address.schema";
-import {
+import type {
 	CountryRegionInfo,
 	DeliveryOption,
 	StateProvinceInfo,
 } from "@msdyn365-commerce/retail-proxy";
-import { Shipping } from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/graphqlRequestSdk";
-import * as addressTranslator from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/address/e4-address.translator";
-import { addressMap } from "@evenicanpm/storefront-core/src/api-manager/datasources/e4/address/e4-address.remaps";
 import { merge } from "object-mapper";
 
 const address = {