@faststore/core 3.50.4 → 3.51.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.50.3 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.50.4 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.50.3 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.50.4 partytown /home/runner/work/faststore/faststore/packages/core
 > partytown copylib ./public/~partytown
 
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 
-> @faststore/core@3.50.3 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.50.4 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.50.3 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.50.4 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.50.3 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.50.4 generate:codegen /home/runner/work/faststore/faststore/packages/core
 > graphql-codegen
 
 [STARTED] Parse Configuration
@@ -37,11 +37,11 @@ Running lifecycle hook "afterStart" scripts...
 [CLI] Loading Documents
 [CLI] Generating output
 
-> @faststore/core@3.50.3 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.50.4 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.50.3 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.50.4 build /home/runner/work/faststore/faststore/packages/core
 > next build
 
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -83,8 +83,8 @@ Route (pages)                              Size     First Load JS
 ├   └ css/b7bba8fce075688b.css             4.2 kB
 ├ ● /account/404                           2.03 kB         130 kB
 ├   └ css/5347dbc8b71de47d.css             4.25 kB
-├ λ /account/orders                        8.65 kB         136 kB
-├   └ css/3aa693541804727c.css             11.8 kB
+├ λ /account/orders                        8.71 kB         137 kB
+├   └ css/24ae9ad548165362.css             11.8 kB
 ├ λ /account/orders/[id]                   10.1 kB         138 kB
 ├   └ css/506442c818624bd2.css             11.5 kB
 ├ λ /account/profile                       1.27 kB         129 kB
@@ -101,7 +101,7 @@ Route (pages)                              Size     First Load JS
   ├ chunks/framework-807b0f81cbc129f0.js   45.4 kB
   ├ chunks/main-f658704b53a96ab1.js        33.1 kB
   ├ chunks/pages/_app-eb6edb0ba4b4be67.js  16.3 kB
-  ├ chunks/webpack-17a0c2c20bc27381.js     3.7 kB
+  ├ chunks/webpack-100cd28c010132c0.js     3.7 kB
   └ css/0a57ee6c7a57788c.css               3.49 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,15 +1,14 @@
 
-> @faststore/core@3.50.3 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.50.4 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/server/cms/global.test.ts (24.378 s)
-PASS test/utils/multipleTemplates.test.ts (25.255 s)
+PASS test/utils/multipleTemplates.test.ts (24.95 s)
+PASS test/server/cms/global.test.ts (25.773 s)
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (29.621 s)
-A worker process has failed to exit gracefully and has been force exited. This is likely caused by tests leaking due to improper teardown. Try running with --detectOpenHandles to find leaks. Active timers can also cause this, ensure that .unref() was called on them.
+PASS test/server/index.test.ts (30.782 s)
 
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        30.925 s
+Time:        32.091 s
 Ran all test suites.

package/@generated/gql.ts

