Skip to content

refactor: bouquets as pages #719

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

Merged
merged 73 commits into from
Apr 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
44dc3c5
useSearchPageRoutes
abulte Apr 2, 2025
cb97c56
pageKey is now slug
abulte Apr 2, 2025
188862b
rename Bouquet read views to Topic
abulte Apr 2, 2025
29e40f0
Merge branch 'main' into refactor/bouquets-as-page
abulte Apr 3, 2025
bbfe25d
refactor TopicsListView
abulte Apr 3, 2025
ddcb43a
useRouteMeta
abulte Apr 3, 2025
0ce6cce
refactor: TopicList
abulte Apr 3, 2025
4cf092a
default sort
abulte Apr 3, 2025
cddbfa4
wip: new checkbox filter
abulte Apr 3, 2025
15f630b
checkbox filter
abulte Apr 7, 2025
17bfced
move route meta type to root types
abulte Apr 7, 2025
3138bec
fix selectcomponent, EcospheresDatasetFilters rename
abulte Apr 7, 2025
4aefdb4
generic tags on TopicCard, no more bouquet
abulte Apr 7, 2025
c4dbecb
almost no bouquet in TopicDetailView, rename linked components
abulte Apr 7, 2025
c572df1
clone uses {{ topicsName }}
abulte Apr 7, 2025
d2b9d1d
move topic conf to router props
abulte Apr 7, 2025
0661b72
almost all read pages migrated to new conf
abulte Apr 7, 2025
0589d17
migrate TopicFormView
abulte Apr 8, 2025
df329f6
revert wrong folder rename
abulte Apr 8, 2025
d4548a9
create topic w/ generic filters 🎉
abulte Apr 8, 2025
ceeb8b4
fix metaTitle handling
abulte Apr 9, 2025
cb37eae
working edit init, indicators detail custom view
abulte Apr 9, 2025
93fcb2c
small fix and fixme
abulte Apr 9, 2025
dba8b43
conditionnal spatial coverage
abulte Apr 9, 2025
639e48a
useless isSubmitted
abulte Apr 9, 2025
987756b
migrate TopicOwnerForm
abulte Apr 9, 2025
c697f2e
migrate DatasetAddToBouquetModal
abulte Apr 9, 2025
2d8dd48
fix indicateurs add to bouquet
abulte Apr 9, 2025
e211c28
migrate DatasetPropertiesFields
abulte Apr 9, 2025
4ec54f8
migrate DatasetPropertiesTextFields
abulte Apr 9, 2025
1e98dd6
useSiteId() for extras key
abulte Apr 9, 2025
830b544
migrate ReusesList
abulte Apr 9, 2025
73c3ad0
topicsConf almost dead, only topicsCanAdd standing
abulte Apr 9, 2025
37f0c66
minor refacto of TopicsConf
abulte Apr 10, 2025
f47afc9
useCurrentPageConf
abulte Apr 10, 2025
4ddc9ce
migrate meteo
abulte Apr 10, 2025
9e9bd5e
remove search input
abulte Apr 10, 2025
e7c95b3
remove config.universe
abulte Apr 10, 2025
a42371f
show drafts only for connected users
abulte Apr 10, 2025
a2cebf2
keep migrating sites confs
abulte Apr 10, 2025
49aeb81
config doc
abulte Apr 10, 2025
30619ec
migrate discussions config to page conf
abulte Apr 10, 2025
2c368ec
finish meteo migration
abulte Apr 14, 2025
865b8f0
Merge branch 'main' into refactor/bouquets-as-page
abulte Apr 14, 2025
6fc7f12
migrate logistique
abulte Apr 14, 2025
edce055
logistique: add geozone filter
abulte Apr 14, 2025
4f883ee
migrate defis (draft)
abulte Apr 14, 2025
7bdae84
list_all in PageConf
abulte Apr 14, 2025
8465fe1
finish defis migration
abulte Apr 14, 2025
f3000b3
remove saison-3 default filter in menu
abulte Apr 14, 2025
b85ec37
add defis to pr previews
abulte Apr 14, 2025
a80dba7
migrate hackathons
abulte Apr 14, 2025
a149d74
fix tiles links for logistique
abulte Apr 14, 2025
a6310dc
module for router model
abulte Apr 14, 2025
45f83f1
fix meteo hp links
abulte Apr 15, 2025
ca9a06f
[defis] update: config
geoffreyaldebert Apr 15, 2025
b15c082
bouquet -> topic in DatasetAddToTopicModal
abulte Apr 23, 2025
f4281d7
bouquet -> topic in DatasetDetailView
abulte Apr 23, 2025
43bbcb5
bouquet -> topic in SelectTopicGroup
abulte Apr 23, 2025
fdb3ea9
bouquet -> topic in DatasetCardForSelect
abulte Apr 23, 2025
1ee8035
bouquet -> topic in DatasetEditModal, TopicGroup
abulte Apr 23, 2025
5ef7cb9
bouquet -> topic in TopicDetailView
abulte Apr 23, 2025
04947f7
Update src/views/topics/TopicFormView.vue
abulte Apr 23, 2025
438896a
Update configs/ecospheres/config.yaml
abulte Apr 23, 2025
705c67c
Update configs/ecospheres/config.yaml
abulte Apr 23, 2025
4e368ac
Update configs/logistique/config.yaml
abulte Apr 23, 2025
cf97ced
tags in useTagsQuery
abulte Apr 23, 2025
b4ed922
topicsSlug -> pageKey in TopicCard
abulte Apr 23, 2025
20cf7b5
fix DiscussionsList subjectClass and add emptyMessage
abulte Apr 23, 2025
55ca031
rename object to labels
abulte Apr 23, 2025
1196668
wording
abulte Apr 23, 2025
363bb23
typo
abulte Apr 23, 2025
cbf842e
disable extra deploys
abulte Apr 24, 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
2 changes: 2 additions & 0 deletions .github/workflows/review-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
- ecospheres
- meteo-france
- logistique
# - defis
# - hackathon
permissions:
deployments: write
# only run if the PR is from the same repo
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ npm run format
- `@vueuse/integrations` // intégration supplémentaires de vueuse (`focustrap`)
- `unplugin-auto-import` - `vite.config.mts` // auto-import d'API `vue` (`ref`, `computed`…) et `vue-dsfr` ([d'après ce tutoriel](https://vue-ds.fr/guide/pour-commencer#avoir-un-bundle-optimise-et-une-dx-optimale))
- `unplugin-vue-components` - `vite.config.mts` // auto-import des composants custom et `vue-dsfr` ([idem](https://vue-ds.fr/guide/pour-commencer#avoir-un-bundle-optimise-et-une-dx-optimale))
- `vee-validate` // validation de formulaire
- `@vee-validate/rules` // collection de règles de validation
- `@unhead/vue` // SEO (en gros)

