Merge branch 'main' into lkostrowski/ts-strict-scan

Author: lkostrowski

.changeset/warm-ducks-lead.md

@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": minor
+---
+
+Support REFUNDED_IN_ORDER event in gift card history

locale/defaultMessages.json

@@ -8519,6 +8519,10 @@
     "context": "product export to csv file, header",
     "string": "Export Settings"
   },
+  "kkFOHD": {
+    "context": "gift card history message",
+    "string": "Gift card was refunded in an order"
+  },
   "kn7jjd": {
     "context": "section header",
     "string": "General settings"
@@ -9485,6 +9489,10 @@
     "context": "User registration",
     "string": "User registration"
   },
+  "qOXgxv": {
+    "context": "gift card history message",
+    "string": "Gift card was refunded in order {orderLink}"
+  },
   "qPSWmL": {
     "string": "Enter usage"
   },

schema-staging.graphql

@@ -11425,7 +11425,7 @@ type GiftCard implements Node & ObjectWithMetadata @doc(category: "Gift cards")
   product: Product
 
   """
-  List of events associated with the gift card. Requires MANAGE_GIFT_CARD permission to access all events. Users with MANAGE_ORDERS permission can access only USED_IN_ORDER events.
+  List of events associated with the gift card. Requires MANAGE_GIFT_CARD permission to access all events. Users with MANAGE_ORDERS permission can access only USED_IN_ORDER and REFUNDED_IN_ORDER events.
 
   Requires one of the following permissions: MANAGE_GIFT_CARD, MANAGE_ORDERS.
   """
@@ -11519,6 +11519,7 @@ enum GiftCardEventsEnum @doc(category: "Gift cards") {
   RESENT
   NOTE_ADDED
   USED_IN_ORDER
+  REFUNDED_IN_ORDER
 }
 
 type GiftCardEventBalance @doc(category: "Gift cards") {

src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx

@@ -3,7 +3,8 @@ import Link from "@dashboard/components/Link";
 import { TimelineEvent } from "@dashboard/components/Timeline/TimelineEvent";
 import { customerPath } from "@dashboard/customers/urls";
 import { ExtensionsPaths, ExtensionsUrls } from "@dashboard/extensions/urls";
-import { type GiftCardDetailsQuery, GiftCardEventsEnum } from "@dashboard/graphql";
+import { type GiftCardDetailsQuery } from "@dashboard/graphql";
+import { GiftCardEventsEnum } from "@dashboard/graphql/staging";
 import { orderUrl } from "@dashboard/orders/urls";
 import { staffMemberDetailsUrl } from "@dashboard/staff/urls";
 import { type IntlShape, useIntl } from "react-intl";
@@ -44,7 +45,12 @@ const getEventMessage = (event: GiftCardEventType, intl: IntlShape) => {
   const user = getUserOrApp(event);
   const userUrl = getUserOrAppUrl(event);
 
-  switch (event.type) {
+  // We cast to the staging GiftCardEventsEnum because the new enum (from 3.23 schema)
+  // extends the stable one (3.22) with additional values. In 3.22, event.type will never contain
+  // the new values, so this cast is safe. In 3.23, the staging enum will match the stable schema
+  // and the cast becomes a no-op.
+  // TODO: Remove this cast when 3.23 is released and the stable schema includes the new enum values.
+  switch (event.type as GiftCardEventsEnum) {
     case GiftCardEventsEnum.ACTIVATED:
       return user
         ? intl.formatMessage(timelineMessages.activated, {
@@ -79,6 +85,12 @@ const getEventMessage = (event: GiftCardEventType, intl: IntlShape) => {
             issuedBy: <Link href={userUrl}>{user}</Link>,
           })
         : intl.formatMessage(timelineMessages.issuedAnonymous);
+    case GiftCardEventsEnum.REFUNDED_IN_ORDER:
+      return event.orderId && event.orderNumber
+        ? intl.formatMessage(timelineMessages.refundedInOrder, {
+            orderLink: <Link href={orderUrl(event.orderId)}>#{event.orderNumber}</Link>,
+          })
+        : intl.formatMessage(timelineMessages.refundedInOrderNoLink);
     case GiftCardEventsEnum.RESENT:
       return intl.formatMessage(timelineMessages.resent);
     case GiftCardEventsEnum.SENT_TO_CUSTOMER:

src/giftCards/GiftCardUpdate/GiftCardHistory/messages.ts

@@ -88,6 +88,16 @@ const giftCardHistoryTimelineMessages = defineMessages({
     defaultMessage: "Gift card tags were updated",
     description: "gift card history message",
   },
+  refundedInOrder: {
+    id: "qOXgxv",
+    defaultMessage: "Gift card was refunded in order {orderLink}",
+    description: "gift card history message",
+  },
+  refundedInOrderNoLink: {
+    id: "kkFOHD",
+    defaultMessage: "Gift card was refunded in an order",
+    description: "gift card history message",
+  },
   usedInOrder: {
     id: "Uu2B2G",
     defaultMessage: "Gift card was used as a payment method on order {orderLink} <buyer>by</buyer>",

src/graphql/typesStaging.generated.ts

@@ -2977,6 +2977,7 @@ export enum GiftCardEventsEnum {
   EXPIRY_DATE_UPDATED = 'EXPIRY_DATE_UPDATED',
   ISSUED = 'ISSUED',
   NOTE_ADDED = 'NOTE_ADDED',
+  REFUNDED_IN_ORDER = 'REFUNDED_IN_ORDER',
   RESENT = 'RESENT',
   SENT_TO_CUSTOMER = 'SENT_TO_CUSTOMER',
   TAGS_UPDATED = 'TAGS_UPDATED',