Merge branch 'release/1.30.0'

.circleci/config.yml

@@ -321,6 +321,7 @@ workflows:
           requires:
             - confirm-release
             - tag-release
+
   # Publish canary prerelease to NPM for testing on client sites
   canary-npm-release:
     when:
@@ -342,3 +343,63 @@ workflows:
       - tag-release:
           requires:
             - create-prerelease
+
+  nightwatch:
+    when: << pipeline.parameters.e2e >>
+    jobs:
+      - sdp-test/smoke:
+          filters:
+            branches:
+              only:
+                - /^release\/.*/
+          context:
+            - e2e-test
+            - e2e-test-open
+          be_url: << pipeline.parameters.e2e_be_url >>
+          fe_url: << pipeline.parameters.e2e_fe_url >>
+          project: << pipeline.parameters.e2e_project >>
+          browser: 'chrome'
+      # Make sure the Backend has passed test first.
+      - sdp-test/e2e-be:
+          filters:
+            branches:
+              only:
+                - /^release\/.*/
+          context:
+            - e2e-test
+            - e2e-test-open
+          be_url: << pipeline.parameters.e2e_be_url >>
+          project: << pipeline.parameters.e2e_project >>
+          browser: 'chrome'
+      - sdp-test/e2e:
+          name: sdp-test/e2eChrome
+          filters:
+            branches:
+              only:
+                - /^release\/.*/
+          requires:
+            - sdp-test/smoke
+            - sdp-test/e2e-be
+          context:
+            - e2e-test
+            - e2e-test-open
+          be_url: << pipeline.parameters.e2e_be_url >>
+          fe_url: << pipeline.parameters.e2e_fe_url >>
+          project: << pipeline.parameters.e2e_project >>
+          browser: 'chrome'
+      - sdp-test/e2e:
+          name: sdp-test/e2eAndroid
+          filters:
+            branches:
+              only:
+                - /^release\/.*/
+          requires:
+            - sdp-test/smoke
+            - sdp-test/e2e-be
+          context:
+            - e2e-test
+            - e2e-test-open
+          be_url: << pipeline.parameters.e2e_be_url >>
+          fe_url: << pipeline.parameters.e2e_fe_url >>
+          project: << pipeline.parameters.e2e_project >>
+          browser: 'androidChrome'

.lagoon.yml

@@ -9,6 +9,11 @@ tasks:
             . /app/scripts/jira-post-comment.sh $JIRA_ENDPOINT $JIRA_USERNAME $JIRA_PASSWORD $LAGOON_PR_HEAD_BRANCH $LAGOON_ROUTES "$LAGOON_PR_TITLE"
           fi
         service: app
+    - run:
+        name: Trigger Nightwatch E2E Tests CI
+        command: |-
+          . /app/scripts/trigger-e2e.sh
+        service: app
 
 environments:
   master:

