Feat: regroupement de facteurs #583

narduin · 2024-11-14T20:49:43Z

Ajout de la notion de regroupement group dans les bouquets.

Jusqu'ici:

Ajout du composant Vue 3 Multiselect pour la sélection/création de regroupements.

Test de ce même composant pour la sélection des datasets (quelques bugs en cours).

Fix ecolabdata/ecospheres#145
Fix ecolabdata/ecospheres#491
Fix ecolabdata/ecospheres#518

create disclosure component add group field to datasetEditModal start group logic implementation

netlify · 2024-11-14T20:50:37Z

✅ Deploy Preview for ecospheres ready!

Name	Link
🔨 Latest commit	`de65e2b`
🔍 Latest deploy log	https://app.netlify.com/sites/ecospheres/deploys/6786732758793a0008286a96
😎 Deploy Preview	https://deploy-preview-583--ecospheres.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

netlify · 2024-11-14T20:51:21Z

✅ Deploy Preview for meteo-france ready!

Name	Link
🔨 Latest commit	`de65e2b`
🔍 Latest deploy log	https://app.netlify.com/sites/meteo-france/deploys/67867327b400ad000808719c
😎 Deploy Preview	https://deploy-preview-583--meteo-france.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

abulte

Cool, ça prend déjà forme 😎

package.json

src/components.d.ts

src/components/DisclosureWidget.vue

src/components/bouquets/BouquetDatasetList.vue

src/utils/bouquetGroups.ts

src/components/datasets/DatasetAddToBouquetModal.vue

refactor group selection in datasetAddToBouquetModdal

remove unused dep

sort group alphabetically in composable + styles

small cleanup

abulte

💪 😎

j'ai une erreur en console <path>... au chargement de la page de détails
problème à la suppression du dernier JDD d'un groupe (KO et erreurs console)
les problèmes sur le nouveau select dataset que tu as vues je crois
petite régression sur le style quand pas de JDD

src/components/DisclosureWidget.vue

src/components/forms/dataset/SelectDataset.vue

src/utils/bouquetGroups.ts

narduin · 2024-12-04T11:59:29Z

j'ai une erreur en console <path>... au chargement de la page de détails

Problème d'export svg c'est corrigé !

problème à la suppression du dernier JDD d'un groupe (KO et erreurs console)

Je n'ai pas réussi à reproduire, tu aurais étape par étape ?

DanFluture275 · 2024-12-23T14:34:58Z

@narduin J'ai encore un comportement bizarre lors de la modif d'un JDD pendant qu'un filtre est actif.
Dans un bouquet, j'ai :

facteur 1
facteur 2

Je filtre sur "2", j'édite "facteur 2" pour le renommer en "facteur 2 doublon", j'enregistre.
--> "facteur 1" a disparu, et j'ai "facteur 2" + "facteur 2 doublon".

Comportement attendu : avoir "facteur 1" et "facteur 2 doublon"

Vidéo en pj
https://github.com/user-attachments/assets/920c858b-7c75-4cd3-b299-03866e611b0c

Hide filtered elements instead of removing them from the array. This allows updating the array without replacing the original version with the filtered one.

narduin · 2025-01-03T14:12:13Z

J'ai modifié le comportement du filtre. Plutôt que de ne garder que les éléments correspondants à la recherche, je garde tout et je cache les éléments qui ne correspondent pas.

Ainsi, on garde les datasetsProperties d'origine lors du filtrage et on ne les écrase pas avec une version incomplète quand on modifie un groupe ou un facteur.

src/components/bouquets/BouquetDatasetList.vue

src/utils/bouquetGroups.ts

DanFluture275 · 2025-01-08T09:18:56Z

Autre point vu : l'affichage du tag non disponible disparait lorsque l'on n'est pas connecté. Peut éventuellement être traité comme un bug après la MEP si besoin et si pas d'autre effet de bord

place the v-for on a template to use v-if on the li

src/components/bouquets/BouquetDatasetList.vue

move some logic to composable add missing factors number info to onlyNoGroup results

abulte · 2025-01-14T15:03:17Z

