Catalog: drop unused linkedData / overviewUrl code paths (#4856)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: nl0

catalog/CHANGELOG.md

@@ -18,6 +18,7 @@ where verb is one of
 
 ## Changes
 
+- [Removed] Drop unused `linkedData` / `overviewUrl` code paths from the catalog: admin form fields, JSON-LD mounts, and the precomputed-summary S3 fetch branches ([#4856](https://github.com/quiltdata/quilt/pull/4856))
 - [Fixed] Admin Users / Policies panels: drop phantom permission rows referencing a just-removed bucket (cache was not cascading the removal through `Policy.permissions` / `ManagedRole.permissions`) ([#4855](https://github.com/quiltdata/quilt/pull/4855))
 - [Changed] Migrate user-facing bucket queries to the new role-scoped `buckets` / `bucket` GraphQL type; admins in a scoped managed role now see only role-permitted buckets in navbar / listings / deep-links (admin panel unchanged) ([#4839](https://github.com/quiltdata/quilt/pull/4839))
 - [Fixed] Refresh navbar bucket selector after bucket removal and after policy / role / user-role edits that change the caller's managed-role bucket set ([#4839](https://github.com/quiltdata/quilt/pull/4839))

catalog/app/containers/Admin/Buckets/Buckets.tsx

@@ -50,9 +50,7 @@ const bucketToPrimaryValues = (bucket: BucketConfig) => ({
 
 const bucketToMetadataValues = (bucket: BucketConfig) => ({
   relevanceScore: bucket.relevanceScore.toString(),
-  overviewUrl: bucket.overviewUrl || '',
   tags: (bucket.tags || []).join(', '),
-  linkedData: bucket.linkedData ? JSON.stringify(bucket.linkedData) : '',
 })
 
 const bucketToIndexingAndNotificationsValues = (bucket: BucketConfig) => ({
@@ -369,12 +367,10 @@ const editFormSpec: FormSpec<Model.GQLTypes.BucketUpdateInput> = {
     (s) => s || null,
     Types.decode(Types.nullable(Types.IntFromString)),
   ),
-  overviewUrl: R.pipe(
-    R.prop('overviewUrl'),
-    Types.decode(Types.fromNullable(IO.string, '')),
-    R.trim,
-    (s) => (s ? (s as Types.NonEmptyString) : null),
-  ),
+  // overviewUrl and linkedData are deprecated unused fields (see CHANGELOG).
+  // Kept as null-producing entries to satisfy BucketUpdateInput / BucketAddInput
+  // until the server-side schema drops them.
+  overviewUrl: () => null,
   tags: R.pipe(
     R.prop('tags'),
     Types.decode(Types.fromNullable(IO.string, '')),
@@ -385,12 +381,7 @@ const editFormSpec: FormSpec<Model.GQLTypes.BucketUpdateInput> = {
     (tags) =>
       tags.length ? (tags as FP.nonEmptyArray.NonEmptyArray<Types.NonEmptyString>) : null,
   ),
-  linkedData: R.pipe(
-    R.prop('linkedData'),
-    Types.decode(Types.fromNullable(IO.string, '')),
-    (s) => s.trim() || 'null',
-    Types.decode(Types.withFallback(Types.JsonFromString, null)),
-  ),
+  linkedData: () => null,
   fileExtensionsToIndex: (values) =>
     !values.enableDeepIndexing
       ? []
@@ -830,28 +821,6 @@ function MetadataForm() {
         rows={1}
         rowsMax={3}
       />
-      <RF.Field
-        component={Form.Field}
-        name="overviewUrl"
-        label="Overview URL"
-        parse={R.trim}
-        fullWidth
-        margin="normal"
-      />
-      <RF.Field
-        component={Form.Field}
-        name="linkedData"
-        label="Structured data (JSON-LD)"
-        validate={validators.jsonObject as FF.FieldValidator<any>}
-        errors={{
-          jsonObject: 'Must be a valid JSON object',
-        }}
-        fullWidth
-        multiline
-        rows={1}
-        rowsMax={10}
-        margin="normal"
-      />
     </>
   )
 }

catalog/app/containers/Admin/Buckets/gql/BucketConfigSelection.generated.ts

@@ -11,9 +11,7 @@ export type BucketConfigSelectionFragment = {
   | 'iconUrl'
   | 'description'
   | 'relevanceScore'
-  | 'overviewUrl'
   | 'tags'
-  | 'linkedData'
   | 'fileExtensionsToIndex'
   | 'indexContentBytes'
   | 'scannerParallelShardsDepth'
@@ -38,9 +36,7 @@ export const BucketConfigSelectionFragmentDoc = {
           { kind: 'Field', name: { kind: 'Name', value: 'iconUrl' } },
           { kind: 'Field', name: { kind: 'Name', value: 'description' } },
           { kind: 'Field', name: { kind: 'Name', value: 'relevanceScore' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'overviewUrl' } },
           { kind: 'Field', name: { kind: 'Name', value: 'tags' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'linkedData' } },
           { kind: 'Field', name: { kind: 'Name', value: 'fileExtensionsToIndex' } },
           { kind: 'Field', name: { kind: 'Name', value: 'indexContentBytes' } },
           { kind: 'Field', name: { kind: 'Name', value: 'scannerParallelShardsDepth' } },

catalog/app/containers/Admin/Buckets/gql/BucketConfigSelection.graphql

@@ -4,9 +4,7 @@ fragment BucketConfigSelection on BucketConfig {
   iconUrl
   description
   relevanceScore
-  overviewUrl
   tags
-  linkedData
   fileExtensionsToIndex
   indexContentBytes
   scannerParallelShardsDepth

catalog/app/containers/Bucket/Overview/Header.tsx

@@ -39,8 +39,6 @@ interface ExtData {
   objects: number
 }
 
-const RODA_LINK = 'https://registry.opendata.aws'
-const RODA_BUCKET = 'quilt-open-data-bucket'
 const MAX_EXTS = 7
 // must have length >= MAX_EXTS
 const COLOR_MAP = [
@@ -276,10 +274,10 @@ function StatsItemSkeleton() {
   )
 }
 
-function useStats(bucket: string, overviewUrl?: string | null) {
+function useStats(bucket: string) {
   const s3 = AWS.S3.use()
   const req = APIConnector.use()
-  const statsData = useData(requests.bucketStats, { req, s3, bucket, overviewUrl })
+  const statsData = useData(requests.bucketStats, { req, s3, bucket })
   const countQuery = GQL.useQuery(STAT_COUNTS_QUERY, { buckets: [bucket] })
   const totalBytes: string | null = React.useMemo(
     () =>
@@ -349,12 +347,11 @@ const useStatsStyles = M.makeStyles((t) => ({
 interface StatsProps {
   className: string
   bucket: string
-  overviewUrl?: string | null
 }
 
-function Stats({ className, bucket, overviewUrl }: StatsProps) {
+function Stats({ className, bucket }: StatsProps) {
   const classes = useStatsStyles()
-  const { totalBytes, totalObjects, pkgCount } = useStats(bucket, overviewUrl)
+  const { totalBytes, totalObjects, pkgCount } = useStats(bucket)
   return (
     <div className={cx(classes.root, className)}>
       {totalBytes ? <StatsItem value={totalBytes} /> : <StatsItemSkeleton />}
@@ -418,16 +415,14 @@ const useStyles = M.makeStyles((t) => ({
 interface HeaderProps {
   s3: AWSSDK.S3
   bucket: string
-  overviewUrl: string | null | undefined
   description: string | null | undefined
 }
 
-export default function Header({ s3, overviewUrl, bucket, description }: HeaderProps) {
+export default function Header({ s3, bucket, description }: HeaderProps) {
   const classes = useStyles()
   const req = APIConnector.use()
-  const isRODA = !!overviewUrl && overviewUrl.includes(`/${RODA_BUCKET}/`)
   const colorPool = useConst(() => makeColorPool(COLOR_MAP))
-  const statsData = useData(requests.bucketStats, { req, s3, bucket, overviewUrl })
+  const statsData = useData(requests.bucketStats, { req, s3, bucket })
   const { urls } = NamedRoutes.use()
   const isAdmin = redux.useSelector(authSelectors.isAdmin)
   return (
@@ -439,24 +434,7 @@ export default function Header({ s3, overviewUrl, bucket, description }: HeaderP
             <M.Typography variant="body1">{description}</M.Typography>
           </M.Box>
         )}
-        {isRODA && (
-          <M.Box
-            mt={1}
-            position={{ md: 'absolute' }}
-            right={{ md: 32 }}
-            bottom={{ md: 31 }}
-            color="grey.300"
-            textAlign={{ md: 'right' }}
-          >
-            <M.Typography variant="body2">
-              From the{' '}
-              <M.Link href={RODA_LINK} color="inherit" underline="always">
-                Registry of Open Data on AWS
-              </M.Link>
-            </M.Typography>
-          </M.Box>
-        )}
-        <Stats className={classes.stats} bucket={bucket} overviewUrl={overviewUrl} />
+        <Stats className={classes.stats} bucket={bucket} />
         {isAdmin && (
           <RRLink className={classes.settings} to={urls.adminBucketEdit(bucket)}>
             <M.IconButton color="inherit">

catalog/app/containers/Bucket/Overview/Overview.tsx

@@ -11,7 +11,6 @@ import AsyncResult from 'utils/AsyncResult'
 import * as BucketPreferences from 'utils/BucketPreferences'
 import Data from 'utils/Data'
 import * as GQL from 'utils/GraphQL'
-import * as LinkedData from 'utils/LinkedData'
 
 import * as Gallery from '../Gallery'
 import * as Summarize from '../Summarize'
@@ -20,37 +19,24 @@ import * as requests from '../requests'
 import Header from './Header'
 import BUCKET_QUERY from './gql/Bucket.generated'
 
-interface BucketReadmes {
-  forced?: Model.S3.S3ObjectLocation
-  discovered: Model.S3.S3ObjectLocation[]
-}
-
 interface ReadmesProps {
   s3: AWSSDK.S3
   bucket: string
-  overviewUrl: string | undefined | null
 }
 
-function Readmes({ s3, overviewUrl, bucket }: ReadmesProps) {
+function Readmes({ s3, bucket }: ReadmesProps) {
   return (
     // @ts-expect-error
-    <Data fetch={requests.bucketReadmes} params={{ s3, overviewUrl, bucket }}>
+    <Data fetch={requests.bucketReadmes} params={{ s3, bucket }}>
       {AsyncResult.case({
-        Ok: (rs: BucketReadmes) =>
-          (rs.discovered.length > 0 || !!rs.forced) && (
-            <>
-              {!!rs.forced && (
-                <Summarize.FilePreview key="readme:forced" handle={rs.forced} expanded />
-              )}
-              {rs.discovered.map((h) => (
-                <Summarize.FilePreview
-                  key={`readme:${h.bucket}/${h.key}`}
-                  handle={h}
-                  expanded
-                />
-              ))}
-            </>
-          ),
+        Ok: (readmes: Model.S3.S3ObjectLocation[]) =>
+          readmes.map((h) => (
+            <Summarize.FilePreview
+              key={`readme:${h.bucket}/${h.key}`}
+              handle={h}
+              expanded
+            />
+          )),
         _: () => <Summarize.FilePreviewSkel key="readme:skeleton" />,
       })}
     </Data>
@@ -60,15 +46,14 @@ function Readmes({ s3, overviewUrl, bucket }: ReadmesProps) {
 interface ImgsProps {
   s3: AWSSDK.S3
   bucket: string
-  overviewUrl: string | undefined | null
   inStack: boolean
 }
 
-function Imgs({ s3, overviewUrl, inStack, bucket }: ImgsProps) {
+function Imgs({ s3, inStack, bucket }: ImgsProps) {
   const req = APIConnector.use()
   return (
     // @ts-expect-error
-    <Data fetch={requests.bucketImgs} params={{ req, s3, overviewUrl, inStack, bucket }}>
+    <Data fetch={requests.bucketImgs} params={{ req, s3, inStack, bucket }}>
       {AsyncResult.case({
         Ok: (images: Model.S3.S3ObjectLocation[]) =>
           images.length ? <Gallery.Thumbnails images={images} /> : null,
@@ -89,7 +74,6 @@ interface ThumbnailsWrapperProps extends ImgsProps {
 
 function ThumbnailsWrapper({
   s3,
-  overviewUrl,
   inStack,
   bucket,
   preferences: galleryPrefs,
@@ -101,10 +85,8 @@ function ThumbnailsWrapper({
     <Data fetch={requests.ensureQuiltSummarizeIsPresent} params={{ s3, bucket }}>
       {AsyncResult.case({
         Ok: (h?: Model.S3.S3ObjectLocation) =>
-          (!h || galleryPrefs.summarize) && (
-            <Imgs {...{ s3, bucket, inStack, overviewUrl }} />
-          ),
-        Err: () => <Imgs {...{ s3, bucket, inStack, overviewUrl }} />,
+          (!h || galleryPrefs.summarize) && <Imgs {...{ s3, bucket, inStack }} />,
+        Err: () => <Imgs {...{ s3, bucket, inStack }} />,
         Pending: () => <Gallery.Skeleton />,
         _: () => null,
       })}
@@ -118,20 +100,12 @@ export default function Overview() {
   const s3 = AWS.S3.use()
   const { bucket: bucketData } = GQL.useQueryS(BUCKET_QUERY, { bucket })
   const inStack = !!bucketData
-  // overviewUrl is dead; stubbed until the field + its Readmes/Imgs/
-  // Summarize code paths are removed.
-  const overviewUrl = undefined
   const description = bucketData?.description
   const { prefs } = BucketPreferences.use()
   return (
     <M.Box pb={{ xs: 0, sm: 4 }} mx={{ xs: -2, sm: 0 }} position="relative" zIndex={1}>
-      {inStack && (
-        <React.Suspense fallback={null}>
-          <LinkedData.BucketData bucket={bucket} />
-        </React.Suspense>
-      )}
       {bucketData ? (
-        <Header {...{ s3, bucket, overviewUrl, description }} />
+        <Header {...{ s3, bucket, description }} />
       ) : (
         <M.Box
           pt={2}
@@ -142,20 +116,20 @@ export default function Overview() {
           <M.Typography variant="h5">{bucket}</M.Typography>
         </M.Box>
       )}
-      <Readmes {...{ s3, bucket, overviewUrl }} />
+      <Readmes {...{ s3, bucket }} />
       {BucketPreferences.Result.match(
         {
           Ok: ({ ui: { blocks } }) => (
             <ThumbnailsWrapper
-              {...{ s3, bucket, inStack, overviewUrl, preferences: blocks.gallery }}
+              {...{ s3, bucket, inStack, preferences: blocks.gallery }}
             />
           ),
           Pending: () => <Gallery.Skeleton />,
           Init: () => null,
         },
         prefs,
       )}
-      <Summarize.SummaryRoot {...{ s3, bucket, inStack, overviewUrl }} />
+      <Summarize.SummaryRoot {...{ s3, bucket, inStack }} />
     </M.Box>
   )
 }

catalog/app/containers/Bucket/PackageRevisions/PackageRevisions.tsx

@@ -557,28 +557,3 @@ export default function PackageRevisionsWrapper() {
     </>
   )
 }
-
-// TODO: restore linked data
-/*
-{!!bucketCfg &&
-  AsyncResult.case(
-    {
-      _: () => null,
-      Ok: ({ hash, modified, header }) => (
-        <React.Suspense fallback={null}>
-          <LinkedData.PackageData
-            {...{
-              bucket: bucketCfg,
-              name,
-              revision: r,
-              hash,
-              modified,
-              header,
-            }}
-          />
-        </React.Suspense>
-      ),
-    },
-    res,
-  )}
-*/

catalog/app/containers/Bucket/PackageTree/PackageTree.tsx

@@ -1080,15 +1080,6 @@ function PackageTree({
   return (
     <FileView.Root>
       <RRDom.Prompt when={!slt.isEmpty} message={guardNavigation} />
-      {/* TODO: bring back linked data after re-implementing it using graphql
-      {!!bucketCfg &&
-        revisionData.case({
-          Ok: ({ hash, modified }) => (
-            <ExposeLinkedData {...{ bucketCfg, bucket, name, hash, modified }} />
-          ),
-          _: () => null,
-        })}
-      */}
       {!!resolvedFrom && (
         <M.Box mb={2}>
           <Lab.Alert

catalog/app/containers/Bucket/Summarize.tsx

@@ -570,12 +570,11 @@ interface SummaryRootProps {
   s3: S3
   bucket: string
   inStack: boolean
-  overviewUrl?: string | null
 }
 
-export function SummaryRoot({ s3, bucket, inStack, overviewUrl }: SummaryRootProps) {
+export function SummaryRoot({ s3, bucket, inStack }: SummaryRootProps) {
   const req = APIConnector.use()
-  const data = useData(requests.bucketSummary, { req, s3, bucket, inStack, overviewUrl })
+  const data = useData(requests.bucketSummary, { req, s3, bucket, inStack })
   return (
     <FileThemeContext.Provider value={FileThemes.Overview}>
       {data.case({