@@ -44,7 +44,7 @@ const documents = {
     types.UserOrderItemsFragmentFragmentDoc,
   '\n  query ServerOrderDetailsQuery($orderId: String!) {\n    userOrder(orderId: $orderId) {\n      orderId\n      status\n      statusDescription\n      allowCancellation\n      storePreferencesData {\n        currencyCode\n      }\n      clientProfileData {\n        firstName\n        lastName\n        email\n        phone\n        corporateName\n        isCorporate\n      }\n      customFields {\n        type\n        id\n        fields {\n          name\n          value\n          refId\n        }\n      }\n      deliveryOptionsData {\n        deliveryOptions {\n          selectedSla\n          deliveryChannel\n          deliveryCompany\n          deliveryWindow {\n            startDateUtc\n            endDateUtc\n            price\n          }\n          shippingEstimate\n          shippingEstimateDate\n          friendlyShippingEstimate\n          friendlyDeliveryOptionName\n          seller\n          address {\n            addressType\n            receiverName\n            addressId\n            versionId\n            entityId\n            postalCode\n            city\n            state\n            country\n            street\n            number\n            neighborhood\n            complement\n            reference\n            geoCoordinates\n          }\n          pickupStoreInfo {\n            additionalInfo\n            address {\n              addressType\n              receiverName\n              addressId\n              versionId\n              entityId\n              postalCode\n              city\n              state\n              country\n              street\n              number\n              neighborhood\n              complement\n              reference\n              geoCoordinates\n            }\n            dockId\n            friendlyName\n            isPickupStore\n          }\n          quantityOfDifferentItems\n          total\n          items {\n            id\n            name\n            quantity\n            price\n            imageUrl\n            tax\n            total\n          }\n        }\n        contact {\n          email\n          phone\n          name\n        }\n      }\n      paymentData {\n        transactions {\n          isActive\n          payments {\n            id\n            paymentSystemName\n            value\n            installments\n            referenceValue\n            lastDigits\n            url\n            group\n            tid\n            connectorResponses {\n              authId\n            }\n            bankIssuedInvoiceIdentificationNumber\n            redemptionCode\n            paymentOrigin\n          }\n        }\n      }\n      totals {\n        id\n        name\n        value\n      }\n    }\n  }\n':
     types.ServerOrderDetailsQueryDocument,
-  '\n  query ServerListOrdersQuery ($page: Int,$perPage: Int, $status: [String], $dateInitial: String, $dateFinal: String, $text: String, $clientEmail: String) {\n    listUserOrders (page: $page, perPage: $perPage, status: $status, dateInitial: $dateInitial, dateFinal: $dateFinal, text: $text, clientEmail: $clientEmail) {\n      list {\n        orderId\n        creationDate\n        clientName\n        items {\n          seller\n          quantity\n          description\n          ean\n          refId\n          id\n          productId\n          sellingPrice\n          price\n        }\n        totalValue\n        status\n        statusDescription\n        ShippingEstimatedDate\n        currencyCode\n        customFields {\n          costCenter\n          poNumber\n          release\n          desktop\n        }\n      }\n      paging {\n        total\n        pages\n        currentPage\n        perPage\n      }\n    }\n  }\n':
+  '\n  query ServerListOrdersQuery ($page: Int,$perPage: Int, $status: [String], $dateInitial: String, $dateFinal: String, $text: String, $clientEmail: String) {\n    listUserOrders (page: $page, perPage: $perPage, status: $status, dateInitial: $dateInitial, dateFinal: $dateFinal, text: $text, clientEmail: $clientEmail) {\n      list {\n        orderId\n        creationDate\n        clientName\n        items {\n          seller\n          quantity\n          description\n          ean\n          refId\n          id\n          productId\n          sellingPrice\n          price\n        }\n        totalValue\n        status\n        statusDescription\n        ShippingEstimatedDate\n        currencyCode\n        customFields {\n          type\n          value\n        }\n      }\n      paging {\n        total\n        pages\n        currentPage\n        perPage\n      }\n    }\n  }\n':
     types.ServerListOrdersQueryDocument,
   '\n  mutation CancelOrderMutation($data: IUserOrderCancel!) {\n    cancelOrder(data: $data) {\n      data\n    }\n  }\n':
     types.CancelOrderMutationDocument,
@@ -176,7 +176,7 @@ export function gql(
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function gql(
-  source: '\n  query ServerListOrdersQuery ($page: Int,$perPage: Int, $status: [String], $dateInitial: String, $dateFinal: String, $text: String, $clientEmail: String) {\n    listUserOrders (page: $page, perPage: $perPage, status: $status, dateInitial: $dateInitial, dateFinal: $dateFinal, text: $text, clientEmail: $clientEmail) {\n      list {\n        orderId\n        creationDate\n        clientName\n        items {\n          seller\n          quantity\n          description\n          ean\n          refId\n          id\n          productId\n          sellingPrice\n          price\n        }\n        totalValue\n        status\n        statusDescription\n        ShippingEstimatedDate\n        currencyCode\n        customFields {\n          costCenter\n          poNumber\n          release\n          desktop\n        }\n      }\n      paging {\n        total\n        pages\n        currentPage\n        perPage\n      }\n    }\n  }\n'
+  source: '\n  query ServerListOrdersQuery ($page: Int,$perPage: Int, $status: [String], $dateInitial: String, $dateFinal: String, $text: String, $clientEmail: String) {\n    listUserOrders (page: $page, perPage: $perPage, status: $status, dateInitial: $dateInitial, dateFinal: $dateFinal, text: $text, clientEmail: $clientEmail) {\n      list {\n        orderId\n        creationDate\n        clientName\n        items {\n          seller\n          quantity\n          description\n          ean\n          refId\n          id\n          productId\n          sellingPrice\n          price\n        }\n        totalValue\n        status\n        statusDescription\n        ShippingEstimatedDate\n        currencyCode\n        customFields {\n          type\n          value\n        }\n      }\n      paging {\n        total\n        pages\n        currentPage\n        perPage\n      }\n    }\n  }\n'
 ): typeof import('./graphql').ServerListOrdersQueryDocument
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.

package/@generated/graphql.ts

@@ -1555,7 +1555,7 @@ export type UserOrderFromList = {
   clientName: Maybe<Scalars['String']['output']>
   creationDate: Maybe<Scalars['String']['output']>
   currencyCode: Maybe<Scalars['String']['output']>
-  customFields: Maybe<UserOrderFromListCustomFields>
+  customFields: Maybe<Array<Maybe<UserOrderFromListCustomFields>>>
   deliveryDates: Maybe<Array<Maybe<Scalars['String']['output']>>>
   giftCardProviders: Maybe<Array<Maybe<Scalars['String']['output']>>>
   hostname: Maybe<Scalars['String']['output']>
@@ -1587,10 +1587,8 @@ export type UserOrderFromList = {
 }
 
 export type UserOrderFromListCustomFields = {
-  costCenter: Maybe<Array<Maybe<Scalars['String']['output']>>>
-  desktop: Maybe<Array<Maybe<Scalars['String']['output']>>>
-  poNumber: Maybe<Array<Maybe<Scalars['String']['output']>>>
-  release: Maybe<Array<Maybe<Scalars['String']['output']>>>
+  type: Maybe<Scalars['String']['output']>
+  value: Maybe<Array<Maybe<Scalars['String']['output']>>>
 }
 
 export type UserOrderFromListMinimal = {
@@ -1598,7 +1596,7 @@ export type UserOrderFromListMinimal = {
   clientName: Maybe<Scalars['String']['output']>
   creationDate: Maybe<Scalars['String']['output']>
   currencyCode: Maybe<Scalars['String']['output']>
-  customFields: Maybe<UserOrderFromListCustomFields>
+  customFields: Maybe<Array<Maybe<UserOrderFromListCustomFields>>>
   items: Maybe<Array<Maybe<UserOrderItemsSummarized>>>
   orderId: Maybe<Scalars['String']['output']>
   status: Maybe<Scalars['String']['output']>
@@ -1702,7 +1700,7 @@ export type UserOrderListPaging = {
 
 export type UserOrderListResult = {
   facets: Maybe<Array<Maybe<Scalars['String']['output']>>>
-  list: Maybe<Array<Maybe<UserOrderFromList>>>
+  list: Maybe<Array<UserOrderFromList>>
   paging: Maybe<UserOrderListPaging>
   reportRecordsLimit: Maybe<Scalars['Int']['output']>
   stats: Maybe<UserOrderListStats>
@@ -2415,12 +2413,10 @@ export type ServerListOrdersQueryQuery = {
         sellingPrice: number | null
         price: number | null
       } | null> | null
-      customFields: {
-        costCenter: Array<string | null> | null
-        poNumber: Array<string | null> | null
-        release: Array<string | null> | null
-        desktop: Array<string | null> | null
-      } | null
+      customFields: Array<{
+        type: string | null
+        value: Array<string | null> | null
+      } | null> | null
     } | null> | null
     paging: {
       total: number | null
@@ -3475,7 +3471,7 @@ export const ServerOrderDetailsQueryDocument = {
 export const ServerListOrdersQueryDocument = {
   __meta__: {
     operationName: 'ServerListOrdersQuery',
-    operationHash: '7fba0a7d767fceed07b268597d68e5577d952b43',
+    operationHash: '867fff060c5b7726220ed8a10a115b1484762fcf',
   },
 } as unknown as TypedDocumentString<
   ServerListOrdersQueryQuery,

package/@generated/persisted-documents.json

@@ -2,7 +2,7 @@
   "4b33c5c07f440dc7489e55619dc2211a13786e72": "fragment ServerCollectionPage on Query { collection(slug: $slug) { id } } query ServerCollectionPageQuery($slug: String!) { collection(slug: $slug) { breadcrumbList { itemListElement { item name position } } meta { selectedFacets { key value } } seo { description title } } ...ServerCollectionPage }",
   "46103bee661405bde706d72126fdbf9b0a0c9e6e": "fragment CartProductItem on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name sku unitMultiplier } fragment ProductDetailsFragment_product on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } description gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name offers { lowPrice lowPriceWithTaxes offers { availability listPrice listPriceWithTaxes price priceWithTaxes seller { identifier } } } id: productID sku unitMultiplier ...CartProductItem } fragment ServerProduct on Query { product(locator: $locator) { id: productID } } query ServerProductQuery($locator: [IStoreSelectedFacet!]!) { product(locator: $locator) { brand { name } breadcrumbList { itemListElement { item name position } } description gtin image { alternateName url } isVariantOf { productGroupID } name offers { highPrice lowPrice lowPriceWithTaxes offers { availability itemCondition price priceCurrency priceValidUntil seller { identifier } } priceCurrency } id: productID releaseDate seo { canonical description title } sku ...ProductDetailsFragment_product } ...ServerProduct }",
   "8b9b9c7703b0b9af12f47cb86dd3d2e8eb40c8fd": "query ServerOrderDetailsQuery($orderId: String!) { userOrder(orderId: $orderId) { allowCancellation clientProfileData { corporateName email firstName isCorporate lastName phone } customFields { fields { name refId value } id type } deliveryOptionsData { contact { email name phone } deliveryOptions { address { addressId addressType city complement country entityId geoCoordinates neighborhood number postalCode receiverName reference state street versionId } deliveryChannel deliveryCompany deliveryWindow { endDateUtc price startDateUtc } friendlyDeliveryOptionName friendlyShippingEstimate items { id imageUrl name price quantity tax total } pickupStoreInfo { additionalInfo address { addressId addressType city complement country entityId geoCoordinates neighborhood number postalCode receiverName reference state street versionId } dockId friendlyName isPickupStore } quantityOfDifferentItems selectedSla seller shippingEstimate shippingEstimateDate total } } orderId paymentData { transactions { isActive payments { bankIssuedInvoiceIdentificationNumber connectorResponses { authId } group id installments lastDigits paymentOrigin paymentSystemName redemptionCode referenceValue tid url value } } } status statusDescription storePreferencesData { currencyCode } totals { id name value } } }",
-  "7fba0a7d767fceed07b268597d68e5577d952b43": "query ServerListOrdersQuery($clientEmail: String, $dateFinal: String, $dateInitial: String, $page: Int, $perPage: Int, $status: [String], $text: String) { listUserOrders( page: $page perPage: $perPage status: $status dateInitial: $dateInitial dateFinal: $dateFinal text: $text clientEmail: $clientEmail ) { list { ShippingEstimatedDate clientName creationDate currencyCode customFields { costCenter desktop poNumber release } items { description ean id price productId quantity refId seller sellingPrice } orderId status statusDescription totalValue } paging { currentPage pages perPage total } } }",
+  "867fff060c5b7726220ed8a10a115b1484762fcf": "query ServerListOrdersQuery($clientEmail: String, $dateFinal: String, $dateInitial: String, $page: Int, $perPage: Int, $status: [String], $text: String) { listUserOrders( page: $page perPage: $perPage status: $status dateInitial: $dateInitial dateFinal: $dateFinal text: $text clientEmail: $clientEmail ) { list { ShippingEstimatedDate clientName creationDate currencyCode customFields { type value } items { description ean id price productId quantity refId seller sellingPrice } orderId status statusDescription totalValue } paging { currentPage pages perPage total } } }",
   "e2b06da6840614d3c72768e56579b9d3b8e80802": "mutation CancelOrderMutation($data: IUserOrderCancel!) { cancelOrder(data: $data) { data } }",
   "c2b3f8bff73ebf6ac79d758c66cabbc21ba9fcc0": "fragment CartItem on StoreOffer { itemOffered { ...CartProductItem } listPrice listPriceWithTaxes price priceWithTaxes quantity seller { identifier } } fragment CartMessage on StoreCartMessage { status text } fragment CartProductItem on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name sku unitMultiplier } mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) { validateCart(cart: $cart, session: $session) { messages { ...CartMessage } order { acceptedOffer { ...CartItem } orderNumber shouldSplitItem } } }",
   "feb7005103a859e2bc8cf2360d568806fd88deba": "mutation SubscribeToNewsletter($data: IPersonNewsletter!) { subscribeToNewsletter(data: $data) { id } }",

package/@generated/schema.graphql

@@ -1288,7 +1288,7 @@ type UserOrderResult {
 }
 
 type UserOrderListResult {
-  list: [UserOrderFromList]
+  list: [UserOrderFromList!]
   paging: UserOrderListPaging
   stats: UserOrderListStats
   facets: [String]
@@ -1361,7 +1361,7 @@ type UserOrderFromList {
   paymentApprovedDate: String
   readyForHandlingDate: String
   deliveryDates: [String]
-  customFields: UserOrderFromListCustomFields
+  customFields: [UserOrderFromListCustomFields]
 }
 
 type UserOrderCustomData {
@@ -1936,10 +1936,8 @@ type UserOrderCustomFieldsGrouped {
 }
 
 type UserOrderFromListCustomFields {
-  costCenter: [String]
-  poNumber: [String]
-  release: [String]
-  desktop: [String]
+  type: String
+  value: [String]
 }
 
 type UserOrderListMinimalResult {
@@ -1956,6 +1954,6 @@ type UserOrderFromListMinimal {
   status: String
   statusDescription: String
   ShippingEstimatedDate: String
-  customFields: UserOrderFromListCustomFields
+  customFields: [UserOrderFromListCustomFields]
   currencyCode: String
 }

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.51.0](https://github.com/vtex/faststore/compare/v3.50.4...v3.51.0) (2025-06-04)
+
+### Features
+
+- list orders custom fields new structure and layout ([#2871](https://github.com/vtex/faststore/issues/2871)) ([6842899](https://github.com/vtex/faststore/commit/68428999e0651a5754164bca41f03e7c1c7d2ed3))
+
 ## [3.50.4](https://github.com/vtex/faststore/compare/v3.50.3...v3.50.4) (2025-06-03)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.50.4",
+  "version": "3.51.0",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -44,7 +44,7 @@
     "@envelop/graphql-jit": "^8.0.3",
     "@envelop/parser-cache": "^6.0.2",
     "@envelop/validation-cache": "^6.0.2",
-    "@faststore/api": "^3.50.4",
+    "@faststore/api": "^3.51.0",
     "@faststore/graphql-utils": "^3.50.3",
     "@faststore/lighthouse": "^3.50.3",
     "@faststore/sdk": "^3.50.3",
@@ -105,5 +105,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "1dbca8e4b5116b9c756f8b07c2cb62027eaa273e"
+  "gitHead": "29d0474fbc2826c2a5d1af94eec0c90bf8fca36d"
 }

package/src/components/account/orders/MyAccountListOrders/MyAccountListOrdersTable/MyAccountListOrdersTable.tsx

@@ -104,6 +104,14 @@ export default function MyAccountListOrdersTable({
   perPage,
   filters,
 }: MyAccountListOrdersTableProps) {
+  const hasOrderOrItemCustomFields =
+    listOrders?.list?.some(
+      (order) =>
+        order?.customFields
+          ?.filter((field) => field.type === 'order' || field.type === 'item')
+          .flatMap((field) => field.value).length > 0
+    ) || false
+
   const router = useRouter()
   const { isDesktop } = useScreenResize()
   const { locale } = useSession()
@@ -126,33 +134,16 @@ export default function MyAccountListOrdersTable({
   return (
     <>
       <table data-fs-list-orders-table>
-        <thead data-fs-list-orders-table-header>
-          <tr
-            data-fs-list-orders-table-header-row
-            data-fs-list-orders-table-row
-          >
-            {isDesktop && (
-              <>
-                <th data-fs-list-orders-table-header-cell>Order</th>
-                <th data-fs-list-orders-table-header-cell>Ordered by</th>
-                <th data-fs-list-orders-table-header-cell>Release</th>
-                <th data-fs-list-orders-table-header-cell>PO number</th>
-                <th data-fs-list-orders-table-header-cell>Cost Center</th>
-              </>
-            )}
-            <th data-fs-list-orders-table-header-cell>
-              {isDesktop && <>Status</>}
-            </th>
-          </tr>
-        </thead>
         <tbody data-fs-list-orders-table-body>
           {listOrders.list.map((item) => {
-            const costCenters = item?.customFields?.costCenter || []
+            const itemLevel =
+              item?.customFields?.find(({ type }) => type === 'item')?.value ||
+              []
             const isExpanded = expandedRows[item.orderId]
-            const shouldShowButton = costCenters.length > MAX_COST_CENTERS
-            const displayedCostCenters = isExpanded
-              ? costCenters
-              : costCenters.slice(0, 5)
+            const shouldShowButton = itemLevel.length > MAX_COST_CENTERS
+            const displayedItemLevel = isExpanded
+              ? itemLevel
+              : itemLevel.slice(0, 5)
             return (
               // biome-ignore lint/a11y/useKeyWithClickEvents: <explanation>
               <tr
@@ -163,28 +154,10 @@ export default function MyAccountListOrdersTable({
                 role="button"
               >
                 <td data-fs-list-orders-table-cell>
-                  <div data-fs-list-orders-table-product-info>
+                  <div data-fs-list-orders-table-product-info-main>
                     <p data-fs-list-orders-table-product-info-order-id>
                       {item.orderId || '-'}
                     </p>
-                    <p data-fs-list-orders-table-product-info-order-date>
-                      Placed on{' '}
-                      {item.creationDate
-                        ? formatShippingDate(item.creationDate, locale)
-                        : '-'}
-                    </p>
-                    {isDesktop && (
-                      <p data-fs-list-orders-table-product-info-order-delivery>
-                        Delivery by{' '}
-                        {item.ShippingEstimatedDate
-                          ? formatShippingDate(
-                              item.ShippingEstimatedDate,
-                              locale
-                            )
-                          : '-'}
-                      </p>
-                    )}
-
                     <p data-fs-list-orders-table-product-info-order-total>
                       Total: {formatPrice(item.totalValue, item.currencyCode)}
                     </p>
@@ -193,54 +166,138 @@ export default function MyAccountListOrdersTable({
 
                 {isDesktop && (
                   <>
-                    <td data-fs-list-orders-table-cell>{item?.clientName}</td>
-                    <td data-fs-list-orders-table-cell>
-                      {item?.customFields?.release?.map((field) => (
-                        <p key={field}>{field}</p>
-                      ))}
-                    </td>
                     <td data-fs-list-orders-table-cell>
-                      {item?.customFields?.poNumber?.map((field) => (
-                        <p key={field}>{field}</p>
-                      ))}
-                    </td>
-                    <td data-fs-list-orders-table-cell>
-                      {displayedCostCenters.map((field) => (
-                        <p key={field}>{field}</p>
-                      ))}
-                      {shouldShowButton && (
-                        <Button
-                          data-fs-list-orders-table-expand-button
-                          size="small"
-                          variant="primary"
-                          inverse
-                          iconPosition="right"
-                          icon={
-                            isExpanded ? (
-                              <Icon
-                                width={16}
-                                height={16}
-                                name="CaretUp"
-                                aria-label="Collapse"
-                              />
-                            ) : (
-                              <Icon
-                                width={16}
-                                height={16}
-                                name="CaretDown"
-                                aria-label="Expand"
-                              />
-                            )
-                          }
-                          onClick={(e) => {
-                            e.stopPropagation()
-                            handleToggleExpand(item.orderId)
-                          }}
-                        >
-                          {isExpanded ? 'View less' : 'View all'}
-                        </Button>
+                      <div data-fs-list-orders-table-product-info>
+                        <p data-fs-list-orders-table-product-info-label>
+                          Placed on
+                        </p>
+                        <p data-fs-list-orders-table-product-info-value>
+                          {item.creationDate
+                            ? formatShippingDate(item.creationDate, locale)
+                            : '-'}
+                        </p>
+                      </div>
+                      {hasOrderOrItemCustomFields && (
+                        <>
+                          <div data-fs-list-orders-table-product-info>
+                            <p data-fs-list-orders-table-product-info-label>
+                              Delivery by
+                            </p>
+                            <p data-fs-list-orders-table-product-info-value>
+                              {item.ShippingEstimatedDate
+                                ? formatShippingDate(
+                                    item.ShippingEstimatedDate,
+                                    locale
+                                  )
+                                : '-'}
+                            </p>
+                          </div>
+                          <div data-fs-list-orders-table-product-info>
+                            <p data-fs-list-orders-table-product-info-label>
+                              Placed by
+                            </p>
+                            <p data-fs-list-orders-table-product-info-value>
+                              {item?.clientName}
+                            </p>
+                            <p data-fs-list-orders-table-product-info-value>
+                              {/* {item?.clientOrgName} */}
+                            </p>
+                          </div>
+                        </>
                       )}
                     </td>
+                    {!hasOrderOrItemCustomFields && (
+                      <>
+                        <td data-fs-list-orders-table-cell>
+                          <div data-fs-list-orders-table-product-info>
+                            <p data-fs-list-orders-table-product-info-label>
+                              Delivery by
+                            </p>
+                            <p data-fs-list-orders-table-product-info-value>
+                              {item.ShippingEstimatedDate
+                                ? formatShippingDate(
+                                    item.ShippingEstimatedDate,
+                                    locale
+                                  )
+                                : '-'}
+                            </p>
+                          </div>
+                        </td>
+                        <td data-fs-list-orders-table-cell>
+                          <div data-fs-list-orders-table-product-info>
+                            <p data-fs-list-orders-table-product-info-label>
+                              Placed by
+                            </p>
+                            <p data-fs-list-orders-table-product-info-value>
+                              {item?.clientName}
+                            </p>
+                            <p data-fs-list-orders-table-product-info-value>
+                              {/* {item?.clientOrgName} */}
+                            </p>
+                          </div>
+                        </td>
+                      </>
+                    )}
+                    {hasOrderOrItemCustomFields && (
+                      <>
+                        <td data-fs-list-orders-table-cell>
+                          {item?.customFields
+                            ?.find(({ type }) => type === 'order')
+                            ?.value?.map((field: string, idx: number) => (
+                              <p
+                                key={field + idx}
+                                data-fs-list-orders-table-product-info-order
+                              >
+                                {field}
+                              </p>
+                            ))}
+                        </td>
+                        <td data-fs-list-orders-table-cell>
+                          {displayedItemLevel.map(
+                            (field: string, idx: number) => (
+                              <p
+                                key={field + idx}
+                                data-fs-list-orders-table-product-info-item
+                              >
+                                {field}
+                              </p>
+                            )
+                          )}
+                          {shouldShowButton && (
+                            <Button
+                              data-fs-list-orders-table-expand-button
+                              size="small"
+                              variant="primary"
+                              inverse
+                              iconPosition="right"
+                              icon={
+                                isExpanded ? (
+                                  <Icon
+                                    width={16}
+                                    height={16}
+                                    name="CaretUp"
+                                    aria-label="Collapse"
+                                  />
+                                ) : (
+                                  <Icon
+                                    width={16}
+                                    height={16}
+                                    name="CaretDown"
+                                    aria-label="Expand"
+                                  />
+                                )
+                              }
+                              onClick={(e) => {
+                                e.stopPropagation()
+                                handleToggleExpand(item.orderId)
+                              }}
+                            >
+                              {isExpanded ? 'View less' : 'View all'}
+                            </Button>
+                          )}
+                        </td>
+                      </>
+                    )}
                   </>
                 )}
 

package/src/components/account/orders/MyAccountListOrders/MyAccountListOrdersTable/styles.scss

@@ -8,12 +8,13 @@
   --fs-list-orders-table-header-font-weight        : var(--fs-text-weight-medium);
   --fs-list-orders-table-header-line-height        : var(--fs-text-size-1);
   --fs-list-orders-table-header-color              : var(--fs-color-neutral-6);
-  --fs-list-orders-table-first-child-width         : 20%;
-  --fs-list-orders-table-first-child-width-mobile  : 30%;
-  --fs-list-orders-table-last-child-width          : 10%;
+  --fs-list-orders-table-first-child-width         : 40%;
+  --fs-list-orders-table-first-child-width-mobile  : auto;
+  --fs-list-orders-table-last-child-width          : auto;
   --fs-list-orders-table-gap                       : 1.2rem;
   --fs-list-orders-table-product-info-text-size    : var(--fs-text-size-base);
   --fs-list-orders-table-product-info-font-weight  : var(--fs-text-weight-semibold);
+  --fs-list-orders-table-product-info-margin-top-first   : var(--fs-spacing-0);
   --fs-list-orders-table-product-info-margin-top   : var(--fs-spacing-1);
   --fs-list-orders-table-product-info-line-height  : var(--fs-text-size-1);
   --fs-list-orders-table-cell-padding              : var(--fs-spacing-4) var(--fs-spacing-2) var(--fs-spacing-3);
@@ -33,19 +34,7 @@
   border-collapse: collapse;
   border: none;
 
-  [data-fs-list-orders-table-header] [data-fs-list-orders-table-header-cell] {
-    @include media("<notebook") {
-      padding: 0;
-    }
-
-    padding: var(--fs-list-orders-table-header-padding);
-    font-weight: var(--fs-list-orders-table-header-font-weight);
-    line-height: var(--fs-list-orders-table-header-line-height);
-    color: var(--fs-list-orders-table-header-color);
-    cursor: default;
-  }
-
-  [data-fs-list-orders-table-header-cell]:first-child, [data-fs-list-orders-table-cell]:first-child {
+  [data-fs-list-orders-table-cell]:first-child {
     width: var(--fs-list-orders-table-first-child-width);
 
     @include media("<notebook") {
@@ -55,7 +44,7 @@
     }
   }
 
-  [data-fs-list-orders-table-header-cell]:last-child,[data-fs-list-orders-table-cell]:last-child {
+  [data-fs-list-orders-table-cell]:last-child {
     width: var(--fs-list-orders-table-last-child-width);
     text-align: end;
 
@@ -69,24 +58,36 @@
     }
   }
 
-  [data-fs-list-orders-table-product-info-order-id], [data-fs-list-orders-table-product-info-order-date], [data-fs-list-orders-table-product-info-order-delivery], [data-fs-list-orders-table-product-info-order-total] {
+  [data-fs-list-orders-table-product-info-order-id], [data-fs-list-orders-table-product-info-order-total], [data-fs-list-orders-table-product-info-value] {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
+  [data-fs-list-orders-table-product-info]:first-child, [data-fs-list-orders-table-product-info-value] {
+    margin-top: var(--fs-list-orders-table-product-info-margin-top-first);
+  }
+
+  [data-fs-list-orders-table-product-info-label] {
+    font-weight: var(--fs-list-orders-table-product-info-font-weight);
+  }
+
+  [data-fs-list-orders-table-product-info] {
+    margin-top: var(--fs-list-orders-table-product-info-margin-top);
+  }
+
   [data-fs-list-orders-table-product-info-order-id] {
     font-size: var(--fs-list-orders-table-product-info-text-size);
     font-weight: var(--fs-list-orders-table-product-info-font-weight);
     vertical-align: middle;
   }
 
-  [data-fs-list-orders-table-product-info-order-date], [data-fs-list-orders-table-product-info-order-total] {
-    margin-top: var(--fs-list-orders-table-product-info-margin-top);
+  [data-fs-list-orders-table-product-info-order-total] {
+    margin-top: var(--fs-list-orders-table-product-info-margin-top-first);
     line-height: var(--fs-list-orders-table-product-info-line-height);
   }
 
-  [data-fs-list-orders-table-header-cell], [data-fs-list-orders-table-cell] {
+  [data-fs-list-orders-table-cell] {
     padding: var(--fs-list-orders-table-cell-padding);
     text-align: left;
     vertical-align: top;
@@ -97,6 +98,13 @@
     }
   }
 
+  [data-fs-list-orders-table-product-info-order], [data-fs-list-orders-table-product-info-item] {
+    margin-top: var(--fs-list-orders-table-product-info-margin-top-first);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
   [data-fs-list-orders-table-cell]:not(:first-child):not(:last-child) {
     padding-top: calc(var(--fs-spacing-4) + var(--fs-spacing-0));
     color: var(--fs-list-orders-table-cell-color);