Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: regroupement de facteurs #583

Open
wants to merge 48 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a644db4
add group property to datasetProperties
narduin Nov 11, 2024
53ae317
WIP
narduin Nov 12, 2024
bdc4a70
WIP
narduin Nov 13, 2024
5457a0e
switched to a composable for groups related operations
narduin Nov 13, 2024
30a2cc5
WIP
narduin Nov 14, 2024
0003b97
dataset edit and remove refactor to account for groups
narduin Nov 14, 2024
165d9c5
reset bouquet.ts
narduin Nov 14, 2024
006f36a
add group selection from dataset details form
narduin Nov 14, 2024
c02dcca
move datasetIndex to composable
narduin Nov 19, 2024
d622ead
move group selection to component
narduin Nov 19, 2024
42e39f6
add rename group feature
narduin Nov 19, 2024
ae9c485
cleanup
narduin Nov 19, 2024
74cbc97
delete group + move delete dataset to composable
narduin Nov 20, 2024
8290ec0
WIP - more utils for groups + groups styles
narduin Nov 20, 2024
1a8785f
WIP
narduin Nov 20, 2024
5ce2848
refactor disclosure structure + styles
narduin Nov 21, 2024
44b33af
change forms order for group selection
narduin Nov 21, 2024
e908eca
add teleport to disclosure modal to test in preview
narduin Nov 21, 2024
e5a56b9
fix delete group bug +
narduin Dec 3, 2024
2663dbc
add group to export
narduin Dec 3, 2024
7082889
review fixes and refactor
narduin Dec 4, 2024
f2d6826
harmonize group renaming function +
narduin Dec 5, 2024
e783a6b
rename and move DisclosureWidget to BouquetGroup
narduin Dec 5, 2024
22e2a40
fix async option fetching in new multiselect
narduin Dec 5, 2024
5a7fb53
fix margins inside tab panel
narduin Dec 5, 2024
5e8e320
don't show nogroup name if it is the only group
narduin Dec 5, 2024
3d2a574
feat(groups): apply updated styles
narduin Dec 10, 2024
6f7416f
feat(groups): fix styles
narduin Dec 10, 2024
d9dbb5a
feat(groups): add number of factors to group name
narduin Dec 10, 2024
c96adad
Merge branch 'main' into feat/regroupement-facteurs
narduin Dec 11, 2024
22a6e86
feat(groups): factor number wording
narduin Dec 11, 2024
9264de4
feat(groups): use dsfr icons and buttons
narduin Dec 11, 2024
7505561
feat(groups): cleanup of multiselect props and slots
narduin Dec 11, 2024
9db627c
feat(groups): harmonize bouquetGroup utils functions return values
narduin Dec 11, 2024
4fe46ea
Merge branch 'main' into feat/regroupement-facteurs
narduin Dec 12, 2024
7bb7f8f
feat(groups): trim goup name on creation and comparison
narduin Dec 16, 2024
bd1d5d6
feat(groups): fix group option style
narduin Dec 16, 2024
7be9837
feat(groups): harmonize debounce delay
narduin Dec 16, 2024
3b9557c
Merge branch 'main' into feat/regroupement-facteurs
narduin Dec 17, 2024
9b84316
feat(groups): harmonize select styles
narduin Dec 17, 2024
82790b4
feat(groups): edit multiselect styles
narduin Dec 17, 2024
980bfc4
feat(groups): fix permissions + validation
narduin Dec 19, 2024
3a7c351
feat(groups): fix empty string validation
narduin Dec 19, 2024
e028241
feat: filtre facteurs (#621)
narduin Dec 19, 2024
c99129e
feat(groups): revert empty group attribution
narduin Dec 19, 2024
0beeb17
feat(groups-filter): fix filtering side effects
narduin Dec 20, 2024
1661d8f
fix(groups): change filtering logic
narduin Jan 3, 2025
f68fef5
fix(groups): update TOC logic
narduin Jan 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
413 changes: 402 additions & 11 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"@json2csv/plainjs": "^7.0.6",
"@unhead/vue": "^1.11.10",
"@vee-validate/rules": "^4.13.2",
"@vueform/multiselect": "^2.6.10",
narduin marked this conversation as resolved.
Show resolved Hide resolved
"@vueuse/core": "^11.1.0",
"@vueuse/integrations": "^11.1.0",
"axios": "^1.7.7",
Expand All @@ -36,7 +37,6 @@
"vee-validate": "^4.13.2",
"vite-plugin-html": "^3.2.2",
"vue": "^3.5.12",
"vue-draggable-next": "^2.2.1",
"vue-loading-overlay": "^6.0.6",
"vue-matomo": "^4.2.0",
"vue-multiselect": "^3.1.0",
Expand Down
23 changes: 14 additions & 9 deletions src/assets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
--toastify-color-success: #1f8d49; /* --success-main-525 (unavailable to date) */
/* DSFR contrast fix */
--blue-cumulus-sun-368-moon-732-hover--fix: #516fb3;

/*
progressively enhanced height: auto transition
https://caniuse.com/mdn-css_properties_interpolate-size
*/
interpolate-size: allow-keywords;
}

