From 6af49571594ff6a2f9d444c3ac30a0e04e6ae325 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 10:08:12 +0000 Subject: [PATCH 01/66] Bump nanoid in the npm_and_yarn group across 1 directory Bumps the npm_and_yarn group with 1 update in the / directory: [nanoid](https://github.com/ai/nanoid). Updates `nanoid` from 3.3.7 to 3.3.8 - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] --- package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ecda49a6..674952d6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7586,16 +7586,15 @@ "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, From ad45f51e74a481c36ffc07812bee8c85a23fc0bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bult=C3=A9?= Date: Mon, 16 Dec 2024 10:24:44 +0100 Subject: [PATCH 02/66] chore: remove datasets export --- src/views/datasets/DatasetsListView.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/datasets/DatasetsListView.vue b/src/views/datasets/DatasetsListView.vue index 7d169a1b6..70375e1fd 100644 --- a/src/views/datasets/DatasetsListView.vue +++ b/src/views/datasets/DatasetsListView.vue @@ -23,7 +23,6 @@ import { import { useOrganizationStore } from '@/store/OrganizationStore' import { useSearchStore } from '@/store/SearchStore' import { useTopicStore } from '@/store/TopicStore' -import { useUserStore } from '@/store/UserStore' import { useTopicsConf } from '@/utils/config' defineEmits(['search']) @@ -56,7 +55,6 @@ const loader = useLoading() const queryResults = ref(null) const topicStore = useTopicStore() -const userStore = useUserStore() const selectedTopicId: Ref = ref(null) const selectedOrganizationId: Ref = ref(null) @@ -236,7 +234,8 @@ onMounted(() => { class="fr-grid-row fr-grid-row--gutters fr-grid-row--middle justify-between fr-pb-1w" >

Jeux de données

-
+ +

{{ total }} résultats de recherche pour "{{ query }}". From 0e789503b37fdf50c6892d6cd631992a3ff9d5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Bult=C3=A9?= Date: Mon, 16 Dec 2024 20:19:20 +0100 Subject: [PATCH 03/66] fix: remove iconify cdn (#616) --- configs/ecospheres/config.yaml | 2 +- package-lock.json | 52 ++++--------------- package.json | 1 - src/App.vue | 6 ++- src/components/OrganizationCard.vue | 13 +++-- src/components/SearchComponent.vue | 4 +- src/components/TooltipWrapper.vue | 26 ---------- src/components/VIconCustom.vue | 37 +++++++++++++ src/components/bouquets/BouquetCard.vue | 19 +++++-- .../bouquets/BouquetDatasetAccordionTitle.vue | 2 +- .../bouquets/BouquetDatasetList.vue | 8 +-- .../bouquets/BouquetDatasetListExport.vue | 2 +- src/components/bouquets/BouquetList.vue | 2 +- src/components/forms/bouquet/BouquetForm.vue | 8 +-- src/views/bouquets/BouquetDetailView.vue | 8 +-- src/views/bouquets/BouquetFormView.vue | 2 +- src/views/bouquets/BouquetsListView.vue | 2 +- src/views/datasets/DatasetDetailView.vue | 9 ++-- src/views/datasets/DatasetsListView.vue | 6 ++- vite.config.mts | 10 ++++ 20 files changed, 112 insertions(+), 107 deletions(-) delete mode 100644 src/components/TooltipWrapper.vue create mode 100644 src/components/VIconCustom.vue diff --git a/configs/ecospheres/config.yaml b/configs/ecospheres/config.yaml index 82d46c63c..9d05fde9f 100644 --- a/configs/ecospheres/config.yaml +++ b/configs/ecospheres/config.yaml @@ -261,4 +261,4 @@ indicators: - id: attenuation name: Atténuation - id: biodiversite - name: Biodiversité \ No newline at end of file + name: Biodiversité diff --git a/package-lock.json b/package-lock.json index 674952d6b..d4a6b597a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,6 @@ "vue-matomo": "^4.2.0", "vue-multiselect": "^3.1.0", "vue-router": "^4.4.5", - "vue-tippy": "^6.5.0", "vue3-text-clamp": "^0.1.2", "vue3-toastify": "^0.2.3" }, @@ -1498,16 +1497,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@popperjs/core": { - "version": "2.11.8", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", - "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/@rollup/pluginutils": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", @@ -7005,14 +6994,14 @@ } }, "node_modules/local-pkg": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", - "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.1.tgz", + "integrity": "sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==", "dev": true, "license": "MIT", "dependencies": { - "mlly": "^1.4.2", - "pkg-types": "^1.0.3" + "mlly": "^1.7.3", + "pkg-types": "^1.2.1" }, "engines": { "node": ">=14" @@ -7543,15 +7532,15 @@ "license": "MIT" }, "node_modules/mlly": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz", - "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.3.tgz", + "integrity": "sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.12.1", + "acorn": "^8.14.0", "pathe": "^1.1.2", - "pkg-types": "^1.2.0", + "pkg-types": "^1.2.1", "ufo": "^1.5.4" } }, @@ -9596,15 +9585,6 @@ "node": ">=14.0.0" } }, - "node_modules/tippy.js": { - "version": "6.3.7", - "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz", - "integrity": "sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==", - "license": "MIT", - "dependencies": { - "@popperjs/core": "^2.9.0" - } - }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -10617,18 +10597,6 @@ "vue": "^3.2.0" } }, - "node_modules/vue-tippy": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/vue-tippy/-/vue-tippy-6.5.0.tgz", - "integrity": "sha512-U44UDETTLuZWZGosagslEwgimWQdt1JVSxfWStVPnVdeqo2jo9X5zW3SB04k7JaTFosdgrDhFsUDrd6n42Nh7Q==", - "license": "MIT", - "dependencies": { - "tippy.js": "^6.3.7" - }, - "peerDependencies": { - "vue": "^3.2.0" - } - }, "node_modules/vue-tsc": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.1.6.tgz", diff --git a/package.json b/package.json index 04dded670..b8bffc0fa 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "vue-matomo": "^4.2.0", "vue-multiselect": "^3.1.0", "vue-router": "^4.4.5", - "vue-tippy": "^6.5.0", "vue3-text-clamp": "^0.1.2", "vue3-toastify": "^0.2.3" }, diff --git a/src/App.vue b/src/App.vue index 7daffc030..7119f6873 100644 --- a/src/App.vue +++ b/src/App.vue @@ -40,14 +40,16 @@ const quickLinks = computed(() => { const headerButton = { label: button.label, - icon: 'ri-lightbulb-line', + icon: 'fr-icon-lightbulb-line', href: button.link, iconRight: true } const logLink = { label: isLoggedIn.value ? 'Déconnexion' : 'Se connecter', - icon: isLoggedIn.value ? 'ri-logout-box-r-line' : 'ri-account-circle-line', + icon: isLoggedIn.value + ? 'fr-icon-logout-box-r-line' + : 'fr-icon-account-circle-line', to: isLoggedIn.value ? '/logout' : '/login', iconRight: true } diff --git a/src/components/OrganizationCard.vue b/src/components/OrganizationCard.vue index 8ddc23bed..e98f742a5 100644 --- a/src/components/OrganizationCard.vue +++ b/src/components/OrganizationCard.vue @@ -45,16 +45,16 @@ const isPublicService = (): boolean =>

- {{ organization.name }} -
@@ -94,7 +94,6 @@ const isPublicService = (): boolean => .fr-title-v2__title .badge { color: var(--blue-france-sun-113-625); - width: 0.9rem; } .card__tag { diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue index 2c85248d0..e1064c00d 100644 --- a/src/components/SearchComponent.vue +++ b/src/components/SearchComponent.vue @@ -85,7 +85,7 @@ const dropdownLabel = (text: string) => { label-visible > @@ -130,7 +130,7 @@ const dropdownLabel = (text: string) => {