diff --git a/src/components/HomeThemes.vue b/src/components/HomeThemes.vue index 70d4493b..37a2f5f1 100644 --- a/src/components/HomeThemes.vue +++ b/src/components/HomeThemes.vue @@ -8,15 +8,15 @@ import { useTopicStore } from '@/store/TopicStore' import Tile from './Tile.vue' const topicStore = useTopicStore() -const extrasToProcess = config.website.topics.extras_to_process + +const extrasToProcess = config.website.topics.extras_to_process as string +const topicName = config.website.topics.topic_name.name as string +const topicSlug = config.website.topics.topic_name.slug as string const getCustomBoxShadow = (color: string) => { return `box-shadow: rgb(221, 221, 221) 0px 0px 0px 1px inset, #${color} 0px -4px 0px 0px inset` } -const topicName = config.website.topics.topic_name.name -const topicSlug = config.website.topics.topic_name.slug - const getThemeDescription = (theme: Theme) => { const nbBouquets = topicStore.data.filter((topic) => { return !topic.private && topic.extras[extrasToProcess].theme === theme.name diff --git a/src/components/bouquets/BouquetCard.vue b/src/components/bouquets/BouquetCard.vue index f321272c..f7363ae8 100644 --- a/src/components/bouquets/BouquetCard.vue +++ b/src/components/bouquets/BouquetCard.vue @@ -17,8 +17,8 @@ import { useExtras } from '@/utils/bouquet' import { useSpatialCoverage } from '@/utils/spatial' import { getThemeColor, getThemeTextColor } from '@/utils/theme' -const topicName = config.website.topics.topic_name.name -const topicSlug = config.website.topics.topic_name.slug +const topicSlug = config.website.topics.topic_name.slug as string +const extrasToProcess = config.website.topics.extras_to_process as string const props = defineProps({ bouquet: { @@ -27,9 +27,7 @@ const props = defineProps({ } }) -const extrasToProcess = config.website.topics.extras_to_process - -const bouquetRef = toRef(props, topicName) +const bouquetRef = toRef(props, 'bouquet') const spatialCoverage = useSpatialCoverage(bouquetRef) const ownerName = useOwnerName(props.bouquet) diff --git a/src/components/bouquets/BouquetDatasetList.vue b/src/components/bouquets/BouquetDatasetList.vue index f8d91939..92b0014d 100644 --- a/src/components/bouquets/BouquetDatasetList.vue +++ b/src/components/bouquets/BouquetDatasetList.vue @@ -37,7 +37,7 @@ const expandStore: Ref<{ [key: string]: string | null }> = ref({}) // make a copy for local reordering before save const originalDatasets = ref([...datasets.value]) -const topicName = config.website.topics.topic_name.name +const topicName = config.website.topics.topic_name.name as string const expandedIds = computed(() => { return Object.keys(expandStore.value).filter((k) => !!expandStore.value[k]) @@ -60,7 +60,7 @@ const getAccordeonId = (index: number): string => { const removeDataset = (index: number) => { if ( window.confirm( - `Etes-vous sûr de vouloir supprimer ce jeu de données du ${topicName.value} ?` + `Etes-vous sûr de vouloir supprimer ce jeu de données du ${topicName} ?` ) ) { delete expandStore.value[getAccordeonId(index)] diff --git a/src/components/bouquets/BouquetSearch.vue b/src/components/bouquets/BouquetSearch.vue index 67abdee0..38043cff 100644 --- a/src/components/bouquets/BouquetSearch.vue +++ b/src/components/bouquets/BouquetSearch.vue @@ -41,10 +41,10 @@ const selectedSpatialCoverage: Ref = ref(undefined) const themeNameRef = toRef(props, 'themeName') const { themeOptions, subthemeOptions } = useThemeOptions(themeNameRef) -const topicName = config.website.topics.topic_name.slug -const useThemes = config.website.topics.themes.usage -const mainTheme = config.website.topics.themes.main_name -const secondaryTheme = config.website.topics.themes.secondary_name +const topicName = config.website.topics.topic_name.slug as string +const useThemes = config.website.topics.themes.usage as boolean +const mainTheme = config.website.topics.themes.main_name as string +const secondaryTheme = config.website.topics.themes.secondary_name as string const localShowDrafts = ref(false) const computeQueryArgs = ( diff --git a/src/components/datasets/DatasetAddToBouquetModal.vue b/src/components/datasets/DatasetAddToBouquetModal.vue index c67c25f7..28046897 100644 --- a/src/components/datasets/DatasetAddToBouquetModal.vue +++ b/src/components/datasets/DatasetAddToBouquetModal.vue @@ -30,7 +30,7 @@ const datasetEditorialization = ref( config.website.topics.dataset_editorialization ) -const topicName = config.website.topics.topic_name.name +const topicName = config.website.topics.topic_name.name as string const bouquets = topicStore.myTopics const datasetProperties = ref({ @@ -103,12 +103,9 @@ const submit = async () => { tags: bouquet.tags, extras: bouquet.extras }) - toast( - `Jeu de données ajouté avec succès au ${topicName.value} "${bouquet.name}"`, - { - type: 'success' - } - ) + toast(`Jeu de données ajouté avec succès au ${topicName} "${bouquet.name}"`, { + type: 'success' + }) closeModal() } @@ -151,8 +148,8 @@ onMounted(() => { diff --git a/src/components/forms/bouquet/BouquetForm.vue b/src/components/forms/bouquet/BouquetForm.vue index 8e77e956..0c682060 100644 --- a/src/components/forms/bouquet/BouquetForm.vue +++ b/src/components/forms/bouquet/BouquetForm.vue @@ -19,19 +19,19 @@ const emits = defineEmits(['updateValidation']) const spatialCoverage = useSpatialCoverage(topic) -const extrasToProcess = config.website.topics.extras_to_process -const useThemes = config.website.topics.themes.usage -const mainTheme = config.website.topics.themes.main_name -const secondaryTheme = config.website.topics.themes.secondary_name +const extrasToProcess = config.website.topics.extras_to_process as string +const useThemes = config.website.topics.themes.usage as boolean +const mainTheme = config.website.topics.themes.main_name as string +const secondaryTheme = config.website.topics.themes.secondary_name as string -const topicName = config.website.topics.topic_name.name -const topicSlug = config.website.topics.topic_name.slug +const topicName = config.website.topics.topic_name.name as string +const topicSlug = config.website.topics.topic_name.slug as string const theme = ref(NoOptionSelected) const subtheme = ref(NoOptionSelected) const isValid = computed(() => { - if (useThemes.value) { + if (useThemes) { return ( topic.value.name && topic.value.name.trim() !== '' && @@ -132,7 +132,7 @@ onMounted(() => { /> -
+
diff --git a/src/components/forms/bouquet/BouquetOwnerForm.vue b/src/components/forms/bouquet/BouquetOwnerForm.vue index e4d5ca5b..82dec155 100644 --- a/src/components/forms/bouquet/BouquetOwnerForm.vue +++ b/src/components/forms/bouquet/BouquetOwnerForm.vue @@ -17,7 +17,7 @@ const choice: Ref<'organization' | 'owner'> = ref( ) const organizations = computed(() => userStore.data?.organizations || []) -const topicName = config.website.topics.topic_name.name +const topicName = config.website.topics.topic_name.name as string const onSelectOrganization = (value: string) => { const idx = parseInt(value) diff --git a/src/components/forms/dataset/DatasetPropertiesTextFields.vue b/src/components/forms/dataset/DatasetPropertiesTextFields.vue index 23745e1b..96577438 100644 --- a/src/components/forms/dataset/DatasetPropertiesTextFields.vue +++ b/src/components/forms/dataset/DatasetPropertiesTextFields.vue @@ -10,7 +10,7 @@ const props = defineProps({ } }) -const topicName = config.website.topics.topic_name.name +const topicName = config.website.topics.topic_name.name as string const emit = defineEmits(['update:datasetProperties']) diff --git a/src/components/topics/TopicDataTile.vue b/src/components/topics/TopicDataTile.vue index a3b22bde..31d39e3f 100644 --- a/src/components/topics/TopicDataTile.vue +++ b/src/components/topics/TopicDataTile.vue @@ -1,11 +1,13 @@ -