Post migration cleanup (#361)

* Removed excess code leftover from migration * Fixed build errors * Removed old layout components
datacite · May 29, 2024 · d48793d · d48793d
1 parent 5b00d35
commit d48793d
Show file tree

Hide file tree

Showing 41 changed files with 350 additions and 1,678 deletions.
diff --git a/src/app/api/download-reports/doi/related-works/route.ts b/src/app/api/download-reports/doi/related-works/route.ts
@@ -1,6 +1,6 @@
 import { type NextRequest } from 'next/server'
 import { gql } from '@apollo/client';
-import apolloClient from 'src/utils/server/apolloClient'
+import apolloClient from 'src/utils/apolloClient'
 import { stringify } from 'csv-stringify/sync'
 import { Work } from 'src/data/types';
 import { QueryData } from 'src/data/queries/doiQuery'
@@ -159,7 +159,7 @@ export async function GET(request: NextRequest) {
       { key: 'connectionType', header: 'Connection Type' }
     ]
   })
-	
+
   try {
     return new Response(csv, {
       status: 200,
@@ -171,4 +171,4 @@ export async function GET(request: NextRequest) {
   } catch (error) {
     return new Response(JSON.stringify({ error }), { status: 400 })
   }
-}
+}
diff --git a/src/app/api/download-reports/ror/funders/route.ts b/src/app/api/download-reports/ror/funders/route.ts
@@ -1,6 +1,6 @@
 import { type NextRequest } from 'next/server'
 import { gql } from '@apollo/client';
-import apolloClient from 'src/utils/server/apolloClient'
+import apolloClient from 'src/utils/apolloClient'
 import { stringify } from 'csv-stringify/sync'
 
 const QUERY = gql`
@@ -53,11 +53,11 @@ export async function GET(request: NextRequest) {
     query: QUERY,
     variables: variables
   })
-  
-	
+
+
   const csv = stringify(data.organization.works.funders, {
     header: true,
-    columns: [ { key: 'id', header: 'Funder ID' }, { key: 'title', header: 'Title' }, { key: 'count', header: 'Work Count' } ]
+    columns: [{ key: 'id', header: 'Funder ID' }, { key: 'title', header: 'Title' }, { key: 'count', header: 'Work Count' }]
   })
 
 

diff --git a/src/app/api/download-reports/ror/related-works/route.ts b/src/app/api/download-reports/ror/related-works/route.ts
@@ -1,6 +1,6 @@
 import { type NextRequest } from 'next/server'
 import { gql } from '@apollo/client';
-import apolloClient from 'src/utils/server/apolloClient'
+import apolloClient from 'src/utils/apolloClient'
 import { stringify } from 'csv-stringify/sync'
 
 const QUERY = gql`
@@ -83,7 +83,7 @@ export async function GET(request: NextRequest) {
       // { key: '???', header: 'Connection Type(s)' }
     ]
   })
