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.

Sign up for GitHub

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

Jump to bottom

feat: Allow adding the same dataset multiple times to a bouquet. #507

Merged
merged 11 commits into from
Sep 12, 2024
Merged

feat: Allow adding the same dataset multiple times to a bouquet. #507

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
15a96dd
Allowed adding the same dataset multiple times to a bouquet. Added a …
narduin Aug 23, 2024
a3d7160
Moved keyboard instructions down
narduin Aug 26, 2024
f0b17e9
visually hide keyboard instruction
narduin Aug 27, 2024
ebc8ff9
adjusted styles of badge
narduin Aug 26, 2024
4b1a7d7
had to rebase, missed something…
narduin Aug 28, 2024
a66c489
Merge branch 'main' into feat/merge/allow-adding-same-dataset-to-bouquet
narduin Aug 28, 2024
26b9e8b
Moved badge intro card component
narduin Aug 29, 2024
c4f2abf
Add same DS to bouquet from DS detail
narduin Sep 3, 2024
70a305b
refactor and cleanup
narduin Sep 4, 2024
fe21961
Deduplicate datasets before updating bouquet
narduin Sep 11, 2024
768ad3e
cleanup import and text
narduin Sep 11, 2024
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
25 changes: 23 additions & 2 deletions src/components/forms/dataset/SelectDataset.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const search = debounce(async (query: string) => {
await new SearchAPI().search(query, null, 1, {
page_size: 10
})
).data.filter((dataset) => !alreadySelected(dataset.id))
).data
options.value = datasets
isLoading.value = false
}, 400)
Expand All @@ -69,7 +69,6 @@ const clear = () => {
:loading="isLoading"
:clear-on-select="true"
:close-on-select="true"
:max-height="600"
:show-no-results="false"
:hide-selected="true"
@search-change="search"
Expand All @@ -82,11 +81,33 @@ const clear = () => {
></div>
</template>
<template #singleLabel="slotProps">
<DsfrBadge
v-if="alreadySelected(slotProps.option.id)"
type="warning"
label="Déjà sélectionné"
small
class="dsfr-badge-warning"
/>
<DatasetCardForSelect :dataset="slotProps.option" />
</template>
<template #option="slotProps">
<DsfrBadge
v-if="alreadySelected(slotProps.option.id)"
type="warning"
label="Déjà sélectionné"
small
class="dsfr-badge-warning"
/>
<DatasetCardForSelect :dataset="slotProps.option" />
</template>
<template #noOptions> Précisez ou élargissez votre recherche </template>
</Multiselect>
</template>

<style scoped>
/* specificity override fix for badge icon */
.dsfr-badge-warning.dsfr-badge-warning::before {
-webkit-mask-image: url(/node_modules/@gouvfr/dsfr/dist/icons/system/fr--warning-fill.svg);
mask-image: url(/node_modules/@gouvfr/dsfr/dist/icons/system/fr--warning-fill.svg);
}
</style>
Loading