@font-face {
Expand All @@ -35,11 +41,6 @@ body {
word-wrap: break-word;
}

.multiselect {
--ms-bg: var(--background-contrast-grey);
margin: 8px 0;
}

.fr-col-sm-45 {
flex: 0 0 45%;
max-width: 45%;
Expand Down Expand Up @@ -98,20 +99,24 @@ body {

/* form */

form textarea {
:is(form, .form) textarea {
abulte marked this conversation as resolved.
Show resolved Hide resolved
resize: vertical;
}

form :where(input, textarea, fieldset, select)[aria-invalid='true'] {
:is(form, .form)
:where(input, textarea, fieldset, select)[aria-invalid='true'] {
border: 2px solid var(--border-plain-error);
}
form .error {
:is(form, .form) .error {
margin-block-start: 0.5rem;
color: var(--text-default-error);
}
form .error-status {
:is(form, .form) .error-status {
border: 4px solid var(--background-flat-warning);
}
:is(form, .form) .fr-text--sm {
color: var(--text-mention-grey);
}

/* editorial (markdown) pages */
.editorial {
Expand Down
13 changes: 12 additions & 1 deletion src/assets/multiselect.css
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@
transform: rotate(-45deg);
}
}
.multiselect,
.multiselect-wrapper {
--ms-bg: var(--background-contrast-grey);
}
.multiselect-wrapper {
--ms-radius: 0.25rem 0.25rem 0 0;
--ms-caret-color: var(--border-plain-grey);
}
.multiselect-search {
box-shadow: inset 0 -2px 0 0 var(--border-plain-grey);
}
.multiselect__tags {
--idle: transparent;
--hover: var(--background-contrast-grey-hover);
Expand All @@ -59,7 +70,7 @@
-moz-appearance: none;
-webkit-appearance: none;
background-color: var(--background-contrast-grey);
border-radius: 0.25rem 0.25rem 0 0;
border: 0;
box-shadow: inset 0 -2px 0 0 var(--border-plain-grey);
color: var(--text-title-grey);
display: block;
Expand Down
8 changes: 4 additions & 4 deletions src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
BouquetCard: typeof import('./components/bouquets/BouquetCard.vue')['default']
BouquetDatasetAccordionTitle: typeof import('./components/bouquets/BouquetDatasetAccordionTitle.vue')['default']
BouquetDatasetCard: typeof import('./components/bouquets/BouquetDatasetCard.vue')['default']
BouquetDatasetList: typeof import('./components/bouquets/BouquetDatasetList.vue')['default']
BouquetDatasetListExport: typeof import('./components/bouquets/BouquetDatasetListExport.vue')['default']
Expand All @@ -21,9 +20,9 @@ declare module 'vue' {
DatasetEditModal: typeof import('./components/forms/dataset/DatasetEditModal.vue')['default']
DatasetPropertiesFields: typeof import('./components/forms/dataset/DatasetPropertiesFields.vue')['default']
DatasetPropertiesTextFields: typeof import('./components/forms/dataset/DatasetPropertiesTextFields.vue')['default']
DisclosureContent: typeof import('./components/DisclosureContent.vue')['default']
DisclosureWidget: typeof import('./components/DisclosureWidget.vue')['default']
DiscussionsList: typeof import('./components/DiscussionsList.vue')['default']
DsfrAccordion: typeof import('@gouvminint/vue-dsfr')['DsfrAccordion']
DsfrAccordionsGroup: typeof import('@gouvminint/vue-dsfr')['DsfrAccordionsGroup']
DsfrAlert: typeof import('@gouvminint/vue-dsfr')['DsfrAlert']
DsfrBadge: typeof import('@gouvminint/vue-dsfr')['DsfrBadge']
DsfrBreadcrumb: typeof import('@gouvminint/vue-dsfr')['DsfrBreadcrumb']
Expand All @@ -35,6 +34,7 @@ declare module 'vue' {
DsfrHeaderMenuLink: typeof import('./components/header/DsfrHeaderMenuLink.vue')['default']
DsfrHeaderMenuLinks: typeof import('@gouvminint/vue-dsfr')['DsfrHeaderMenuLinks']
DsfrInput: typeof import('@gouvminint/vue-dsfr')['DsfrInput']
DsfrInputGroup: typeof import('@gouvminint/vue-dsfr')['DsfrInputGroup']
DsfrLogo: typeof import('@gouvminint/vue-dsfr')['DsfrLogo']
DsfrModal: typeof import('@gouvminint/vue-dsfr')['DsfrModal']
DsfrNavigation: typeof import('@gouvminint/vue-dsfr')['DsfrNavigation']
Expand All @@ -47,7 +47,6 @@ declare module 'vue' {
DsfrSearchBar: typeof import('@gouvminint/vue-dsfr')['DsfrSearchBar']
DsfrSelect: typeof import('@gouvminint/vue-dsfr')['DsfrSelect']
DsfrTabContent: typeof import('@gouvminint/vue-dsfr')['DsfrTabContent']
DsfrTabItem: typeof import('@gouvminint/vue-dsfr')['DsfrTabItem']
DsfrTabs: typeof import('@gouvminint/vue-dsfr')['DsfrTabs']
DsfrTag: typeof import('@gouvminint/vue-dsfr')['DsfrTag']
ExtendedInformationPanel: typeof import('./components/datasets/ExtendedInformationPanel.vue')['default']
Expand All @@ -63,6 +62,7 @@ declare module 'vue' {
RouterView: typeof import('vue-router')['RouterView']
SelectDataset: typeof import('./components/forms/dataset/SelectDataset.vue')['default']
SelectSpatialCoverage: typeof import('./components/forms/SelectSpatialCoverage.vue')['default']
SelectTopicGroup: typeof import('./components/forms/SelectTopicGroup.vue')['default']
SkipLinks: typeof import('./components/SkipLinks.vue')['default']
SubSectionButtons: typeof import('./components/sections/SubSectionButtons.vue')['default']
SubSectionCards: typeof import('./components/sections/SubSectionCards.vue')['default']
Expand Down
Loading