-	
+
   try {
     return new Response(csv, {
       status: 200,
@@ -95,4 +95,4 @@ export async function GET(request: NextRequest) {
   } catch (error) {
     return new Response(JSON.stringify({ error }), { status: 400 })
   }
-}
+}
diff --git a/src/app/doi.org/[...doi]/Content.tsx b/src/app/doi.org/[...doi]/Content.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import ReactHtmlParser from 'react-html-parser'
 import { Row, Col } from "src/components/Layout";
 
-import apolloClient from 'src/utils/server/apolloClient'
-import { Work as  WorkType } from 'src/data/types'
+import apolloClient from 'src/utils/apolloClient'
+import { Work as WorkType } from 'src/data/types'
 import { DOI_QUERY, QueryVar, QueryData } from 'src/data/queries/doiQuery'
 
 import Error from 'src/components/Error/Error'
@@ -21,7 +21,7 @@ interface Props {
   isBot?: boolean
 }
 
-export default async function Content (props: Props) {
+export default async function Content(props: Props) {
   const { variables, isBot = false } = props
 
   const { data, error } = await apolloClient.query<QueryData, QueryVar>({
@@ -50,13 +50,13 @@ export default async function Content (props: Props) {
     <Row>
       <Col md={3} id="side-bar">
         <div className='left-menu-buttons'>
-          { work.registrationAgency.id == "datacite" && ( 
+          {work.registrationAgency.id == "datacite" && (
             <Claim doi_id={work.doi} />
           )}
           <DownloadMetadata doi={work} />
         </div>
         <CiteAs doi={work} />
-        { !isBot && <DownloadReports
+        {!isBot && <DownloadReports
           links={[
             {
               title: 'Related Works (CSV)',
@@ -65,7 +65,7 @@ export default async function Content (props: Props) {
             }
           ]}
           variables={variables as any}
-        /> }
+        />}
         <ShareLinks url={'doi.org/' + work.doi} title={title} />
       </Col>
       <Col md={9} id="content">
@@ -74,4 +74,4 @@ export default async function Content (props: Props) {
     </Row>
   </>
   )
-}
+}
diff --git a/src/app/doi.org/[...doi]/RelatedContent.tsx b/src/app/doi.org/[...doi]/RelatedContent.tsx
@@ -9,7 +9,7 @@ import { RELATED_CONTENT_QUERY, QueryVar, QueryData } from 'src/data/queries/doi
 import { Works } from 'src/data/types'
 
 import Error from 'src/components/Error/Error'
-import WorksListing from 'src/components/WorksListing/Server'
+import WorksListing from 'src/components/WorksListing/WorksListing'
 
 interface Props {
   variables: QueryVar
@@ -18,7 +18,7 @@ interface Props {
   isBot?: boolean
 }
 
-export default function RelatedContent (props: Props) {
+export default function RelatedContent(props: Props) {
   const { variables, showSankey, connectionType, isBot = false } = props
 
   const { loading, data, error } = useQuery<QueryData, QueryVar>(
@@ -65,9 +65,9 @@ export default function RelatedContent (props: Props) {
 
   const defaultConnectionType =
     referenceCount > 0 ? 'references' :
-    citationCount > 0 ? 'citations' :
-    partCount > 0 ? 'parts' :
-    partOfCount > 0 ? 'partOf' : 'otherRelated'
+      citationCount > 0 ? 'citations' :
+        partCount > 0 ? 'parts' :
+          partOfCount > 0 ? 'partOf' : 'otherRelated'
 
   const displayedConnectionType = connectionType ? connectionType : defaultConnectionType
 
@@ -78,7 +78,7 @@ export default function RelatedContent (props: Props) {
 
   const hasNextPage = works.pageInfo ? works.pageInfo.hasNextPage : false
   const endCursor = works.pageInfo ? works.pageInfo.endCursor : ''
-  
+
   return (
     <>
       <Row>
@@ -110,4 +110,4 @@ export default function RelatedContent (props: Props) {
       </Row>
     </>
   )
-}
+}
diff --git a/src/app/doi.org/[...doi]/page.tsx b/src/app/doi.org/[...doi]/page.tsx
@@ -5,7 +5,7 @@ import truncate from 'lodash/truncate'
 
 import { rorFromUrl, isProject, isDMP } from 'src/utils/helpers'
 
-import apolloClient from 'src/utils/server/apolloClient'
+import apolloClient from 'src/utils/apolloClient'
 import { CROSSREF_FUNDER_GQL } from 'src/data/queries/crossrefFunderQuery'
 import Content from './Content'
 import { DOI_METADATA_QUERY, MetadataQueryData, MetadataQueryVar } from 'src/data/queries/doiQuery'
@@ -37,7 +37,7 @@ interface Props {
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const doi = params.doi.join('/')
-  
+
   const { data } = await apolloClient.query<MetadataQueryData, MetadataQueryVar>({
     query: DOI_METADATA_QUERY,
     variables: { id: doi },
@@ -73,9 +73,9 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const description = !data.work.descriptions[0]
     ? undefined
     : truncate(data.work.descriptions[0].description, {
-        length: 2500,
-        separator: '… '
-      })
+      length: 2500,
+      separator: '… '
+    })
 
   // TODO: Refer here for type https://nextjs.org/docs/app/api-reference/functions/generate-metadata#generatemetadata-function:~:text=image.png%22%20/%3E-,Good%20to%20know,-%3A
   // https://nextjs.org/docs/app/api-reference/functions/generate-metadata#generatemetadata-function:~:text=image.png%22%20/%3E-,Good%20to%20know,-%3A
@@ -85,7 +85,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
 
   // <script type="application/ld+json">{work.schemaOrg}</script>
- 
+
 
   return {
     title: title,
@@ -101,7 +101,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   }
 }
 
-function mapSearchparams (searchParams: Props['searchParams']) {
+function mapSearchparams(searchParams: Props['searchParams']) {
   return {
     filterQuery: searchParams.filterQuery,
     cursor: searchParams.cursor,
@@ -130,7 +130,7 @@ export default async function Page({ params, searchParams }: Props) {
       variables: { crossrefFunderId: doi },
       errorPolicy: 'all'
     })
-    
+
     if (!data) notFound()
     redirect(`/ror.org${rorFromUrl(data.organization.id)}?filterQuery=${vars.filterQuery}`)
   }

diff --git a/src/app/grid.ac/[...grid]/page.tsx b/src/app/grid.ac/[...grid]/page.tsx
@@ -1,6 +1,6 @@
 import { notFound, redirect } from "next/navigation"
 import { GRID_GQL, QueryData, QueryVar } from "src/data/queries/gridQuery"
-import apolloClient from "src/utils/server/apolloClient"
+import apolloClient from "src/utils/apolloClient"
 import { rorFromUrl } from "src/utils/helpers"
 
 interface Props {
@@ -16,7 +16,7 @@ export default async function GridPage({ params }: Props) {
     variables: { gridId },
     errorPolicy: 'all'
   })
-  
+
   if (!data) notFound()
   redirect(`/ror.org${rorFromUrl(data.organization.id)}`)
-}
+}
diff --git a/src/app/orcid.org/[orcid]/Content.tsx b/src/app/orcid.org/[orcid]/Content.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Row, Col } from "src/components/Layout";
 
-import apolloClient from 'src/utils/server/apolloClient'
+import apolloClient from 'src/utils/apolloClient'
 import { PERSON_QUERY, QueryVar, QueryData } from 'src/data/queries/personQuery'
 
 import Error from 'src/components/Error/Error'
@@ -14,7 +14,7 @@ interface Props {
   isBot?: boolean
 }
 
-export default async function Content (props: Props) {
+export default async function Content(props: Props) {
   const { variables } = props
 
   const { data, error } = await apolloClient.query<QueryData, QueryVar>({
@@ -48,4 +48,4 @@ export default async function Content (props: Props) {
     </Row>
   </>
   )
-}
+}
diff --git a/src/app/orcid.org/[orcid]/RelatedContent.tsx b/src/app/orcid.org/[orcid]/RelatedContent.tsx
@@ -8,7 +8,7 @@ import Loading from 'src/components/Loading/Loading'
 import { RELATED_CONTENT_QUERY, QueryVar, QueryData } from 'src/data/queries/personQuery'
 
 import Error from 'src/components/Error/Error'
-import WorksListing from 'src/components/WorksListing/Server'
+import WorksListing from 'src/components/WorksListing/WorksListing'
 import { pluralize } from 'src/utils/helpers';
 
 interface Props {
@@ -17,7 +17,7 @@ interface Props {
   isBot?: boolean
 }
 
-export default function RelatedContent (props: Props) {
+export default function RelatedContent(props: Props) {
   const { orcid, variables, isBot = false } = props
 
   const { loading, data, error } = useQuery<QueryData, QueryVar>(
@@ -80,4 +80,4 @@ export default function RelatedContent (props: Props) {
       </Row>
     </>
   )
-}
+}
diff --git a/src/app/orcid.org/[orcid]/page.tsx b/src/app/orcid.org/[orcid]/page.tsx
@@ -3,7 +3,7 @@ import { Metadata } from 'next'
 import { notFound } from 'next/navigation'
 import truncate from 'lodash/truncate'
 
-import apolloClient from 'src/utils/server/apolloClient'
+import apolloClient from 'src/utils/apolloClient'
 import Content from './Content'
 import { PERSON_METADATA_QUERY, MetadataQueryData, MetadataQueryVar } from 'src/data/queries/personQuery'
 import RelatedContent from './RelatedContent'
@@ -32,7 +32,7 @@ interface Props {
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const orcid = 'http://orcid.org/' + params.orcid
-  
+
   const { data } = await apolloClient.query<MetadataQueryData, MetadataQueryVar>({
     query: PERSON_METADATA_QUERY,
     variables: { id: orcid },
@@ -79,7 +79,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
 
   // <script type="application/ld+json">{work.schemaOrg}</script>
- 
+
 
   return {
     title: title,
@@ -95,7 +95,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   }
 }
 
-function mapSearchparams (searchParams: Props['searchParams']) {
+function mapSearchparams(searchParams: Props['searchParams']) {
   return {
     filterQuery: searchParams.filterQuery,
     cursor: searchParams.cursor,

diff --git a/src/app/repositories/[...repoid]/Content.tsx b/src/app/repositories/[...repoid]/Content.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Row, Col } from "src/components/Layout";
 
-import apolloClient from 'src/utils/server/apolloClient'
+import apolloClient from 'src/utils/apolloClient'
 import { Repository as RepositoryType } from 'src/data/types'
 import { REPOSITORY_QUERY, QueryData, QueryVar } from 'src/data/queries/repositoryQuery';
 
@@ -13,7 +13,7 @@ interface Props {
   isBot?: boolean
 }
 
-export default async function Content (props: Props) {
+export default async function Content(props: Props) {
   const { variables } = props
 
   const { data, error } = await apolloClient.query<QueryData, QueryVar>({
@@ -34,11 +34,11 @@ export default async function Content (props: Props) {
   return (
     <Row>
       <Col md={3}>
-        <RepositorySidebar repo={repository}/>
+        <RepositorySidebar repo={repository} />
       </Col>
       <Col md={9}>
         <RepositoryDetail repo={repository} />
       </Col>
     </Row>
   )
-}
+}
diff --git a/src/app/repositories/[...repoid]/page.tsx b/src/app/repositories/[...repoid]/page.tsx
@@ -1,7 +1,7 @@
 import React, { Suspense } from 'react'
 import { Metadata } from 'next'
 import { notFound } from 'next/navigation'
-import apolloClient from 'src/utils/server/apolloClient'
+import apolloClient from 'src/utils/apolloClient'
 import Content from './Content'
 import Loading from 'src/components/Loading/Loading'
 import { MetadataQueryData, MetadataQueryVar, REPOSITORY_METADATA_QUERY } from 'src/data/queries/repositoryQuery'
@@ -17,7 +17,7 @@ interface Props {
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const repoid = params.repoid.join('/')
-  
+
   const { data } = await apolloClient.query<MetadataQueryData, MetadataQueryVar>({
     query: REPOSITORY_METADATA_QUERY,
     variables: { id: repoid },
@@ -43,8 +43,8 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   const baseUrl =
     process.env.NEXT_PUBLIC_API_URL === 'https://api.datacite.org'
-    ? 'https://commons.datacite.org/'
-    : 'https://commons.stage.datacite.org/'
+      ? 'https://commons.datacite.org/'
+      : 'https://commons.stage.datacite.org/'
 
   const pageUrl = repo.re3dataDoi
     ? baseUrl + "repositories/" + repo.re3dataDoi