@DanFluture275 bon pour moi (je n'ai regardé que le code)

DanFluture275

C'est bon pour moi également !

narduin added 6 commits November 11, 2024 19:09

add group property to datasetProperties

a644db4

create disclosure component add group field to datasetEditModal start group logic implementation

WIP

53ae317

WIP

bdc4a70

switched to a composable for groups related operations

5457a0e

WIP

30a2cc5

dataset edit and remove refactor to account for groups

0003b97

narduin added 2 commits November 14, 2024 21:56

reset bouquet.ts

165d9c5

add group selection from dataset details form

006f36a

abulte reviewed Nov 18, 2024

View reviewed changes

narduin added 10 commits November 19, 2024 15:56

move datasetIndex to composable

c02dcca

refactor group selection in datasetAddToBouquetModdal

move group selection to component

d622ead

remove unused dep

add rename group feature

42e39f6

cleanup

ae9c485

delete group + move delete dataset to composable

74cbc97

WIP - more utils for groups + groups styles

8290ec0

WIP

1a8785f

refactor disclosure structure + styles

5ce2848

change forms order for group selection

44b33af

add teleport to disclosure modal to test in preview

e908eca

narduin requested a review from abulte November 28, 2024 16:52

fix delete group bug +

e5a56b9

sort group alphabetically in composable + styles

narduin force-pushed the feat/regroupement-facteurs branch from 2339bee to e5a56b9 Compare December 3, 2024 13:31

narduin marked this pull request as ready for review December 3, 2024 13:45

add group to export

2663dbc

small cleanup

narduin force-pushed the feat/regroupement-facteurs branch from 445dce4 to 2663dbc Compare December 3, 2024 13:49

abulte reviewed Dec 4, 2024

View reviewed changes

review fixes and refactor

7082889

feat(groups-filter): fix filtering side effects

0beeb17

narduin dismissed DanFluture275’s stale review via 0beeb17 December 20, 2024 16:22

narduin requested review from abulte and Thesauruv December 20, 2024 16:25

abulte previously approved these changes Dec 23, 2024

View reviewed changes

narduin requested a review from DanFluture275 December 23, 2024 09:51

fix(groups): change filtering logic

1661d8f

Hide filtered elements instead of removing them from the array. This allows updating the array without replacing the original version with the filtered one.

narduin dismissed abulte’s stale review via 1661d8f January 3, 2025 14:08

narduin removed request for Thesauruv and DanFluture275 January 3, 2025 14:09

narduin added 2 commits January 3, 2025 15:18

fix(groups): update TOC logic

f68fef5

fix(groups): better filter handling

866a0a5

abulte reviewed Jan 6, 2025

View reviewed changes

src/components/bouquets/BouquetDatasetList.vue Outdated Show resolved Hide resolved

abulte mentioned this pull request Jan 6, 2025

Chore: update dependencies #641

Merged

abulte reviewed Jan 6, 2025

View reviewed changes

src/utils/bouquetGroups.ts Outdated Show resolved Hide resolved

src/utils/bouquetGroups.ts Outdated Show resolved Hide resolved

narduin added 2 commits January 9, 2025 16:53

feat(groups-filter): fix showing/hiding elements

3a5e473

feat(groups): change rendering structure

10c484a

place the v-for on a template to use v-if on the li

narduin requested review from abulte and DanFluture275 January 14, 2025 09:42

abulte reviewed Jan 14, 2025

View reviewed changes

src/components/bouquets/BouquetDatasetList.vue Outdated Show resolved Hide resolved

src/components/bouquets/BouquetDatasetList.vue Outdated Show resolved Hide resolved

feat(groups): code cleanup

de65e2b

move some logic to composable add missing factors number info to onlyNoGroup results

narduin requested a review from abulte January 14, 2025 14:34

abulte approved these changes Jan 14, 2025

View reviewed changes

DanFluture275 approved these changes Jan 14, 2025

View reviewed changes

narduin merged commit 87a8dd4 into main Jan 14, 2025
8 checks passed

narduin deleted the feat/regroupement-facteurs branch January 14, 2025 15:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: regroupement de facteurs #583

Feat: regroupement de facteurs #583

narduin commented Nov 14, 2024 •

edited

Loading

netlify bot commented Nov 14, 2024 •

edited

Loading

netlify bot commented Nov 14, 2024 •

edited

Loading

abulte left a comment

abulte left a comment

narduin commented Dec 4, 2024 •

edited

Loading

DanFluture275 commented Dec 23, 2024

narduin commented Jan 3, 2025

DanFluture275 commented Jan 8, 2025

abulte commented Jan 14, 2025

DanFluture275 left a comment

Feat: regroupement de facteurs #583

Feat: regroupement de facteurs #583

Conversation

narduin commented Nov 14, 2024 • edited Loading

netlify bot commented Nov 14, 2024 • edited Loading

✅ Deploy Preview for ecospheres ready!

netlify bot commented Nov 14, 2024 • edited Loading

✅ Deploy Preview for meteo-france ready!

abulte left a comment

Choose a reason for hiding this comment

abulte left a comment

Choose a reason for hiding this comment

narduin commented Dec 4, 2024 • edited Loading

DanFluture275 commented Dec 23, 2024

narduin commented Jan 3, 2025

DanFluture275 commented Jan 8, 2025

abulte commented Jan 14, 2025

DanFluture275 left a comment

Choose a reason for hiding this comment

narduin commented Nov 14, 2024 •

edited

Loading

netlify bot commented Nov 14, 2024 •

edited

Loading

netlify bot commented Nov 14, 2024 •

edited

Loading

narduin commented Dec 4, 2024 •

edited

Loading