Merge branch 'develop' into feature/R20-1985-content-rating-text

# Conflicts: # packages/nuxt-ripple/mapping/site/index.ts
dpc-sdp · Jul 21, 2024 · 583aac7 · 583aac7
2 parents 28d0cdc + 4e55fb3
commit 583aac7
Show file tree

Hide file tree

Showing 132 changed files with 2,080 additions and 472 deletions.
diff --git a/.github/workflows/components.yml b/.github/workflows/components.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
       - name: Install Dependencies
@@ -37,16 +37,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
         with:
           version: 9.0.6
           run_install: true
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
@@ -60,16 +60,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
         with:
           version: 9.0.6
           run_install: true
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -11,14 +11,14 @@ jobs:
   Docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,14 +4,14 @@ jobs:
   Test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'

diff --git a/.github/workflows/nuxt.yml b/.github/workflows/nuxt.yml
@@ -11,14 +11,14 @@ jobs:
   TestNuxt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
@@ -45,10 +45,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
 

diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
@@ -11,17 +11,17 @@ jobs:
       packages: write
       contents: read
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           registry-url: 'https://npm.pkg.github.com/'
           node-version: 20

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,14 +10,14 @@ jobs:
       packages: write
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           registry-url: 'https://npm.pkg.github.com/'
           node-version: 20

diff --git a/.github/workflows/studio.yml b/.github/workflows/studio.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           version: 9.0.6
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           version: ${{ matrix.node }}
           cache: ${{ steps.pkgman.outputs.cache }}

diff --git a/.github/workflows/vue.yml b/.github/workflows/vue.yml
@@ -11,16 +11,16 @@ jobs:
   Examples:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
 
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'

diff --git a/.github/workflows/webcomponents.yml b/.github/workflows/webcomponents.yml
@@ -11,16 +11,16 @@ jobs:
   Examples:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
 
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,73 @@
 # Changelog
 
