clients/web: remove IssueReference and IssueDependency logic

polarsource · Apr 4, 2024 · 3d30bc7 · 3d30bc7
1 parent 1b365ef
commit 3d30bc7
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 749 deletions.
diff --git a/clients/apps/web/src/app/[organization]/[repo]/issues/[number]/(create)/ClientPage.tsx b/clients/apps/web/src/app/[organization]/[repo]/issues/[number]/(create)/ClientPage.tsx
@@ -5,13 +5,7 @@ import HowItWorks from '@/components/Pledge/HowItWorks'
 import IssueCard from '@/components/Pledge/IssueCard'
 import PledgeCheckoutPanel from '@/components/Pledge/PledgeCheckoutPanel'
 import { useTrafficRecordPageView } from '@/utils/traffic'
-import {
-  Issue,
-  Pledger,
-  PullRequest,
-  RewardsSummary,
-  Visibility,
-} from '@polar-sh/sdk'
+import { Issue, Pledger, RewardsSummary, Visibility } from '@polar-sh/sdk'
 import { WhiteCard } from 'polarkit/components/ui/Cards'
 import { Banner } from 'polarkit/components/ui/molecules'
 import posthog from 'posthog-js'
@@ -23,14 +17,12 @@ const ClientPage = ({
   pledgers,
   gotoURL,
   rewards,
-  pullRequests,
 }: {
   issue: Issue
   htmlBody?: string
   pledgers: Pledger[]
   gotoURL?: string
   rewards?: RewardsSummary
-  pullRequests?: PullRequest[]
 }) => {
   useTrafficRecordPageView({ organization: issue.repository.organization })
 
@@ -70,7 +62,6 @@ const ClientPage = ({
             pledgers={pledgers}
             currentPledgeAmount={amount}
             rewards={rewards}
-            pullRequests={pullRequests}
           />
         </div>
 

diff --git a/...ts/apps/web/src/app/[organization]/[repo]/issues/[number]/(create)/PledgePage.stories.tsx b/...ts/apps/web/src/app/[organization]/[repo]/issues/[number]/(create)/PledgePage.stories.tsx
@@ -189,47 +189,6 @@ export const PullRequests: Story = {
       ...issue,
       upfront_split_to_contributors: 75,
     },
-    pullRequests: [
-      {
-        id: 'x',
-        number: 123,
-        title: 'I am a pull request! Here we gooooooooo!',
-        additions: 500,
-        deletions: 200,
-        is_merged: false,
-        is_closed: false,
-      },
-      {
-        id: 'x',
-        number: 12322,
-        title: 'I am a merged pull request!',
-        additions: 500,
-        deletions: 200,
-        is_merged: true,
-        is_closed: true,
-        author: {
-          login: 'baz',
-          html_url: 'x',
-          id: 132,
-          avatar_url: 'https://avatars.githubusercontent.com/u/47952?v=4',
-        },
-      },
-      {
-        id: 'x',
-        number: 12322,
-        title: 'I am a closed pull request!',
-        additions: 10,
-        deletions: 200,
-        is_merged: false,
-        is_closed: true,
-        author: {
-          login: 'baz',
-          html_url: 'x',
-          id: 132,
-          avatar_url: 'https://avatars.githubusercontent.com/u/47952?v=4',
-        },
-      },
-    ],
   },
 }
 

diff --git a/clients/apps/web/src/app/[organization]/[repo]/issues/[number]/(create)/page.tsx b/clients/apps/web/src/app/[organization]/[repo]/issues/[number]/(create)/page.tsx
@@ -1,12 +1,6 @@
 import { getServerSideAPI } from '@/utils/api'
 import { redirectToCanonicalDomain } from '@/utils/nav'
-import {
-  Issue,
-  Pledger,
-  PullRequest,
-  ResponseError,
-  RewardsSummary,
-} from '@polar-sh/sdk'
+import { Issue, Pledger, ResponseError, RewardsSummary } from '@polar-sh/sdk'
 import { Metadata, ResolvingMetadata } from 'next'
 import { headers } from 'next/headers'
 import { notFound } from 'next/navigation'
@@ -81,7 +75,6 @@ export default async function Page({
   let issueHTMLBody: string | undefined
   let pledgers: Pledger[] = []
   let rewards: RewardsSummary | undefined
-  let pulls: PullRequest[] = []
 
   const api = getServerSideAPI()
 
@@ -93,20 +86,17 @@ export default async function Page({
       cacheConfig,
     )
 
-    const [bodyResponse, pledgeSummary, rewardsSummary, pullRequests] =
-      await Promise.all([
-        api.issues.getBody({ id: issue.id }, { next: { revalidate: 60 } }), // Cache for 60s
-        api.pledges.summary({ issueId: issue.id }, cacheConfig),
-        api.rewards.summary({ issueId: issue.id }, cacheConfig),
-        api.pullRequests.search({ referencesIssueId: issue.id }, cacheConfig),
-      ])
+    const [bodyResponse, pledgeSummary, rewardsSummary] = await Promise.all([
+      api.issues.getBody({ id: issue.id }, { next: { revalidate: 60 } }), // Cache for 60s
+      api.pledges.summary({ issueId: issue.id }, cacheConfig),
+      api.rewards.summary({ issueId: issue.id }, cacheConfig),
+    ])
 
     issueHTMLBody = bodyResponse
     pledgers = pledgeSummary.pledges
       .map(({ pledger }) => pledger)
       .filter((p): p is Pledger => !!p)
     rewards = rewardsSummary
-    pulls = pullRequests.items || []
   } catch (e) {
     if (e instanceof ResponseError && e.response.status === 404) {
       notFound()
@@ -131,7 +121,6 @@ export default async function Page({
       pledgers={pledgers}
       rewards={rewards}
       gotoURL={undefined}
-      pullRequests={pulls}
     />
   )
 }
diff --git a/clients/apps/web/src/app/maintainer/[organization]/(topbar)/funding/ClientPage.tsx b/clients/apps/web/src/app/maintainer/[organization]/(topbar)/funding/ClientPage.tsx
@@ -83,7 +83,6 @@ export default function ClientPage() {
             <IssueListItem
               key={ps[0].issue.id}
               issue={ps[0].issue}
-              references={[]}
               pledges={ps}
               canAddRemovePolarLabel={false}
               showLogo={true}
@@ -99,7 +98,6 @@ export default function ClientPage() {
             <IssueListItem
               key={ps[0].issue.id}
               issue={ps[0].issue}
-              references={[]}
               pledges={ps}
               canAddRemovePolarLabel={false}
               showLogo={true}

diff --git a/clients/apps/web/src/components/Feed/Markdown/Embed/BrowserEmbed.tsx b/clients/apps/web/src/components/Feed/Markdown/Embed/BrowserEmbed.tsx
@@ -90,7 +90,6 @@ const EmbedIssue = (props: { src: string }) => {
     <div className="not-prose dark:bg-polar-800 border-bg-gray-100 dark:border:bg-polar-700 my-2 overflow-hidden rounded-2xl border bg-white">
       <IssueListItem
         issue={issue}
-        references={[]}
         pledges={[]}
         key={issue.id}
         canAddRemovePolarLabel={false}

diff --git a/clients/apps/web/src/components/Feed/Recommended.tsx b/clients/apps/web/src/components/Feed/Recommended.tsx
@@ -36,7 +36,6 @@ const Recommended = () => {
             {issues.data?.items?.map((issue) => (
               <IssueListItem
                 issue={issue}
-                references={[]}
                 pledges={[]}
                 key={issue.id}
                 canAddRemovePolarLabel={false}

diff --git a/clients/apps/web/src/components/Finance/SplitRewardModal.tsx b/clients/apps/web/src/components/Finance/SplitRewardModal.tsx
@@ -1,18 +1,13 @@
 import { useAuth } from '@/hooks'
-import { Author, ConfirmIssueSplit } from '@polar-sh/sdk'
-import {
-  useIssueMarkConfirmed,
-  useListPledesForIssue,
-  useListPullsReferencingIssue,
-} from 'polarkit/hooks'
+import { ConfirmIssueSplit } from '@polar-sh/sdk'
+import { useIssueMarkConfirmed, useListPledesForIssue } from 'polarkit/hooks'
 import { useState } from 'react'
 import Spinner from '../Shared/Spinner'
 import Split, { Contributor, Share } from './Split'
 import SplitNotify from './SplitNotify'
 
 const SplitRewardModal = (props: { issueId: string; onClose: () => void }) => {
   const pledges = useListPledesForIssue(props.issueId)
-  const pulls = useListPullsReferencingIssue(props.issueId)
 
   const { currentUser } = useAuth()
 
@@ -90,23 +85,7 @@ const SplitRewardModal = (props: { issueId: string; onClose: () => void }) => {
         ]
       : []
 
-  const pullRequestContributors: Contributor[] = pulls.data?.items
-    ? pulls.data.items
-        .map((pr) => pr.author)
-        .filter((a): a is Author => !!a)
-        .map((a) => {
-          return {
-            username: a.login,
-            avatar_url: a.avatar_url,
-            is_suggested_from_contributions: true,
-          }
-        })
-    : []
-
-  const contributors: Contributor[] = [
-    ...selfOrgContributors,
-    ...pullRequestContributors,
-  ]
+  const contributors: Contributor[] = [...selfOrgContributors]
 
   const tmpShares: Share[] = contributors.map((c) => {
     return {
@@ -119,7 +98,7 @@ const SplitRewardModal = (props: { issueId: string; onClose: () => void }) => {
     ...new Map(tmpShares.map((item) => [item.username, item])).values(),
   ]
 
-  if (!pledges.isFetched || !pulls.isFetched) {
+  if (!pledges.isFetched) {
     return <Spinner />
   }
 

diff --git a/clients/apps/web/src/components/Issues/IssueList.tsx b/clients/apps/web/src/components/Issues/IssueList.tsx
@@ -89,7 +89,6 @@ const IssueListPage = (props: {
       {props.page.data.map((issue) => (
         <IssueListItem
           issue={issue.attributes}
-          references={issue.references || []}
           pledges={issue.pledges || []}
           pledgesSummary={issue.pledges_summary}
           rewards={issue.rewards}

diff --git a/clients/apps/web/src/components/Issues/IssueListItem.tsx b/clients/apps/web/src/components/Issues/IssueListItem.tsx
@@ -2,13 +2,7 @@
 
 import { ModalBox, Modal as ModernModal } from '@/components/Modal'
 import { useToastLatestPledged } from '@/hooks/stripe'
-import {
-  Issue,
-  IssueReferenceRead,
-  Pledge,
-  PledgesTypeSummaries,
-  Reward,
-} from '@polar-sh/sdk'
+import { Issue, Pledge, PledgesTypeSummaries, Reward } from '@polar-sh/sdk'
 import { api } from 'polarkit/api'
 import {
   IssueActivityBox,
@@ -25,7 +19,6 @@ import { AddBadgeButton } from './IssuePromotionModal'
 
 const IssueListItem = (props: {
   issue: Issue
-  references: IssueReferenceRead[]
   pledges: Array<Pledge>
   pledgesSummary?: PledgesTypeSummaries
   checkJustPledged?: boolean
@@ -55,8 +48,6 @@ const IssueListItem = (props: {
   }
 
   const havePledge = mergedPledges.length > 0
-  const haveReference = props.references && props.references?.length > 0
-  const havePledgeOrReference = havePledge || haveReference
 
   const [showDisputeModalForPledge, setShowDisputeModalForPledge] = useState<
     Pledge | undefined
@@ -96,13 +87,12 @@ const IssueListItem = (props: {
             </>
           }
         />
-        {havePledgeOrReference && (
+        {havePledge && (
           <IssueActivityBox>
             <IssueListItemDecoration
               issue={props.issue}
               pledges={mergedPledges}
               pledgesSummary={props.pledgesSummary}
-              references={props.references}
               showDisputeAction={true}
               onDispute={onDispute}
               showConfirmPledgeAction={true}

diff --git a/clients/apps/web/src/components/Pledge/IssueCard.stories.tsx b/clients/apps/web/src/components/Pledge/IssueCard.stories.tsx
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react'
 
-import { issue, issueBodyHTML, pledger, pullRequest } from 'polarkit/testdata'
+import { issue, issueBodyHTML, pledger } from 'polarkit/testdata'
 import IssueCard from './IssueCard'
 
 const meta: Meta<typeof IssueCard> = {
@@ -272,7 +272,6 @@ export const RewardedSplitPulls: Story = {
         },
       ],
     },
-    pullRequests: [pullRequest, pullRequest],
   },
 }
 
@@ -284,6 +283,5 @@ export const Pulls: Story = {
     issue: {
       ...issue,
     },
-    pullRequests: [pullRequest, pullRequest],
   },
 }
diff --git a/clients/apps/web/src/components/Pledge/IssueCard.tsx b/clients/apps/web/src/components/Pledge/IssueCard.tsx
@@ -35,14 +35,12 @@ const IssueCard = ({
   pledgers,
   currentPledgeAmount,
   rewards,
-  pullRequests,
 }: {
   issue: Issue
   htmlBody?: string
   pledgers: Pledger[]
   currentPledgeAmount: number
   rewards?: RewardsSummary
-  pullRequests?: PullRequest[]
 }) => {
   const url = githubIssueUrl(
     issue.repository.organization.name,
@@ -206,10 +204,6 @@ const IssueCard = ({
           )}
         </div>
       ) : null}
-
-      {pullRequests && pullRequests.length > 0 && (
-        <PullRequests pulls={pullRequests} />
-      )}
     </div>
   )
 }

diff --git a/clients/apps/web/src/components/Pledge/Status.tsx b/clients/apps/web/src/components/Pledge/Status.tsx
@@ -81,7 +81,6 @@ export const Status = (props: {
           <IssueListItem
             issue={pledge.issue}
             pledges={[pledge]}
-            references={[]}
             checkJustPledged={false}
             canAddRemovePolarLabel={false}
             showPledgeAction={true}