Release/2.3.4

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 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 <[email protected]>
+- Jeffrey Dowdle <[email protected]>
+- Jason Smith <[email protected]>
+
 ## v2.3.3
 
 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.3.2...v2.3.3)

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.3",
+  "version": "2.3.4",
   "npmClient": "pnpm",
   "exact": true,
   "command": {

packages/eslint-config-ripple/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/eslint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",

packages/nuxt-ripple-analytics/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/nuxt-ripple-analytics",
   "description": "Nuxt module for handling event tracking.",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

packages/nuxt-ripple-cli/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/nuxt-ripple-cli",
   "description": "A CLI for simplifying common setup and scaffolding tasks",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",

packages/nuxt-ripple-preview/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/nuxt-ripple-preview",
   "description": "Adds support for drupal preview links in Ripple frontend sites",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

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 =

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:

packages/nuxt-ripple/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/nuxt-ripple",
   "description": "Nuxt module for integrating Ripple and Tide",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

packages/ripple-storybook/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "ripple-storybook",
   "description": "Ripple Storybook instance",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "private": true,
   "repository": "https://github.com/dpc-sdp/ripple-framework",

packages/ripple-test-utils/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-test-utils",
   "description": "Test utils for Ripple sites",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/config/index.js",

packages/ripple-tide-api/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-tide-api",
   "description": "Ripple API endpoints for Tide Drupal backend",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",

packages/ripple-tide-event/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-tide-event",
   "description": "Ripple mappings and components for Tide Event Content type",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

packages/ripple-tide-grant/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-tide-grant",
   "description": "Ripple mappings and components for Tide Grant Content type",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

packages/ripple-tide-landing-page/mapping/index.ts

@@ -85,3 +85,9 @@ const tideLandingPageModule: IRplTideModuleMapping = {
 }
 
 export default tideLandingPageModule
+
+export {
+  secondaryCampaignIncludes,
+  secondaryCampaignMapping,
+  heroHeaderMapping
+}

packages/ripple-tide-landing-page/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "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.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

packages/ripple-tide-media/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-tide-media",
   "description": "Ripple mappings and components for Tide media",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

packages/ripple-tide-news/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-tide-news",
   "description": "Ripple mappings and components for Tide News content type",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

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: '/' },
       {
@@ -92,7 +90,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'
   ]
 }
 

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',

packages/ripple-tide-publication/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-tide-publication",
   "description": "Ripple mappings and components for Tide Publication Content type",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

packages/ripple-tide-publication/server/api/tide/publication-index.ts

@@ -1,10 +1,7 @@
 import jsonapiParse from 'jsonapi-parse'
 import { defineEventHandler, getQuery, H3Event } from 'h3'
 import { createHandler, TideApiBase, logger } from '@dpc-sdp/ripple-tide-api'
-import {
-  ApplicationError,
-  BadRequestError
-} from '@dpc-sdp/ripple-tide-api/errors'
+import { BadRequestError } from '@dpc-sdp/ripple-tide-api/errors'
 import type {
   RplTideModuleConfig,
   IRplTideModuleMapping,
@@ -69,10 +66,8 @@ class TidePublicationIndexApi extends TideApiBase {
       )
       return siteData
     } catch (error: any) {
-      // Could be 404?
-      throw new ApplicationError('Error fetching publication index', {
-        cause: error
-      })
+      // Could be 404? publication could be in share or preview so need to ignore this error and render page anyway
+      logger.error(`Error fetching publication index`, error)
     }
   }
 }

packages/ripple-tide-publication/utils/processMenu.ts

@@ -17,37 +17,27 @@ const parseChildren = (node: indexNode, route: RouteRecord): indexNode[] => {
   )
 }
 
-const transformNode = (node: indexNode, route: RouteRecord): indexNode[] => {
-  const parent: indexNode = {
-    text: node.text,
-    url: node.url,
-    id: node.id,
-    active: node.url === route.path,
-    items: undefined
-  }
-
-  return [parent, ...parseChildren(node, route)]
+const processMenu = (res: indexNode, route: RouteRecord): indexNode[] => {
+  return [
+    {
+      text: res.text,
+      url: res.url,
+      id: res.id,
+      active: res.url === route.path,
+      items: undefined
+    },
+    ...((res.items || []).map(
+      (child: indexNode): indexNode => ({
+        text: child.text,
+        url: child.url,
+        id: child.id,
+        active: route.path.includes(child.url),
+        items:
+          // Group chapter together (child with its children)
+          child.items ? parseChildren(child, route) : undefined
+      })
+    ) as any[])
+  ]
 }
 
-const processMenu = (res: indexNode, route: RouteRecord): indexNode[] => [
-  {
-    text: res.text,
-    url: res.url,
-    id: res.id,
-    active: res.url === route.path,
-    items: undefined
-  },
-  ...((res.items || []).map(
-    (child: indexNode): indexNode => ({
-      text: child.text,
-      url: child.url,
-      id: child.id,
-      active: route.path.includes(child.url),
-      items:
-        // Group chapter together (child with its children)
-        child.items ? transformNode(child, route) : undefined
-    })
-  ) as any[])
-]
-
 export { type indexNode, processMenu }

packages/ripple-tide-search/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-tide-search",
   "description": "Ripple search UI and services for connecting to Tide search",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

packages/ripple-tide-topic/package.json

@@ -9,7 +9,7 @@
     "./mapping": "./mapping/index.ts",
     "./types": "./types.ts"
   },
-  "version": "2.3.3",
+  "version": "2.3.4",
   "dependencies": {
     "@dpc-sdp/nuxt-ripple": "workspace:*",
     "@dpc-sdp/ripple-tide-api": "workspace:*",

packages/ripple-ui-core/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-ui-core",
   "description": "Ripple UI Core component library",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [

packages/ripple-ui-forms/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/ripple-ui-forms",
   "description": "A form component library built with Formkit",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/rpl-forms.umd.js",

packages/stylelint-config-ripple/package.json

@@ -2,7 +2,7 @@
   "packageManager": "[email protected]",
   "name": "@dpc-sdp/stylelint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",