+## v2.12.0
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.11.1...v2.12.0)
+
+
+### 🚀 Enhancements
+
+  - **@dpc-sdp/ripple-tide-search:** Adds address search and refactors search suggestions ([46609e3a0](https://github.com/dpc-sdp/ripple-framework/commit/46609e3a0))
+  - ✨  extend formkit input library ([f93e47d7e](https://github.com/dpc-sdp/ripple-framework/commit/f93e47d7e))
+  - **@dpc-sdp/nuxt-ripple-cli:** Update action versions, respect GitHubs prerelease checkbox ([7c91a1dfd](https://github.com/dpc-sdp/ripple-framework/commit/7c91a1dfd))
+  - **@dpc-sdp/ripple-ui-maps:** Default map pin color to primary site color instead of red ([6c21be8a1](https://github.com/dpc-sdp/ripple-framework/commit/6c21be8a1))
+  - **@dpc-sdp/ripple-tide-search:** Added helper components for laying out result tables ([87a470be6](https://github.com/dpc-sdp/ripple-framework/commit/87a470be6))
+  - **@dpc-sdp/ripple-ui-core:** Use classes for list types, remove circle ([3627fb8b1](https://github.com/dpc-sdp/ripple-framework/commit/3627fb8b1))
+  - **@dpc-sdp/ripple-ui-core:** Update component tests ([07829674c](https://github.com/dpc-sdp/ripple-framework/commit/07829674c))
+  - **@dpc-sdp/ripple-tide-api:** Update list plugin ([e86005d53](https://github.com/dpc-sdp/ripple-framework/commit/e86005d53))
+  - **@dpc-sdp/ripple-ui-core:** Add file example to search results ([4a069a7fe](https://github.com/dpc-sdp/ripple-framework/commit/4a069a7fe))
+  - **@dpc-sdp/ripple-tide-api:** Use relative URLs for media files ([48199d668](https://github.com/dpc-sdp/ripple-framework/commit/48199d668))
+  - **@dpc-sdp/ripple-tide-search:** Allow specifying the url text key ([fed98ed31](https://github.com/dpc-sdp/ripple-framework/commit/fed98ed31))
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-ui-core:** Fixed description list missing types ([db90aaceb](https://github.com/dpc-sdp/ripple-framework/commit/db90aaceb))
+  - **@dpc-sdp/ripple-tide-search:** Pass map deadspace to map results hook ([ed11a1468](https://github.com/dpc-sdp/ripple-framework/commit/ed11a1468))
+  - **@dpc-sdp/ripple-ui-maps:** Fixed centreMap util when it's given a custom zoom level ([ef6a21741](https://github.com/dpc-sdp/ripple-framework/commit/ef6a21741))
+  - **@dpc-sdp/nuxt-ripple:** Fallback to value if no URL exists ([b653e76c3](https://github.com/dpc-sdp/ripple-framework/commit/b653e76c3))
+  - **@dpc-sdp/ripple-tide-search:** Add variant prop to locationQueryConfig component ([717ca9985](https://github.com/dpc-sdp/ripple-framework/commit/717ca9985))
+
+### 💅 Refactors
+
+  - ♻️  move layer to nuxt-app ([fbffa9ac9](https://github.com/dpc-sdp/ripple-framework/commit/fbffa9ac9))
+
+### 📦 Build
+
+  - 👷  update actions to node 20 ([b51d24e9c](https://github.com/dpc-sdp/ripple-framework/commit/b51d24e9c))
+  - 👷  update actions to node 20 ([54b46e710](https://github.com/dpc-sdp/ripple-framework/commit/54b46e710))
+
+### 🏡 Chore
+
+  - **@dpc-sdp/ripple-tide-search:** Depricate old suggestions props ([9131e3a63](https://github.com/dpc-sdp/ripple-framework/commit/9131e3a63))
+  - **ripple-ui-forms-ext:** ⚗️  example layer for custom input ([03f5c3c60](https://github.com/dpc-sdp/ripple-framework/commit/03f5c3c60))
+  - Remove unneeded import ([dbc71a6fd](https://github.com/dpc-sdp/ripple-framework/commit/dbc71a6fd))
+  - **@dpc-sdp/nuxt-ripple:** Update label ([5d9dd42c6](https://github.com/dpc-sdp/ripple-framework/commit/5d9dd42c6))
+
+### ✅ Tests
+
+  - **@dpc-sdp/ripple-tide-search:** Added tests for location suggestions ([b6f1be8a4](https://github.com/dpc-sdp/ripple-framework/commit/b6f1be8a4))
+  - **@dpc-sdp/ripple-tide-webform:** ✅  fix unit test ([349ac75c4](https://github.com/dpc-sdp/ripple-framework/commit/349ac75c4))
+  - ✅  add cypress tests for form input extend ([4bdb5a5c4](https://github.com/dpc-sdp/ripple-framework/commit/4bdb5a5c4))
+
+### ❤️  Contributors
+
+- David Featherston <david.featherstone@dpc.vic.gov.au>
+- Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
+- Jason Smith <jason.smith@dpc.vic.gov.au>
+
+## v2.11.1
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.11.0...v2.11.1)
+
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-tide-news:** 🐛  added flag option to remove published time ([50c04d3e1](https://github.com/dpc-sdp/ripple-framework/commit/50c04d3e1))
+
+### ❤️  Contributors
+
+- Dylan Kelly <dylan.kelly@dpc.vic.gov.au>
+
 ## v2.11.0
 
 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.10.3...v2.11.0)

diff --git a/examples/nuxt-app/app.config.ts b/examples/nuxt-app/app.config.ts
@@ -35,6 +35,27 @@ export default defineAppConfig({
         // `dynamicValue` is used in a cypress test to ensure fallbackValues function are called
         dynamicValue: () => ['blue']
       },
+      suggestionsFunctions: {
+        exampleSuggestionsFn: async (query, args) => {
+          return [
+            {
+              id: '1',
+              name: `Test location - ${args.testArg} - 1`,
+              center: [144.9631, -37.8136]
+            },
+            {
+              id: '2',
+              name: `Test location - ${args.testArg} - 2`,
+              center: [-33.8688, 151.2093]
+            },
+            {
+              id: '2',
+              name: `With magic key`,
+              arcGISMagicKey: 'fake1234'
+            }
+          ]
+        }
+      },
       filterFunctions: {
         // `dummyFunctionFilter` is used in a cypress test to check that the correct parameters are passed to custom filter functions
         dummyFunctionFilter: (filterConfig, values) => {

diff --git a/examples/nuxt-app/cypress.config.mjs b/examples/nuxt-app/cypress.config.mjs
@@ -12,7 +12,6 @@ export default defineConfig({
     baseUrl: 'http://localhost:3000',
     specPattern: '**/*.{feature,feature.ts}',
     supportFile: false,
-    supportFolder: './test',
     downloadsFolder: './test/downloads',
     fixturesFolder: './test/fixtures',
     videosFolder: './test/videos',