Brouillon
+
-
@@ -71,15 +67,11 @@ const subtheme = useTag('bouquets', bouquetRef, 'subtheme')
-
-
-
-
-
- -
-
+ -
+
-
+
-
+
- ![]()
-
-
- {{ bouquet.name }}
+
+ {{ topic.name }}
-
+
-
{{ stripFromMarkdown(bouquet.description) }}
+{{ stripFromMarkdown(topic.description) }}
@@ -115,7 +107,7 @@ const subtheme = useTag('bouquets', bouquetRef, 'subtheme') name="time-line" class="fr-mr-1w text-grey-380 fr-icon--sm" /> - Mis à jour {{ formatRelativeIfRecentDate(bouquet.last_modified) }} + Mis à jour {{ formatRelativeIfRecentDate(topic.last_modified) }}
diff --git a/src/components/bouquets/BouquetDatasetCard.vue b/src/components/topics/TopicDatasetCard.vue
similarity index 96%
rename from src/components/bouquets/BouquetDatasetCard.vue
rename to src/components/topics/TopicDatasetCard.vue
index 4c62ee92f..2c69488bf 100644
--- a/src/components/bouquets/BouquetDatasetCard.vue
+++ b/src/components/topics/TopicDatasetCard.vue
@@ -49,8 +49,8 @@ onMounted(async () => {
:key="datasetContent.id"
:dataset="datasetContent"
:dataset-url="{
- name: 'dataset_detail',
- params: { did: datasetContent.id }
+ name: 'datasets_detail',
+ params: { item_id: datasetContent.id }
}"
:show-description="false"
class="dataset-card fr-m-0"
diff --git a/src/components/bouquets/BouquetDatasetList.vue b/src/components/topics/TopicDatasetList.vue
similarity index 93%
rename from src/components/bouquets/BouquetDatasetList.vue
rename to src/components/topics/TopicDatasetList.vue
index a014c39b8..061e9af30 100644
--- a/src/components/bouquets/BouquetDatasetList.vue
+++ b/src/components/topics/TopicDatasetList.vue
@@ -9,19 +9,15 @@ import DatasetEditModal, {
import config from '@/config'
import { type DatasetProperties } from '@/model/topic'
import { useDatasetStore } from '@/store/OrganizationDatasetStore'
-import { isAvailable } from '@/utils/bouquet'
-import { useTopicsConf } from '@/utils/config'
import { toastHttpError } from '@/utils/error'
import { isNotFoundError } from '@/utils/http'
+import { isAvailable } from '@/utils/topic'
+import { useCurrentPageConf } from '@/router/utils'
import { basicSlugify, fromMarkdown } from '@/utils'
-import {
- isOnlyNoGroup,
- useDatasetFilter,
- useGroups
-} from '@/utils/bouquetGroups'
-import BouquetDatasetCard from './BouquetDatasetCard.vue'
-import BouquetGroup from './BouquetGroup.vue'
+import { isOnlyNoGroup, useDatasetFilter, useGroups } from '@/utils/topicGroups'
+import TopicDatasetCard from './TopicDatasetCard.vue'
+import TopicGroup from './TopicGroup.vue'
const datasetsProperties = defineModel({
type: Array,
@@ -44,7 +40,7 @@ const emits = defineEmits(['updateDatasets'])
const modal: Ref = ref(null)
const datasetsContent = ref(new Map())
-const { topicsName } = useTopicsConf()
+const { pageConf } = useCurrentPageConf()
const {
groupedDatasets,
@@ -140,7 +136,7 @@ onMounted(() => {
{
class="no-dataset fr-mt-2w"
>
-
+
- Composition du {{ topicsName }} de données + Composition du {{ pageConf.labels.extended }}
Aucune donnée trouvée pour cette recherche.
-Ce {{ topicsName }} ne contient pas encore de donnée.
++ Ce {{ pageConf.labels.singular }} ne contient pas encore de donnée. +
@@ -185,7 +183,7 @@ onMounted(() => {
-
-
{ - { >
- {
ref="modal"
v-model="datasetsProperties"
v-model:groups-model="groupedDatasets"
+ :dataset-editorialization
@submit-modal="onDatasetEditModalSubmit"
/>
diff --git a/src/components/bouquets/BouquetDatasetListExport.vue b/src/components/topics/TopicDatasetListExport.vue
similarity index 100%
rename from src/components/bouquets/BouquetDatasetListExport.vue
rename to src/components/topics/TopicDatasetListExport.vue
diff --git a/src/components/bouquets/BouquetGroup.vue b/src/components/topics/TopicGroup.vue
similarity index 96%
rename from src/components/bouquets/BouquetGroup.vue
rename to src/components/topics/TopicGroup.vue
index c866ad122..2084bce5e 100644
--- a/src/components/bouquets/BouquetGroup.vue
+++ b/src/components/topics/TopicGroup.vue
@@ -1,9 +1,11 @@
-
+
@@ -117,19 +129,19 @@ defineExpose({
/>
-
+
Essayez de réinitialiser les filtres pour agrandir votre champ de
recherche.
- Vous pouvez aussi contribuer en créant un {{ topicsName }}. + Vous pouvez aussi contribuer en créant un {{ pageConf.labels.singular }}.
diff --git a/src/custom/defis/routes.ts b/src/custom/defis/routes.ts
new file mode 100644
index 000000000..b797f4700
--- /dev/null
+++ b/src/custom/defis/routes.ts
@@ -0,0 +1,28 @@
+import {
+ useDatasetSearchPageRoutes,
+ useTopicAdminPagesRoutes,
+ useTopicSearchPageRoutes
+} from '@/router/utils'
+import type { RouteRecordRaw } from 'vue-router'
+
+const topicConf = {
+ displayMetadata: false,
+ enableReadMore: false,
+ datasetEditorialization: false
+}
+
+export const routes: RouteRecordRaw[] = [
+ useDatasetSearchPageRoutes({
+ pageKey: 'datasets',
+ metaTitle: 'Données'
+ }),
+ useTopicSearchPageRoutes({
+ pageKey: 'defis',
+ metaTitle: 'Défis',
+ topicConf
+ }),
+ ...useTopicAdminPagesRoutes({
+ pageKey: 'defis',
+ topicConf
+ })
+]
diff --git a/src/custom/ecospheres/components/datasets/EcospheresDatasetSearch.vue b/src/custom/ecospheres/components/datasets/EcospheresDatasetFilters.vue
similarity index 93%
rename from src/custom/ecospheres/components/datasets/EcospheresDatasetSearch.vue
rename to src/custom/ecospheres/components/datasets/EcospheresDatasetFilters.vue
index a63f57947..eff9f0abc 100644
--- a/src/custom/ecospheres/components/datasets/EcospheresDatasetSearch.vue
+++ b/src/custom/ecospheres/components/datasets/EcospheresDatasetFilters.vue
@@ -1,4 +1,5 @@
-
-
-
-
-
-
-
diff --git a/src/views/datasets/DatasetDetailView.vue b/src/views/datasets/DatasetDetailView.vue
index 5e7001ab9..bd2af27dd 100644
--- a/src/views/datasets/DatasetDetailView.vue
+++ b/src/views/datasets/DatasetDetailView.vue
@@ -15,7 +15,7 @@ import GenericContainer from '@/components/GenericContainer.vue'
import OrganizationLogo from '@/components/OrganizationLogo.vue'
import ReusesList from '@/components/ReusesList.vue'
import ContactPoints from '@/components/datasets/ContactPoints.vue'
-import DatasetAddToBouquetModal from '@/components/datasets/DatasetAddToBouquetModal.vue'
+import DatasetAddToTopicModal from '@/components/datasets/DatasetAddToTopicModal.vue'
import ExtendedInformationPanel from '@/components/datasets/ExtendedInformationPanel.vue'
import ResourcesList from '@/components/datasets/ResourcesList.vue'
import config from '@/config'
@@ -23,36 +23,45 @@ import {
AccessibilityPropertiesKey,
type AccessibilityPropertiesType
} from '@/model/injectionKeys'
-import { useRouteParamsAsString } from '@/router/utils'
+import { useCurrentPageConf, useRouteParamsAsString } from '@/router/utils'
import { useDatasetStore } from '@/store/OrganizationDatasetStore'
import { useUserStore } from '@/store/UserStore'
import { descriptionFromMarkdown, formatDate } from '@/utils'
-import { useTopicsConf } from '@/utils/config'
+import { useDatasetsConf, usePageConf } from '@/utils/config'
import { useLicense } from '@/utils/dataset'
const route = useRouteParamsAsString()
-const datasetId = route.params.did
+const datasetId = route.params.item_id
const datasetStore = useDatasetStore()
const userStore = useUserStore()
-const { canAddBouquet } = storeToRefs(userStore)
+const { canAddTopic } = storeToRefs(userStore)
const dataset = computed(() => datasetStore.get(datasetId))
-const showAddToBouquetModal = ref(false)
+const showAddToTopicModal = ref(false)
-const showDiscussions = config.website.discussions.dataset.display as boolean
-const { topicsName } = useTopicsConf()
+const { pageKey, pageConf } = useCurrentPageConf()
+const showDiscussions = pageConf.discussions.display
+
+const datasetsConf = useDatasetsConf()
+const topicPageConf = datasetsConf.add_to_topic?.page
+ ? usePageConf(datasetsConf.add_to_topic.page)
+ : null
const setAccessibilityProperties = inject(
AccessibilityPropertiesKey
) as AccessibilityPropertiesType
-const links = computed(() => [
- { to: '/', text: 'Accueil' },
- { to: '/datasets', text: 'Données' },
- { text: dataset.value?.title || '' }
-])
+const links = computed(() => {
+ const breadcrumbs = [{ to: '/', text: 'Accueil' }]
+ breadcrumbs.push({
+ to: pageConf.list_all === true ? `/${pageKey || 'datasets'}` : '',
+ text: pageConf.breadcrumb_title || pageConf.title
+ })
+ breadcrumbs.push({ to: '', text: dataset.value?.title ?? '' })
+ return breadcrumbs
+})
const tabTitles = [
{ title: 'Fichiers', tabId: 'tab-0', panelId: 'tab-content-0' },
@@ -68,8 +77,7 @@ const license = useLicense(dataset)
const showHarvestQualityWarning = computed(() => {
const backend = dataset.value?.harvest?.backend
- const warningBackends =
- config.website.datasets.harvest_backends_quality_warning || []
+ const warningBackends = datasetsConf.harvest_backends_quality_warning || []
return backend && warningBackends.includes(backend)
})
@@ -177,23 +185,19 @@ onMounted(() => {
la source originale peuvent avoir été perdues lors de leur
récupération. Nous travaillons actuellement à améliorer la situation.
-
+
{
-
{{ numberOfResultMsg }}
-
-
-
-
+ -
+
- Vous pouvez aussi contribuer en créant un {{ topicsName }}. + Vous pouvez aussi contribuer en créant un {{ pageConf.labels.singular }}.
-
-
-
-
-
-
- {{ capitalize(topicsName) }}s
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/datasets/DatasetsListView.vue b/src/views/datasets/DatasetsListView.vue
index 4a59332b4..9cb9f1151 100644
--- a/src/views/datasets/DatasetsListView.vue
+++ b/src/views/datasets/DatasetsListView.vue
@@ -5,10 +5,10 @@ import { useRoute, useRouter } from 'vue-router'
import GenericContainer from '@/components/GenericContainer.vue'
import DatasetList from '@/components/datasets/DatasetList.vue'
-import type { RouteMeta } from '@/router'
+import { useCurrentPageConf } from '@/router/utils'
import { fromMarkdown } from '@/utils'
import { useAccessibilityProperties } from '@/utils/a11y'
-import { debounceWait, usePageConf } from '@/utils/config'
+import { debounceWait } from '@/utils/config'
defineEmits(['search'])
@@ -25,8 +25,7 @@ const props = defineProps({
const router = useRouter()
const route = useRoute()
-const meta = route.meta as RouteMeta
-const pageConf = usePageConf(meta.filterKey || 'datasets')
+const { meta, pageConf } = useCurrentPageConf()
const datasetListComp = ref | null>(null)
const searchResultsMessage = computed(
@@ -43,7 +42,7 @@ const search = useDebounceFn((query) => {
router.push({
name: route.name,
query: { ...route.query, q: query },
- hash: '#datasets-list'
+ hash: '#list'
})
}, debounceWait)
@@ -59,9 +58,18 @@ const FiltersComponent = computed(() => {
})
}
return defineAsyncComponent(
- () => import('@/components/datasets/DatasetSearch.vue')
+ () => import('@/components/pages/PageFilters.vue')
)
})
+
+// TODO: this should be handled by the router, but we don't have access to pageConf there
+onMounted(() => {
+ if (!pageConf.list_all) {
+ router.push({
+ name: 'not_found'
+ })
+ }
+})
@@ -82,7 +90,7 @@ const FiltersComponent = computed(() => {
-
+
{
}
}
-.datasets-list-container {
+.list-container {
width: 100%;
}
diff --git a/src/views/organizations/OrganizationDetailView.vue b/src/views/organizations/OrganizationDetailView.vue
index d40a8c7b5..aa6b25e27 100644
--- a/src/views/organizations/OrganizationDetailView.vue
+++ b/src/views/organizations/OrganizationDetailView.vue
@@ -126,7 +126,7 @@ watchEffect(() => {
-
+
{{ topic.name }}
--
+
-
+
+
+
+
@@ -244,7 +242,7 @@ watch(
-
@@ -260,7 +258,7 @@ watch(
size="md"
label="Cloner"
icon="fr-icon-git-merge-line"
- title="Cloner le bouquet"
+ :title="`Cloner le ${pageConf.labels.singular}`"
@click="showCloneModal = true"
/>
Vous pouvez choisir de conserver les liens vers les jeux de - données du bouquet que vous souhaitez cloner. + données du {{ pageConf.labels.singular }} que vous souhaitez + cloner.
Si vous ne conservez pas les liens, les jeux de données ne - seront pas ajoutés au nouveau bouquet, mais leurs libellés et - raisons d'utilisation seront conservés. + seront pas ajoutés au {{ pageConf.labels.singular }} cloné, + mais leurs libellés et raisons d'utilisation seront conservés.
Voulez-vous conserver les liens vers les jeux de @@ -307,7 +306,7 @@ watch( />
+
{{ clonedFrom.name }}
@@ -374,17 +373,17 @@ watch(
v-model="activeTab"
class="fr-mt-2w"
:tab-titles="tabTitles"
- :tab-list-name="`Groupes d'attributs du ${topicsName}`"
+ :tab-list-name="`Groupes d'attributs du ${pageConf.labels.singular}`"
>
-
@@ -406,7 +406,7 @@ watch(