From c87f0a2cb985784beaf932b2bc8cc86b2341e46e Mon Sep 17 00:00:00 2001
From: geoffreyaldebert <geoffrey.aldebert@gmail.com>
Date: Tue, 6 Aug 2024 20:50:23 +0200
Subject: [PATCH 1/2] migrate: bouquets to main components, views, utils and
 services

---
 .../bouquets}/BouquetCard.vue                 |   3 +-
 .../BouquetDatasetAccordionTitle.vue          |   3 +-
 .../bouquets}/BouquetDatasetCard.vue          |   0
 .../bouquets}/BouquetDatasetList.vue          |   8 +-
 .../bouquets/BouquetDatasetListExport.vue     |  39 +++++
 .../bouquets}/BouquetList.vue                 |   3 +-
 .../bouquets}/BouquetSearch.vue               |   3 +-
 .../datasets/DatasetAddToBouquetModal.vue     |   3 +-
 .../forms/SelectSpatialCoverage.vue           |   0
 .../components/forms/bouquet/BouquetForm.vue  |   2 +-
 .../forms/bouquet/BouquetOwnerForm.vue        |   0
 .../forms/dataset/DatasetCardForSelect.vue    |   0
 .../forms/dataset/DatasetEditModal.vue        |   0
 .../forms/dataset/DatasetPropertiesFields.vue |   0
 .../dataset/DatasetPropertiesTextFields.vue   |   0
 .../forms/dataset/SelectDataset.vue           |   0
 src/custom/defis/routes.ts                    |   8 +-
 .../components/BouquetDatasetListExport.vue   |   2 +-
 src/custom/ecospheres/routes.ts               |  49 ------
 src/router/index.ts                           |  47 +++++-
 .../ecospheres => }/services/export.ts        |   0
 src/{custom/ecospheres => }/utils/bouquet.ts  |   0
 .../views/bouquets/BouquetDetailView.vue      |  15 +-
 .../views/bouquets/BouquetFormView.vue        |   7 +-
 .../views/bouquets/BouquetsListView.vue       |   4 +-
 src/views/datasets/DatasetDetailView.vue      |   2 +-
 src/views/topics/TopicsListView.vue           | 142 ------------------
 27 files changed, 106 insertions(+), 234 deletions(-)
 rename src/{custom/ecospheres/components => components/bouquets}/BouquetCard.vue (98%)
 rename src/{custom/ecospheres/components => components/bouquets}/BouquetDatasetAccordionTitle.vue (95%)
 rename src/{custom/ecospheres/components => components/bouquets}/BouquetDatasetCard.vue (100%)
 rename src/{custom/ecospheres/components => components/bouquets}/BouquetDatasetList.vue (98%)
 create mode 100644 src/components/bouquets/BouquetDatasetListExport.vue
 rename src/{custom/ecospheres/components => components/bouquets}/BouquetList.vue (98%)
 rename src/{custom/ecospheres/components => components/bouquets}/BouquetSearch.vue (98%)
 rename src/{custom/ecospheres => }/components/datasets/DatasetAddToBouquetModal.vue (97%)
 rename src/{custom/ecospheres => }/components/forms/SelectSpatialCoverage.vue (100%)
 rename src/{custom/ecospheres => }/components/forms/bouquet/BouquetForm.vue (98%)
 rename src/{custom/ecospheres => }/components/forms/bouquet/BouquetOwnerForm.vue (100%)
 rename src/{custom/ecospheres => }/components/forms/dataset/DatasetCardForSelect.vue (100%)
 rename src/{custom/ecospheres => }/components/forms/dataset/DatasetEditModal.vue (100%)
 rename src/{custom/ecospheres => }/components/forms/dataset/DatasetPropertiesFields.vue (100%)
 rename src/{custom/ecospheres => }/components/forms/dataset/DatasetPropertiesTextFields.vue (100%)
 rename src/{custom/ecospheres => }/components/forms/dataset/SelectDataset.vue (100%)
 rename src/{custom/ecospheres => }/services/export.ts (100%)
 rename src/{custom/ecospheres => }/utils/bouquet.ts (100%)
 rename src/{custom/ecospheres => }/views/bouquets/BouquetDetailView.vue (97%)
 rename src/{custom/ecospheres => }/views/bouquets/BouquetFormView.vue (96%)
 rename src/{custom/ecospheres => }/views/bouquets/BouquetsListView.vue (96%)
 delete mode 100644 src/views/topics/TopicsListView.vue

