fix: Add local type overrides

src/data-fixtures/Category/Category.ts

@@ -1,6 +1,6 @@
 import { test as base, expect } from '@playwright/test';
 import type { FixtureTypes } from '../../types/FixtureTypes';
-import type { components } from '@shopware/api-client/admin-api-types';
+import type { Category } from '../../types/ShopwareTypes';
 
 export const CategoryData = base.extend<FixtureTypes>({
     CategoryData: async ({ IdProvider, AdminApiContext, DefaultSalesChannel, ProductData }, use) => {
@@ -26,7 +26,7 @@ export const CategoryData = base.extend<FixtureTypes>({
 
         expect(categoryResponse.ok()).toBeTruthy();
 
-        const { data: category } = (await categoryResponse.json()) as { data: components['schemas']['Category'] };
+        const { data: category } = (await categoryResponse.json()) as { data: Category };
 
         await use(category);
 

src/data-fixtures/DataFixtures.ts

@@ -1,5 +1,6 @@
 import { mergeTests } from '@playwright/test';
 import type { components } from '@shopware/api-client/admin-api-types';
+import type { Product, Category, Order } from '../types/ShopwareTypes';
 import { ProductData } from './Product/Product';
 import { CategoryData } from './Category/Category';
 import { DigitalProductData } from './Product/DigitalProduct';
@@ -10,21 +11,11 @@ import { MediaData } from './Media/Media';
 import { OrderData } from './Order/Order';
 import { TagData } from './Tag/Tag';
 
-export type ProductType = components['schemas']['Product'] & {
-    id: string,
-    price: {
-        gross: number,
-        net: number,
-        linked: boolean,
-        currencyId: string,
-    }[]
-}
-
 export interface DataFixtureTypes {
-    ProductData: ProductType,
-    CategoryData: components['schemas']['Category'],
+    ProductData: Product,
+    CategoryData: Category,
     DigitalProductData: {
-        product: ProductType,
+        product: Product,
         fileContent: string
     },
     PromotionWithCodeData: components['schemas']['Promotion'],
@@ -34,7 +25,7 @@ export interface DataFixtureTypes {
         propertyGroupSize: components['schemas']['PropertyGroup']
     },
     MediaData: components['schemas']['Media'],
-    OrderData: components['schemas']['Order'],
+    OrderData: Order,
     TagData: components['schemas']['Tag'],
 }
 

src/data-fixtures/Order/Order.ts

@@ -1,6 +1,6 @@
 import { test as base, expect } from '@playwright/test';
 import type { FixtureTypes } from '../../types/FixtureTypes';
-import type { components } from '@shopware/api-client/admin-api-types';
+import type { Order } from '../../types/ShopwareTypes';
 import {
     getCurrency,
     getSalutationId,
@@ -226,7 +226,7 @@ export const OrderData = base.extend<FixtureTypes>({
 
         expect(orderResponse.ok()).toBeTruthy();
 
-        const { data: order } = (await orderResponse.json()) as { data: components['schemas']['Order'] };
+        const { data: order } = (await orderResponse.json()) as { data: Order };
 
         // Use order data in the test
         await use(order);

src/data-fixtures/Product/DigitalProduct.ts

@@ -1,5 +1,6 @@
 import { test as base, expect } from '@playwright/test';
 import type { FixtureTypes } from '../../types/FixtureTypes';
+import type { Order } from '../../types/ShopwareTypes';
 import type { components } from '@shopware/api-client/admin-api-types';
 
 export const DigitalProductData = base.extend<FixtureTypes>({
@@ -58,7 +59,7 @@ export const DigitalProductData = base.extend<FixtureTypes>({
         });
         expect(orderSearchResponse.ok()).toBeTruthy();
 
-        const { data: ordersWithDigitalProduct } = (await orderSearchResponse.json()) as { data: components['schemas']['Order'][] };
+        const { data: ordersWithDigitalProduct } = (await orderSearchResponse.json()) as { data: Order[] };
 
         // Delete Orders using the digital product, to be able to delete the uploaded media file
         for (const order of ordersWithDigitalProduct) {

src/data-fixtures/Product/Product.ts

@@ -1,6 +1,6 @@
 import { test as base, expect } from '@playwright/test';
 import type { FixtureTypes } from '../../types/FixtureTypes';
-import type { ProductType } from '../DataFixtures';
+import type { Product } from '../../types/ShopwareTypes';
 
 export const ProductData = base.extend<FixtureTypes>({
     ProductData: async ({ IdProvider, SalesChannelBaseConfig, AdminApiContext, DefaultSalesChannel }, use) => {
@@ -61,7 +61,7 @@ export const ProductData = base.extend<FixtureTypes>({
         });
         expect(productResponse.ok()).toBeTruthy();
 
-        const { data: product } = (await productResponse.json()) as { data: ProductType };
+        const { data: product } = (await productResponse.json()) as { data: Product };
 
         // Use product data in the test
         await use(product);

src/fixtures/DefaultSalesChannel.ts

@@ -1,5 +1,6 @@
 import { test as base, expect, APIResponse } from '@playwright/test';
 import type { FixtureTypes } from '../types/FixtureTypes';
+import type { Customer } from '../types/ShopwareTypes';
 import type { components } from '@shopware/api-client/admin-api-types';
 import { createHash } from 'crypto';
 import {
@@ -33,7 +34,7 @@ export interface DefaultSalesChannelTypes {
     SalesChannelBaseConfig: StoreBaseConfig;
     DefaultSalesChannel: {
         salesChannel: components['schemas']['SalesChannel'];
-        customer: components['schemas']['Customer'] & { password: string };
+        customer: Customer;
         url: string;
     }
 }
@@ -295,7 +296,7 @@ export const test = base.extend<NonNullable<unknown>, FixtureTypes>({
             expect(themeAssignResp.ok()).toBeTruthy();
             expect(salesChannelResp.ok()).toBeTruthy();
 
-            const customer = (await customerResp.json()) as { data: components['schemas']['Customer'] };
+            const customer = (await customerResp.json()) as { data: Customer };
             const salesChannel = (await salesChannelResp.json()) as { data: components['schemas']['SalesChannel'] };
 
             await use({

src/page-objects/administration/CustomerDetail.ts

@@ -12,7 +12,7 @@ export class CustomerDetail implements PageObject {
         this.accountCard = page.locator('.sw-customer-card')
     }
 
-    url(customerId: string | undefined) {
+    url(customerId: string) {
         return `#/sw/customer/detail/${customerId}/base`
     }
 }

src/page-objects/administration/OrderDetail.ts

@@ -12,7 +12,7 @@ export class OrderDetail implements PageObject {
         this.orderTag = page.locator('.sw-select-selection-list__item');
     }
 
-    url(orderId: string | undefined) {
+    url(orderId: string) {
         return `#/sw/order/detail/${orderId}/general`;
     }
 }

src/page-objects/storefront/ProductDetail.ts

@@ -1,6 +1,6 @@
 import type { Page, Locator } from '@playwright/test';
 import type { PageObject } from '../../types/PageObject';
-import type { ProductType } from '../../data-fixtures/DataFixtures';
+import type { Product } from '../../types/ShopwareTypes';
 
 export class ProductDetail implements PageObject {
 
@@ -29,7 +29,7 @@ export class ProductDetail implements PageObject {
         this.offCanvasSummaryTotalPrice = page.locator('.offcanvas-summary').locator('dt:has-text("Subtotal") + dd');
     }
 
-    url(productData: ProductType) {
+    url(productData: Product) {
         let namePath = '';
         if (productData.translated && productData.translated.name) {
             namePath = productData.translated.name.replaceAll('_', '-');

src/types/ShopwareTypes.ts

@@ -0,0 +1,24 @@
+import type { components } from '@shopware/api-client/admin-api-types';
+
+export type Customer = components['schemas']['Customer'] & {
+    id: string,
+    password: string,
+}
+
+export type Product = components['schemas']['Product'] & {
+    id: string,
+    price: {
+        gross: number,
+        net: number,
+        linked: boolean,
+        currencyId: string,
+    }[]
+}
+
+export type Category = components['schemas']['Category'] & {
+    id: string,
+}
+
+export type Order = components['schemas']['Order'] & {
+    id: string,
+}