Skip to content
Snippets Groups Projects
Commit de04c5cb authored by simon.mellerin's avatar simon.mellerin
Browse files

Merge branch '52-fix-dataset-edit' into 'main'

#52 - Dataset form - fix edition

See merge request !84
parents 028a5474 53d36622
No related branches found
No related tags found
1 merge request!84#52 - Dataset form - fix edition
Pipeline #10897 passed
...@@ -17,7 +17,7 @@ import AutoComplete from 'primevue/autocomplete' ...@@ -17,7 +17,7 @@ import AutoComplete from 'primevue/autocomplete'
import { ref } from 'vue' import { ref } from 'vue'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
const model = defineModel<string[] | undefined>() const model = defineModel<string[] | undefined | null>()
const { locale } = useI18n() const { locale } = useI18n()
const loading = ref<boolean>(false) const loading = ref<boolean>(false)
...@@ -38,7 +38,7 @@ const addCustomValue = (event: KeyboardEvent) => { ...@@ -38,7 +38,7 @@ const addCustomValue = (event: KeyboardEvent) => {
const value = (event.target as HTMLInputElement).value const value = (event.target as HTMLInputElement).value
if (value) { if (value) {
if (model.value === undefined) { if (model.value == null) {
model.value = [value] model.value = [value]
} else if (!model.value.includes(value)) { } else if (!model.value.includes(value)) {
model.value.push(value) model.value.push(value)
......
...@@ -10,7 +10,12 @@ ...@@ -10,7 +10,12 @@
:href="shareLink" :href="shareLink"
/> />
<Button <Button
v-if="resource?.identifier && can('read', community) && can('update', resource) && router.hasRoute(updateRoute.name)" v-if="
resource?.identifier &&
can('read', community) &&
can('update', resource) &&
router.hasRoute(updateRoute.name)
"
size="small" size="small"
:as="OcLink" :as="OcLink"
:to="updateRoute" :to="updateRoute"
...@@ -162,7 +167,7 @@ ...@@ -162,7 +167,7 @@
v-if="spatialGeometry.length" v-if="spatialGeometry.length"
:spatial-items="spatialGeometry" :spatial-items="spatialGeometry"
/> />
<div v-if="spatialConcepts.length" class="flex gap-2"> <div v-if="spatialConcepts.length" class="flex flex-wrap gap-2">
<span <span
class="rounded bg-slate-200 border border-slate-500 text-black font-medium px-2 py-1" class="rounded bg-slate-200 border border-slate-500 text-black font-medium px-2 py-1"
v-for="spatialConcept in spatialConcepts" v-for="spatialConcept in spatialConcepts"
......
...@@ -133,7 +133,7 @@ function buildDatasetTriples(dataset: OcDataset, profile: OcPerson) { ...@@ -133,7 +133,7 @@ function buildDatasetTriples(dataset: OcDataset, profile: OcPerson) {
dcat:hadRole <https://www.irit.fr/opencommon/terms/dataStewardRole> dcat:hadRole <https://www.irit.fr/opencommon/terms/dataStewardRole>
]` ]`
if (dataset.keyword && dataset.keyword.length) { if (dataset.keyword) {
const keywords: string = formatLocalizedProperty<string[]>(dataset.keyword, (item, locale) => { const keywords: string = formatLocalizedProperty<string[]>(dataset.keyword, (item, locale) => {
return item.map((item) => defaultLocalizedPropFormatter(item, locale)).join(', ') return item.map((item) => defaultLocalizedPropFormatter(item, locale)).join(', ')
}) })
...@@ -657,7 +657,6 @@ export async function getDataset(identifier: string, auth?: Credentials): Promis ...@@ -657,7 +657,6 @@ export async function getDataset(identifier: string, auth?: Credentials): Promis
dataset.accrualPeriodicity = datasetResponse[11][0] dataset.accrualPeriodicity = datasetResponse[11][0]
dataset.license = datasetResponse[12][0] dataset.license = datasetResponse[12][0]
dataset.conformsTo = datasetResponse[13][0] dataset.conformsTo = datasetResponse[13][0]
dataset.spatial = datasetResponse[14]
// Format Dates // Format Dates
// dataset.issued = dataset.issued ? new Date(Date.parse(dataset.issued)) : dataset.issued // dataset.issued = dataset.issued ? new Date(Date.parse(dataset.issued)) : dataset.issued
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment