Merge branch 'main' into merx-1336-order-metadata-filtering

saleor · Jan 8, 2025 · 5d98a74 · 5d98a74
2 parents 13e61eb + 9b33a11
commit 5d98a74
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 77 deletions.
diff --git a/.changeset/weak-apples-draw.md b/.changeset/weak-apples-draw.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Discounts no longer blocks the UI when the user has no permissions for managing channels.
diff --git a/src/discounts/queries.ts b/src/discounts/queries.ts
@@ -229,27 +229,7 @@ export const PromotionDetailsQuery = /* GraphQL */ `
         name
         description
         channels {
-          id
-          isActive
-          name
-          slug
-          currencyCode
-          defaultCountry {
-            code
-            country
-          }
-          stockSettings {
-            allocationStrategy
-          }
-          hasOrders
-          orderSettings {
-            markAsPaidStrategy
-            deleteExpiredOrdersAfter
-            allowUnpaidOrders
-          }
-          paymentSettings {
-            defaultTransactionFlowStrategy
-          }
+          ...PromotionRuleChannel
         }
         giftIds
         rewardType

diff --git a/src/fragments/discounts.ts b/src/fragments/discounts.ts
@@ -230,13 +230,27 @@ export const voucherDetailsFragment = gql`
   }
 `;
 
+export const promotionRuleChannelFragment = gql`
+  fragment PromotionRuleChannel on Channel {
+    id
+    isActive
+    name
+    slug
+    currencyCode
+    defaultCountry {
+      code
+      country
+    }
+  }
+`;
+
 export const promotionRuleDetailsFragment = gql`
   fragment PromotionRuleDetails on PromotionRule {
     id
     name
     description
     channels {
-      ...ChannelDetails
+      ...PromotionRuleChannel
     }
     giftIds
     rewardType

diff --git a/src/graphql/hooks.generated.ts b/src/graphql/hooks.generated.ts
@@ -286,6 +286,33 @@ export const ChannelErrorFragmentDoc = gql`
   message
 }
     `;
+export const WarehouseFragmentDoc = gql`
+    fragment Warehouse on Warehouse {
+  id
+  name
+}
+    `;
+export const ChannelDetailsFragmentDoc = gql`
+    fragment ChannelDetails on Channel {
+  ...Channel
+  hasOrders
+  warehouses {
+    ...Warehouse
+  }
+  orderSettings {
+    markAsPaidStrategy
+    deleteExpiredOrdersAfter
+    allowUnpaidOrders
+  }
+  paymentSettings {
+    defaultTransactionFlowStrategy
+  }
+  checkoutSettings {
+    automaticallyCompleteFullyPaidCheckouts
+  }
+}
+    ${ChannelFragmentDoc}
+${WarehouseFragmentDoc}`;
 export const CollectionFragmentDoc = gql`
     fragment Collection on Collection {
   id
@@ -635,40 +662,26 @@ export const VoucherDetailsFragmentDoc = gql`
     ${VoucherFragmentDoc}
 ${ChannelListingProductWithoutPricingFragmentDoc}
 ${PageInfoFragmentDoc}`;
-export const WarehouseFragmentDoc = gql`
-    fragment Warehouse on Warehouse {
+export const PromotionRuleChannelFragmentDoc = gql`
+    fragment PromotionRuleChannel on Channel {
   id
+  isActive
   name
-}
-    `;
-export const ChannelDetailsFragmentDoc = gql`
-    fragment ChannelDetails on Channel {
-  ...Channel
-  hasOrders
-  warehouses {
-    ...Warehouse
-  }
-  orderSettings {
-    markAsPaidStrategy
-    deleteExpiredOrdersAfter
-    allowUnpaidOrders
-  }
-  paymentSettings {
-    defaultTransactionFlowStrategy
-  }
-  checkoutSettings {
-    automaticallyCompleteFullyPaidCheckouts
+  slug
+  currencyCode
+  defaultCountry {
+    code
+    country
   }
 }
-    ${ChannelFragmentDoc}
-${WarehouseFragmentDoc}`;
+    `;
 export const PromotionRuleDetailsFragmentDoc = gql`
     fragment PromotionRuleDetails on PromotionRule {
   id
   name
   description
   channels {
-    ...ChannelDetails
+    ...PromotionRuleChannel
   }
   giftIds
   rewardType
@@ -677,7 +690,7 @@ export const PromotionRuleDetailsFragmentDoc = gql`
   cataloguePredicate
   orderPredicate
 }
-    ${ChannelDetailsFragmentDoc}`;
+    ${PromotionRuleChannelFragmentDoc}`;
 export const PromotionDetailsFragmentDoc = gql`
     fragment PromotionDetails on Promotion {
   id
@@ -8665,27 +8678,7 @@ export const PromotionDetailsQueryDocument = gql`
       name
       description
       channels {
-        id
-        isActive
-        name
-        slug
-        currencyCode
-        defaultCountry {
-          code
-          country
-        }
-        stockSettings {
-          allocationStrategy
-        }
-        hasOrders
-        orderSettings {
-          markAsPaidStrategy
-          deleteExpiredOrdersAfter
-          allowUnpaidOrders
-        }
-        paymentSettings {
-          defaultTransactionFlowStrategy
-        }
+        ...PromotionRuleChannel
       }
       giftIds
       rewardType
@@ -8696,7 +8689,7 @@ export const PromotionDetailsQueryDocument = gql`
     }
   }
 }
-    `;
+    ${PromotionRuleChannelFragmentDoc}`;
 
 /**
  * __usePromotionDetailsQueryQuery__