examples/basic-examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basic-examples",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "Example site for showing how to add custom work",
   "private": true,
   "scripts": {
@@ -21,7 +21,7 @@
     "start:build": "nuxt build --modern=client && nuxt start --modern=client"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-nuxt-tide": "1.29.3",
+    "@dpc-sdp/ripple-nuxt-tide": "1.30.0",
     "dotenv": "^5.0.1",
     "nuxt": "2.15.2",
     "run-script-os": "^1.1.3"
@@ -34,7 +34,7 @@
     "@babel/plugin-transform-runtime": "^7.12.13",
     "@babel/preset-env": "^7.12.13",
     "@babel/runtime": "^7.12.13",
-    "@dpc-sdp/ripple-test-tools": "1.29.3",
+    "@dpc-sdp/ripple-test-tools": "1.30.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.8.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",

examples/reference/nuxt.config.js

@@ -136,7 +136,7 @@ export default {
   * See https://www.npmjs.com/package/@dpc-sdp/ripple-nuxt-ui
   */
   ripple: {
-    viclogo: false,
+    viclogo: true,
     viclogoFooter: false
   },
   /*

examples/reference/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reference",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "Reference nuxt site using Ripple front end and connecting to Tide backend",
   "private": true,
   "scripts": {
@@ -20,8 +20,8 @@
     "start:build": "nuxt build --modern=client && nuxt start --modern=client"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-data-vic-api": "1.29.3",
-    "@dpc-sdp/ripple-nuxt-tide": "1.29.3",
+    "@dpc-sdp/ripple-data-vic-api": "1.30.0",
+    "@dpc-sdp/ripple-nuxt-tide": "1.30.0",
     "@nuxtjs/gtm": "^2.4.0",
     "@nuxtjs/robots": "^2.0.0",
     "dotenv": "^5.0.1",
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.12.13",
     "@babel/eslint-plugin": "^7.12.13",
-    "@dpc-sdp/ripple-test-tools": "1.29.3",
+    "@dpc-sdp/ripple-test-tools": "1.30.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^7.0.3",
     "eslint": "^7.19.0",

examples/reference/tide/tide.content-collection.js

@@ -1,13 +1,26 @@
 import ContentCollection from '@dpc-sdp/ripple-nuxt-tide/modules/landing-page/lib/content-collection'
 
 export default class CustomContentCollection extends ContentCollection {
+  // eslint-disable-next-line no-useless-constructor
   constructor (configuration, searchEndpoint, environment) {
     super(configuration, searchEndpoint, environment)
-    console.log('Running custom content collection constructor')
   }
 
   // Overrides the default and adds custom to the start
   getTitle () {
     return this.config.title
   }
+
+  getSimpleDSLSort (state) {
+    if (state.q && state.q.length > 0) {
+      return []
+    }
+    const contentTypes = this.getSimpleDSLContentTypes()
+    // sort news content type by the news item date
+    if (contentTypes.type.includes('news')) {
+      return [{ field_news_date: 'desc' }, { created: 'desc' }]
+    }
+    // All other items sorted by created date
+    return [{ created: 'desc' }]
+  }
 }

examples/vue-example-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ripple-app",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "Example Vue.js app(Not Nuxt.js) for showing how to use Ripple",
   "private": true,
   "scripts": {
@@ -14,17 +14,17 @@
     "test:dev": "cross-env NODE_ENV=test start-server-and-test serve http://localhost:3000 cy:open"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-accordion": "1.29.3",
-    "@dpc-sdp/ripple-button": "1.29.3",
-    "@dpc-sdp/ripple-card": "1.29.3",
-    "@dpc-sdp/ripple-markup": "1.29.3",
+    "@dpc-sdp/ripple-accordion": "1.30.0",
+    "@dpc-sdp/ripple-button": "1.30.0",
+    "@dpc-sdp/ripple-card": "1.30.0",
+    "@dpc-sdp/ripple-markup": "1.30.0",
     "core-js": "^3.8.1",
     "vue": "^2.6.12"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.12.13",
     "@babel/eslint-plugin": "^7.12.13",
-    "@dpc-sdp/ripple-test-tools": "1.29.3",
+    "@dpc-sdp/ripple-test-tools": "1.30.0",
     "@vue/babel-preset-app": "^4.5.11",
     "@vue/cli-plugin-babel": "^4.5.11",
     "@vue/cli-plugin-eslint": "^4.5.11",

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.29.3",
+  "version": "1.30.0",
   "exact": true,
   "npmClient": "yarn",
   "useWorkspaces": true,

packages/components/Atoms/Button/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-button",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "A button themed element. Will be a `<button>` by default, or a an `<a>` if a `href` is provided.",
   "license": "Apache-2.0",
   "main": "index.vue",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.29.3",
-    "@dpc-sdp/ripple-link": "1.29.3"
+    "@dpc-sdp/ripple-global": "1.30.0",
+    "@dpc-sdp/ripple-link": "1.30.0"
   }
 }

packages/components/Atoms/Global/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-global",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "The core styles and utilities used by all ripple components. Includes sets of colours, fonts, breakpoints.",
   "license": "Apache-2.0",
   "main": "./index.js",

packages/components/Atoms/Grid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-grid",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "A grid system for page layout.",
   "license": "Apache-2.0",
   "main": "index.js",

packages/components/Atoms/Icon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-icon",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "A configurable SVG, sprite-based icon set for use with ripple components.",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,6 +10,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.29.3"
+    "@dpc-sdp/ripple-global": "1.30.0"
   }
 }

packages/components/Atoms/Link/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-link",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "Components for creating page links in plain text, and with accompanying icon. External links open in a new window by default.",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.29.3",
-    "@dpc-sdp/ripple-icon": "1.29.3"
+    "@dpc-sdp/ripple-global": "1.30.0",
+    "@dpc-sdp/ripple-icon": "1.30.0"
   }
 }

packages/components/Atoms/MetaTag/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-meta-tag",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "A link component to represent tags.",
   "license": "Apache-2.0",
   "main": "index.vue",
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.29.3",
-    "@dpc-sdp/ripple-link": "1.29.3"
+    "@dpc-sdp/ripple-global": "1.30.0",
+    "@dpc-sdp/ripple-link": "1.30.0"
   }
 }

packages/components/Atoms/ResponsiveImg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-responsive-img",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "A component which renders an image with optimised sources for each breakpoint using kraken.io querystrings",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,6 +10,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.29.3"
+    "@dpc-sdp/ripple-global": "1.30.0"
   }
 }

packages/components/Molecules/Alert/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpc-sdp/ripple-alert",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "A set of components to display alert notifications.",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -10,8 +10,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@dpc-sdp/ripple-global": "1.29.3",
-    "@dpc-sdp/ripple-icon": "1.29.3",
-    "@dpc-sdp/ripple-link": "1.29.3"
+    "@dpc-sdp/ripple-global": "1.30.0",
+    "@dpc-sdp/ripple-icon": "1.30.0",
+    "@dpc-sdp/ripple-link": "1.30.0"
   }
 }

packages/components/Molecules/AnchorLinks/index.vue

@@ -7,7 +7,25 @@
       <ul v-if="links" class="rpl-anchor-links__items">
         <li v-for="(item, index) of links" :key="index" :class="['rpl-anchor-links__item', {'rpl-anchor-links__item--indent': (item.type && item.type === 'h3')}]">
           <rpl-icon v-if="(item.type && item.type === 'h3')" class="rpl-anchor-links__item--indent-icon" symbol="list_indent" size="1.05"/>
-          <rpl-text-link :url="item.url" :text="item.text" :underline="true" size="small" />
+          <a
+            v-if="item.index && item.index > 0"
+            @click="triggerComponent(item)"
+            :href="item.url"
+            class="rpl-link rpl-text-link rpl-text-link--underline"
+          >
+            <span class="rpl-link__inner">
+              <span class="rpl-text-label rpl-text-label--small rpl-text-label--small--underline">
+                <span>{{item.text}}</span>
+              </span>
+            </span>
+          </a>
+          <rpl-text-link
+            v-else
+            :url="item.url"
+            :text="item.text"
+            :underline="true"
+            size="small"
+          />
         </li>
       </ul>
     </div>
@@ -18,6 +36,7 @@
 import { RplTextLink } from '@dpc-sdp/ripple-link'
 import { RplIcon } from '@dpc-sdp/ripple-icon'
 import rtl from '@dpc-sdp/ripple-global/mixins/rtl.js'
+import { RplAccordionEventBus } from '@dpc-sdp/ripple-accordion'
 
 export default {
   name: 'RplAnchorLinks',
@@ -29,6 +48,14 @@ export default {
   components: {
     RplTextLink,
     RplIcon
+  },
+  methods: {
+    triggerComponent: function (item) {
+      RplAccordionEventBus.$emit('open-panel', {
+        url: item.url,
+        index: item.index - 1 // post-render decode (0 index is falsy)
+      })
+    }
   }
 }
 </script>