diff --git a/src/custom/ecospheres/components/BouquetCard.vue b/src/components/bouquets/BouquetCard.vue
similarity index 98%
rename from src/custom/ecospheres/components/BouquetCard.vue
rename to src/components/bouquets/BouquetCard.vue
index 99a77da18..e899c6edc 100644
--- a/src/custom/ecospheres/components/BouquetCard.vue
+++ b/src/components/bouquets/BouquetCard.vue
@@ -12,11 +12,10 @@ import { NoOptionSelected } from '@/model/theme'
 import type { Topic } from '@/model/topic'
 import { stripFromMarkdown } from '@/utils'
 import { getOwnerAvatar } from '@/utils/avatar'
+import { useExtras } from '@/utils/bouquet'
 import { useSpatialCoverage } from '@/utils/spatial'
 import { getThemeColor, getThemeTextColor } from '@/utils/theme'
 
-import { useExtras } from '../utils/bouquet'
-
 const props = defineProps({
   bouquet: {
     type: Object as () => Topic,
diff --git a/src/custom/ecospheres/components/BouquetDatasetAccordionTitle.vue b/src/components/bouquets/BouquetDatasetAccordionTitle.vue
similarity index 95%
rename from src/custom/ecospheres/components/BouquetDatasetAccordionTitle.vue
rename to src/components/bouquets/BouquetDatasetAccordionTitle.vue
index 5b638daf0..e8f6537e2 100644
--- a/src/custom/ecospheres/components/BouquetDatasetAccordionTitle.vue
+++ b/src/components/bouquets/BouquetDatasetAccordionTitle.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { DatasetProperties } from '@/model/topic'
-
-import { isAvailable } from '../utils/bouquet'
+import { isAvailable } from '@/utils/bouquet'
 
 defineProps({
   datasetProperties: {
diff --git a/src/custom/ecospheres/components/BouquetDatasetCard.vue b/src/components/bouquets/BouquetDatasetCard.vue
similarity index 100%
rename from src/custom/ecospheres/components/BouquetDatasetCard.vue
rename to src/components/bouquets/BouquetDatasetCard.vue
diff --git a/src/custom/ecospheres/components/BouquetDatasetList.vue b/src/components/bouquets/BouquetDatasetList.vue
similarity index 98%
rename from src/custom/ecospheres/components/BouquetDatasetList.vue
rename to src/components/bouquets/BouquetDatasetList.vue
index 00c5c17f5..64163cbc9 100644
--- a/src/custom/ecospheres/components/BouquetDatasetList.vue
+++ b/src/components/bouquets/BouquetDatasetList.vue
@@ -2,16 +2,16 @@
 import { computed, ref, defineModel, type Ref } from 'vue'
 import { VueDraggableNext as draggable } from 'vue-draggable-next'
 
+import DatasetEditModal, {
+  type DatasetEditModalType
+} from '@/components/forms/dataset/DatasetEditModal.vue'
 import config from '@/config'
-import { isAvailable } from '@/custom/ecospheres/utils/bouquet'
 import { type DatasetProperties } from '@/model/topic'
 import { fromMarkdown } from '@/utils'
+import { isAvailable } from '@/utils/bouquet'
 
 import BouquetDatasetAccordionTitle from './BouquetDatasetAccordionTitle.vue'
 import BouquetDatasetCard from './BouquetDatasetCard.vue'
-import DatasetEditModal, {
-  type DatasetEditModalType
-} from './forms/dataset/DatasetEditModal.vue'
 
 const datasets = defineModel({
   type: Array<DatasetProperties>,
diff --git a/src/components/bouquets/BouquetDatasetListExport.vue b/src/components/bouquets/BouquetDatasetListExport.vue
new file mode 100644
index 000000000..9db6a1396
--- /dev/null
+++ b/src/components/bouquets/BouquetDatasetListExport.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import type { DatasetProperties } from '@/model/topic'
+import { exportDatasets } from '@/services/export'
+
+const props = defineProps({
+  filename: {
+    type: String,
+    required: true
+  },
+  datasets: {
+    type: Array<DatasetProperties>,
+    default: []
+  }
+})
+
+const doExport = async () => {
+  const data = await exportDatasets(props.datasets)
+  const link = document.createElement('a')
+  link.href = URL.createObjectURL(data)
+  link.setAttribute('download', `${props.filename}.csv`)
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+}
+</script>
+
+<template>
+  <div v-if="datasets.length > 0" class="flex align-start fr-mt-2w">
+    <DsfrButton
+      size="sm"
+      type="button"
+      label="Exporter la liste des jeux de données"
+      class="fr-mt-2w fr-ml-auto"
+      icon="ri-file-download-line"
+      secondary
+      @click.prevent="doExport"
+    />
+  </div>
+</template>
diff --git a/src/custom/ecospheres/components/BouquetList.vue b/src/components/bouquets/BouquetList.vue
similarity index 98%
rename from src/custom/ecospheres/components/BouquetList.vue
rename to src/components/bouquets/BouquetList.vue
index 76ec5e930..42d352629 100644
--- a/src/custom/ecospheres/components/BouquetList.vue
+++ b/src/components/bouquets/BouquetList.vue
@@ -4,12 +4,11 @@ import { computed, onMounted } from 'vue'
 import { useLoading } from 'vue-loading-overlay'
 import { useRouter, useRoute, type LocationQueryRaw } from 'vue-router'
 
+import BouquetCard from '@/components/bouquets/BouquetCard.vue'
 import { NoOptionSelected } from '@/model/theme'
 import type { Topic } from '@/model/topic'
 import { useTopicStore } from '@/store/TopicStore'
 
-import BouquetCard from '../components/BouquetCard.vue'
-
 const router = useRouter()
 const route = useRoute()
 const topicStore = useTopicStore()
diff --git a/src/custom/ecospheres/components/BouquetSearch.vue b/src/components/bouquets/BouquetSearch.vue
similarity index 98%
rename from src/custom/ecospheres/components/BouquetSearch.vue
rename to src/components/bouquets/BouquetSearch.vue
index 67e305071..8feb0df96 100644
--- a/src/custom/ecospheres/components/BouquetSearch.vue
+++ b/src/components/bouquets/BouquetSearch.vue
@@ -2,14 +2,13 @@
 import { ref, watchEffect, toRef, type Ref, type PropType } from 'vue'
 import { useRouter, useRoute, type LocationQueryRaw } from 'vue-router'
 
+import SelectSpatialCoverage from '@/components/forms/SelectSpatialCoverage.vue'
 import type { SpatialCoverage } from '@/model/spatial'
 import { NoOptionSelected } from '@/model/theme'
 import SpatialAPI from '@/services/api/SpatialAPI'
 import { useUserStore } from '@/store/UserStore'
 import { useThemeOptions } from '@/utils/theme'
 
-import SelectSpatialCoverage from './forms/SelectSpatialCoverage.vue'
-
 const spatialAPI = new SpatialAPI()
 
 const props = defineProps({
diff --git a/src/custom/ecospheres/components/datasets/DatasetAddToBouquetModal.vue b/src/components/datasets/DatasetAddToBouquetModal.vue
similarity index 97%
rename from src/custom/ecospheres/components/datasets/DatasetAddToBouquetModal.vue
rename to src/components/datasets/DatasetAddToBouquetModal.vue
index 278b7f0a7..5fe5980c6 100644
--- a/src/custom/ecospheres/components/datasets/DatasetAddToBouquetModal.vue
+++ b/src/components/datasets/DatasetAddToBouquetModal.vue
@@ -5,11 +5,10 @@ import { toast } from 'vue3-toastify'
 import { useLoading } from 'vue-loading-overlay'
 
 import Tooltip from '@/components/TooltipWrapper.vue'
+import DatasetPropertiesTextFields from '@/components/forms/dataset/DatasetPropertiesTextFields.vue'
 import { Availability, type DatasetProperties, type Topic } from '@/model/topic'
 import { useTopicStore } from '@/store/TopicStore'
 
-import DatasetPropertiesTextFields from '../forms/dataset/DatasetPropertiesTextFields.vue'
-
 const props = defineProps({
   show: {
     type: Boolean,
diff --git a/src/custom/ecospheres/components/forms/SelectSpatialCoverage.vue b/src/components/forms/SelectSpatialCoverage.vue
similarity index 100%
rename from src/custom/ecospheres/components/forms/SelectSpatialCoverage.vue
rename to src/components/forms/SelectSpatialCoverage.vue
diff --git a/src/custom/ecospheres/components/forms/bouquet/BouquetForm.vue b/src/components/forms/bouquet/BouquetForm.vue
similarity index 98%
rename from src/custom/ecospheres/components/forms/bouquet/BouquetForm.vue
rename to src/components/forms/bouquet/BouquetForm.vue
index 9dbe120ed..1e159efb1 100644
--- a/src/custom/ecospheres/components/forms/bouquet/BouquetForm.vue
+++ b/src/components/forms/bouquet/BouquetForm.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { defineModel, computed, ref, onMounted, watch } from 'vue'
 
-import { updateEcospheresExtras } from '@/custom/ecospheres/utils/bouquet'
 import type { SpatialCoverage } from '@/model/spatial'
 import { NoOptionSelected } from '@/model/theme'
 import type { Topic } from '@/model/topic'
+import { updateEcospheresExtras } from '@/utils/bouquet'
 import { useSpatialCoverage } from '@/utils/spatial'
 import { useThemeOptions } from '@/utils/theme'
 
diff --git a/src/custom/ecospheres/components/forms/bouquet/BouquetOwnerForm.vue b/src/components/forms/bouquet/BouquetOwnerForm.vue
similarity index 100%
rename from src/custom/ecospheres/components/forms/bouquet/BouquetOwnerForm.vue
rename to src/components/forms/bouquet/BouquetOwnerForm.vue
diff --git a/src/custom/ecospheres/components/forms/dataset/DatasetCardForSelect.vue b/src/components/forms/dataset/DatasetCardForSelect.vue
similarity index 100%
rename from src/custom/ecospheres/components/forms/dataset/DatasetCardForSelect.vue
rename to src/components/forms/dataset/DatasetCardForSelect.vue
diff --git a/src/custom/ecospheres/components/forms/dataset/DatasetEditModal.vue b/src/components/forms/dataset/DatasetEditModal.vue
similarity index 100%
rename from src/custom/ecospheres/components/forms/dataset/DatasetEditModal.vue
rename to src/components/forms/dataset/DatasetEditModal.vue
diff --git a/src/custom/ecospheres/components/forms/dataset/DatasetPropertiesFields.vue b/src/components/forms/dataset/DatasetPropertiesFields.vue
similarity index 100%
rename from src/custom/ecospheres/components/forms/dataset/DatasetPropertiesFields.vue
rename to src/components/forms/dataset/DatasetPropertiesFields.vue
diff --git a/src/custom/ecospheres/components/forms/dataset/DatasetPropertiesTextFields.vue b/src/components/forms/dataset/DatasetPropertiesTextFields.vue
similarity index 100%
rename from src/custom/ecospheres/components/forms/dataset/DatasetPropertiesTextFields.vue
rename to src/components/forms/dataset/DatasetPropertiesTextFields.vue
diff --git a/src/custom/ecospheres/components/forms/dataset/SelectDataset.vue b/src/components/forms/dataset/SelectDataset.vue
similarity index 100%
rename from src/custom/ecospheres/components/forms/dataset/SelectDataset.vue
rename to src/components/forms/dataset/SelectDataset.vue
diff --git a/src/custom/defis/routes.ts b/src/custom/defis/routes.ts
index c8c14ca49..b46f1af62 100644
--- a/src/custom/defis/routes.ts
+++ b/src/custom/defis/routes.ts
@@ -8,9 +8,7 @@ export const routes = [
         path: '',
         name: 'bouquets',
         component: async () =>
-          await import(
-            '@/custom/ecospheres/views/bouquets/BouquetsListView.vue'
-          ),
+          await import('@/views/bouquets/BouquetsListView.vue'),
         props: (route: RouteLocationNormalizedLoaded) => ({
           query: route.query.q
         })
@@ -22,9 +20,7 @@ export const routes = [
           bouquetId: route.params.bid
         }),
         component: async () =>
-          await import(
-            '@/custom/ecospheres/views/bouquets/BouquetDetailView.vue'
-          )
+          await import('@/views/bouquets/BouquetDetailView.vue')
       }
     ]
   }
diff --git a/src/custom/ecospheres/components/BouquetDatasetListExport.vue b/src/custom/ecospheres/components/BouquetDatasetListExport.vue
index 5a716c3e1..f0566906a 100644
--- a/src/custom/ecospheres/components/BouquetDatasetListExport.vue
+++ b/src/custom/ecospheres/components/BouquetDatasetListExport.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { DatasetProperties } from '@/model/topic'
 
-import { exportDatasets } from '../services/export'
+import { exportDatasets } from '../../../services/export'
 
 const props = defineProps({
   filename: {
diff --git a/src/custom/ecospheres/routes.ts b/src/custom/ecospheres/routes.ts
index e3266bc59..b2ca33bc8 100644
--- a/src/custom/ecospheres/routes.ts
+++ b/src/custom/ecospheres/routes.ts
@@ -1,56 +1,7 @@
-import type { RouteLocationNormalizedLoaded } from 'vue-router'
-
 export const routes = [
   {
     path: '/',
     name: 'home',
     component: async () => await import('./views/HomeView.vue')
-  },
-  {
-    path: '/bouquets',
-    children: [
-      {
-        path: '',
-        name: 'bouquets',
-        component: async () =>
-          await import(
-            '@/custom/ecospheres/views/bouquets/BouquetsListView.vue'
-          ),
-        props: (route: RouteLocationNormalizedLoaded) => ({
-          query: route.query.q,
-          subtheme: route.query.subtheme,
-          theme: route.query.theme,
-          geozone: route.query.geozone,
-          drafts: route.query.drafts
-        })
-      },
-      {
-        path: ':bid',
-        name: 'bouquet_detail',
-        props: (route: RouteLocationNormalizedLoaded) => ({
-          bouquetId: route.params.bid
-        }),
-        component: async () =>
-          await import(
-            '@/custom/ecospheres/views/bouquets/BouquetDetailView.vue'
-          )
-      }
-    ]
-  },
-  {
-    path: `/admin/bouquets/add`,
-    name: 'bouquet_add',
-    component: async () =>
-      await import('@/custom/ecospheres/views/bouquets/BouquetFormView.vue'),
-    meta: { requiresAuth: true },
-    props: { isCreate: true }
-  },
-  {
-    path: `/admin/bouquets/edit/:bid`,
-    name: 'bouquet_edit',
-    component: async () =>
-      await import('@/custom/ecospheres/views/bouquets/BouquetFormView.vue'),
-    meta: { requiresAuth: true },
-    props: { isCreate: false }
   }
 ]
diff --git a/src/router/index.ts b/src/router/index.ts
index 5cf0cddc2..c01548c5b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -44,12 +44,6 @@ const defaultRoutes: RouteRecordRaw[] = [
       }
     ]
   },
-  // topics
-  {
-    path: '/topics',
-    name: 'topics',
-    component: async () => await import('@/views/topics/TopicsListView.vue')
-  },
   // organizations
   {
     path: '/organizations',
@@ -69,6 +63,47 @@ const defaultRoutes: RouteRecordRaw[] = [
       }
     ]
   },
+  {
+    path: '/bouquets',
+    children: [
+      {
+        path: '',
+        name: 'bouquets',
+        component: async () =>
+          await import('@/views/bouquets/BouquetsListView.vue'),
+        props: (route: RouteLocationNormalizedLoaded) => ({
+          query: route.query.q,
+          subtheme: route.query.subtheme,
+          theme: route.query.theme,
+          geozone: route.query.geozone,
+          drafts: route.query.drafts
+        })
+      },
+      {
+        path: ':bid',
+        name: 'bouquet_detail',
+        props: (route: RouteLocationNormalizedLoaded) => ({
+          bouquetId: route.params.bid
+        }),
+        component: async () =>
+          await import('@/views/bouquets/BouquetDetailView.vue')
+      }
+    ]
+  },
+  {
+    path: `/admin/bouquets/add`,
+    name: 'bouquet_add',
+    component: async () => await import('@/views/bouquets/BouquetFormView.vue'),
+    meta: { requiresAuth: true },
+    props: { isCreate: true }
+  },
+  {
+    path: `/admin/bouquets/edit/:bid`,
+    name: 'bouquet_edit',
+    component: async () => await import('@/views/bouquets/BouquetFormView.vue'),
+    meta: { requiresAuth: true },
+    props: { isCreate: false }
+  },
   // technical pages
   {
     path: '/404',
diff --git a/src/custom/ecospheres/services/export.ts b/src/services/export.ts
similarity index 100%
rename from src/custom/ecospheres/services/export.ts
rename to src/services/export.ts
diff --git a/src/custom/ecospheres/utils/bouquet.ts b/src/utils/bouquet.ts
similarity index 100%
rename from src/custom/ecospheres/utils/bouquet.ts
rename to src/utils/bouquet.ts
diff --git a/src/custom/ecospheres/views/bouquets/BouquetDetailView.vue b/src/views/bouquets/BouquetDetailView.vue
similarity index 97%
rename from src/custom/ecospheres/views/bouquets/BouquetDetailView.vue
rename to src/views/bouquets/BouquetDetailView.vue
index a580d3174..43f79a291 100644
--- a/src/custom/ecospheres/views/bouquets/BouquetDetailView.vue
+++ b/src/views/bouquets/BouquetDetailView.vue
@@ -14,23 +14,22 @@ import DiscussionsList from '@/components/DiscussionsList.vue'
 import GenericContainer from '@/components/GenericContainer.vue'
 import OrganizationLogo from '@/components/OrganizationLogo.vue'
 import ReusesList from '@/components/ReusesList.vue'
+import BouquetDatasetList from '@/components/bouquets/BouquetDatasetList.vue'
+import BouquetDatasetListExport from '@/components/bouquets/BouquetDatasetListExport.vue'
 import config from '@/config'
-import BouquetDatasetList from '@/custom/ecospheres/components/BouquetDatasetList.vue'
-import {
-  useBreadcrumbLinksForTopic,
-  useExtras,
-  updateEcospheresExtras
-} from '@/custom/ecospheres/utils/bouquet'
 import { type Topic } from '@/model/topic'
 import { useTopicStore } from '@/store/TopicStore'
 import { useUserStore } from '@/store/UserStore'
 import { descriptionFromMarkdown, formatDate } from '@/utils'
 import { getOwnerAvatar } from '@/utils/avatar'
+import {
+  useBreadcrumbLinksForTopic,
+  useExtras,
+  updateEcospheresExtras
+} from '@/utils/bouquet'
 import { useSpatialCoverage } from '@/utils/spatial'
 import { getThemeTextColor, getThemeColor } from '@/utils/theme'
 
-import BouquetDatasetListExport from '../../components/BouquetDatasetListExport.vue'
-
 const props = defineProps({
   bouquetId: {
     type: String,
diff --git a/src/custom/ecospheres/views/bouquets/BouquetFormView.vue b/src/views/bouquets/BouquetFormView.vue
similarity index 96%
rename from src/custom/ecospheres/views/bouquets/BouquetFormView.vue
rename to src/views/bouquets/BouquetFormView.vue
index 34801d598..c1bfacd14 100644
--- a/src/custom/ecospheres/views/bouquets/BouquetFormView.vue
+++ b/src/views/bouquets/BouquetFormView.vue
@@ -4,15 +4,14 @@ import { useLoading } from 'vue-loading-overlay'
 import { useRouter } from 'vue-router'
 
 import GenericContainer from '@/components/GenericContainer.vue'
+import BouquetForm from '@/components/forms/bouquet/BouquetForm.vue'
+import BouquetOwnerForm from '@/components/forms/bouquet/BouquetOwnerForm.vue'
 import config from '@/config'
-import { cloneTopic } from '@/custom/ecospheres/utils/bouquet'
 import { NoOptionSelected } from '@/model/theme'
 import type { TopicPostData } from '@/model/topic'
 import { useRouteParamsAsString, useRouteQueryAsString } from '@/router/utils'
 import { useTopicStore } from '@/store/TopicStore'
-
-import BouquetForm from '../../components/forms/bouquet/BouquetForm.vue'
-import BouquetOwnerForm from '../../components/forms/bouquet/BouquetOwnerForm.vue'
+import { cloneTopic } from '@/utils/bouquet'
 
 const props = defineProps({
   isCreate: {
diff --git a/src/custom/ecospheres/views/bouquets/BouquetsListView.vue b/src/views/bouquets/BouquetsListView.vue
similarity index 96%
rename from src/custom/ecospheres/views/bouquets/BouquetsListView.vue
rename to src/views/bouquets/BouquetsListView.vue
index 142bd8147..f023c88e6 100644
--- a/src/custom/ecospheres/views/bouquets/BouquetsListView.vue
+++ b/src/views/bouquets/BouquetsListView.vue
@@ -3,8 +3,8 @@ import { ref, computed, watch, type Ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
 import GenericContainer from '@/components/GenericContainer.vue'
-import BouquetList from '@/custom/ecospheres/components/BouquetList.vue'
-import BouquetSearch from '@/custom/ecospheres/components/BouquetSearch.vue'
+import BouquetList from '@/components/bouquets/BouquetList.vue'
+import BouquetSearch from '@/components/bouquets/BouquetSearch.vue'
 import type { BreadcrumbItem } from '@/model/breadcrumb'
 import { NoOptionSelected } from '@/model/theme'
 
diff --git a/src/views/datasets/DatasetDetailView.vue b/src/views/datasets/DatasetDetailView.vue
index 94d26f6ff..0d7b2f629 100644
--- a/src/views/datasets/DatasetDetailView.vue
+++ b/src/views/datasets/DatasetDetailView.vue
@@ -13,8 +13,8 @@ import { computed, onMounted, ref, watch } from 'vue'
 import { useLoading } from 'vue-loading-overlay'
 
 import GenericContainer from '@/components/GenericContainer.vue'
+import DatasetAddToBouquetModal from '@/components/datasets/DatasetAddToBouquetModal.vue'
 import config from '@/config'
-import DatasetAddToBouquetModal from '@/custom/ecospheres/components/datasets/DatasetAddToBouquetModal.vue'
 
 import ChartData from '../../components/ChartData.vue'
 import DiscussionsList from '../../components/DiscussionsList.vue'
diff --git a/src/views/topics/TopicsListView.vue b/src/views/topics/TopicsListView.vue
deleted file mode 100644
index e9c86b166..000000000
--- a/src/views/topics/TopicsListView.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<script setup>
-import { DatasetCard } from '@etalab/data.gouv.fr-components'
-import debounce from 'lodash/debounce'
-import { computed, onMounted, ref, watchEffect, watch } from 'vue'
-import { useLoading } from 'vue-loading-overlay'
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router'
-
-import config from '@/config'
-import { fromMarkdown } from '@/utils/index'
-
-import { useSearchStore } from '../../store/SearchStore'
-import { useTopicStore } from '../../store/TopicStore'
-
-const route = useRoute()
-const router = useRouter()
-const store = useSearchStore()
-const originalQuery = computed(() => route.query.q)
-const currentPage = ref(1)
-const query = ref()
-const loader = useLoading()
-const topicStore = useTopicStore()
-const topic = computed(() => route.query.topic)
-const selectedTopicId = ref(null)
-const datasets = computed(() => store.datasets)
-const pages = computed(() => store.pagination)
-const title = config.website.title
-const topicsConf = config.website.list_search_topics
-const topicsData = computed(() => {
-  return topicStore.$state.data
-})
-const topicOptions = computed(() => {
-  if (!topicsConf?.length) return
-  const topics = topicStore.$state.data
-    .filter((t) => {
-      return topicsConf.map((st) => st.id).includes(t.id)
-    })
-    .map((t) => {
-      return { value: t.id, text: t.name }
-    })
-  return [{ value: '', text: 'Toutes les données' }, ...topics]
-})
-const links = [{ to: '/', text: 'Accueil' }, { text: 'Défis' }]
-const onSelectTopic = (topicId) => {
-  selectedTopicId.value = topicId
-  currentPage.value = 1
-}
-const search = () => {
-  router.push({ path: '/topics', query: { q: query.value } })
-}
-const zIndex = (key) => {
-  return { zIndex: datasets.value.length - key }
-}
-// reset currentPage when query changes
-onBeforeRouteUpdate((to, from) => {
-  currentPage.value = 1
-})
-const getDatasetPage = (id) => {
-  return { name: 'dataset_detail', params: { did: id } }
-}
-const getOrganizationPage = (id) => {
-  if (router.hasRoute('organization_detail')) {
-    return { name: 'organization_detail', params: { oid: id } }
-  }
-  return ''
-}
-onMounted(() => {
-  if (topicsConf?.length) {
-    topicStore.loadTopicsFromList(topicsConf)
-  }
-  query.value = originalQuery.value
-})
-// fill topic name when arriving on the page with a topic ID
-// TODO: topicId is not updated when selecting a topic
-watchEffect(() => {
-  if (!topic.value || !topicsConf) return
-  selectedTopicId.value = topic.value
-})
-watchEffect(() => {
-  if (!originalQuery.value) return
-  query.value = originalQuery.value
-})
-const delayedSearch = debounce(
-  (currentQuery, currentTopicId, currentPageValue) => {
-    const loadingInstance = loader.show()
-    store.search(currentQuery, currentTopicId, currentPageValue).finally(() => {
-      loadingInstance.hide()
-    })
-  },
-  400
-)
-watch(
-  [query, selectedTopicId, currentPage],
-  ([currentQuery, currentTopicId, currentPageValue]) => {
-    delayedSearch(currentQuery, currentTopicId, currentPageValue)
-  },
-  {
-    immediate: true
-  }
-)
-</script>
-<template>
-  <div class="fr-container">
-    <DsfrBreadcrumb class="fr-mb-1v" :links="links" />
-  </div>
-  <div class="fr-container fr-mb-4w">
-    <h1 class="fr-mb-2v">Défis</h1>
-    <div v-if="topicsConf" class="fr-col-md-12 fr-mb-2w">
-      <DsfrSelect
-        :model-value="selectedTopicId"
-        :options="topicOptions"
-        default-unselected-text="Toutes les données"
-        @update:model-value="onSelectTopic"
-      >
-        <template #label>Sélectionner un autre défi</template>
-      </DsfrSelect>
-    </div>
-    <div v-for="topic in topicsData" v-bind:key="topic.id">
-      <template v-if="topic.id == selectedTopicId">
-        <br />
-        <h2>{{ topic.name }}</h2>
-        <div v-html="fromMarkdown(topic.description)"></div>
-        <div class="datagouv-components fr-col-md-12">
-          <DatasetCard
-            v-for="(d, index) in datasets"
-            :key="d.id"
-            :style="zIndex(index)"
-            :dataset="d"
-            :dataset-url="getDatasetPage(d.id)"
-            :organization-url="getOrganizationPage(d.organization.id)"
-          />
-        </div>
-      </template>
-    </div>
-  </div>
-  <DsfrPagination
-    v-if="pages.length"
-    class="fr-container"
-    :current-page="currentPage - 1"
-    :pages="pages"
-    @update:current-page="(p) => (currentPage = p + 1)"
-  />
-</template>

From 6ac1a36fad48297216c971666382fe359e99b312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Bult=C3=A9?= <alexandre@bulte.net>
Date: Mon, 12 Aug 2024 17:32:43 +0200
Subject: [PATCH 2/2] delete unused BouquetDatasetListExport

---
 .../components/BouquetDatasetListExport.vue   | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 src/custom/ecospheres/components/BouquetDatasetListExport.vue

diff --git a/src/custom/ecospheres/components/BouquetDatasetListExport.vue b/src/custom/ecospheres/components/BouquetDatasetListExport.vue
deleted file mode 100644
index f0566906a..000000000
--- a/src/custom/ecospheres/components/BouquetDatasetListExport.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<script setup lang="ts">
-import type { DatasetProperties } from '@/model/topic'
-
-import { exportDatasets } from '../../../services/export'
-
-const props = defineProps({
-  filename: {
-    type: String,
-    required: true
-  },
-  datasets: {
-    type: Array<DatasetProperties>,
-    default: []
-  }
-})
-
-const doExport = async () => {
-  const data = await exportDatasets(props.datasets)
-  const link = document.createElement('a')
-  link.href = URL.createObjectURL(data)
-  link.setAttribute('download', `${props.filename}.csv`)
-  document.body.appendChild(link)
-  link.click()
-  document.body.removeChild(link)
-}
-</script>
-
-<template>
-  <div v-if="datasets.length > 0" class="flex align-start fr-mt-2w">
-    <DsfrButton
-      size="sm"
-      type="button"
-      label="Exporter la liste des jeux de données"
-      class="fr-mt-2w fr-ml-auto"
-      icon="ri-file-download-line"
-      secondary
-      @click.prevent="doExport"
-    />
-  </div>
-</template>