@graphcommerce/magento-graphql 9.0.4-canary.9 → 9.1.0-canary.15

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## 9.1.0-canary.15
+
+### Patch Changes
+
+- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`db56933`](https://github.com/graphcommerce-org/graphcommerce/commit/db569336dddd3e955ff0b5b00cafa25079f1adee) - Implemented order sorting for account overview and account list and implement custom resolver for Magento 2.4.5 (which is slow but works). ([@paales](https://github.com/paales))
+
+## 9.0.4-canary.14
+
+## 9.0.4-canary.13
+
+## 9.0.4-canary.12
+
+## 9.0.4-canary.11
+
+## 9.0.4-canary.10
+
 ## 9.0.4-canary.9
 
 ## 9.0.4-canary.8

package/mesh/magentoOrderItemResolvers.ts

@@ -0,0 +1,51 @@
+import { fragments } from '@graphcommerce/graphql'
+import {
+  selectionSetTemplate,
+  type Maybe,
+  type MeshContext,
+  type OrderItemInterfaceResolvers,
+  type ResolverFn,
+  type Resolvers,
+  type ResolversParentTypes,
+  type ResolversTypes,
+} from '@graphcommerce/graphql-mesh'
+
+type OrderItemTypes = NonNullable<Awaited<ReturnType<OrderItemInterfaceResolvers['__resolveType']>>>
+const orderItemTypes = fragments.possibleTypes.OrderItemInterface as OrderItemTypes[]
+
+export const resolvers: Resolvers = {}
+
+type ProductResolver = ResolverFn<
+  Maybe<ResolversTypes['ProductInterface']>,
+  ResolversParentTypes['OrderItemInterface'],
+  MeshContext,
+  Record<string, never>
+>
+
+const productResolver: ProductResolver = async (root, args, context, info) => {
+  const { product_url_key, product } = root
+  if (product || !product_url_key) return product || null
+
+  const foundProduct = await context.m2.Query.products<string, ReturnType<ProductResolver>>({
+    key: product_url_key,
+    argsFromKeys: (keys) => ({ filter: { url_key: { in: keys } } }),
+    selectionSet: (node) => selectionSetTemplate`{ items { uid url_key ${node} } }`,
+    context,
+    info,
+    valuesFromResults: (results, keys) => {
+      const items = (results?.items ?? []).filter((i) => !!i)
+      return keys.map((key) => items.find((i) => i?.url_key === key) as ReturnType<ProductResolver>)
+    },
+  })
+
+  return foundProduct
+}
+
+orderItemTypes.forEach((type) => {
+  if (!resolvers[type]) resolvers[type] = {}
+
+  resolvers[type].product = {
+    selectionSet: '{ product_url_key }',
+    resolve: productResolver,
+  }
+})

package/mesh/magentoOrdersResolvers.ts

@@ -0,0 +1,61 @@
+import { execute, selectionSetTemplate, type Resolvers } from '@graphcommerce/graphql-mesh'
+import { filterNonNullableKeys } from '@graphcommerce/next-ui'
+
+export const resolvers: Resolvers = {
+  Customer: {
+    orders: async (root, args, context, info) => {
+      const { currentPage, pageSize, filter, scope, sort } = args
+
+      let items =
+        (
+          await context.m2.Query.customer({
+            info,
+            context,
+            selectionSet: (node) =>
+              selectionSetTemplate`{ orders(pageSize: 100) { number ${node} } }`,
+          })
+        )?.orders?.items ?? []
+
+      if (filter) {
+        items = items.filter((order) => {
+          if (!order?.number) return false
+
+          if (filter.number) {
+            if (filter.number.eq) return order?.number === filter.number.eq
+            if (filter.number.in) return filter.number.in.includes(order?.number ?? '')
+            if (filter.number.match) return order?.number?.match(filter.number.match)
+          }
+          return true
+        })
+      }
+      if (sort) {
+        items.sort((a, b) => {
+          if (sort.sort_field === 'NUMBER') {
+            return sort.sort_direction === 'DESC'
+              ? (b?.number?.localeCompare(a?.number ?? '') ?? 0)
+              : (a?.number?.localeCompare(b?.number ?? '') ?? 0)
+          }
+          if (sort.sort_field === 'CREATED_AT') {
+            return sort.sort_direction === 'DESC'
+              ? (b?.order_date?.localeCompare(a?.order_date ?? '') ?? 0)
+              : (a?.order_date?.localeCompare(b?.order_date ?? '') ?? 0)
+          }
+          return 0
+        })
+      }
+
+      const totalCount = items.length
+      items = items.slice((currentPage - 1) * pageSize, currentPage * pageSize)
+
+      return {
+        items,
+        page_info: {
+          total_pages: Math.ceil(totalCount / pageSize),
+          current_page: currentPage,
+          page_size: pageSize,
+        },
+        total_count: totalCount,
+      }
+    },
+  },
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-graphql",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.4-canary.9",
+  "version": "9.1.0-canary.15",
   "sideEffects": false,
   "main": "index.ts",
   "prettier": "@graphcommerce/prettier-config-pwa",
@@ -13,10 +13,10 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.0.4-canary.9",
-    "@graphcommerce/graphql": "^9.0.4-canary.9",
-    "@graphcommerce/prettier-config-pwa": "^9.0.4-canary.9",
-    "@graphcommerce/typescript-config-pwa": "^9.0.4-canary.9",
+    "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.15",
+    "@graphcommerce/graphql": "^9.1.0-canary.15",
+    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.15",
+    "@graphcommerce/typescript-config-pwa": "^9.1.0-canary.15",
     "graphql": "^16.0.0",
     "next": "*",
     "react": "^18.2.0",

package/plugins/magentoOrderItemMesh.ts

@@ -0,0 +1,28 @@
+import type { meshConfig as meshConfigBase } from '@graphcommerce/graphql-mesh/meshConfig'
+import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
+
+export const config: PluginConfig = {
+  module: '@graphcommerce/graphql-mesh/meshConfig',
+  type: 'function',
+}
+
+export const meshConfig: FunctionPlugin<typeof meshConfigBase> = (
+  prev,
+  baseConfig,
+  graphCommerceConfig,
+) => {
+  if (graphCommerceConfig.magentoVersion >= 247) {
+    return prev(baseConfig, graphCommerceConfig)
+  }
+
+  return prev(
+    {
+      ...baseConfig,
+      additionalResolvers: [
+        ...(baseConfig.additionalResolvers ?? []),
+        '@graphcommerce/magento-graphql/mesh/magentoOrderItemResolvers.ts',
+      ],
+    },
+    graphCommerceConfig,
+  )
+}

package/plugins/magentoOrders.ts

@@ -0,0 +1,28 @@
+import type { meshConfig as meshConfigBase } from '@graphcommerce/graphql-mesh/meshConfig'
+import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
+
+export const config: PluginConfig = {
+  module: '@graphcommerce/graphql-mesh/meshConfig',
+  type: 'function',
+}
+
+export const meshConfig: FunctionPlugin<typeof meshConfigBase> = (
+  prev,
+  baseConfig,
+  graphCommerceConfig,
+) => {
+  if (graphCommerceConfig.magentoVersion >= 246) {
+    return prev(baseConfig, graphCommerceConfig)
+  }
+
+  return prev(
+    {
+      ...baseConfig,
+      additionalResolvers: [
+        ...(baseConfig.additionalResolvers ?? []),
+        '@graphcommerce/magento-graphql/mesh/magentoOrdersResolvers.ts',
+      ],
+    },
+    graphCommerceConfig,
+  )
+}

package/schema-246/Customer-orders.graphqls

@@ -0,0 +1,40 @@
+enum ScopeTypeEnum {
+  GLOBAL
+  WEBSITE
+  STORE
+}
+
+input CustomerOrderSortInput {
+  sort_direction: SortEnum!
+  sort_field: CustomerOrderSortableField!
+}
+
+enum CustomerOrderSortableField {
+  NUMBER
+  CREATED_AT
+}
+
+extend type Customer {
+  orders(
+    """
+    Defines the filter to use for searching customer orders.
+    """
+    filter: CustomerOrdersFilterInput
+    """
+    Specifies which page of results to return. The default value is 1.
+    """
+    currentPage: Int = 1
+    """
+    Specifies the maximum number of results to return at once. The default value is 20.
+    """
+    pageSize: Int = 20
+    """
+    Specifies which field to sort on, and whether to return the results in ascending or descending order.
+    """
+    sort: CustomerOrderSortInput
+    """
+    Specifies the scope to search for customer orders. The Store request header identifies the customer's store view code. The default value of STORE limits the search to the value specified in the header. Specify WEBSITE to expand the search to include all customer orders assigned to the website that is defined in the header, or specify GLOBAL to include all customer orders across all websites and stores.
+    """
+    scope: ScopeTypeEnum
+  ): CustomerOrders
+}

package/schema-247/CartItem-product.graphqls

@@ -0,0 +1,15 @@
+extend interface OrderItemInterface {
+  product: ProductInterface
+}
+
+extend type OrderItem {
+  product: ProductInterface
+}
+
+extend type BundleOrderItem {
+  product: ProductInterface
+}
+
+extend type DownloadableOrderItem {
+  product: ProductInterface
+}