fix(Dashboard): hide resume contributions message for hosts (#10639)

opencollective · Sep 5, 2024 · 97db9de · 97db9de
1 parent 24db73c
commit 97db9de
Show file tree

Hide file tree

Showing 6 changed files with 2,684 additions and 2,416 deletions.
diff --git a/components/dashboard/sections/contributions/Contributions.tsx b/components/dashboard/sections/contributions/Contributions.tsx
@@ -172,6 +172,16 @@ const dashboardContributionsMetadataQuery = gql`
       ) @skip(if: $onlyExpectedFunds) {
         totalCount
       }
+      PAUSED_RESUMABLE: orders(
+        filter: INCOMING
+        status: [PAUSED]
+        includeIncognito: true
+        includeHostedAccounts: false
+        includeChildrenAccounts: true
+        pausedBy: [COLLECTIVE, HOST, PLATFORM]
+      ) @skip(if: $onlyExpectedFunds) {
+        totalCount
+      }
       DISPUTED: orders(
         filter: $filter
         status: [DISPUTED]
@@ -852,12 +862,15 @@ const Contributions = ({ accountSlug, direction, onlyExpectedFunds, includeHoste
         />
         <Filterbar {...queryFilter} />
 
-        {isIncoming && !onlyExpectedFunds && metadata?.account?.[ContributionsTab.PAUSED].totalCount > 0 && (
-          <PausedIncomingContributionsMessage
-            account={metadata.account}
-            count={metadata.account[ContributionsTab.PAUSED].totalCount}
-          />
-        )}
+        {isIncoming &&
+          !onlyExpectedFunds &&
+          metadata?.account?.PAUSED_RESUMABLE.totalCount > 0 &&
+          !metadata.account.parent && (
+            <PausedIncomingContributionsMessage
+              account={metadata.account}
+              count={metadata.account[ContributionsTab.PAUSED].totalCount}
+            />
+          )}
 
         {error ? (
           <MessageBoxGraphqlError error={error} />

diff --git a/graphql.config.js b/graphql.config.js
@@ -38,7 +38,6 @@ module.exports = {
         'components/edit-collective/sections/PaymentReceipts.js',
         'components/edit-collective/sections/Webhooks.js',
         'components/tier-page/graphql/queries.js',
-        'components/tier-page/index.js',
         'lib/graphql/v1/fragments.js',
         'lib/graphql/v1/mutations.js',
         'lib/graphql/v1/queries.js',

diff --git a/lib/graphql/schema.graphql b/lib/graphql/schema.graphql
@@ -4559,18 +4559,6 @@ type Mutation {
   ): UserDetails
   editConnectedAccount(connectedAccount: ConnectedAccountInputType!): ConnectedAccountType
 
-  """
-  Update a single tier
-  """
-  editTier(
-    """
-    The tier to update
-    """
-    tier: TierInputType!
-  ): Tier @deprecated(reason: "2024-07-16: Please use editTiers mutation from GraphQLV2")
-  editTiers(id: Int!, tiers: [TierInputType]): [Tier]
-    @deprecated(reason: "2024-07-16: Please use editTiers mutation from GraphQLV2")
-
   """
   Updates all the core contributors (role = ADMIN or MEMBER) for this collective.
   """
@@ -4774,7 +4762,6 @@ input CollectiveInputType {
   image: String
   backgroundImage: String
   tags: [String]
-  tiers: [TierInputType]
   settings: JSON
   data: JSON @deprecated(reason: "2020-10-08: data cannot be edited. This field will be ignored.")
 
@@ -4834,90 +4821,6 @@ input LocationInputType {
   structured: JSON
 }
 
-"""
-Input type for TierType
-"""
-input TierInputType {
-  id: Int
-  type: String
-  name: String
-  description: String
-
-  """
-  A long, html-formatted description.
-  """
-  longDescription: String
-
-  """
-  Whether this tier has a standalone page
-  """
-  useStandalonePage: Boolean
-
-  """
-  Link to a video (YouTube, Vimeo).
-  """
-  videoUrl: String
-
-  """
-  amount in the lowest unit of the currency of the host (ie. in cents)
-  """
-  amount: Int
-
-  """
-  Button text
-  """
-  button: String
-  currency: String
-  presets: [Int]
-  interval: String
-  maxQuantity: Int
-  minimumAmount: Int
-  amountType: String
-
-  """
-  amount that you are trying to raise with this tier
-  """
-  goal: Int
-  customFields: [CustomFieldsInputType]
-
-  """
-  Start of the campaign
-  """
-  startsAt: String
-
-  """
-  End of the campaign
-  """
-  endsAt: String
-
-  """
-  Invoice receipt template
-  """
-  invoiceTemplate: String
-}
-
-"""
-Input for custom fields for order
-"""
-input CustomFieldsInputType {
-  type: CustomFieldType
-  name: String
-  label: String
-  required: Boolean
-}
-
-"""
-Type of custom field
-"""
-enum CustomFieldType {
-  number
-  text
-  email
-  date
-  radio
-  url
-}
-
 """
 Input type for MemberType
 """