### Formatage et validation du code
Expand Down
100 changes: 67 additions & 33 deletions configs/defis/config.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
# config file for defis

site_id: defis

datagouvfr:
# data.gouv.fr base URL
base_url: https://www.data.gouv.fr
# oauth settings
oauth_client_id: 670924ba96082fcc26ee3898

universe:
# "universe" topic id
topic_id: 65c0f2e2fb22540a9e91a2e4
# universe name, used as bouquets tag
name: defis

robots:
disallow:
sitemap:
Expand Down Expand Up @@ -78,7 +74,7 @@ website:
sub_section_cards:
title:
cards:
- id: '6704d5262a223f0cbc866c68'
- id: '67f5438a3b2d79d922863e03'
name: 'Diversité et inclusion en entreprise'
description: 'Quelle politique sur l’inclusion et la diversité au sein d’EDF SA ? Défi porté par EDF'
url: '/defis/diversite-et-inclusion-en-entreprise'
Expand Down Expand Up @@ -150,12 +146,12 @@ website:
image_url: 'https://raw.githubusercontent.com/thanhhale7/images/main/defi-acces-au-sport.jpg'
- id: '6639df879e70e0b00e5aeef1'
name: 'Accès et exploitation des données météorologiques'
description: "Comment faciliter la manipulation des données météorologiques ?"
url: 'defis/acces-et-exploitation-des-donnees-meteorologiques'
description: 'Comment faciliter la manipulation des données météorologiques ?'
url: 'defis/acces-aux-donnees-meteos'
image_url: 'https://raw.githubusercontent.com/thanhhale7/images/refs/heads/main/acces-meteo.jpg'
- id: '6639e67fa95c6e4f1da70e39'
name: 'Décision agricole'
description: "Comment informer la prise de décision à partir des données météorologiques ?"
description: 'Comment informer la prise de décision à partir des données météorologiques ?'
url: 'defis/decision-agricole'
image_url: 'https://raw.githubusercontent.com/thanhhale7/images/refs/heads/main/decision-agricole.jpg'
- id: '6639e311f4a75be320cfa517'
Expand Down Expand Up @@ -202,6 +198,8 @@ website:
name:
link:
menu:
- text: Défis
to: /defis
- text: Open Data University
to: /opendatauniversity
- text: Guides
Expand Down Expand Up @@ -256,37 +254,73 @@ website:
matomo:
host:
siteId:
discussions:
dataset:
display: true
create: false
topic:
display: false
create: false
datasets:
add_to_bouquet: false
add_to_topic:
# similar to QUALITY_METADATA_BACKEND_IGNORE on data.gouv.fr
harvest_backends_quality_warning: []
show_extended_information_panel: false
topics:
slug: defis
name: défi
extras_key: 'defis'
themes:
usage: true
main_name: thématique
secondary_name: chantier
# include a list page with all topics
list_all: false
show_drafts_by_default: false
display_metadata: false
activate_read_more: false
dataset_editorialization: false
can_add_topics:
everyone: false
authorized_users:
- 5fda299e56f984a4b126afe1 #thanh-ha
- 5e6f426e634f417810ab794b #geoffrey
- 5fda299e56f984a4b126afe1 # thanh-ha
- 5e6f426e634f417810ab794b # geoffrey
- 65e8b5082f2504e916c8f6da # ecospheres

pages:
# DEFIS
defis:
list_all: true
universe_query:
tag: defisdatagouvfr
tag_prefix: defisdatagouvfr
title: Défis
breadcrumb_title: Défis
labels:
singular: défi
plural: défis
extended: défi
search:
input: Chercher un défi
banner:
discussions:
display: false
create: false
filters:
- name: Saison
default_option: Toutes les saisons
id: saison
type: select
color: green-emeraude
use_tag_prefix: true
form:
required: true
values:
- id: saison-1
name: Saison 1
- id: saison-2
name: Saison 2
- id: saison-3
name: Saison 3
# DATASETS
datasets:
list_all: false
universe_query:
tag_prefix:
title:
breadcrumb_title: Données
labels:
singular: jeu de données
plural: jeux de données
extended: jeu de données
search:
input:
banner:
discussions:
display: false
create: false
filters: []

# list of organisations' ids that should be handled by the portal
# to find an id go to https://www.data.gouv.fr/fr/organizations/ministere-de-la-transition-ecologique/
# then Informations > ID at the bottom of the page
Expand Down
Loading
Loading