From f46ed87fb041c75f84aba5c937589f0993a85f05 Mon Sep 17 00:00:00 2001 From: Jeffrey Dowdle Date: Wed, 7 Aug 2024 12:07:08 +1000 Subject: [PATCH 1/4] fix(@dpc-sdp/ripple-tide-api): :bug: fixed getTaxonomy only getting first 50 items --- .../ripple-tide-api/src/services/tide-page.ts | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/packages/ripple-tide-api/src/services/tide-page.ts b/packages/ripple-tide-api/src/services/tide-page.ts index 73a4aad296..168cb8afe4 100644 --- a/packages/ripple-tide-api/src/services/tide-page.ts +++ b/packages/ripple-tide-api/src/services/tide-page.ts @@ -327,10 +327,10 @@ export default class TidePageApi extends TideApiBase { async getEntityList( entityType, bundle, - filtering, - includes, - pagination, - sorting, + filtering?, + includes?, + pagination?, + sorting?, { allPages = true } = {} ) { const params: Record = { @@ -442,20 +442,8 @@ export default class TidePageApi extends TideApiBase { } async getTaxonomy(taxonomyName: string) { - const params = { - site: this.site - } try { - const { data: response } = await this.get( - `/taxonomy_term/${taxonomyName}`, - { - params - } - ) - if (response) { - const resource = jsonapiParse.parse(response).data - return resource - } + return await this.getEntityList('taxonomy_term', taxonomyName) } catch (error: any) { throw new ApplicationError('Error fetching taxonomy', { cause: error }) } From fb738364eac6158404ed23c071793263e0e6c5f6 Mon Sep 17 00:00:00 2001 From: Dylan Kelly Date: Thu, 8 Aug 2024 16:25:18 +1000 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=F0=9F=94=96=20release=20ripple=20?= =?UTF-8?q?2.13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 13 +++++++++++++ lerna.json | 2 +- packages/eslint-config-ripple/package.json | 2 +- packages/nuxt-ripple-analytics/package.json | 2 +- packages/nuxt-ripple-cli/package.json | 2 +- packages/nuxt-ripple-preview/package.json | 2 +- packages/nuxt-ripple/package.json | 2 +- packages/ripple-sdp-core/package.json | 2 +- packages/ripple-storybook/package.json | 2 +- packages/ripple-test-utils/package.json | 2 +- packages/ripple-tide-api/package.json | 2 +- packages/ripple-tide-event/package.json | 2 +- packages/ripple-tide-grant/package.json | 2 +- packages/ripple-tide-landing-page/package.json | 2 +- packages/ripple-tide-media/package.json | 2 +- packages/ripple-tide-news/package.json | 2 +- packages/ripple-tide-publication/package.json | 2 +- packages/ripple-tide-search/package.json | 2 +- packages/ripple-tide-topic/package.json | 2 +- packages/ripple-tide-webform/package.json | 2 +- packages/ripple-ui-core/package.json | 2 +- packages/ripple-ui-forms/package.json | 2 +- packages/ripple-ui-maps/package.json | 2 +- packages/stylelint-config-ripple/package.json | 2 +- 24 files changed, 36 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77011bef5e..d585c04b7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## v2.13.1 + +[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.13.0...v2.13.1) + + +### 🩹 Fixes + + - **@dpc-sdp/ripple-tide-api:** 🐛 fixed getTaxonomy only getting first 50 items ([f46ed87fb](https://github.com/dpc-sdp/ripple-framework/commit/f46ed87fb)) + +### ❤️ Contributors + +- Jeffrey Dowdle + ## v2.13.0 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.12.0...v2.13.0) diff --git a/lerna.json b/lerna.json index 118d6b6828..1fff1fe847 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.13.0", + "version": "2.13.1", "npmClient": "pnpm", "exact": true, "command": { diff --git a/packages/eslint-config-ripple/package.json b/packages/eslint-config-ripple/package.json index d006e83318..7ef2111936 100644 --- a/packages/eslint-config-ripple/package.json +++ b/packages/eslint-config-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/eslint-config-ripple", "description": "ESLint config for Ripple projects", - "version": "2.13.0", + "version": "2.13.1", "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 index 86841feecf..fd227ab704 100644 --- a/packages/nuxt-ripple-analytics/package.json +++ b/packages/nuxt-ripple-analytics/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-analytics", "description": "Nuxt module for handling event tracking.", - "version": "2.13.0", + "version": "2.13.1", "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 index 781841ef8b..ccc88551a7 100644 --- a/packages/nuxt-ripple-cli/package.json +++ b/packages/nuxt-ripple-cli/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-cli", "description": "A CLI for simplifying common setup and scaffolding tasks", - "version": "2.13.0", + "version": "2.13.1", "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 index bc0a3358c3..177fd7b033 100644 --- a/packages/nuxt-ripple-preview/package.json +++ b/packages/nuxt-ripple-preview/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple-preview", "description": "Adds support for drupal preview links in Ripple frontend sites", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/nuxt-ripple/package.json b/packages/nuxt-ripple/package.json index a7ff50e3ae..e1b7ddbd0c 100644 --- a/packages/nuxt-ripple/package.json +++ b/packages/nuxt-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/nuxt-ripple", "description": "Nuxt module for integrating Ripple and Tide", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "main": "./nuxt.config.ts", "repository": "https://github.com/dpc-sdp/ripple-framework", diff --git a/packages/ripple-sdp-core/package.json b/packages/ripple-sdp-core/package.json index 1a49f9d3f1..a70c5b00c0 100644 --- a/packages/ripple-sdp-core/package.json +++ b/packages/ripple-sdp-core/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-sdp-core", "description": "SDP core content types", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-storybook/package.json b/packages/ripple-storybook/package.json index dd21539d56..eb8efa1149 100644 --- a/packages/ripple-storybook/package.json +++ b/packages/ripple-storybook/package.json @@ -1,7 +1,7 @@ { "name": "ripple-storybook", "description": "Ripple Storybook instance", - "version": "2.13.0", + "version": "2.13.1", "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 index ef1d874218..4f13476a9b 100644 --- a/packages/ripple-test-utils/package.json +++ b/packages/ripple-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-test-utils", "description": "Test utils for Ripple sites", - "version": "2.13.0", + "version": "2.13.1", "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 index 0e9f290384..17c097757f 100644 --- a/packages/ripple-tide-api/package.json +++ b/packages/ripple-tide-api/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-api", "description": "Ripple API endpoints for Tide Drupal backend", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./dist/index.js", diff --git a/packages/ripple-tide-event/package.json b/packages/ripple-tide-event/package.json index 54667fb821..6ae96f97f4 100644 --- a/packages/ripple-tide-event/package.json +++ b/packages/ripple-tide-event/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-event", "description": "Ripple mappings and components for Tide Event Content type", - "version": "2.13.0", + "version": "2.13.1", "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 index c844338f06..a4aa9d178d 100644 --- a/packages/ripple-tide-grant/package.json +++ b/packages/ripple-tide-grant/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-grant", "description": "Ripple mappings and components for Tide Grant Content type", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-landing-page/package.json b/packages/ripple-tide-landing-page/package.json index 7848e174a2..9e36200abb 100644 --- a/packages/ripple-tide-landing-page/package.json +++ b/packages/ripple-tide-landing-page/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-landing-page", "description": "Ripple mappings and components for Tide landing-page Content type", - "version": "2.13.0", + "version": "2.13.1", "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 index 7ade91d8e3..7e6caf399f 100644 --- a/packages/ripple-tide-media/package.json +++ b/packages/ripple-tide-media/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-media", "description": "Ripple mappings and components for Tide media", - "version": "2.13.0", + "version": "2.13.1", "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 index 3ccda32c81..aaa60c90ee 100644 --- a/packages/ripple-tide-news/package.json +++ b/packages/ripple-tide-news/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-news", "description": "Ripple mappings and components for Tide News content type", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-publication/package.json b/packages/ripple-tide-publication/package.json index 5de3fb9bb8..b5af5f5256 100644 --- a/packages/ripple-tide-publication/package.json +++ b/packages/ripple-tide-publication/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-publication", "description": "Ripple mappings and components for Tide Publication Content type", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-search/package.json b/packages/ripple-tide-search/package.json index 62e0fdbd06..9fdbe0ef19 100644 --- a/packages/ripple-tide-search/package.json +++ b/packages/ripple-tide-search/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-search", "description": "Ripple search UI and services for connecting to Tide search", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-tide-topic/package.json b/packages/ripple-tide-topic/package.json index ef54588474..df8a4d8b3b 100644 --- a/packages/ripple-tide-topic/package.json +++ b/packages/ripple-tide-topic/package.json @@ -9,7 +9,7 @@ "./mapping": "./mapping/index.ts", "./types": "./types.ts" }, - "version": "2.13.0", + "version": "2.13.1", "dependencies": { "@dpc-sdp/nuxt-ripple": "workspace:*", "@dpc-sdp/ripple-tide-api": "workspace:*", diff --git a/packages/ripple-tide-webform/package.json b/packages/ripple-tide-webform/package.json index bf412865a3..265f2c3ac0 100644 --- a/packages/ripple-tide-webform/package.json +++ b/packages/ripple-tide-webform/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-tide-webform", "description": "Ripple mappings and components for Tide webforms", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./nuxt.config.ts", diff --git a/packages/ripple-ui-core/package.json b/packages/ripple-ui-core/package.json index 3bf02c74d7..c4f35a42d1 100644 --- a/packages/ripple-ui-core/package.json +++ b/packages/ripple-ui-core/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-core", "description": "Ripple UI Core component library", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "files": [ diff --git a/packages/ripple-ui-forms/package.json b/packages/ripple-ui-forms/package.json index f42bcb5d1b..4e2c69634e 100644 --- a/packages/ripple-ui-forms/package.json +++ b/packages/ripple-ui-forms/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-forms", "description": "A form component library built with Formkit", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "./dist/rpl-forms.umd.js", diff --git a/packages/ripple-ui-maps/package.json b/packages/ripple-ui-maps/package.json index 62f6a8b8b1..6eeaaf057b 100644 --- a/packages/ripple-ui-maps/package.json +++ b/packages/ripple-ui-maps/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/ripple-ui-maps", "description": "Ripple UI Core component library", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "files": [ diff --git a/packages/stylelint-config-ripple/package.json b/packages/stylelint-config-ripple/package.json index 27c492b404..73f61c5905 100644 --- a/packages/stylelint-config-ripple/package.json +++ b/packages/stylelint-config-ripple/package.json @@ -1,7 +1,7 @@ { "name": "@dpc-sdp/stylelint-config-ripple", "description": "ESLint config for Ripple projects", - "version": "2.13.0", + "version": "2.13.1", "license": "Apache-2.0", "repository": "https://github.com/dpc-sdp/ripple-framework", "main": "index.js", From ed81faa173163242a5832deaf3c6cd85fe33760d Mon Sep 17 00:00:00 2001 From: Bryce Gilhome Date: Tue, 13 Aug 2024 12:07:35 +0930 Subject: [PATCH 3/4] feat(@dpc-sdp/ripple-ui-maps): add clustering distance optional prop, default as current --- packages/ripple-ui-maps/src/components/map/RplMap.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/ripple-ui-maps/src/components/map/RplMap.vue b/packages/ripple-ui-maps/src/components/map/RplMap.vue index 8ff948a6d8..f6e21d8f90 100644 --- a/packages/ripple-ui-maps/src/components/map/RplMap.vue +++ b/packages/ripple-ui-maps/src/components/map/RplMap.vue @@ -50,6 +50,7 @@ interface Props { hasSidePanel?: boolean noresults?: boolean getFeatureTitle?: (feature: any) => string + clusteringDistance?: number } const props = withDefaults(defineProps(), { @@ -75,7 +76,8 @@ const props = withDefaults(defineProps(), { return ic }, noresults: false, - getFeatureTitle: (feature: any) => (feature ? feature.title : '') + getFeatureTitle: (feature: any) => (feature ? feature.title : ''), + clusteringDistance: 100 }) const zoom = ref(props.initialZoom) @@ -365,7 +367,7 @@ const noResultsRef = ref(null) From ad297e4e2ba1021f04eb94f4ec3bb6eaf5adcd6d Mon Sep 17 00:00:00 2001 From: Bryce Gilhome Date: Tue, 13 Aug 2024 12:10:07 +0930 Subject: [PATCH 4/4] feat(@dpc-sdp/ripple-ui-maps): add map stories to demonstrate clustering distance (nearer/disabled) --- .../src/components/map/RplMap.stories.mdx | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/packages/ripple-ui-maps/src/components/map/RplMap.stories.mdx b/packages/ripple-ui-maps/src/components/map/RplMap.stories.mdx index 18ea14bed2..2f56e3be05 100644 --- a/packages/ripple-ui-maps/src/components/map/RplMap.stories.mdx +++ b/packages/ripple-ui-maps/src/components/map/RplMap.stories.mdx @@ -139,4 +139,26 @@ export const Template = (args) => ({ > {Template.bind()} + + {Template.bind()} + + + {Template.bind()} +