refactor: link to /maps? from climb or area page, if on climb, will l…

…ink to parent
OpenBeta · Dec 7, 2024 · 973e065 · 973e065
1 parent c49b6c4
commit 973e065
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/app/(default)/area/[[...slug]]/page.tsx b/src/app/(default)/area/[[...slug]]/page.tsx
@@ -56,7 +56,7 @@ export default async function Page ({ params }: PageWithCatchAllUuidProps): Prom
           ? <UploadPhotoCTA />
           : <PhotoMontage photoList={photoList} />
       }
-      pageActions={<AreaAndClimbPageActions name={areaName} uuid={uuid} targetType={TagTargetType.area} />}
+      pageActions={<AreaAndClimbPageActions name={areaName} uuid={uuid} targetType={TagTargetType.area} parentUuid={uuid} />}
       breadcrumbs={
         <StickyHeaderContainer>
           <AreaCrumbs pathTokens={pathTokens} ancestors={ancestors} />

diff --git a/src/app/(default)/climb/[[...slug]]/page.tsx b/src/app/(default)/climb/[[...slug]]/page.tsx
@@ -40,6 +40,9 @@ export default async function Page ({ params }: PageWithCatchAllUuidProps): Prom
     id, name, type, ancestors, pathTokens, parent
   } = climb
 
+  console.log('parent', parent.uuid);
+
+
   const correctSlug = getFriendlySlug(name)
 
   if (correctSlug !== userProvidedSlug) {
@@ -66,7 +69,7 @@ export default async function Page ({ params }: PageWithCatchAllUuidProps): Prom
                   ? <UploadPhotoCTA />
                   : <PhotoMontage photoList={photoList} />
         }
-      pageActions={<AreaAndClimbPageActions name={name} uuid={id} targetType={TagTargetType.climb} />}
+      pageActions={<AreaAndClimbPageActions name={name} uuid={id} targetType={TagTargetType.climb} parentUuid={parent.uuid} />}
       breadcrumbs={
         <StickyHeaderContainer>
           <AreaCrumbs pathTokens={pathTokens} ancestors={ancestors} />

diff --git a/src/app/(default)/components/AreaAndClimbPageActions.tsx b/src/app/(default)/components/AreaAndClimbPageActions.tsx
@@ -8,22 +8,26 @@ import { TagTargetType } from '@/js/types'
 
 /**
  * Main action bar for area & climb page
+ * In an area page, pass in the same uuid for both `uuid` and `parentUuid` but `parentUuid` is not used.
  */
-export const AreaAndClimbPageActions: React.FC<{ uuid: string, name: string, targetType: TagTargetType }> = ({ uuid, name, targetType }) => {
+export const AreaAndClimbPageActions: React.FC<{ uuid: string, name: string, targetType: TagTargetType, parentUuid: string }> = ({ uuid, name, targetType, parentUuid }) => {
   let url: string
   let sharePath: string
   let enableEdit = true
   let editLabel = 'Edit'
+  let navigateUuid = ''
   switch (targetType) {
     case TagTargetType.area:
       url = `/editArea/${uuid}`
       sharePath = `/area/${uuid}`
+      navigateUuid = uuid
       break
     case TagTargetType.climb:
       url = `/editClimb/${uuid}`
       sharePath = `/climb/${uuid}`
       enableEdit = false
       editLabel = 'Edit (TBD)'
+      navigateUuid = parentUuid ?? ''
   }
   return (
     <ul className='flex items-center justify-between gap-2'>
@@ -33,7 +37,7 @@ export const AreaAndClimbPageActions: React.FC<{ uuid: string, name: string, tar
 
       <UploadPhotoButton />
 
-      <Link href='#map' className='btn no-animation'>
+      <Link href={`/maps?areaId=${navigateUuid}`} className='btn no-animation'>
         <MapTrifold size={20} className='hidden md:inline' /> Map
       </Link>
       <SharePageURLButton path={sharePath} name={name} />

diff --git a/src/js/graphql/gql/climbById.ts b/src/js/graphql/gql/climbById.ts
@@ -55,6 +55,7 @@ export const QUERY_CLIMB_BY_ID = gql`
         climbId
       }
       parent {
+        uuid,
         areaName
         gradeContext
         metadata {