Merge pull request #892 from dpc-sdp/release/v2.3.5

Release/v2.3.5
dpc-sdp · Oct 11, 2023 · bcc0b1a · bcc0b1a
2 parents b60fe07 + 3a78093
commit bcc0b1a
Show file tree

Hide file tree

Showing 31 changed files with 127 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Changelog
 
+## v2.3.5
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.3.4...v2.3.5)
+
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-tide-api:** Passed headers to route, page and publication menu endpoints ([e760940d](https://github.com/dpc-sdp/ripple-framework/commit/e760940d))
+
+### ❤️  Contributors
+
+- Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
+
+## v2.3.4
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.3.3...v2.3.4)
+
+
+### 🚀 Enhancements
+
+  - **@dpc-sdp/ripple-tide-publication:** Added proper publication header mapping ([aa657deb](https://github.com/dpc-sdp/ripple-framework/commit/aa657deb))
+
+### 🩹 Fixes
+
+  - **nuxt-ripple:** 🐛  enable external redirects ([6c0e4894](https://github.com/dpc-sdp/ripple-framework/commit/6c0e4894))
+  - **@dpc-sdp/nuxt-ripple:** Fixed console error when request event was being fetched client side ([b8f94314](https://github.com/dpc-sdp/ripple-framework/commit/b8f94314))
+  - **@dpc-sdp/ripple-tide-publication:** Fixed duplication side nav links ([a08742e4](https://github.com/dpc-sdp/ripple-framework/commit/a08742e4))
+
+### 🏡 Chore
+
+  - **@dpc-sdp/ripple-tide-publication:** 🐛  [R20-1574] fix publication preview menu issue ([b737e32b](https://github.com/dpc-sdp/ripple-framework/commit/b737e32b))
+  - **@dpc-sdp/ripple-tide-publication:** 🚨  fix unused var ([acd09f34](https://github.com/dpc-sdp/ripple-framework/commit/acd09f34))
+
+### ❤️  Contributors
+
+- Dylan Kelly <dylan.kelly@dpc.vic.gov.au>
+- Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
+- Jason Smith <jason.smith@dpc.vic.gov.au>
+
 ## v2.3.3
 
 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.3.2...v2.3.3)

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.3",
+  "version": "2.3.5",
   "npmClient": "pnpm",
   "exact": true,
   "command": {

diff --git a/packages/eslint-config-ripple/package.json b/packages/eslint-config-ripple/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/eslint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",

diff --git a/packages/nuxt-ripple-analytics/package.json b/packages/nuxt-ripple-analytics/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/nuxt-ripple-analytics",
   "description": "Nuxt module for handling event tracking.",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/nuxt-ripple-cli/package.json b/packages/nuxt-ripple-cli/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/nuxt-ripple-cli",
   "description": "A CLI for simplifying common setup and scaffolding tasks",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",

diff --git a/packages/nuxt-ripple-preview/package.json b/packages/nuxt-ripple-preview/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/nuxt-ripple-preview",
   "description": "Adds support for drupal preview links in Ripple frontend sites",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/nuxt-ripple/composables/use-merge-section-tags.ts b/packages/nuxt-ripple/composables/use-merge-section-tags.ts
@@ -12,9 +12,11 @@ const mergeTags = (existingTags: string, newTags: string): string => {
 export const useMergeSectionTags = async (
   sectionCacheTags: any
 ): Promise<void> => {
+  // event will be undefined if the request is on the client side
   const event = useRequestEvent()
+
   // Section.io cache tags must be set on the response header to invalidate the cache after a change in drupal
-  if (sectionCacheTags) {
+  if (event && sectionCacheTags) {
     const currentResponseHeaders = getResponseHeaders(event)
 
     const currentSectionTags: string =

diff --git a/packages/nuxt-ripple/composables/use-tide-page.ts b/packages/nuxt-ripple/composables/use-tide-page.ts
@@ -88,7 +88,8 @@ export const useTidePage = async (
         case '305':
         case '307':
           await navigateTo(data.value.redirect_url, {
-            redirectCode: data.value.status_code
+            redirectCode: data.value.status_code,
+            external: data.value.redirect_type === 'external'
           })
           break
         default:

diff --git a/packages/nuxt-ripple/package.json b/packages/nuxt-ripple/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/nuxt-ripple",
   "description": "Nuxt module for integrating Ripple and Tide",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/nuxt-ripple/server/api/tide/page.ts b/packages/nuxt-ripple/server/api/tide/page.ts
@@ -9,10 +9,7 @@ import {
 import { createHandler, TidePageApi } from '@dpc-sdp/ripple-tide-api'
 import { BadRequestError } from '@dpc-sdp/ripple-tide-api/errors'
 import { useNitroApp } from '#imports'
-import {
-  isPreviewPath,
-  AuthCookieNames
-} from '@dpc-sdp/nuxt-ripple-preview/utils'
+import { AuthCookieNames } from '@dpc-sdp/nuxt-ripple-preview/utils'
 
 export const createPageHandler = async (
   event: H3Event,
@@ -32,8 +29,7 @@ export const createPageHandler = async (
     const tokenCookie = getCookie(event, AuthCookieNames.ACCESS_TOKEN)
     const headers = {}
 
-    // Only add the access token to the headers if the path is a preview path
-    if (isPreviewPath(query.path)) {
+    if (tokenCookie) {
       headers['X-OAuth2-Authorization'] = `Bearer ${tokenCookie}`
     }
 
@@ -45,7 +41,7 @@ export const createPageHandler = async (
     )
 
     // Need to pass on the section cache tags to the nuxt app
-    if (pageResponse.headers) {
+    if (pageResponse.headers && pageResponse.headers['section-cache-tags']) {
       setResponseHeader(
         event,
         'section-cache-tags',

diff --git a/packages/nuxt-ripple/server/api/tide/site.ts b/packages/nuxt-ripple/server/api/tide/site.ts
@@ -18,11 +18,13 @@ export const createSiteHandler = async (
     const siteResponse = await tideSiteApi.getSiteData(query.id)
 
     // Need to pass on the section cache tags to the nuxt app
-    setResponseHeader(
-      event,
-      'section-cache-tags',
-      siteResponse.headers['section-cache-tags']
-    )
+    if (siteResponse.headers && siteResponse.headers['section-cache-tags']) {
+      setResponseHeader(
+        event,
+        'section-cache-tags',
+        siteResponse.headers['section-cache-tags']
+      )
+    }
 
     return siteResponse.data
   })

diff --git a/packages/ripple-storybook/package.json b/packages/ripple-storybook/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "ripple-storybook",
   "description": "Ripple Storybook instance",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "private": true,
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/ripple-test-utils/package.json b/packages/ripple-test-utils/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.0.0",
   "name": "@dpc-sdp/ripple-test-utils",
   "description": "Test utils for Ripple sites",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/config/index.js",

diff --git a/packages/ripple-tide-api/package.json b/packages/ripple-tide-api/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-api",
   "description": "Ripple API endpoints for Tide Drupal backend",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",

diff --git a/packages/ripple-tide-api/src/services/tide-page.ts b/packages/ripple-tide-api/src/services/tide-page.ts
@@ -84,12 +84,12 @@ export default class TidePageApi extends TideApiBase {
     }
   }
 
-  async getRouteByPath(path: string, site: string = this.site) {
+  async getRouteByPath(path: string, site: string = this.site, headers = {}) {
     this.path = path
 
     const routeUrl = `/route?site=${site}&path=${path}`
 
-    return this.get(routeUrl)
+    return this.get(routeUrl, { headers })
       .then((response) => response?.data?.data?.attributes)
       .catch((error) => {
         throw new NotFoundError(
@@ -117,7 +117,7 @@ export default class TidePageApi extends TideApiBase {
       return this.getPageFromPreviewLink(path, site, params, headers)
     }
 
-    const route = await this.getRouteByPath(path, site)
+    const route = await this.getRouteByPath(path, site, headers)
     if (route && !route.error) {
       if (route.hasOwnProperty('redirect_type')) {
         return {
@@ -135,7 +135,7 @@ export default class TidePageApi extends TideApiBase {
       if (includes !== '') {
         fullParams['include'] = includes
       }
-      return this.getPageByRouteData(route, { params: fullParams })
+      return this.getPageByRouteData(route, { params: fullParams, headers })
     }
   }
 

diff --git a/packages/ripple-tide-event/package.json b/packages/ripple-tide-event/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-event",
   "description": "Ripple mappings and components for Tide Event Content type",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

diff --git a/packages/ripple-tide-grant/package.json b/packages/ripple-tide-grant/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-grant",
   "description": "Ripple mappings and components for Tide Grant Content type",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-landing-page/mapping/index.ts b/packages/ripple-tide-landing-page/mapping/index.ts
@@ -86,4 +86,8 @@ const tideLandingPageModule: IRplTideModuleMapping = {
 
 export default tideLandingPageModule
 
-export { secondaryCampaignIncludes, secondaryCampaignMapping }
+export {
+  secondaryCampaignIncludes,
+  secondaryCampaignMapping,
+  heroHeaderMapping
+}
diff --git a/packages/ripple-tide-landing-page/package.json b/packages/ripple-tide-landing-page/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-landing-page",
   "description": "Ripple mappings and components for Tide landing-page Content type",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-media/package.json b/packages/ripple-tide-media/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-media",
   "description": "Ripple mappings and components for Tide media",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-news/package.json b/packages/ripple-tide-news/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-news",
   "description": "Ripple mappings and components for Tide News content type",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

diff --git a/packages/ripple-tide-publication/mapping/publication-page.ts b/packages/ripple-tide-publication/mapping/publication-page.ts
@@ -5,6 +5,7 @@ import {
   tidePageBaseIncludes
 } from '@dpc-sdp/nuxt-ripple/mapping'
 import type { IRplTideModuleMapping } from '@dpc-sdp/ripple-tide-api/types'
+import { heroHeaderMapping } from '@dpc-sdp/ripple-tide-landing-page/mapping'
 
 const tidePublicationPageModule: IRplTideModuleMapping = {
   mapping: {
@@ -22,10 +23,7 @@ const tidePublicationPageModule: IRplTideModuleMapping = {
       }
       return 'h2'
     },
-    header: {
-      title: 'title',
-      summary: 'field_landing_page_intro_text'
-    },
+    header: heroHeaderMapping,
     breadcrumbs: (src: string) => [
       { text: 'Home', url: '/' },
       {
@@ -90,7 +88,9 @@ const tidePublicationPageModule: IRplTideModuleMapping = {
     'field_landing_page_contact.field_paragraph_phones',
     'field_landing_page_contact.field_paragraph_social_media',
     'field_landing_page_component.field_paragraph_media.field_media_image',
-    'field_landing_page_component.field_paragraph_topic'
+    'field_landing_page_component.field_paragraph_topic',
+    'field_landing_page_hero_image',
+    'field_landing_page_hero_image.field_media_image'
   ]
 }
 

diff --git a/packages/ripple-tide-publication/mapping/publication.ts b/packages/ripple-tide-publication/mapping/publication.ts
@@ -5,6 +5,7 @@ import {
   tidePageBaseIncludes
 } from '@dpc-sdp/nuxt-ripple/mapping'
 import type { IRplTideModuleMapping } from '@dpc-sdp/ripple-tide-api/types'
+import { heroHeaderMapping } from '@dpc-sdp/ripple-tide-landing-page/mapping'
 
 const chapters = (src: string) =>
   getField(src, 'publication_children')
@@ -24,10 +25,7 @@ const tidePublicationModule: IRplTideModuleMapping = {
       withSidebarSocialShare: true
     }),
     url: 'path.url',
-    header: {
-      title: 'title',
-      summary: 'field_landing_page_intro_text'
-    },
+    header: heroHeaderMapping,
     summary: 'field_landing_page_summary',
     showInPageNav: 'field_show_table_of_content',
     inPageNavHeadingLevel: (src) => {
@@ -84,6 +82,7 @@ const tidePublicationModule: IRplTideModuleMapping = {
     'field_node_documents.field_media_file',
     'field_landing_page_contact.field_paragraph_phones',
     'field_landing_page_contact.field_paragraph_social_media',
+    'field_landing_page_hero_image',
     'field_landing_page_hero_image.field_media_image',
     'field_license_type',
     'field_landing_page_component.field_complex_image_media.field_media_image',

diff --git a/packages/ripple-tide-publication/package.json b/packages/ripple-tide-publication/package.json
@@ -2,7 +2,7 @@
   "packageManager": "pnpm@8.6.2",
   "name": "@dpc-sdp/ripple-tide-publication",
   "description": "Ripple mappings and components for Tide Publication Content type",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",