[C] integrate sidebar to main page template

lsst-epo · Jul 18, 2024 · d46fc9b · d46fc9b
1 parent 5f9f82c
commit d46fc9b
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 255 deletions.
diff --git a/components/dynamic/DataProductsList/index.js b/components/dynamic/DataProductsList/index.js
diff --git a/components/templates/DataProductPage/index.js b/components/templates/DataProductPage/index.js
diff --git a/components/templates/Page/index.js b/components/templates/Page/index.js
@@ -19,6 +19,7 @@ import GuideNavigation from "@/components/layout/GuideNavigation";
 import SiblingNavigation from "@/components/layout/SiblingNavigation";
 import NestedContext from "@/contexts/Nested";
 import PageContent from "@/page/PageContent";
+import MediaAside from "@/components/page/Aside/patterns/Media";
 import { FilterParamsProvider } from "@/contexts/FilterParams";
 
 export default function Page({
@@ -43,6 +44,8 @@ export default function Page({
     subHeroColorScheme,
     parent,
     showGuideNav,
+    showSidebar,
+    sidebarAssets = [],
     investigation,
     siblings,
     childNavigation,
@@ -143,6 +146,14 @@ export default function Page({
           <PageContent
             heroImage={!showSiblingNav && hero}
             overlapHero={showSiblingNav ? false : shouldOverlapHero}
+            sidebar={
+              showSidebar && (
+                <MediaAside
+                  manualAssets={sidebarAssets}
+                  contentBlockAssets={contentBlocks}
+                />
+              )
+            }
             {...{ focalPointX, focalPointY }}
           >
             <SubHero

diff --git a/lib/api/entries.js b/lib/api/entries.js
@@ -12,7 +12,6 @@ import { glossaryTermFragment } from "@/lib/api/fragments/glossary-term";
 import { studentPageFragment } from "./fragments/student-page";
 import { educatorPageFragment } from "./fragments/educator-page";
 import { investigationLandingPageFragment } from "./fragments/investigation-landing-page";
-import { dataProductFragment } from "@/lib/api/fragments/data-product";
 
 function dataListQueryify(fragment) {
   return gql`
@@ -228,14 +227,6 @@ export function useDataList({
           ${dataListQueryify(`...slideshowFragment`)}
         `;
         break;
-      case "dataProducts":
-        theSection = section;
-        theOrderBy = "dateCreated desc";
-        query = gql`
-          ${dataProductFragment}
-          ${dataListQueryify(`...dataProductFragment`)}
-        `;
-        break;
       default: // find a way to pass just news and pages
         theSection = null;
         theOrderBy = "dateUpdated desc";

diff --git a/lib/api/entry.js b/lib/api/entry.js
@@ -21,7 +21,6 @@ import { glossaryTermFragmentFull } from "./fragments/glossary-term";
 import { studentPageFragmentFull } from "./fragments/student-page";
 import { educatorPageFragmentFull } from "./fragments/educator-page";
 import { investigationLandingPageFragmentFull } from "./fragments/investigation-landing-page";
-import { dataProductFragmentFull } from "@/lib/api/fragments/data-product";
 import { addRelatedInvestigation } from "./investigation";
 import { addSiblings } from "./sibling-nav";
 
@@ -161,14 +160,6 @@ function getQueryFragments(uri, section, type, site) {
         ${entryQueryify(`...searchFragmentFull`)}
       `;
       break;
-    case "dataProducts":
-      query = gql`
-        ${linkFragment}
-        ${allPageBlocksFragment}
-        ${dataProductFragmentFull}
-        ${entryQueryify(`...dataProductFragmentFull`)}
-      `;
-      break;
     default:
       query = gql`
         ${linkFragment}
@@ -177,7 +168,6 @@ function getQueryFragments(uri, section, type, site) {
         ${eventFragmentFull}
         ${homepageFragmentFull}
         ${newsPostFragmentFull}
-        ${dataProductFragmentFull}
         ${pageFragmentFull}
         ${studentPageFragmentFull}
         ${searchFragmentFull}
@@ -191,7 +181,6 @@ function getQueryFragments(uri, section, type, site) {
           ...eventFragmentFull
           ...homepageFragmentFull
           ...newsPostFragmentFull
-          ...dataProductFragmentFull
           ...pageFragmentFull
           ...studentPageFragmentFull
           ...educatorPageFragmentFull

diff --git a/lib/api/fragments/data-product.js b/lib/api/fragments/data-product.js
diff --git a/lib/api/fragments/page.js b/lib/api/fragments/page.js
@@ -13,6 +13,14 @@ export const pageFragment = `
           ${getImageFields("crop", 900, 550)}
         }
       }
+      sidebarAssets {
+        ... on sidebarAssets_textLink_BlockType {
+          text
+          textLink {
+            url
+          }
+        }
+      }
     }
   }
 `;
@@ -42,6 +50,42 @@ fragment pageFragmentFull on pages_pages_Entry {
         ${getImageFields("crop", 800, 600)}
       }
     }
+    showSidebar
+    sidebarAssets {
+      ... on sidebarAssets_header_BlockType {
+        assetHeader
+      }
+      ... on sidebarAssets_textLink_BlockType {
+        text
+        textLink {
+          url
+        }
+      }
+      ... on sidebarAssets_externalLink_BlockType {
+        text
+        externalLink
+      }
+      ... on sidebarAssets_image_BlockType {
+        image {
+          ... on contentImages_Asset {
+          ${getImageFields("crop", 900, 550)}
+          }
+        }
+        caption
+      }
+      ... on sidebarAssets_galleryItem_BlockType {
+        galleryItem {
+          uri
+          ... on galleryItems_galleryItem_Entry {
+            representativeAssetVariant {
+              ... on assetVariants_Asset {
+                ${getImageFields("crop", 900, 550)}
+              }
+            }
+          }
+        }
+      }
+    }
     ancestors {
       ... on pages_pages_Entry {
         id