dont show Add Readme button for nested package tree

quiltdata · Jul 29, 2022 · e1ab582 · e1ab582
1 parent aa9173a
commit e1ab582
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/catalog/app/containers/Bucket/Dir.tsx b/catalog/app/containers/Bucket/Dir.tsx
@@ -120,7 +120,7 @@ function DirContents({ response, locked, bucket, path, loadMore }: DirContentsPr
       />
       {/* Remove TS workaround when Summary will be converted to .tsx */}
       {/* @ts-expect-error */}
-      <Summary files={response.files} mkUrl={null} />
+      <Summary files={response.files} mkUrl={null} path={path} />
     </>
   )
 }

diff --git a/catalog/app/containers/Bucket/PackageTree/PackageTree.tsx b/catalog/app/containers/Bucket/PackageTree/PackageTree.tsx
@@ -448,6 +448,7 @@ function DirDisplay({
               <M.Box mt={2}>
                 {preferences?.ui?.blocks?.browser && <Listing items={items} key={hash} />}
                 <Summary
+                  path={path}
                   files={summaryHandles}
                   mkUrl={mkUrl}
                   packageHandle={packageHandle}

diff --git a/catalog/app/containers/Bucket/Summary.js b/catalog/app/containers/Bucket/Summary.js
@@ -1,4 +1,4 @@
-import path from 'path'
+import { basename, join } from 'path'
 
 import * as R from 'ramda'
 import * as React from 'react'
@@ -29,7 +29,7 @@ function AddReadmeSection({ packageHandle: { bucket, name } }) {
   const classes = useAddReadmeSectionStyles()
   const { urls } = NamedRoutes.use()
   const next = urls.bucketPackageDetail(bucket, name, { action: 'revisePackage' })
-  const toConfig = urls.bucketFile(bucket, path.join(name, 'README.md'), {
+  const toConfig = urls.bucketFile(bucket, join(name, 'README.md'), {
     add: true,
     edit: true,
     next,
@@ -109,7 +109,7 @@ function SummaryItemFile({ handle, name, mkUrl }) {
     <Container>
       <Header>
         <StyledLink to={mkUrl(handle)}>
-          {name || path.basename(handle.logicalKey || handle.key)}
+          {name || basename(handle.logicalKey || handle.key)}
         </StyledLink>
       </Header>
       <M.CardContent>{withData(Preview.display({ renderContents }))}</M.CardContent>
@@ -171,8 +171,8 @@ function Thumbnails({ images, mkUrl }) {
                   <Thumbnail
                     handle={resolved}
                     className={classes.img}
-                    alt={path.basename(i.logicalKey || i.key)}
-                    title={path.basename(i.logicalKey || i.key)}
+                    alt={basename(i.logicalKey || i.key)}
+                    title={basename(i.logicalKey || i.key)}
                   />
                 ),
               })}
@@ -199,7 +199,7 @@ function Thumbnails({ images, mkUrl }) {
 }
 
 // files: Array of s3 handles
-export default function BucketSummary({ files, mkUrl: mkUrlProp, packageHandle }) {
+export default function BucketSummary({ files, mkUrl: mkUrlProp, packageHandle, path }) {
   const { urls } = NamedRoutes.use()
   const mkUrl = React.useCallback(
     (handle) =>
@@ -214,12 +214,14 @@ export default function BucketSummary({ files, mkUrl: mkUrlProp, packageHandle }
     <>
       {readme && (
         <SummaryItemFile
-          title={path.basename(readme.logicalKey || readme.key)}
+          title={basename(readme.logicalKey || readme.key)}
           handle={readme}
           mkUrl={mkUrl}
         />
       )}
-      {!readme && !!packageHandle && <AddReadmeSection packageHandle={packageHandle} />}
+      {!readme && !path && !!packageHandle && (
+        <AddReadmeSection packageHandle={packageHandle} />
+      )}
       {!!images.length && <Thumbnails {...{ images, mkUrl }} />}
       {summarize && (
         <Summarize.SummaryNested

diff --git a/catalog/app/embed/Dir.js b/catalog/app/embed/Dir.js
@@ -184,7 +184,7 @@ export default function Dir({
                   />
                 }
               />
-              <Summary files={res.files} />
+              <Summary files={res.files} path={path} />
             </>
           )
         },