Merge branch 'release/2.1.4' into develop

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v2.1.4
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.1.3...v2.1.4)
+
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-ui-core:** Fix divider displaying when no cobrand ([f23bc0b5](https://github.com/dpc-sdp/ripple-framework/commit/f23bc0b5))
+
+### ✅ Tests
+
+  - **@dpc-sdp/ripple-ui-core:** ✅  add test for cobrand logo ([dc6806ca](https://github.com/dpc-sdp/ripple-framework/commit/dc6806ca))
+
+### ❤️  Contributors
+
+- Dylan Kelly <[email protected]>
+
 ## v2.1.3
 
 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.1.2...v2.1.3)

examples/nuxt-app/test/features/site/theme.feature

@@ -35,5 +35,6 @@ Feature: Site theme
     And the page endpoint for path "/" returns fixture "/landingpage/image-banner" with status 200
     Given I visit the page "/"
     Then the vic.gov.au logo should not be displayed
+    And the cobrand logo should be displayed
 
 

examples/nuxt-app/test/fixtures/site/disable-vic-logo.json

@@ -6,6 +6,11 @@
     "twitter": {},
     "og": {}
   },
+  "siteLogo": {
+    "href": "/",
+    "src": "https://placehold.co/140x40",
+    "altText": ""
+  },
   "featureFlags": {
     "disablePrimaryLogo": true
   },

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",

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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/config/index.js",

packages/ripple-test-utils/step_definitions/common/site/theme.ts

@@ -39,3 +39,6 @@ Then('the vic.gov.au logo should be displayed', (theme: string) => {
 Then('the vic.gov.au logo should not be displayed', (theme: string) => {
   cy.get(`[aria-label="Victoria government logo"]`).should('not.exist')
 })
+Then('the cobrand logo should be displayed', (theme: string) => {
+  cy.get('.rpl-primary-nav__secondary-logo-image').should('exist')
+})

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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

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.1.3",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",

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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [

packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.vue

@@ -105,7 +105,10 @@ const handleToggleItem = (level: number, item) => {
       </RplLink>
 
       <!-- Logo divider -->
-      <div v-if="secondaryLogo" class="rpl-primary-nav__logo-divider"></div>
+      <div
+        v-if="secondaryLogo && !disablePrimaryLogo"
+        class="rpl-primary-nav__logo-divider"
+      ></div>
 
       <!-- Secondary logo -->
       <RplLink

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.1.3",
+  "version": "2.1.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.1.3",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",