@@ -204,12 +205,14 @@ import {
NcLoadingIcon,
NcSelect,
} from '@nextcloud/vue'
-import { z } from 'zod'
-import validator from 'validator'
+import { verifyInput as _verifyInput } from './verifyInput.js'
+import { setDefaultValue as _setDefaultValue } from './setDefaultValue.js'
// icons
import Plus from 'vue-material-design-icons/Plus.vue'
+import { Publication } from '../../entities/index.js'
+
export default {
name: 'AddPublicationDataModal',
components: {
@@ -244,7 +247,7 @@ export default {
getFilteredMetadataProperties() {
if (!publicationStore.publicationMetaData?.properties) return []
return Object.values(publicationStore.publicationMetaData?.properties)
- .filter((prop) => !Object.keys(publicationStore.publicationItem?.data).includes(prop.title))
+ .filter((prop) => !Object.keys(publicationStore.publicationItem?.data ?? {}).includes(prop.title))
},
/**
* based on the result `getFilteredMetadataProperties` gives AND the selected value in the eigenschappen dropdown,
@@ -255,7 +258,7 @@ export default {
* @return {object | null} A single metadata properties object or null
*/
getSelectedMetadataProperty() {
- return this.getFilteredMetadataProperties.filter((prop) => prop?.title === this.eigenschappen.value?.label)[0] || null
+ return this.getFilteredMetadataProperties.find((prop) => prop?.title ? prop?.title === this.eigenschappen.value?.label : null) || null
},
mapMetadataEigenschappen() {
if (publicationStore.publicationMetaData) {
@@ -289,295 +292,7 @@ export default {
* @see getSelectedMetadataProperty
*/
verifyInput() {
- const selectedProperty = this.getSelectedMetadataProperty
- if (!selectedProperty) return {}
-
- let schema = z.any()
-
- // TYPE
- if (selectedProperty.type === 'string') {
- schema = z.string()
- }
- if (selectedProperty.type === 'number') {
- schema = z.number()
- }
- if (selectedProperty.type === 'integer') {
- schema = z.number()
- }
- if (selectedProperty.type === 'object') {
- schema = z.string().refine((val) => {
- try {
- JSON.parse(val)
- return true
- } catch (error) {
- return false
- }
- }, 'Dit is niet een geldige object')
- }
- if (selectedProperty.type === 'array') {
- schema = z.array(z.string())
- }
- if (selectedProperty.type === 'boolean') {
- schema = z.boolean()
- }
- if (selectedProperty.type === 'dictionary') {
- schema = z.string() // its not known what a dictionary is yet, so this is here as a little failsafe
- }
-
- // FORMAT - you only want format to be used on strings, this may change in the future
- if (selectedProperty.type === 'string') {
- if (selectedProperty.format === 'date') {
- schema = schema.datetime()
- }
- if (selectedProperty.format === 'time') {
- schema = schema.datetime()
- }
- if (selectedProperty.format === 'date-time') {
- schema = schema.datetime()
- }
- if (selectedProperty.format === 'uuid') {
- // schema = schema.uuid({ message: 'Dit is geen geldige UUID' })
- schema = schema.refine(validator.isUUID, { message: 'Dit is geen geldige UUID' })
- }
- if (selectedProperty.format === 'email') {
- // schema = schema.email({ message: 'Dit is geen geldige Email' })
- schema = schema.refine(validator.isEmail, { message: 'Dit is geen geldige Email' })
- }
- if (selectedProperty.format === 'idn-email') {
- // schema = schema.email({ message: 'Dit is geen geldige Email' })
- schema = schema.refine(validator.isEmail, { message: 'Dit is geen geldige IDN-Email' })
- }
- if (selectedProperty.format === 'hostname') {
- schema = schema.regex(
- /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9-]*[A-Za-z0-9])$/g,
- { message: 'Dit is geen geldige hostname' },
- )
- }
- if (selectedProperty.format === 'idn-hostname') {
- schema = schema.regex(
- /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9-]*[A-Za-z0-9])$/g,
- { message: 'Dit is geen geldige IDN-hostname' },
- )
- }
- if (selectedProperty.format === 'ipv4') {
- // schema = schema.ip({ version: 'v4', message: 'Dit is geen geldige ipv4' })
- schema = schema.refine((val) => validator.isIP(val, 4), { message: 'Dit is geen geldige ipv4' })
- }
- if (selectedProperty.format === 'ipv6') {
- // schema = schema.ip({ version: 'v6', message: 'Dit is geen geldige ipv6' })
- schema = schema.refine((val) => validator.isIP(val, 6), { message: 'Dit is geen geldige ipv6' })
- }
- if (selectedProperty.format === 'url') {
- schema = schema.refine(
- (val) => validator.isURL(val, { require_protocol: true }),
- { message: 'Dit is geen geldige URL' },
- )
- }
- if (selectedProperty.format === 'uri') {
- // schema = schema.url({ message: 'Dit is geen geldige URI' })
- schema = schema.refine(
- (val) => validator.isURL(val, { require_protocol: true }),
- { message: 'Dit is geen geldige URI' },
- )
- }
- if (selectedProperty.format === 'uri-reference') {
- // schema = schema.url({ message: 'Dit is geen geldige URI-reference' })
- schema = schema.refine(
- (val) => validator.isURL(val, { require_protocol: true }),
- { message: 'Dit is geen geldige URI-reference' },
- )
- }
- if (selectedProperty.format === 'iri') {
- // schema = schema.url({ message: 'Dit is geen geldige IRI' })
- schema = schema.refine(
- (val) => validator.isURL(val, { require_protocol: true }),
- { message: 'Dit is geen geldige IRI' },
- )
- }
- if (selectedProperty.format === 'iri-reference') {
- // schema = schema.url({ message: 'Dit is geen geldige IRI-reference' })
- schema = schema.refine(
- (val) => validator.isURL(val, { require_protocol: true }),
- { message: 'Dit is geen geldige IRI-reference' },
- )
- }
- if (selectedProperty.format === 'uri-template') {
- // schema = schema.url({ message: 'Dit is geen geldige URI-template' })
- schema = schema.refine(
- (val) => validator.isURL(val, { require_protocol: true }),
- { message: 'Dit is geen geldige URI-template' },
- )
- }
- if (selectedProperty.format === 'json-pointer') {
- schema = schema.refine((val) => {
- try {
- JSON.parse(val)
- return true
- } catch (error) {
- return false
- }
- }, 'Dit is niet een geldige json-pointer')
- }
- if (selectedProperty.format === 'regex') {
- schema = schema.refine((val) => {
- try {
- RegExp(val)
- return true
- } catch (error) {
- return false
- }
- }, 'Dit is niet een geldige regex')
- }
- if (selectedProperty.format === 'binary') {
- schema = schema.regex(/^[0|1]*$/g, 'Dit is geen geldige binair')
- }
- if (selectedProperty.format === 'byte') {
- schema = schema.regex(/^([0|1]{8})*$/g, 'Dit is geen geldige byte')
- }
- if (selectedProperty.format === 'rsin') {
- schema = schema.regex(/^(\d{9})$/g, 'Dit is geen geldige RSIN-nummer')
- }
- if (selectedProperty.format === 'kvk') {
- schema = schema.regex(/^(\d{8})$/g, 'Dit is geen geldige KVK-nummer')
- }
- if (selectedProperty.format === 'bsn') {
- schema = schema.regex(/^(\d{9})$/g, 'Dit is geen geldige BSN-nummer')
- }
- if (selectedProperty.format === 'oidn') {
- schema = schema.regex(/^\d{8,12}$/g, 'Dit is geen geldige OIDN-nummer')
- }
- if (selectedProperty.format === 'telephone') {
- schema = schema.refine(validator.isMobilePhone, { message: 'Dit is geen geldige telephone-nummer' })
- }
- }
-
- // GENERIC RULES
- if (selectedProperty.pattern) {
- // check is the regex given is valid to avoid any issues
- let isValidRegex = false
- try {
- RegExp(selectedProperty.pattern)
- isValidRegex = true
- } catch (err) {
- isValidRegex = false
- }
-
- if (isValidRegex) {
- const regexPattern = new RegExp(selectedProperty.pattern)
-
- schema = schema.refine((val) => {
- if (Array.isArray(val)) {
- // Validate each string in the array
- return val.every((item) => regexPattern.test(item))
- } else {
- // Validate single string
- return regexPattern.test(val)
- }
- }, { message: 'Voldoet niet aan het vereiste patroon' })
- }
- }
- // number / integer
- if (selectedProperty.type === 'number' || selectedProperty.type === 'integer') {
- // exclusiveMin / exclusiveMax are a boolean, which you can add to a number to add 1 (e.g: 1 + true = 2),
- // this is a stupid simple way to implement what the stoplight is expecting
- // https://conduction.stoplight.io/docs/open-catalogi/5og7tj13bkzj5-create-metadata
- if (selectedProperty.minimum) {
- const minimum = selectedProperty.minimum
- schema = schema.min(minimum + selectedProperty.exclusiveMin, { message: `Minimaal ${minimum + selectedProperty.exclusiveMin}` })
- }
- if (selectedProperty.maximum) {
- const maximum = selectedProperty.maximum
- schema = schema.max(maximum - selectedProperty.exclusiveMax, { message: `Maximaal ${maximum - selectedProperty.exclusiveMax}` })
- }
- if (selectedProperty.multipleOf) {
- const multipleOf = selectedProperty.multipleOf
- schema = schema.refine((val) => val % multipleOf === 0, `${this.value} is niet een veelvoud van ${multipleOf}`)
- }
- } else if (selectedProperty.type === 'array') { // TYPE : ARRAY
- if (selectedProperty.minItems) {
- const minItems = selectedProperty.minItems
- schema = schema.min(minItems, { message: `Minimale hoeveelheid: ${minItems}` })
- }
- if (selectedProperty.maxItems) {
- const maxItems = selectedProperty.maxItems
- schema = schema.max(maxItems, { message: `Maximale hoeveelheid: ${maxItems}` })
- }
- } else { // Anything else
- if (selectedProperty.minLength) {
- const minLength = selectedProperty.minLength
- schema = schema.min(minLength, { message: `Minimale lengte: ${minLength}` })
- }
- if (selectedProperty.maxLength) {
- const maxLength = selectedProperty.maxLength
- schema = schema.max(maxLength, { message: `Maximale lengte: ${maxLength}` })
- }
- }
-
- // REQUIRED CHECK
- if (selectedProperty.required) {
- if (selectedProperty.type === 'array') {
- schema = schema.and(
- // explanation:
- // if ANY item in the array is not an empty string, it passes
- z.custom((val) => val.some((item) => item.trim() !== ''), { message: 'Deze veld is verplicht' }),
- )
- } else if (selectedProperty.type === 'number') {
- // finite says that ANY number between infinite and -infinite is allowed
- // But NaN is not
- schema = schema.finite({ message: 'Deze veld is verplicht' })
- } else if (selectedProperty.type === 'integer') {
- schema = schema.finite({ message: 'Deze veld is verplicht' })
- } else {
- schema = schema.min // .min() does not exist after .refine(), this has been reported at https://github.com/colinhacks/zod/issues/3725
- ? schema.min(1, { message: 'Deze veld is verplicht' })
- : schema.refine(val => val.length >= 1, { message: 'Deze veld is verplicht' })
- }
- }
- if (!selectedProperty.required) {
- // As the value can NEVER be omitted in this code, which is what `.optional()` does
- // I add a `or()` method with a literal empty array / string to act as optional values
-
- // this array check gives me nightmares, I think it works but please don't touch it
- if (selectedProperty.type === 'array') {
- schema = schema.or( // an empty array is always parsed as ['']
- z.custom((val) => val.length === 1 && val[0].trim() === ''),
- )
- } else if (selectedProperty.type === 'number') {
- schema = schema.or(z.nan())
- } else if (selectedProperty.type === 'integer') {
- schema = schema.or(z.nan())
- } else {
- schema = schema.or(z.literal(''))
- }
- }
-
- // RUN TESTS
- let result
- switch (selectedProperty.type) {
- case 'string':{
- if (['date', 'time', 'date-time'].includes(selectedProperty.format)) {
- result = schema.safeParse(this.value.toISOString())
- } else result = schema.safeParse(this.value)
- break
- }
- case 'array':{
- result = schema.safeParse(this.value.split(/ *, */g)) // split on , to make an array
- break
- }
- case 'number':
- case 'integer':{
- result = schema.safeParse(parseFloat(this.value))
- break
- }
- default: {
- result = schema.safeParse(this.value)
- }
- }
-
- return {
- success: result.success,
- helperText: result?.error?.[0]?.message || result?.error?.issues?.[0].message || false,
- }
+ return _verifyInput(this.getSelectedMetadataProperty, this.value)
},
},
watch: {
@@ -588,100 +303,36 @@ export default {
},
methods: {
/**
- * Accepts the selected metadata property or nothing, and changes the value property in `data()` to the default value from the property.
+ * Accepts the selected metadata property, and changes the value property in `data()` to the default value from the property.
*
- * Depending on the property.type, it will put in specialized data, such as `object` or 'boolean'.
+ * Depending on the property.type, it will put in specialized data, such as `object` or `boolean`.
*
* This function only runs when the selected metadata property changes
* @param {object} SelectedMetadataProperty The metadata property Object containing the rules
* @see getSelectedMetadataProperty
*/
- setDefaultValue(SelectedMetadataProperty = null) {
- const prop = SelectedMetadataProperty || this.getSelectedMetadataProperty
- if (!prop) return
-
- switch (prop.type) {
- case 'string': {
- if (prop.format === 'date' || prop.format === 'time' || prop.format === 'date-time') {
- const isValidDate = !isNaN(new Date(prop.default))
-
- console.log('Set default value to Date ', isValidDate ? prop.default : '')
- this.value = new Date(isValidDate ? prop.default : new Date())
- break
- } else {
- console.log('Set default value to ', prop.default)
- this.value = prop.default
- break
- }
- }
-
- case 'object': {
- console.log('Set default value to Object ', prop.default)
- this.value = typeof prop.default === 'object'
- ? JSON.stringify(prop.default)
- : prop.default
- break
- }
-
- case 'array': {
- console.log('Set default value to Array ', prop.default)
- this.value = Array.isArray(prop.default) ? (prop.default.join(', ') || '') : prop.default
- break
- }
-
- case 'boolean': {
- console.log('Set default value to Boolean ', prop.default)
- const isTrueSet = typeof prop.default === 'boolean'
- ? prop.default
- : prop.default?.toLowerCase() === 'true'
- this.value = isTrueSet
- break
- }
-
- case 'number':
- case 'integer': {
- console.log('Set default value to Number ', prop.default)
- this.value = prop.default || 0
- break
- }
-
- default:
- console.log('Set default value to ', prop.default)
- this.value = prop.default
- break
- }
+ setDefaultValue(SelectedMetadataProperty) {
+ this.value = _setDefaultValue(SelectedMetadataProperty)
},
AddPublicatieEigenschap() {
this.loading = true
- const bodyData = publicationStore.publicationItem
- bodyData.data[this.eigenschappen.value?.label] = this.value
- delete bodyData.publicationDate
-
- fetch(
- `/index.php/apps/opencatalogi/api/publications/${publicationStore.publicationItem.id}`,
- {
- method: 'PUT',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify({
- ...bodyData,
- catalogi: bodyData.catalogi.id,
- metaData: bodyData.metaData.id,
- }),
- },
- )
- .then((response) => {
+ const publicationClone = { ...publicationStore.publicationItem }
+
+ publicationClone.data[this.eigenschappen.value?.label] = this.value
+ delete publicationClone.publicationDate
+
+ const newPublicationItem = new Publication({
+ ...publicationClone,
+ catalogi: publicationClone.catalogi.id ?? publicationClone.catalogi,
+ metaData: publicationClone.metaData.id ?? publicationClone.metaData,
+ })
+
+ publicationStore.editPublication(newPublicationItem)
+ .then(({ response }) => {
this.loading = false
this.success = response.ok
- // Lets refresh the publicationList
- publicationStore.refreshPublicationList()
- response.json().then((data) => {
- publicationStore.setPublicationItem(data)
- })
-
// Wait for the user to read the feedback then close the model
const self = this
setTimeout(function() {
@@ -744,4 +395,12 @@ export default {
display: flex;
gap: 4px;
}
+
+.addPublicationPropertyModal .mx-datepicker {
+ margin-top: 0rem;
+ transition: margin 400ms;
+}
+.addPublicationPropertyModal .mx-datepicker:has(.mx-datepicker-popup) {
+ margin-top: 12rem;
+}
diff --git a/src/modals/publicationData/EditPublicationDataModal.vue b/src/modals/publicationData/EditPublicationDataModal.vue
index e76e86a1..3346a2c2 100644
--- a/src/modals/publicationData/EditPublicationDataModal.vue
+++ b/src/modals/publicationData/EditPublicationDataModal.vue
@@ -4,10 +4,12 @@ import { navigationStore, publicationStore } from '../../store/store.js'
Bewerk publicatie eigenschappen
+
{{ publicationStore.publicationDataKey }}
Publicatie eigenschap succesvol bewerkt
@@ -19,17 +21,169 @@ import { navigationStore, publicationStore } from '../../store/store.js'
{{ error }}
+
+ Deze eigenschap staat gemarkeerd als afgeschaft, hij zal bij een komende versie van het onderliggende publicatie type waarschijnlijk komen te vervallen.
+
+ @click="updatePublication(publication.id)">
@@ -40,21 +194,27 @@ import { navigationStore, publicationStore } from '../../store/store.js'
- {{ success ? 'Sluiten' : 'Annuleer' }}
+ {{ success !== null ? 'Sluiten' : 'Annuleer' }}
+
+
+
diff --git a/src/sidebars/directory/DirectorySideBar.vue b/src/sidebars/directory/DirectorySideBar.vue
index bc5f8337..6a3f0d3d 100644
--- a/src/sidebars/directory/DirectorySideBar.vue
+++ b/src/sidebars/directory/DirectorySideBar.vue
@@ -6,7 +6,7 @@ import { navigationStore, directoryStore, metadataStore } from '../../store/stor
-
@@ -28,7 +28,7 @@ import { navigationStore, directoryStore, metadataStore } from '../../store/stor
-
@@ -36,14 +36,14 @@ import { navigationStore, directoryStore, metadataStore } from '../../store/stor
-
-
-
Deze organisatie is niet gevalideerd met een certificaat.
-
-
-
-
Deze listing heeft geen organisatie.
-
+
+
+
Deze organisatie is niet gevalideerd met een certificaat.
+
+
+
+
Deze listing heeft geen organisatie.
+
Samenvatting:
{{ directoryStore.listingItem?.summery }}
@@ -70,7 +70,7 @@ import { navigationStore, directoryStore, metadataStore } from '../../store/stor
- {{ metadataSingular }}
+ {{ metadataSingular.title ?? metadataSingular.source ?? metadataSingular }}
@@ -141,7 +141,8 @@ export default {
},
data() {
return {
- checkedMetadata: {},
+ checkedMetadataObject: {},
+ switchedListing: false,
listing: '',
loading: false,
syncLoading: false,
@@ -151,24 +152,52 @@ export default {
listingItem() {
return directoryStore.listingItem
},
+ checkedMetadata() {
+ return Object.assign({}, this.checkedMetadataObject)
+ },
},
watch: {
checkedMetadata: {
handler(newValue, oldValue) {
- const metadataUrl = Object.entries(newValue)[0][0]
- const shouldCopyMetadata = Object.entries(newValue)[0][1]
- if (shouldCopyMetadata === true) {
- this.copyMetadata(metadataUrl)
- } else if (shouldCopyMetadata === false && metadataUrl && metadataStore.metaDataList.length > 0) {
- this.deleteMetadata(metadataUrl)
+ // Set new and old values to objects
+ const newValueObject = Object.entries(newValue)
+ let oldValueObject = Object.entries(oldValue)
+
+ // Checks if listing is switched
+ if (this.switchedListing === true) {
+ oldValueObject = []
+ this.switchedListing = false
}
+
+ newValueObject.map((value, idx) => {
+ // If oldValueObject does not exist it means we have selected new listing and not updated a switch so we return
+ if (!oldValueObject.length) return {}
+
+ // Checks which switch has been updated by checking the old value of that switch
+ if (value[1] !== oldValueObject[idx][1]) {
+
+ // Sets metadataUrl and shouldCopyMetaData with the right values
+ const metadataUrl = value[0]
+ const shouldCopyMetadata = value[1]
+
+ if (shouldCopyMetadata === true) {
+ this.copyMetadata(metadataUrl)
+ } else if (shouldCopyMetadata === false && metadataUrl && metadataStore.metaDataList.length > 0) {
+ this.deleteMetadata(metadataUrl)
+ }
+ }
+ return {}
+
+ })
+
},
deep: true,
},
listingItem: {
- handler(newValue, oldValue) {
+ handler(newValue) {
if (newValue !== false && metadataStore?.metaDataList) {
this.loading = true
+ this.switchedListing = true
this.checkMetadataSwitches()
}
},
@@ -199,7 +228,7 @@ export default {
// Check if the metadata URL exists in the metadataStore.metaDataList
const exists = metadataStore.metaDataList.some(metaData => metaData.source === metadataUrl)
// Update the checkedMetadata reactive state
- this.$set(this.checkedMetadata, metadataUrl, exists)
+ this.$set(this.checkedMetadataObject, metadataUrl, exists)
})
}
this.loading = false
@@ -296,6 +325,7 @@ export default {
},
)
.then(() => {
+ directoryStore.refreshListingList()
this.syncLoading = false
})
.catch((err) => {
diff --git a/src/store/modules/catalogi.js b/src/store/modules/catalogi.js
deleted file mode 100644
index eaf47a95..00000000
--- a/src/store/modules/catalogi.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* eslint-disable no-console */
-import { defineStore } from 'pinia'
-import { Catalogi } from '../../entities/index.js'
-
-export const useCatalogiStore = defineStore(
- 'catalogi', {
- state: () => ({
- catalogiItem: false,
- catalogiList: [],
- }),
- actions: {
- setCatalogiItem(catalogiItem) {
- this.catalogiItem = catalogiItem && new Catalogi(catalogiItem)
- console.log('Active catalog item set to ' + catalogiItem && catalogiItem?.id)
- },
- setCatalogiList(catalogiList) {
- this.catalogiList = catalogiList.map(
- (catalogiItem) => new Catalogi(catalogiItem),
- )
- console.log('Catalogi list set to ' + catalogiList.length + ' item')
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- async refreshCatalogiList(search = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/catalogi'
- if (search !== null && search !== '') {
- endpoint = endpoint + '?_search=' + search
- }
- return fetch(endpoint, {
- method: 'GET',
- })
- .then((response) => {
- response.json().then((data) => {
- this.catalogiList = data.results.map(
- (catalogiItem) => new Catalogi(catalogiItem),
- )
- })
- })
- .catch((err) => {
- console.error(err)
- })
- },
- },
- },
-)
diff --git a/src/store/modules/catalogi.spec.js b/src/store/modules/catalogi.spec.js
deleted file mode 100644
index c954bab4..00000000
--- a/src/store/modules/catalogi.spec.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* eslint-disable no-console */
-import { setActivePinia, createPinia } from 'pinia'
-
-import { useCatalogiStore } from './catalogi.js'
-import { Catalogi, mockCatalogi } from '../../entities/index.js'
-
-describe(
- 'Catalogi Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'sets catalogi item correctly', () => {
- const store = useCatalogiStore()
-
- store.setCatalogiItem(mockCatalogi()[0])
-
- expect(store.catalogiItem).toBeInstanceOf(Catalogi)
- expect(store.catalogiItem).toEqual(mockCatalogi()[0])
-
- expect(store.catalogiItem.validate().success).toBe(true)
- })
-
- it(
- 'sets catalogi list correctly', () => {
- const store = useCatalogiStore()
-
- store.setCatalogiList(mockCatalogi())
-
- expect(store.catalogiList).toHaveLength(mockCatalogi().length)
-
- // list item 1
- expect(store.catalogiList[0]).toBeInstanceOf(Catalogi)
- expect(store.catalogiList[0]).toEqual(mockCatalogi()[0])
-
- expect(store.catalogiList[0].validate().success).toBe(true)
-
- // list item 2
- expect(store.catalogiList[1]).toBeInstanceOf(Catalogi)
- expect(store.catalogiList[1]).toEqual(mockCatalogi()[1])
-
- expect(store.catalogiList[1].validate().success).toBe(true)
-
- // list item 3
- expect(store.catalogiList[2]).toBeInstanceOf(Catalogi)
- expect(store.catalogiList[2]).toEqual(mockCatalogi()[2])
-
- expect(store.catalogiList[2].validate().success).toBe(false)
- })
- })
diff --git a/src/store/modules/catalogi.spec.ts b/src/store/modules/catalogi.spec.ts
new file mode 100644
index 00000000..650d5809
--- /dev/null
+++ b/src/store/modules/catalogi.spec.ts
@@ -0,0 +1,48 @@
+/* eslint-disable no-console */
+import { setActivePinia, createPinia } from 'pinia'
+
+import { useCatalogiStore } from './catalogi'
+import { Catalogi, mockCatalogi } from '../../entities/index.js'
+
+describe('Catalogi Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('sets catalogi item correctly', () => {
+ const store = useCatalogiStore()
+
+ store.setCatalogiItem(mockCatalogi()[0])
+
+ expect(store.catalogiItem).toBeInstanceOf(Catalogi)
+ expect(store.catalogiItem).toEqual(mockCatalogi()[0])
+
+ expect(store.catalogiItem.validate().success).toBe(true)
+ })
+
+ it('sets catalogi list correctly', () => {
+ const store = useCatalogiStore()
+
+ store.setCatalogiList(mockCatalogi())
+
+ expect(store.catalogiList).toHaveLength(mockCatalogi().length)
+
+ // list item 1
+ expect(store.catalogiList[0]).toBeInstanceOf(Catalogi)
+ expect(store.catalogiList[0]).toEqual(mockCatalogi()[0])
+
+ expect(store.catalogiList[0].validate().success).toBe(true)
+
+ // list item 2
+ expect(store.catalogiList[1]).toBeInstanceOf(Catalogi)
+ expect(store.catalogiList[1]).toEqual(mockCatalogi()[1])
+
+ expect(store.catalogiList[1].validate().success).toBe(true)
+
+ // list item 3
+ expect(store.catalogiList[2]).toBeInstanceOf(Catalogi)
+ expect(store.catalogiList[2]).toEqual(mockCatalogi()[2])
+
+ expect(store.catalogiList[2].validate().success).toBe(false)
+ })
+})
diff --git a/src/store/modules/catalogi.ts b/src/store/modules/catalogi.ts
new file mode 100644
index 00000000..857ee084
--- /dev/null
+++ b/src/store/modules/catalogi.ts
@@ -0,0 +1,160 @@
+/* eslint-disable no-console */
+import { defineStore } from 'pinia'
+import { Catalogi, TCatalogi } from '../../entities/index.js'
+
+const apiEndpoint = '/index.php/apps/opencatalogi/api/catalogi'
+
+interface Options {
+ /**
+ * Do not save the received item to the store, this can be enabled if API calls get run in a loop
+ */
+ doNotSetStore?: boolean
+}
+
+interface CatalogiStoreState {
+ catalogiItem: Catalogi;
+ catalogiList: Catalogi[];
+}
+
+export const useCatalogiStore = defineStore('catalogi', {
+ state: () => ({
+ catalogiItem: null,
+ catalogiList: [],
+ } as CatalogiStoreState),
+ actions: {
+ setCatalogiItem(catalogiItem: TCatalogi) {
+ this.catalogiItem = catalogiItem && new Catalogi(catalogiItem)
+ console.log('Active catalog item set to ' + catalogiItem && catalogiItem?.id)
+ },
+ setCatalogiList(catalogiList: TCatalogi[]) {
+ this.catalogiList = catalogiList.map(
+ (catalogiItem) => new Catalogi(catalogiItem),
+ )
+ console.log('Catalogi list set to ' + catalogiList.length + ' item')
+ },
+ /* istanbul ignore next */
+ async refreshCatalogiList(search: string = null) {
+ // @todo this might belong in a service?
+ let endpoint = apiEndpoint
+ if (search !== null && search !== '') {
+ endpoint = endpoint + '?_search=' + search
+ }
+ return fetch(endpoint, {
+ method: 'GET',
+ })
+ .then((response) => {
+ response.json().then((data) => {
+ this.setCatalogiList(data.results)
+ })
+ })
+ .catch((err) => {
+ console.error(err)
+ })
+ },
+ /* istanbul ignore next */
+ async getAllCatalogi(options: Options = {}) {
+ const response = await fetch(
+ `${apiEndpoint}`,
+ { method: 'get' },
+ )
+
+ const rawData = await response.json()
+
+ const data = rawData.results.map((catalogiItem: TCatalogi) => new Catalogi(catalogiItem))
+
+ options.doNotSetStore !== true && this.setCatalogiList(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async getOneCatalogi(id: number, options: Options = {}) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'get' },
+ )
+
+ const data = new Catalogi(await response.json())
+
+ options.doNotSetStore !== true && this.setCatalogiItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async addCatalogi(item: Catalogi) {
+ if (!(item instanceof Catalogi)) {
+ throw Error('Please pass a Catalogi item from the Catalogi class')
+ }
+
+ const validateResult = item.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(apiEndpoint,
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Catalogi(await response.json())
+
+ this.refreshCatalogiList()
+ this.setCatalogiItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async editCatalogi(catalogiItem: Catalogi) {
+ if (!(catalogiItem instanceof Catalogi)) {
+ throw Error('Please pass a Catalogi item from the Catalogi class')
+ }
+
+ const validateResult = catalogiItem.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${catalogiItem.id}`,
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Catalogi(await response.json())
+
+ this.refreshCatalogiList()
+ this.setCatalogiItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async deleteCatalogi(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'DELETE' },
+ )
+
+ this.refreshCatalogiList()
+ this.setCatalogiItem(null)
+
+ return { response }
+ },
+ },
+})
diff --git a/src/store/modules/configuration.js b/src/store/modules/configuration.js
deleted file mode 100644
index f64daf7c..00000000
--- a/src/store/modules/configuration.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* eslint-disable no-console */
-import { defineStore } from 'pinia'
-import { Configuration } from '../../entities/index.js'
-
-export const useConfigurationStore = defineStore(
- 'configuration', {
- state: () => ({
- configurationItem: false,
- configurationList: [],
- }),
- actions: {
- setConfigurationItem(configurationItem) {
- this.configurationItem = configurationItem && new Configuration(configurationItem)
- console.log('Active configuration item set to ' + configurationItem)
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- async refreshConfiguration(search = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/configuration'
- if (search !== null && search !== '') {
- endpoint = endpoint + '?_search=' + search
- }
- return fetch(
- endpoint, {
- method: 'GET',
- },
- )
- .then(
- (response) => {
- response.json().then(
- (data) => {
- this.setConfigurationItem(data)
- },
- )
- },
- )
- .catch(
- (err) => {
- console.error(err)
- },
- )
- },
- },
- },
-)
diff --git a/src/store/modules/configuration.spec.js b/src/store/modules/configuration.spec.js
deleted file mode 100644
index 0c86b38b..00000000
--- a/src/store/modules/configuration.spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/* eslint-disable no-console */
-import { createPinia, setActivePinia } from 'pinia'
-import { Configuration, mockConfiguration } from '../../entities/index.js'
-import { useConfigurationStore } from './configuration.js'
-
-describe(
- 'Configuration Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'sets configuration item correctly', () => {
- const store = useConfigurationStore()
-
- store.setConfigurationItem(mockConfiguration()[0])
-
- expect(store.configurationItem).toBeInstanceOf(Configuration)
- expect(store.configurationItem).toEqual(mockConfiguration()[0])
- expect(store.configurationItem.validate().success).toBe(true)
-
- store.setConfigurationItem(mockConfiguration()[1])
-
- expect(store.configurationItem).toBeInstanceOf(Configuration)
- expect(store.configurationItem).toEqual(mockConfiguration()[1])
- expect(store.configurationItem.validate().success).toBe(true)
-
- store.setConfigurationItem(mockConfiguration()[2])
-
- expect(store.configurationItem).toBeInstanceOf(Configuration)
- expect(store.configurationItem).toEqual(mockConfiguration()[2])
- expect(store.configurationItem.validate().success).toBe(false)
- },
- )
- },
-)
diff --git a/src/store/modules/configuration.spec.ts b/src/store/modules/configuration.spec.ts
new file mode 100644
index 00000000..32312f74
--- /dev/null
+++ b/src/store/modules/configuration.spec.ts
@@ -0,0 +1,32 @@
+/* eslint-disable no-console */
+import { createPinia, setActivePinia } from 'pinia'
+import { Configuration, mockConfiguration } from '../../entities/index.js'
+import { useConfigurationStore } from './configuration'
+
+describe('Configuration Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('sets configuration item correctly', () => {
+ const store = useConfigurationStore()
+
+ store.setConfigurationItem(mockConfiguration()[0])
+
+ expect(store.configurationItem).toBeInstanceOf(Configuration)
+ expect(store.configurationItem).toEqual(mockConfiguration()[0])
+ expect(store.configurationItem.validate().success).toBe(true)
+
+ store.setConfigurationItem(mockConfiguration()[1])
+
+ expect(store.configurationItem).toBeInstanceOf(Configuration)
+ expect(store.configurationItem).toEqual(mockConfiguration()[1])
+ expect(store.configurationItem.validate().success).toBe(true)
+
+ store.setConfigurationItem(mockConfiguration()[2])
+
+ expect(store.configurationItem).toBeInstanceOf(Configuration)
+ expect(store.configurationItem).toEqual(mockConfiguration()[2])
+ expect(store.configurationItem.validate().success).toBe(false)
+ })
+})
diff --git a/src/store/modules/configuration.ts b/src/store/modules/configuration.ts
new file mode 100644
index 00000000..3d061d84
--- /dev/null
+++ b/src/store/modules/configuration.ts
@@ -0,0 +1,46 @@
+/* eslint-disable no-console */
+import { defineStore } from 'pinia'
+import { Configuration, TConfiguration } from '../../entities/index.js'
+
+interface ConfigurationStoreState {
+ configurationItem: Configuration;
+ configurationList: Configuration[];
+}
+
+export const useConfigurationStore = defineStore('configuration', {
+ state: () => ({
+ configurationItem: null,
+ configurationList: [],
+ } as ConfigurationStoreState),
+ actions: {
+ setConfigurationItem(configurationItem: TConfiguration) {
+ this.configurationItem = configurationItem && new Configuration(configurationItem)
+ console.log('Active configuration item set to ' + configurationItem)
+ },
+ /* istanbul ignore next */ // ignore this for Jest until moved into a service
+ async refreshConfiguration(search: string = null) {
+ // @todo this might belong in a service?
+ let endpoint = '/index.php/apps/opencatalogi/api/configuration'
+ if (search !== null && search !== '') {
+ endpoint = endpoint + '?_search=' + search
+ }
+ return fetch(
+ endpoint, {
+ method: 'GET',
+ },
+ )
+ .then((response) => {
+ response.json().then(
+ (data) => {
+ this.setConfigurationItem(data)
+ },
+ )
+ })
+ .catch(
+ (err) => {
+ console.error(err)
+ },
+ )
+ },
+ },
+})
diff --git a/src/store/modules/directory.js b/src/store/modules/directory.js
deleted file mode 100644
index 8f301cfc..00000000
--- a/src/store/modules/directory.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* eslint-disable no-console */
-import { defineStore } from 'pinia'
-import { Listing } from '../../entities/index.js'
-
-export const useDirectoryStore = defineStore(
- 'directory', {
- state: () => ({
- listingItem: false,
- listingList: [],
- }),
- actions: {
- setListingItem(listingItem) {
- this.listingItem = listingItem && new Listing(listingItem)
- console.log('Active directory item set to ' + listingItem.id)
- },
- setListingList(listingList) {
- this.listingList = listingList.map(
- (listingItem) => new Listing(listingItem),
- )
- console.log('Active directory item set to ' + listingList.length)
- },
- async refreshListingList(search = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/directory'
- if (search !== null && search !== '') {
- endpoint = endpoint + '?_search=' + search
- }
- return fetch(
- endpoint, {
- method: 'GET',
- },
- )
- .then(
- (response) => {
- response.json().then(
- (data) => {
- this.listingList = data.results.map(
- (listingItem) => {
- listingItem.organisation = listingItem?.organisation ? listingItem.organisation : null
- return new Listing(listingItem)
- },
- )
- },
- )
- },
- )
- .catch(
- (err) => {
- console.error(err)
- },
- )
- },
- },
- setListingList(listingList) {
- this.listingList = listingList.map(
- (listingItem) => new Listing(listingItem),
- )
- console.log('Active directory item set to ' + listingList.length)
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- async refreshListingList(search = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/directory'
- if (search !== null && search !== '') {
- endpoint = endpoint + '?_search=' + search
- }
- return fetch(endpoint, {
- method: 'GET',
- })
- .then((response) => {
- response.json().then((data) => {
- this.listingList = data.results.map(
- (listingItem) => new Listing(listingItem),
- )
- })
- })
- .catch((err) => {
- console.error(err)
- })
- },
- },
-)
diff --git a/src/store/modules/directory.spec.js b/src/store/modules/directory.spec.js
deleted file mode 100644
index e1f61258..00000000
--- a/src/store/modules/directory.spec.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* eslint-disable no-console */
-import { setActivePinia, createPinia } from 'pinia'
-
-import { useDirectoryStore } from './directory.js'
-import { Listing, mockListings } from '../../entities/index.js'
-
-describe(
- 'Directory Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'sets listing item correctly', () => {
- const store = useDirectoryStore()
-
- store.setListingItem(mockListings()[0])
-
- expect(store.listingItem).toBeInstanceOf(Listing)
- expect(store.listingItem).toEqual(mockListings()[0])
-
- expect(store.listingItem.validate().success).toBe(true)
- })
-
- it(
- 'sets listings list correctly', () => {
- const store = useDirectoryStore()
-
- store.setListingList(mockListings())
-
- expect(store.listingList).toHaveLength(mockListings().length)
-
- // list item 1
- expect(store.listingList[0]).toBeInstanceOf(Listing)
- expect(store.listingList[0]).toEqual(mockListings()[0])
-
- expect(store.listingList[0].validate().success).toBe(true)
-
- // list item 2
- expect(store.listingList[1]).toBeInstanceOf(Listing)
- expect(store.listingList[1]).toEqual(mockListings()[1])
-
- expect(store.listingList[1].validate().success).toBe(true)
-
- // list item 3
- expect(store.listingList[2]).toBeInstanceOf(Listing)
- expect(store.listingList[2]).toEqual(mockListings()[2])
-
- expect(store.listingList[2].validate().success).toBe(false)
- })
- })
diff --git a/src/store/modules/directory.spec.ts b/src/store/modules/directory.spec.ts
new file mode 100644
index 00000000..262d9fbd
--- /dev/null
+++ b/src/store/modules/directory.spec.ts
@@ -0,0 +1,48 @@
+/* eslint-disable no-console */
+import { setActivePinia, createPinia } from 'pinia'
+
+import { useDirectoryStore } from './directory'
+import { Listing, mockListings } from '../../entities/index.js'
+
+describe('Directory Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('sets listing item correctly', () => {
+ const store = useDirectoryStore()
+
+ store.setListingItem(mockListings()[0])
+
+ expect(store.listingItem).toBeInstanceOf(Listing)
+ expect(store.listingItem).toEqual(mockListings()[0])
+
+ expect(store.listingItem.validate().success).toBe(true)
+ })
+
+ it('sets listings list correctly', () => {
+ const store = useDirectoryStore()
+
+ store.setListingList(mockListings())
+
+ expect(store.listingList).toHaveLength(mockListings().length)
+
+ // list item 1
+ expect(store.listingList[0]).toBeInstanceOf(Listing)
+ expect(store.listingList[0]).toEqual(mockListings()[0])
+
+ expect(store.listingList[0].validate().success).toBe(true)
+
+ // list item 2
+ expect(store.listingList[1]).toBeInstanceOf(Listing)
+ expect(store.listingList[1]).toEqual(mockListings()[1])
+
+ expect(store.listingList[1].validate().success).toBe(true)
+
+ // list item 3
+ expect(store.listingList[2]).toBeInstanceOf(Listing)
+ expect(store.listingList[2]).toEqual(mockListings()[2])
+
+ expect(store.listingList[2].validate().success).toBe(false)
+ })
+})
diff --git a/src/store/modules/directory.ts b/src/store/modules/directory.ts
new file mode 100644
index 00000000..fe78ca4c
--- /dev/null
+++ b/src/store/modules/directory.ts
@@ -0,0 +1,85 @@
+/* eslint-disable no-console */
+import { defineStore } from 'pinia'
+import { Listing, TListing } from '../../entities/index.js'
+
+interface DirectoryStoreState {
+ listingItem: Listing;
+ listingList: Listing[];
+}
+
+const apiEndpoint = '/index.php/apps/opencatalogi/api/directory'
+
+export const useDirectoryStore = defineStore('directory', {
+ state: () => ({
+ listingItem: null,
+ listingList: [],
+ } as DirectoryStoreState),
+ actions: {
+ setListingItem(listingItem: TListing) {
+ this.listingItem = listingItem && new Listing(listingItem)
+ console.log('Active directory item set to ' + listingItem.id)
+ },
+ setListingList(listingList: TListing[]) {
+ this.listingList = listingList.map(
+ (listingItem: TListing) => new Listing(listingItem),
+ )
+ console.log('Active directory item set to ' + listingList.length)
+ },
+ /* istanbul ignore next */
+ async refreshListingList(search: string = null) {
+ // @todo this might belong in a service?
+ let endpoint = '/index.php/apps/opencatalogi/api/directory'
+ if (search !== null && search !== '') {
+ endpoint = endpoint + '?_search=' + search
+ }
+ return fetch(endpoint, { method: 'GET' })
+ .then((response) => {
+ response.json()
+ .then((data) => {
+ this.listingList = data.results.map(
+ (listingItem: TListing) => {
+ listingItem.organisation = listingItem?.organisation ? listingItem.organisation : null
+ return new Listing(listingItem)
+ },
+ )
+ })
+ })
+ .catch((err) => {
+ console.error(err)
+ })
+ },
+ /* istanbul ignore next */
+ async getOneListing(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'get' },
+ )
+
+ const data = new Listing(await response.json())
+
+ this.setListingItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async deleteListing(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'DELETE' },
+ )
+
+ this.refreshListingList()
+ this.setListingItem(null)
+
+ return { response }
+ },
+ },
+})
diff --git a/src/store/modules/metadata.js b/src/store/modules/metadata.js
deleted file mode 100644
index 037e94a4..00000000
--- a/src/store/modules/metadata.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/* eslint-disable no-console */
-import { defineStore } from 'pinia'
-import { Metadata } from '../../entities/index.js'
-
-export const useMetadataStore = defineStore(
- 'metadata', {
- state: () => ({
- metaDataItem: false,
- metaDataList: [],
- metadataDataKey: false,
- }),
- actions: {
- setMetaDataItem(metaDataItem) {
- // for backward compatibility
- if (!!metaDataItem && typeof metaDataItem?.properties === 'string') {
- metaDataItem.properties = JSON.parse(metaDataItem.properties)
- }
-
- this.metaDataItem = metaDataItem && new Metadata(metaDataItem)
-
- console.log('Active metadata object set to ' + metaDataItem && metaDataItem.id)
- },
- setMetaDataList(metaDataList) {
- this.metaDataList = metaDataList.map(
- (metadataItem) => new Metadata(metadataItem),
- )
- console.log('Active metadata lest set')
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- async refreshMetaDataList(search = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/metadata'
- if (search !== null && search !== '') {
- endpoint = endpoint + '?_search=' + search
- }
- return fetch(
- endpoint,
- {
- method: 'GET',
- },
- )
- .then(
- (response) => {
- response.json().then(
- (data) => {
- this.metaDataList = data.results.map(
- (metadataItem) => new Metadata(metadataItem),
- )
- return data
- },
- )
- },
- )
- .catch(
- (err) => {
- console.error(err)
- return err
- },
- )
- },
- setMetadataDataKey(metadataDataKey) {
- this.metadataDataKey = metadataDataKey
- console.log('Active metadata data key set to ' + metadataDataKey)
- },
- },
- },
-)
diff --git a/src/store/modules/metadata.spec.js b/src/store/modules/metadata.spec.js
deleted file mode 100644
index 65b77ebd..00000000
--- a/src/store/modules/metadata.spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/* eslint-disable no-console */
-import { setActivePinia, createPinia } from 'pinia'
-
-import { useMetadataStore } from './metadata.js'
-import { Metadata, mockMetadata } from '../../entities/index.js'
-
-describe(
- 'Metadata Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'sets metadata item correctly', () => {
- const store = useMetadataStore()
-
- store.setMetaDataItem(mockMetadata()[0])
-
- expect(store.metaDataItem).toBeInstanceOf(Metadata)
- expect(store.metaDataItem).toEqual(mockMetadata()[0])
-
- expect(store.metaDataItem.validate().success).toBe(true)
- },
- )
-
- it(
- 'sets metadata item with string "properties" property', () => {
- const store = useMetadataStore()
-
- // stringify json data
- const mockData = mockMetadata()[0]
- mockData.properties = JSON.stringify(mockData.properties)
-
- store.setMetaDataItem(mockData)
-
- expect(store.metaDataItem).toBeInstanceOf(Metadata)
- expect(store.metaDataItem).toEqual(mockData)
-
- expect(store.metaDataItem.validate().success).toBe(true)
- },
- )
-
- it(
- 'sets metadata list correctly', () => {
- const store = useMetadataStore()
-
- store.setMetaDataList(mockMetadata())
-
- expect(store.metaDataList[0]).toBeInstanceOf(Metadata)
- expect(store.metaDataList[0]).toEqual(mockMetadata()[0])
-
- expect(store.metaDataList[0].validate().success).toBe(true)
- },
- )
-
- it(
- 'get metadata property from key', () => {
- const store = useMetadataStore()
-
- store.setMetaDataItem(mockMetadata()[0])
- store.setMetadataDataKey('test')
-
- expect(store.metaDataItem).toEqual(mockMetadata()[0])
- expect(store.metadataDataKey).toBe('test')
- },
- )
- },
-)
diff --git a/src/store/modules/metadata.spec.ts b/src/store/modules/metadata.spec.ts
new file mode 100644
index 00000000..5335ccab
--- /dev/null
+++ b/src/store/modules/metadata.spec.ts
@@ -0,0 +1,59 @@
+/* eslint-disable no-console */
+import { setActivePinia, createPinia } from 'pinia'
+
+import { useMetadataStore } from './metadata'
+import { Metadata, mockMetadata } from '../../entities/index.js'
+
+describe('Metadata Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('sets metadata item correctly', () => {
+ const store = useMetadataStore()
+
+ store.setMetaDataItem(mockMetadata()[0])
+
+ expect(store.metaDataItem).toBeInstanceOf(Metadata)
+ expect(store.metaDataItem).toEqual(mockMetadata()[0])
+
+ expect(store.metaDataItem.validate().success).toBe(true)
+ })
+
+ it('sets metadata item with string "properties" property', () => {
+ const store = useMetadataStore()
+
+ // stringify json data
+ const mockData = mockMetadata()[0]
+ // @ts-expect-error -- this is for the off chance that properties is a string
+ mockData.properties = JSON.stringify(mockData.properties)
+
+ store.setMetaDataItem(mockData)
+
+ expect(store.metaDataItem).toBeInstanceOf(Metadata)
+ expect(store.metaDataItem).toEqual(mockData)
+
+ expect(store.metaDataItem.validate().success).toBe(true)
+ })
+
+ it('sets metadata list correctly', () => {
+ const store = useMetadataStore()
+
+ store.setMetaDataList(mockMetadata())
+
+ expect(store.metaDataList[0]).toBeInstanceOf(Metadata)
+ expect(store.metaDataList[0]).toEqual(mockMetadata()[0])
+
+ expect(store.metaDataList[0].validate().success).toBe(true)
+ })
+
+ it('get metadata property from key', () => {
+ const store = useMetadataStore()
+
+ store.setMetaDataItem(mockMetadata()[0])
+ store.setMetadataDataKey('test')
+
+ expect(store.metaDataItem).toEqual(mockMetadata()[0])
+ expect(store.metadataDataKey).toBe('test')
+ })
+})
diff --git a/src/store/modules/metadata.ts b/src/store/modules/metadata.ts
new file mode 100644
index 00000000..61b0246e
--- /dev/null
+++ b/src/store/modules/metadata.ts
@@ -0,0 +1,164 @@
+/* eslint-disable no-console */
+import { defineStore } from 'pinia'
+import { Metadata, TMetadata } from '../../entities/index.js'
+
+const apiEndpoint = '/index.php/apps/opencatalogi/api/metadata'
+
+interface MetadataStoreState {
+ metaDataItem: Metadata;
+ metaDataList: Metadata[];
+ metadataDataKey: string;
+}
+
+export const useMetadataStore = defineStore('metadata', {
+ state: () => ({
+ metaDataItem: null,
+ metaDataList: [],
+ metadataDataKey: null,
+ } as MetadataStoreState),
+ actions: {
+ setMetaDataItem(metaDataItem: TMetadata) {
+ // for backward compatibility
+ if (!!metaDataItem && typeof metaDataItem?.properties === 'string') {
+ metaDataItem.properties = JSON.parse(metaDataItem.properties)
+ }
+
+ this.metaDataItem = metaDataItem && new Metadata(metaDataItem)
+
+ console.log('Active metadata object set to ' + metaDataItem && metaDataItem?.id)
+ },
+ setMetaDataList(metaDataList: TMetadata[]) {
+ this.metaDataList = metaDataList.map(
+ (metadataItem) => new Metadata(metadataItem),
+ )
+ console.log('Active metadata lest set')
+ },
+ setMetadataDataKey(metadataDataKey: string) {
+ this.metadataDataKey = metadataDataKey
+ console.log('Active metadata data key set to ' + metadataDataKey)
+ },
+ /* istanbul ignore next */ // ignore this for Jest until moved into a service
+ async refreshMetaDataList(search: string = null) {
+ // @todo this might belong in a service?
+ let endpoint = apiEndpoint
+ if (search !== null && search !== '') {
+ endpoint = endpoint + '?_search=' + search
+ }
+ return fetch(endpoint, { method: 'GET' })
+ .then((response) => {
+ response.json().then((data) => {
+ this.setMetaDataList(data.results)
+ })
+ })
+ .catch((err) => {
+ console.error(err)
+ return err
+ })
+ },
+ /* istanbul ignore next */
+ async getAllMetadata() {
+ const response = await fetch(
+ `${apiEndpoint}`,
+ { method: 'get' },
+ )
+
+ const rawData = await response.json()
+
+ const data = rawData.results.map((item: TMetadata) => new Metadata(item))
+
+ this.metaDataList = data
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async getOneMetadata(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'get' },
+ )
+
+ const data = new Metadata(await response.json())
+
+ this.setMetaDataItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async addMetadata(metadataItem: Metadata) {
+ if (!(metadataItem instanceof Metadata)) {
+ throw Error('Please pass a Metadata item from the Metadata class')
+ }
+
+ const validateResult = metadataItem.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(apiEndpoint,
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Metadata(await response.json())
+
+ this.refreshMetaDataList()
+ this.setMetaDataItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async editMetadata(metadataItem: Metadata) {
+ if (!(metadataItem instanceof Metadata)) {
+ throw Error('Please pass a Metadata item from the Metadata class')
+ }
+
+ const validateResult = metadataItem.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(`${apiEndpoint}/${metadataItem.id}`,
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Metadata(await response.json())
+
+ this.refreshMetaDataList()
+ this.setMetaDataItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async deleteMetadata(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'DELETE' },
+ )
+
+ this.refreshMetaDataList()
+ this.setMetaDataItem(null)
+
+ return { response }
+ },
+ },
+},
+)
diff --git a/src/store/modules/navigation.js b/src/store/modules/navigation.js
deleted file mode 100644
index 225c8b38..00000000
--- a/src/store/modules/navigation.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* eslint-disable no-console */
-import { defineStore } from 'pinia'
-
-export const useNavigationStore = defineStore(
- 'ui', {
- state: () => ({
- // The currently active menu item, defaults to '' which triggers the dashboard
- selected: 'dashboard',
- // The currently selected catalogi within 'publications'
- selectedCatalogus: false,
- // The currently active modal, managed trough the state to ensure that only one modal can be active at the same time
- modal: false,
- // The currently active dialog
- dialog: false,
- // Any data needed in various models, dialogs, views which cannot be transferred through normal means or without writing crappy/excessive code
- transferData: null,
- }),
- actions: {
- setSelected(selected) {
- this.selected = selected
- console.log('Active menu item set to ' + selected)
- },
- setSelectedCatalogus(selectedCatalogus) {
- this.selectedCatalogus = selectedCatalogus
- console.log('Active catalogus menu set to ' + selectedCatalogus)
- },
- setModal(modal) {
- this.modal = modal
- console.log('Active modal set to ' + modal)
- },
- setDialog(dialog) {
- this.dialog = dialog
- console.log('Active dialog set to ' + dialog)
- },
- setTransferData(data) {
- this.transferData = data
- },
- getTransferData() {
- const tempData = this.transferData
- this.transferData = null
- return tempData
- },
- },
- },
-)
diff --git a/src/store/modules/navigation.spec.js b/src/store/modules/navigation.spec.js
deleted file mode 100644
index 73f2e8ff..00000000
--- a/src/store/modules/navigation.spec.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/* eslint-disable no-console */
-import { setActivePinia, createPinia } from 'pinia'
-
-import { useNavigationStore } from './navigation.js'
-
-describe(
- 'Navigation Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'set current selected view correctly', () => {
- const store = useNavigationStore()
-
- store.setSelected('publication')
- expect(store.selected).toBe('publication')
-
- store.setSelected('catalogi')
- expect(store.selected).toBe('catalogi')
-
- store.setSelected('metadata')
- expect(store.selected).toBe('metadata')
- },
- )
-
- it(
- 'set current selected publication catalogi correctly', () => {
- const store = useNavigationStore()
-
- store.setSelectedCatalogus('7a048bfd-210f-4e93-a1e8-5aa9261740b7')
- expect(store.selectedCatalogus).toBe('7a048bfd-210f-4e93-a1e8-5aa9261740b7')
-
- store.setSelectedCatalogus('dd133c51-89bc-4b06-bdbb-41f4dc07c4f1')
- expect(store.selectedCatalogus).toBe('dd133c51-89bc-4b06-bdbb-41f4dc07c4f1')
-
- store.setSelectedCatalogus('3b1cbee2-756e-4904-a157-29fb0cbe01d3')
- expect(store.selectedCatalogus).toBe('3b1cbee2-756e-4904-a157-29fb0cbe01d3')
- },
- )
-
- it(
- 'set modal correctly', () => {
- const store = useNavigationStore()
-
- store.setModal('editPublication')
- expect(store.modal).toBe('editPublication')
-
- store.setModal('editCatalogi')
- expect(store.modal).toBe('editCatalogi')
-
- store.setModal('editMetadata')
- expect(store.modal).toBe('editMetadata')
- },
- )
-
- it(
- 'set modal correctly', () => {
- const store = useNavigationStore()
-
- store.setDialog('deletePublication')
- expect(store.dialog).toBe('deletePublication')
-
- store.setDialog('deleteCatalogi')
- expect(store.dialog).toBe('deleteCatalogi')
-
- store.setDialog('deleteMetadata')
- expect(store.dialog).toBe('deleteMetadata')
- },
- )
- },
-)
diff --git a/src/store/modules/navigation.spec.ts b/src/store/modules/navigation.spec.ts
new file mode 100644
index 00000000..9fe48896
--- /dev/null
+++ b/src/store/modules/navigation.spec.ts
@@ -0,0 +1,62 @@
+/* eslint-disable no-console */
+import { setActivePinia, createPinia } from 'pinia'
+
+import { useNavigationStore } from './navigation'
+
+describe('Navigation Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('set current selected view correctly', () => {
+ const store = useNavigationStore()
+
+ store.setSelected('publication')
+ expect(store.selected).toBe('publication')
+
+ store.setSelected('catalogi')
+ expect(store.selected).toBe('catalogi')
+
+ store.setSelected('metaData')
+ expect(store.selected).toBe('metaData')
+ })
+
+ it('set current selected publication catalogi correctly', () => {
+ const store = useNavigationStore()
+
+ store.setSelectedCatalogus('7a048bfd-210f-4e93-a1e8-5aa9261740b7')
+ expect(store.selectedCatalogus).toBe('7a048bfd-210f-4e93-a1e8-5aa9261740b7')
+
+ store.setSelectedCatalogus('dd133c51-89bc-4b06-bdbb-41f4dc07c4f1')
+ expect(store.selectedCatalogus).toBe('dd133c51-89bc-4b06-bdbb-41f4dc07c4f1')
+
+ store.setSelectedCatalogus('3b1cbee2-756e-4904-a157-29fb0cbe01d3')
+ expect(store.selectedCatalogus).toBe('3b1cbee2-756e-4904-a157-29fb0cbe01d3')
+ })
+
+ it('set modal correctly', () => {
+ const store = useNavigationStore()
+
+ store.setModal('editPublication')
+ expect(store.modal).toBe('editPublication')
+
+ store.setModal('editCatalogi')
+ expect(store.modal).toBe('editCatalogi')
+
+ store.setModal('editMetadata')
+ expect(store.modal).toBe('editMetadata')
+ })
+
+ it('set dialog correctly', () => {
+ const store = useNavigationStore()
+
+ store.setDialog('deletePublication')
+ expect(store.dialog).toBe('deletePublication')
+
+ store.setDialog('deleteCatalogi')
+ expect(store.dialog).toBe('deleteCatalogi')
+
+ store.setDialog('deleteMetadata')
+ expect(store.dialog).toBe('deleteMetadata')
+ })
+})
diff --git a/src/store/modules/navigation.ts b/src/store/modules/navigation.ts
new file mode 100644
index 00000000..87c7f929
--- /dev/null
+++ b/src/store/modules/navigation.ts
@@ -0,0 +1,51 @@
+/* eslint-disable no-console */
+import { defineStore } from 'pinia'
+
+interface NavigationStoreState {
+ selected: 'dashboard' | 'publication' | 'catalogi' | 'metaData' | 'organisations' | 'themes' | 'search';
+ selectedCatalogus: string;
+ modal: string;
+ dialog: string;
+ transferData: string;
+}
+
+export const useNavigationStore = defineStore('ui', {
+ state: () => ({
+ // The currently active menu item, defaults to '' which triggers the dashboard
+ selected: 'dashboard',
+ // The currently selected catalogi within 'publications'
+ selectedCatalogus: null,
+ // The currently active modal, managed trough the state to ensure that only one modal can be active at the same time
+ modal: null,
+ // The currently active dialog
+ dialog: null,
+ // Any data needed in various models, dialogs, views which cannot be transferred through normal means or without writing crappy/excessive code
+ transferData: null,
+ } as NavigationStoreState),
+ actions: {
+ setSelected(selected: NavigationStoreState['selected']) {
+ this.selected = selected
+ console.log('Active menu item set to ' + selected)
+ },
+ setSelectedCatalogus(selectedCatalogus: string) {
+ this.selectedCatalogus = selectedCatalogus
+ console.log('Active catalogus menu set to ' + selectedCatalogus)
+ },
+ setModal(modal: string) {
+ this.modal = modal
+ console.log('Active modal set to ' + modal)
+ },
+ setDialog(dialog: string) {
+ this.dialog = dialog
+ console.log('Active dialog set to ' + dialog)
+ },
+ setTransferData(transferData: string) {
+ this.transferData = transferData
+ },
+ getTransferData(): string {
+ const tempData = this.transferData
+ this.transferData = null
+ return tempData
+ },
+ },
+})
diff --git a/src/store/modules/organisation.js b/src/store/modules/organisation.js
deleted file mode 100644
index 75416c68..00000000
--- a/src/store/modules/organisation.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* eslint-disable no-console */
-import { defineStore } from 'pinia'
-import { Organisation } from '../../entities/index.js'
-
-export const useOrganisationStore = defineStore(
- 'organisation', {
- state: () => ({
- organisationItem: false,
- organisationList: [],
- }),
- actions: {
- setOrganisationItem(organisationItem) {
- this.organisationItem = organisationItem && new Organisation(organisationItem)
- console.log('Active organisation item set to ' + organisationItem && organisationItem?.id)
- },
- setOrganisationList(organisationList) {
- this.organisationList = organisationList.map(
- (organisationItem) => new Organisation(organisationItem),
- )
- console.log('Organisation list set to ' + organisationList.length + ' items')
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- async refreshOrganisationList(search = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/organisations'
- if (search !== null && search !== '') {
- endpoint = endpoint + '?_search=' + search
- }
- return fetch(
- endpoint, {
- method: 'GET',
- },
- )
- .then(
- (response) => {
- response.json().then(
- (data) => {
- this.setOrganisationList(data.results)
- },
- )
- },
- )
- .catch(
- (err) => {
- console.error(err)
- },
- )
- },
- },
- },
-)
diff --git a/src/store/modules/organisation.spec.js b/src/store/modules/organisation.spec.js
deleted file mode 100644
index 27789233..00000000
--- a/src/store/modules/organisation.spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/* eslint-disable no-console */
-import { createPinia, setActivePinia } from 'pinia'
-
-import { mockOrganisation, Organisation } from '../../entities/index.js'
-import { useOrganisationStore } from './organisation.js'
-
-describe(
- 'Organisation Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'sets organisation item correctly', () => {
- const store = useOrganisationStore()
-
- store.setOrganisationItem(mockOrganisation()[0])
-
- expect(store.organisationItem).toBeInstanceOf(Organisation)
- expect(store.organisationItem).toEqual(mockOrganisation()[0])
- expect(store.organisationItem.validate().success).toBe(true)
-
- store.setOrganisationItem(mockOrganisation()[1])
-
- expect(store.organisationItem).toBeInstanceOf(Organisation)
- expect(store.organisationItem).toEqual(mockOrganisation()[1])
- expect(store.organisationItem.validate().success).toBe(true)
-
- store.setOrganisationItem(mockOrganisation()[2])
-
- expect(store.organisationItem).toBeInstanceOf(Organisation)
- expect(store.organisationItem).toEqual(mockOrganisation()[2])
- expect(store.organisationItem.validate().success).toBe(false)
- },
- )
-
- it(
- 'sets organisation list correctly', () => {
- const store = useOrganisationStore()
-
- store.setOrganisationList(mockOrganisation())
-
- expect(store.organisationList).toHaveLength(mockOrganisation().length)
-
- expect(store.organisationList[0]).toBeInstanceOf(Organisation)
- expect(store.organisationList[0]).toEqual(mockOrganisation()[0])
- expect(store.organisationList[0].validate().success).toBe(true)
-
- expect(store.organisationList[1]).toBeInstanceOf(Organisation)
- expect(store.organisationList[1]).toEqual(mockOrganisation()[1])
- expect(store.organisationList[1].validate().success).toBe(true)
-
- expect(store.organisationList[2]).toBeInstanceOf(Organisation)
- expect(store.organisationList[2]).toEqual(mockOrganisation()[2])
- expect(store.organisationList[2].validate().success).toBe(false)
- },
- )
- },
-)
diff --git a/src/store/modules/organisation.spec.ts b/src/store/modules/organisation.spec.ts
new file mode 100644
index 00000000..a9938747
--- /dev/null
+++ b/src/store/modules/organisation.spec.ts
@@ -0,0 +1,53 @@
+/* eslint-disable no-console */
+import { createPinia, setActivePinia } from 'pinia'
+
+import { mockOrganisation, Organisation } from '../../entities/index.js'
+import { useOrganisationStore } from './organisation'
+
+describe('Organisation Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('sets organisation item correctly', () => {
+ const store = useOrganisationStore()
+
+ store.setOrganisationItem(mockOrganisation()[0])
+
+ expect(store.organisationItem).toBeInstanceOf(Organisation)
+ expect(store.organisationItem).toEqual(mockOrganisation()[0])
+ expect(store.organisationItem.validate().success).toBe(true)
+
+ store.setOrganisationItem(mockOrganisation()[1])
+
+ expect(store.organisationItem).toBeInstanceOf(Organisation)
+ expect(store.organisationItem).toEqual(mockOrganisation()[1])
+ expect(store.organisationItem.validate().success).toBe(true)
+
+ store.setOrganisationItem(mockOrganisation()[2])
+
+ expect(store.organisationItem).toBeInstanceOf(Organisation)
+ expect(store.organisationItem).toEqual(mockOrganisation()[2])
+ expect(store.organisationItem.validate().success).toBe(false)
+ })
+
+ it('sets organisation list correctly', () => {
+ const store = useOrganisationStore()
+
+ store.setOrganisationList(mockOrganisation())
+
+ expect(store.organisationList).toHaveLength(mockOrganisation().length)
+
+ expect(store.organisationList[0]).toBeInstanceOf(Organisation)
+ expect(store.organisationList[0]).toEqual(mockOrganisation()[0])
+ expect(store.organisationList[0].validate().success).toBe(true)
+
+ expect(store.organisationList[1]).toBeInstanceOf(Organisation)
+ expect(store.organisationList[1]).toEqual(mockOrganisation()[1])
+ expect(store.organisationList[1].validate().success).toBe(true)
+
+ expect(store.organisationList[2]).toBeInstanceOf(Organisation)
+ expect(store.organisationList[2]).toEqual(mockOrganisation()[2])
+ expect(store.organisationList[2].validate().success).toBe(false)
+ })
+})
diff --git a/src/store/modules/organisation.ts b/src/store/modules/organisation.ts
new file mode 100644
index 00000000..e70e737e
--- /dev/null
+++ b/src/store/modules/organisation.ts
@@ -0,0 +1,153 @@
+/* eslint-disable no-console */
+import { defineStore } from 'pinia'
+import { Organisation, TOrganisation } from '../../entities/index.js'
+
+const apiEndpoint = '/index.php/apps/opencatalogi/api/organisations'
+
+interface OrganisationStoreState {
+ organisationItem: Organisation;
+ organisationList: Organisation[];
+}
+
+export const useOrganisationStore = defineStore('organisation', {
+ state: () => ({
+ organisationItem: null,
+ organisationList: [],
+ } as OrganisationStoreState),
+ actions: {
+ setOrganisationItem(organisationItem: TOrganisation | Organisation) {
+ this.organisationItem = organisationItem && new Organisation(organisationItem)
+ console.log('Active organisation item set to ' + organisationItem && organisationItem?.id)
+ },
+ setOrganisationList(organisationList: TOrganisation[] | Organisation[]) {
+ this.organisationList = organisationList.map(
+ (organisationItem) => new Organisation(organisationItem),
+ )
+ console.log('Organisation list set to ' + organisationList.length + ' items')
+ },
+ /* istanbul ignore next */
+ async refreshOrganisationList(search: string = null) {
+ // @todo this might belong in a service?
+ let endpoint = apiEndpoint
+ if (search !== null && search !== '') {
+ endpoint = endpoint + '?_search=' + search
+ }
+ return fetch(endpoint, {
+ method: 'GET',
+ })
+ .then((response) => {
+ response.json().then((data) => {
+ this.setOrganisationList(data.results)
+ })
+ })
+ .catch((err) => {
+ console.error(err)
+ })
+ },
+ /* istanbul ignore next */
+ async getAllOrganisation() {
+ const response = await fetch(
+ `${apiEndpoint}`,
+ { method: 'get' },
+ )
+
+ const rawData = await response.json()
+
+ const data = rawData.results.map((organisation: TOrganisation) => new Organisation(organisation))
+
+ this.organisationList = data
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async getOneOrganisation(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'get' },
+ )
+
+ const data = new Organisation(await response.json())
+
+ this.setOrganisationItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async addOrganisation(organisationItem: Organisation) {
+ if (!(organisationItem instanceof Organisation)) {
+ throw Error('Please pass a Organisation item from the Organisation class')
+ }
+
+ const validateResult = organisationItem.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(apiEndpoint,
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Organisation(await response.json())
+
+ this.refreshOrganisationList()
+ this.setOrganisationItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async editOrganisation(organisationItem: Organisation) {
+ if (!(organisationItem instanceof Organisation)) {
+ throw Error('Please pass a Organisation item from the Organisation class')
+ }
+
+ const validateResult = organisationItem.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${organisationItem.id}`,
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Organisation(await response.json())
+
+ this.refreshOrganisationList()
+ this.setOrganisationItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async deleteOrganisation(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'DELETE' },
+ )
+
+ this.refreshOrganisationList()
+ this.setOrganisationItem(null)
+
+ return { response }
+ },
+ },
+})
diff --git a/src/store/modules/publication.js b/src/store/modules/publication.js
deleted file mode 100644
index d3053a50..00000000
--- a/src/store/modules/publication.js
+++ /dev/null
@@ -1,250 +0,0 @@
-/* eslint-disable no-console */
-import { Attachment, Publication } from '../../entities/index.js'
-import { defineStore } from 'pinia'
-
-export const usePublicationStore = defineStore('publication', {
- state: () => ({
- publicationItem: false,
- publicationMetaData: false,
- publicationList: [],
- publicationDataKey: false,
- attachmentItem: false,
- attachmentFile: null,
- publicationAttachments: false,
- conceptPublications: [],
- conceptAttachments: [],
- }),
- actions: {
- setPublicationItem(publicationItem) {
- // To prevent forms etc from braking we alway use a default/skeleton object
- this.publicationItem = publicationItem && new Publication(publicationItem)
- console.log('Active publication item set to ' + publicationItem && publicationItem.id)
- },
- setPublicationList(publicationList) {
- this.publicationList = publicationList.map((publicationItem) => new Publication(publicationItem))
- console.log('Active publication item set to ' + publicationList.length)
- },
- async refreshPublicationList(normalSearch = [], advancedSearch = null, sortField = null, sortDirection = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/publications'
- const params = new URLSearchParams()
- for (const item of normalSearch) {
- if (item.key && item.value !== undefined) {
- params.append(item.key, item.value)
- }
- }
- if (advancedSearch !== null && advancedSearch !== '') {
- params.append('_search', advancedSearch)
- }
- if (sortField !== null && sortField !== '' && sortDirection !== null && sortDirection !== '') {
- if (sortField === 'Titel') {
- sortField = 'title'
- }
- if (sortField === 'Datum gepubliceerd') {
- sortField = 'published'
- }
- if (sortField === 'Datum aangepast') {
- sortField = 'modified'
- }
- params.append('_order[' + sortField + ']', sortDirection)
- }
- if (params.toString()) {
- endpoint += '?' + params.toString()
- }
-
- return fetch(
- endpoint,
- {
- method: 'GET',
- },
- )
- .then(
- (response) => {
- response.json().then(
- (data) => {
- this.setPublicationList(data?.results)
- return data
- },
- )
- },
- )
- .catch(
- (err) => {
- console.error(err)
- return err
- },
- )
- },
- getPublicationAttachments(publicationId) {
- fetch(
- `/index.php/apps/opencatalogi/api/publications/${publicationId}/attachments`,
- {
- method: 'GET',
- },
- )
- .then(
- (response) => {
- response.json().then(
- (data) => {
- this.publicationAttachments = data.results.map(
- (attachmentItem) => new Attachment(attachmentItem),
- )
- return data
- },
- )
- },
- )
- .catch(
- (err) => {
- console.error(err)
- return err
- },
- )
- },
- async getConceptPublications(options = {}) { // @todo this might belong in a service?
- const response = await fetch('/index.php/apps/opencatalogi/api/publications?status=concept',
- { method: 'GET' },
- )
-
- const rawData = await response.json()
-
- const data = rawData.results.map((publicationItem) => new Publication(publicationItem))
-
- options.doNotSetStore !== true && (this.conceptPublications = data)
-
- return { response, data }
- },
- async getConceptAttachments(options = {}) { // @todo this might belong in a service?
- const response = await fetch('/index.php/apps/opencatalogi/api/attachments?status=concept',
- { method: 'GET' },
- )
-
- const rawData = await response.json()
-
- const data = rawData.results.map((attachmentItem) => new Attachment(attachmentItem))
-
- options.doNotSetStore !== true && (this.conceptAttachments = data)
-
- return { response, data }
- },
- // @todo why does the following run through the store? -- because its impossible with props, and its vital information for the modal.
- setPublicationDataKey(publicationDataKey) {
- this.publicationDataKey = publicationDataKey
- console.log('Active publication data key set to ' + publicationDataKey)
- },
- setAttachmentItem(attachmentItem) {
- this.attachmentItem = attachmentItem && new Attachment(attachmentItem)
- console.log('Active attachment item set to ' + attachmentItem)
- },
- setAttachmentFile(files) {
- this.attachmentFile = files
- console.log('Active attachment files set to ' + files)
- },
- setPublicationMetaData(metaData) {
- this.publicationMetaData = metaData
- },
- },
- setPublicationList(publicationList) {
- this.publicationList = publicationList.map((publicationItem) => new Publication(publicationItem))
- console.log('Active publication item set to ' + publicationList.length)
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- async refreshPublicationList(search = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/publications'
- if (search !== null && search !== '') {
- endpoint = endpoint + '?_search=' + search
- }
- return fetch(
- endpoint,
- {
- method: 'GET',
- },
- )
- .then((response) => {
- response.json().then((data) => {
- this.setPublicationList(data?.results)
- return data
- })
- })
- .catch((err) => {
- console.error(err)
- return err
- })
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- getPublicationAttachments(publicationId) {
- fetch(
- '/index.php/apps/opencatalogi/api/publications/' + publicationId + '/attachments',
- {
- method: 'GET',
- },
- )
- .then((response) => {
- response.json().then((data) => {
- this.publicationAttachments = data.results.map(
- (attachmentItem) => new Attachment(attachmentItem),
- )
- return data
- })
- })
- .catch((err) => {
- console.error(err)
- return err
- })
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- getConceptPublications() { // @todo this might belong in a service?
- fetch(
- '/index.php/apps/opencatalogi/api/publications?status=concept',
- {
- method: 'GET',
- },
- )
- .then((response) => {
- response.json().then((data) => {
- this.conceptPublications = data
- return data
- })
- })
- .catch((err) => {
- console.error(err)
- return err
- })
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- getConceptAttachments() { // @todo this might belong in a service?
- fetch(
- '/index.php/apps/opencatalogi/api/attachments?status=concept',
- {
- method: 'GET',
- },
- )
- .then((response) => {
- response.json().then((data) => {
- this.conceptAttachments = data
- return data
- })
- })
- .catch((err) => {
- console.error(err)
- return err
- })
- },
- // @todo why does the following run through the store? -- because its impossible with props, and its vital information for the modal.
- setPublicationDataKey(publicationDataKey) {
- this.publicationDataKey = publicationDataKey
- console.log('Active publication data key set to ' + publicationDataKey)
- },
- setAttachmentItem(attachmentItem) {
- this.attachmentItem = attachmentItem && new Attachment(attachmentItem)
- console.log('Active attachment item set to ' + attachmentItem)
- },
- setAttachmentFile(files) {
- this.attachmentFile = files
- },
- setPublicationMetaData(metaData) {
- this.publicationMetaData = metaData
- },
-},
-)
diff --git a/src/store/modules/publication.spec.js b/src/store/modules/publication.spec.js
deleted file mode 100644
index c2fefa45..00000000
--- a/src/store/modules/publication.spec.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/* eslint-disable no-console */
-import { setActivePinia, createPinia } from 'pinia'
-
-import { usePublicationStore } from './publication.js'
-import { Attachment, mockAttachments, mockPublications, Publication } from '../../entities/index.js'
-
-describe(
- 'Metadata Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'sets publication item correctly', () => {
- const store = usePublicationStore()
-
- store.setPublicationItem(mockPublications()[0])
-
- expect(store.publicationItem).toBeInstanceOf(Publication)
- expect(store.publicationItem).toEqual(mockPublications()[0])
- expect(store.publicationItem.validate().success).toBe(true)
-
- store.setPublicationItem(mockPublications()[1])
-
- expect(store.publicationItem).toBeInstanceOf(Publication)
- expect(store.publicationItem).toEqual(mockPublications()[1])
- expect(store.publicationItem.validate().success).toBe(true)
-
- store.setPublicationItem(mockPublications()[2])
-
- expect(store.publicationItem).toBeInstanceOf(Publication)
- expect(store.publicationItem).toEqual(mockPublications()[2])
- expect(store.publicationItem.validate().success).toBe(false)
- })
-
- it(
- 'sets publication list correctly', () => {
- const store = usePublicationStore()
-
- store.setPublicationList(mockPublications())
-
- expect(store.publicationList).toHaveLength(mockPublications().length)
-
- expect(store.publicationList[0]).toBeInstanceOf(Publication)
- expect(store.publicationList[0]).toEqual(mockPublications()[0])
- expect(store.publicationList[0].validate().success).toBe(true)
-
- expect(store.publicationList[1]).toBeInstanceOf(Publication)
- expect(store.publicationList[1]).toEqual(mockPublications()[1])
- expect(store.publicationList[1].validate().success).toBe(true)
-
- expect(store.publicationList[2]).toBeInstanceOf(Publication)
- expect(store.publicationList[2]).toEqual(mockPublications()[2])
- expect(store.publicationList[2].validate().success).toBe(false)
- })
-
- // TODO: fix this
- it(
- 'set publication data.data property key correctly', () => {
- const store = usePublicationStore()
-
- store.setPublicationDataKey('contactPoint')
-
- expect(store.publicationDataKey).toBe('contactPoint')
- },
- )
-
- it(
- 'set attachment item correctly', () => {
- const store = usePublicationStore()
-
- store.setAttachmentItem(mockAttachments()[0])
-
- expect(store.attachmentItem).toBeInstanceOf(Attachment)
- expect(store.attachmentItem).toEqual(mockAttachments()[0])
- expect(store.attachmentItem.validate().success).toBe(true)
-
- store.setAttachmentItem(mockAttachments()[1])
-
- expect(store.attachmentItem).toBeInstanceOf(Attachment)
- expect(store.attachmentItem).toEqual(mockAttachments()[1])
- expect(store.attachmentItem.validate().success).toBe(true)
-
- store.setAttachmentItem(mockAttachments()[2])
-
- expect(store.attachmentItem).toBeInstanceOf(Attachment)
- expect(store.attachmentItem).toEqual(mockAttachments()[2])
- expect(store.attachmentItem.validate().success).toBe(false)
- })
- })
diff --git a/src/store/modules/publication.spec.ts b/src/store/modules/publication.spec.ts
new file mode 100644
index 00000000..53c13fe0
--- /dev/null
+++ b/src/store/modules/publication.spec.ts
@@ -0,0 +1,84 @@
+/* eslint-disable no-console */
+import { setActivePinia, createPinia } from 'pinia'
+
+import { Attachment, mockAttachments, mockPublications, Publication } from '../../entities/index.js'
+import { usePublicationStore } from './publication'
+
+describe('Metadata Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('sets publication item correctly', () => {
+ const store = usePublicationStore()
+
+ store.setPublicationItem(mockPublications()[0])
+
+ expect(store.publicationItem).toBeInstanceOf(Publication)
+ expect(store.publicationItem).toEqual(mockPublications()[0])
+ expect(store.publicationItem.validate().success).toBe(true)
+
+ store.setPublicationItem(mockPublications()[1])
+
+ expect(store.publicationItem).toBeInstanceOf(Publication)
+ expect(store.publicationItem).toEqual(mockPublications()[1])
+ expect(store.publicationItem.validate().success).toBe(true)
+
+ store.setPublicationItem(mockPublications()[2])
+
+ expect(store.publicationItem).toBeInstanceOf(Publication)
+ expect(store.publicationItem).toEqual(mockPublications()[2])
+ expect(store.publicationItem.validate().success).toBe(false)
+ })
+
+ it('sets publication list correctly', () => {
+ const store = usePublicationStore()
+
+ store.setPublicationList(mockPublications())
+
+ expect(store.publicationList).toHaveLength(mockPublications().length)
+
+ expect(store.publicationList[0]).toBeInstanceOf(Publication)
+ expect(store.publicationList[0]).toEqual(mockPublications()[0])
+ expect(store.publicationList[0].validate().success).toBe(true)
+
+ expect(store.publicationList[1]).toBeInstanceOf(Publication)
+ expect(store.publicationList[1]).toEqual(mockPublications()[1])
+ expect(store.publicationList[1].validate().success).toBe(true)
+
+ expect(store.publicationList[2]).toBeInstanceOf(Publication)
+ expect(store.publicationList[2]).toEqual(mockPublications()[2])
+ expect(store.publicationList[2].validate().success).toBe(false)
+ })
+
+ it('set publication data.data property key correctly', () => {
+ const store = usePublicationStore()
+
+ store.setPublicationDataKey('contactPoint')
+
+ expect(store.publicationDataKey).toBe('contactPoint')
+ },
+ )
+
+ it('set attachment item correctly', () => {
+ const store = usePublicationStore()
+
+ store.setAttachmentItem(mockAttachments()[0])
+
+ expect(store.attachmentItem).toBeInstanceOf(Attachment)
+ expect(store.attachmentItem).toEqual(mockAttachments()[0])
+ expect(store.attachmentItem.validate().success).toBe(true)
+
+ store.setAttachmentItem(mockAttachments()[1])
+
+ expect(store.attachmentItem).toBeInstanceOf(Attachment)
+ expect(store.attachmentItem).toEqual(mockAttachments()[1])
+ expect(store.attachmentItem.validate().success).toBe(true)
+
+ store.setAttachmentItem(mockAttachments()[2])
+
+ expect(store.attachmentItem).toBeInstanceOf(Attachment)
+ expect(store.attachmentItem).toEqual(mockAttachments()[2])
+ expect(store.attachmentItem.validate().success).toBe(false)
+ })
+})
diff --git a/src/store/modules/publication.ts b/src/store/modules/publication.ts
new file mode 100644
index 00000000..4523c567
--- /dev/null
+++ b/src/store/modules/publication.ts
@@ -0,0 +1,432 @@
+/* eslint-disable no-console */
+import pinia from '../../pinia'
+import { Attachment, Publication, TAttachment, TPublication } from '../../entities/index.js'
+import { defineStore } from 'pinia'
+
+const apiEndpoint = '/index.php/apps/opencatalogi/api/publications'
+
+interface Options {
+ /**
+ * Do not save the received item to the store, this can be enabled if API calls get run in a loop
+ */
+ doNotSetStore?: boolean
+}
+
+interface PublicationStoreState {
+ publicationItem: Publication;
+ publicationMetaData: string;
+ publicationList: Publication[];
+ publicationDataKey: string;
+ attachmentItem: Attachment;
+ attachmentFile: object;
+ publicationAttachments: Attachment[];
+ conceptPublications: Publication[];
+ conceptAttachments: Attachment[];
+}
+
+export const usePublicationStore = defineStore('publication', {
+ state: () => ({
+ publicationItem: null,
+ publicationMetaData: null,
+ publicationList: [],
+ publicationDataKey: null,
+ attachmentItem: null,
+ attachmentFile: null,
+ publicationAttachments: null,
+ conceptPublications: [],
+ conceptAttachments: [],
+ } as PublicationStoreState),
+ actions: {
+ setPublicationItem(publicationItem: Publication | TPublication) {
+ // To prevent forms etc from braking we alway use a default/skeleton object
+ this.publicationItem = publicationItem && new Publication(publicationItem)
+ console.log('Active publication item set to ' + publicationItem && publicationItem.id)
+ },
+ setPublicationList(publicationList: Publication[] | TPublication[]) {
+ this.publicationList = publicationList.map((publicationItem) => new Publication(publicationItem))
+ console.log('Active publication item set to ' + publicationList.length)
+ },
+ async refreshPublicationList(
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ normalSearch: { [key: string]: any }[] = [],
+ advancedSearch: string = null,
+ sortField: string = null,
+ sortDirection: string = null,
+ ) {
+ // @todo this might belong in a service?
+ let endpoint = apiEndpoint
+ const params = new URLSearchParams()
+ for (const item of normalSearch) {
+ if (item.key && item.value !== undefined) {
+ params.append(item.key, item.value)
+ }
+ }
+ if (advancedSearch !== null && advancedSearch !== '') {
+ params.append('_search', advancedSearch)
+ }
+ if (sortField !== null && sortField !== '' && sortDirection !== null && sortDirection !== '') {
+ if (sortField === 'Titel') {
+ sortField = 'title'
+ }
+ if (sortField === 'Datum gepubliceerd') {
+ sortField = 'published'
+ }
+ if (sortField === 'Datum aangepast') {
+ sortField = 'modified'
+ }
+ params.append('_order[' + sortField + ']', sortDirection)
+ }
+ if (params.toString()) {
+ endpoint += '?' + params.toString()
+ }
+
+ return fetch(endpoint,
+ { method: 'GET' },
+ )
+ .then((response) => {
+ response.json().then((data) => {
+ this.setPublicationList(data?.results)
+ return data
+ })
+ })
+ .catch((err) => {
+ console.error(err)
+ return err
+ })
+ },
+ /* istanbul ignore next */
+ async getOnePublication(id: number, options: Options = {}) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'get' },
+ )
+
+ const data = new Publication(await response.json())
+
+ options.doNotSetStore !== true && this.setPublicationItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async addPublication(item: Publication) {
+ if (!(item instanceof Publication)) {
+ throw Error('Please pass a Publication item from the Publication class')
+ }
+
+ const validateResult = item.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(apiEndpoint,
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Publication(await response.json())
+
+ this.refreshPublicationList()
+ this.setPublicationItem(data)
+
+ // dynamic import the navigationStore to avoid circular imports
+ const { useNavigationStore } = await import('../modules/navigation')
+ const navigationStore = useNavigationStore(pinia)
+ navigationStore.setSelectedCatalogus(data?.catalogi?.id)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async editPublication(item: Publication) {
+ if (!(item instanceof Publication)) {
+ throw Error('Please pass a Publication item from the Publication class')
+ }
+
+ const validateResult = item.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${item.id}`,
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Publication(await response.json())
+
+ this.refreshPublicationList()
+ this.setPublicationItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async deletePublication(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'DELETE' },
+ )
+
+ this.refreshPublicationList()
+ this.setPublicationItem(null)
+
+ return { response }
+ },
+ /* istanbul ignore next */
+ async downloadPublication(id: number, title: string, type: 'pdf' | 'zip') {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+ if (!type) {
+ throw Error('Passed type is pdf or zip')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}/download`,
+ {
+ method: 'GET',
+ headers: {
+ Accept: `application/${type}`,
+ },
+ },
+ )
+
+ const blob = await response.blob()
+
+ const download = () => {
+ const url = window.URL.createObjectURL(new Blob([blob]))
+ const link = document.createElement('a')
+ link.href = url
+
+ link.setAttribute('download', `${title}.${type.toLowerCase()}`)
+ document.body.appendChild(link)
+ link.click()
+ }
+
+ return { response, blob, download }
+ },
+ // ################################
+ // || ||
+ // || ATTACHMENTS ||
+ // || ||
+ // ################################
+ /* istanbul ignore next */
+ async getPublicationAttachments(id: number) {
+ if (!id) {
+ throw Error('Passed publication id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}/attachments`,
+ { method: 'GET' },
+ )
+
+ const rawData = await response.json()
+
+ const data = rawData.results.map(
+ (attachmentItem: TAttachment) => new Attachment(attachmentItem),
+ )
+
+ this.publicationAttachments = data
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async getOneAttachment(id: number) {
+ if (!id) {
+ throw Error('Passed publication id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}/attachments`,
+ { method: 'get' },
+ )
+
+ const data = new Attachment(await response.json())
+
+ this.setPublicationItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async addAttachment(item: Attachment, publicationItem: Publication = null) {
+ if (!(item instanceof Attachment)) {
+ throw Error('Please pass a Attachment item from the Attachment class')
+ }
+ if (publicationItem !== null && !(publicationItem instanceof Publication)) {
+ throw Error('Please pass a Publication item from the Publication class')
+ }
+
+ item.status = 'Concept'
+ item.published = null
+ delete item.id
+
+ const validateResult = item.validate()
+ if (!validateResult.success) {
+ console.log(validateResult)
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch('/index.php/apps/opencatalogi/api/attachments',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Attachment(await response.json())
+
+ // update the publication to include the ID
+ if (publicationItem) {
+ this.getPublicationAttachments(publicationItem?.id)
+
+ const newPublicationItem = new Publication({
+ ...publicationItem,
+ // @ts-expect-error -- screw you typescript, there is no 'string | number', its just number
+ attachments: [...publicationItem.attachments, data.id],
+ // @ts-expect-error -- because I have to POST a number, but receive a object for catalogi, this causes way to much issues. For the love of god let post and get be the same for once.
+ catalogi: publicationItem.catalogi.id,
+ metaData: publicationItem.metaData,
+ })
+
+ this.editPublication(newPublicationItem)
+ }
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async editAttachment(item: Attachment) {
+ if (!(item instanceof Attachment)) {
+ throw Error('Please pass a Attachment item from the Attachment class')
+ }
+
+ const validateResult = item.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${item.id}`,
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Attachment(await response.json())
+
+ this.setAttachmentItem(null)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async deleteAttachment(id: number, publicationItem: Publication = null) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+ if (publicationItem !== null && !(publicationItem instanceof Publication)) {
+ throw Error('Please pass a Publication item from the Publication class')
+ }
+
+ const response = await fetch(
+ `/index.php/apps/opencatalogi/api/attachments/${id}`,
+ { method: 'DELETE' },
+ )
+
+ if (publicationItem) {
+ this.getPublicationAttachments(publicationItem?.id)
+
+ // remove the deleted attachment id
+ // @ts-expect-error -- parse attachment to int to be sure
+ const filteredAttachments = publicationItem.attachments.filter((attachment) => parseInt(attachment) !== parseInt(this.attachmentItem.id))
+
+ const newPublicationItem = new Publication({
+ ...publicationItem,
+ attachments: [...filteredAttachments],
+ // @ts-expect-error -- banana
+ catalogi: publicationItem.catalogi.id,
+ metaData: publicationItem.metaData,
+ })
+
+ this.editPublication(newPublicationItem)
+ }
+
+ this.setAttachmentItem(null)
+ this.getConceptAttachments()
+
+ return { response }
+ },
+ getConceptPublications() { // @todo this might belong in a service?
+ fetch('/index.php/apps/opencatalogi/api/publications?status=Concept',
+ {
+ method: 'GET',
+ },
+ )
+ .then((response) => {
+ response.json().then((data) => {
+ this.conceptPublications = data.results.map((publicationItem: TPublication) => new Publication(publicationItem))
+ return data
+ })
+ })
+ .catch((err) => {
+ console.error(err)
+ return err
+ })
+ },
+ getConceptAttachments() { // @todo this might belong in a service?
+ fetch('/index.php/apps/opencatalogi/api/attachments?status=Concept',
+ {
+ method: 'GET',
+ },
+ )
+ .then((response) => {
+ response.json().then((data) => {
+ this.conceptAttachments = data.results.map((attachmentItem: TAttachment) => new Attachment(attachmentItem))
+ return data
+ })
+ })
+ .catch((err) => {
+ console.error(err)
+ return err
+ })
+ },
+ setPublicationDataKey(publicationDataKey: string) {
+ this.publicationDataKey = publicationDataKey
+ console.log('Active publication data key set to ' + publicationDataKey)
+ },
+ setAttachmentItem(attachmentItem: Attachment | TAttachment) {
+ this.attachmentItem = attachmentItem && new Attachment(attachmentItem)
+ console.log('Active attachment item set to ' + attachmentItem)
+ },
+ setAttachmentFile(files: object) {
+ this.attachmentFile = files
+ console.log('Active attachment files set to ' + files)
+ },
+ setPublicationMetaData(metaData: string) {
+ this.publicationMetaData = metaData
+ },
+ },
+})
diff --git a/src/store/modules/search.spec.js b/src/store/modules/search.spec.js
deleted file mode 100644
index 240ddda6..00000000
--- a/src/store/modules/search.spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* eslint-disable no-console */
-import { createPinia, setActivePinia } from 'pinia'
-
-import { useSearchStore } from './search.js'
-
-describe(
- 'Search Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'set search correctly', () => {
- const store = useSearchStore()
-
- store.setSearch('cata')
- expect(store.search).toBe('cata')
-
- store.setSearch('woo')
- expect(store.search).toBe('woo')
-
- store.setSearch('foo bar')
- expect(store.search).toBe('foo bar')
- },
- )
-
- it(
- 'set search result correctly', () => {
- const store = useSearchStore()
-
- store.setSearchResults(['foo', 'bar', 'bux'])
- expect(store.searchResults).toEqual(['foo', 'bar', 'bux'])
- },
- )
-
- it(
- 'clear search correctly', () => {
- const store = useSearchStore()
-
- store.setSearch('Lorem ipsum dolor sit amet')
- expect(store.search).toBe('Lorem ipsum dolor sit amet')
-
- store.clearSearch()
-
- expect(store.search).toBe('')
- },
- )
- },
-)
diff --git a/src/store/modules/search.spec.ts b/src/store/modules/search.spec.ts
new file mode 100644
index 00000000..7474462b
--- /dev/null
+++ b/src/store/modules/search.spec.ts
@@ -0,0 +1,41 @@
+/* eslint-disable no-console */
+import { createPinia, setActivePinia } from 'pinia'
+
+import { useSearchStore } from './search'
+
+describe('Search Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('set search correctly', () => {
+ const store = useSearchStore()
+
+ store.setSearch('cata')
+ expect(store.search).toBe('cata')
+
+ store.setSearch('woo')
+ expect(store.search).toBe('woo')
+
+ store.setSearch('foo bar')
+ expect(store.search).toBe('foo bar')
+ })
+
+ it('set search result correctly', () => {
+ const store = useSearchStore()
+
+ store.setSearchResults(['foo', 'bar', 'bux'])
+ expect(store.searchResults).toEqual(['foo', 'bar', 'bux'])
+ })
+
+ it('clear search correctly', () => {
+ const store = useSearchStore()
+
+ store.setSearch('Lorem ipsum dolor sit amet')
+ expect(store.search).toBe('Lorem ipsum dolor sit amet')
+
+ store.clearSearch()
+
+ expect(store.search).toBe('')
+ })
+})
diff --git a/src/store/modules/search.js b/src/store/modules/search.ts
similarity index 80%
rename from src/store/modules/search.js
rename to src/store/modules/search.ts
index f98d90b5..3b2a3908 100644
--- a/src/store/modules/search.js
+++ b/src/store/modules/search.ts
@@ -10,24 +10,27 @@ export const useSearchStore = defineStore('search', {
searchError: '',
}),
actions: {
- setSearch(search) {
+ setSearch(search: string) {
this.search = search
console.log('Active search set to ' + search)
},
- setSearchResults(searchResults) {
+ setSearchResults(searchResults: string[]) {
this.searchResults = searchResults
console.log('Active search set to ' + searchResults)
},
/* istanbul ignore next */ // ignore this for Jest until moved into a service
getSearchResults() {
const enabledMetadataIds = Object.entries(this.metadata)
- .filter(([key, value]) => value === true)
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ .filter(([_, value]) => value === true)
.map((metadata) => metadata[0])
const enabledCatalogiIds = Object.entries(this.catalogi)
- .filter(([key, value]) => value === true)
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ .filter(([_, value]) => value === true)
.map((catalogi) => catalogi[0])
+ // @ts-expect-error -- for some reason it gives errors in TS even doh it works
const searchParams = new URLSearchParams({
...(this.search && { _search: this.search }),
...(enabledMetadataIds[0] && { meta_data: enabledMetadataIds }),
diff --git a/src/store/modules/theme.js b/src/store/modules/theme.js
deleted file mode 100644
index d7c204a0..00000000
--- a/src/store/modules/theme.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* eslint-disable no-console */
-import { Theme } from '../../entities/index.js'
-import { defineStore } from 'pinia'
-
-export const useThemeStore = defineStore(
- 'theme', {
- state: () => ({
- themeItem: false,
- themeList: [],
- }),
- actions: {
- setThemeItem(themeItem) {
- this.themeItem = themeItem && new Theme(themeItem)
- console.log('Active theme item set to ' + themeItem && themeItem?.id)
- },
- setThemeList(themeList) {
- this.themeList = themeList.map(
- (themeItem) => new Theme(themeItem),
- )
- console.log('Theme list set to ' + themeList.length + ' items')
- },
- /* istanbul ignore next */ // ignore this for Jest until moved into a service
- async refreshThemeList(search = null) {
- // @todo this might belong in a service?
- let endpoint = '/index.php/apps/opencatalogi/api/themes'
- if (search !== null && search !== '') {
- endpoint = endpoint + '?_search=' + search
- }
- return fetch(
- endpoint, {
- method: 'GET',
- },
- )
- .then(
- (response) => {
- response.json().then(
- (data) => {
- this.setThemeList(data.results)
- },
- )
- },
- )
- .catch(
- (err) => {
- console.error(err)
- },
- )
- },
- },
- },
-)
diff --git a/src/store/modules/theme.spec.js b/src/store/modules/theme.spec.js
deleted file mode 100644
index 75f6a99f..00000000
--- a/src/store/modules/theme.spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/* eslint-disable no-console */
-import { setActivePinia, createPinia } from 'pinia'
-
-import { useThemeStore } from './theme.js'
-import { mockTheme, Theme } from '../../entities/index.js'
-
-describe(
- 'Theme Store', () => {
- beforeEach(
- () => {
- setActivePinia(createPinia())
- },
- )
-
- it(
- 'sets theme item correctly', () => {
- const store = useThemeStore()
-
- store.setThemeItem(mockTheme()[0])
-
- expect(store.themeItem).toBeInstanceOf(Theme)
- expect(store.themeItem).toEqual(mockTheme()[0])
- expect(store.themeItem.validate().success).toBe(true)
-
- store.setThemeItem(mockTheme()[1])
-
- expect(store.themeItem).toBeInstanceOf(Theme)
- expect(store.themeItem).toEqual(mockTheme()[1])
- expect(store.themeItem.validate().success).toBe(true)
-
- store.setThemeItem(mockTheme()[2])
-
- expect(store.themeItem).toBeInstanceOf(Theme)
- expect(store.themeItem).toEqual(mockTheme()[2])
- expect(store.themeItem.validate().success).toBe(false)
- },
- )
-
- it(
- 'sets theme list correctly', () => {
- const store = useThemeStore()
-
- store.setThemeList(mockTheme())
-
- expect(store.themeList).toHaveLength(mockTheme().length)
-
- expect(store.themeList[0]).toBeInstanceOf(Theme)
- expect(store.themeList[0]).toEqual(mockTheme()[0])
- expect(store.themeList[0].validate().success).toBe(true)
-
- expect(store.themeList[1]).toBeInstanceOf(Theme)
- expect(store.themeList[1]).toEqual(mockTheme()[1])
- expect(store.themeList[1].validate().success).toBe(true)
-
- expect(store.themeList[2]).toBeInstanceOf(Theme)
- expect(store.themeList[2]).toEqual(mockTheme()[2])
- expect(store.themeList[2].validate().success).toBe(false)
- },
- )
- },
-)
diff --git a/src/store/modules/theme.spec.ts b/src/store/modules/theme.spec.ts
new file mode 100644
index 00000000..a0c828bf
--- /dev/null
+++ b/src/store/modules/theme.spec.ts
@@ -0,0 +1,53 @@
+/* eslint-disable no-console */
+import { setActivePinia, createPinia } from 'pinia'
+
+import { useThemeStore } from './theme'
+import { mockTheme, Theme } from '../../entities/index.js'
+
+describe('Theme Store', () => {
+ beforeEach(() => {
+ setActivePinia(createPinia())
+ })
+
+ it('sets theme item correctly', () => {
+ const store = useThemeStore()
+
+ store.setThemeItem(mockTheme()[0])
+
+ expect(store.themeItem).toBeInstanceOf(Theme)
+ expect(store.themeItem).toEqual(mockTheme()[0])
+ expect(store.themeItem.validate().success).toBe(true)
+
+ store.setThemeItem(mockTheme()[1])
+
+ expect(store.themeItem).toBeInstanceOf(Theme)
+ expect(store.themeItem).toEqual(mockTheme()[1])
+ expect(store.themeItem.validate().success).toBe(true)
+
+ store.setThemeItem(mockTheme()[2])
+
+ expect(store.themeItem).toBeInstanceOf(Theme)
+ expect(store.themeItem).toEqual(mockTheme()[2])
+ expect(store.themeItem.validate().success).toBe(false)
+ })
+
+ it('sets theme list correctly', () => {
+ const store = useThemeStore()
+
+ store.setThemeList(mockTheme())
+
+ expect(store.themeList).toHaveLength(mockTheme().length)
+
+ expect(store.themeList[0]).toBeInstanceOf(Theme)
+ expect(store.themeList[0]).toEqual(mockTheme()[0])
+ expect(store.themeList[0].validate().success).toBe(true)
+
+ expect(store.themeList[1]).toBeInstanceOf(Theme)
+ expect(store.themeList[1]).toEqual(mockTheme()[1])
+ expect(store.themeList[1].validate().success).toBe(true)
+
+ expect(store.themeList[2]).toBeInstanceOf(Theme)
+ expect(store.themeList[2]).toEqual(mockTheme()[2])
+ expect(store.themeList[2].validate().success).toBe(false)
+ })
+})
diff --git a/src/store/modules/theme.ts b/src/store/modules/theme.ts
new file mode 100644
index 00000000..1ca0d97b
--- /dev/null
+++ b/src/store/modules/theme.ts
@@ -0,0 +1,168 @@
+/* eslint-disable no-console */
+import { Theme, TTheme } from '../../entities/index.js'
+import { defineStore } from 'pinia'
+
+const apiEndpoint = '/index.php/apps/opencatalogi/api/themes'
+
+interface Options {
+ /**
+ * Do not save the received item to the store, this can be enabled if API calls get run in a loop
+ */
+ doNotSetStore?: boolean
+}
+
+interface ThemeStoreState {
+ themeItem: Theme;
+ themeList: Theme[];
+}
+
+export const useThemeStore = defineStore('theme', {
+ state: () => ({
+ themeItem: null,
+ themeList: [],
+ } as ThemeStoreState),
+ actions: {
+ setThemeItem(themeItem: Theme | TTheme) {
+ this.themeItem = themeItem && new Theme(themeItem)
+ console.log('Active theme item set to ' + themeItem && themeItem?.id)
+ },
+ setThemeList(themeList: Theme[] | TTheme[]) {
+ this.themeList = themeList.map(
+ (themeItem) => new Theme(themeItem),
+ )
+ console.log('Theme list set to ' + themeList.length + ' items')
+ },
+ /* istanbul ignore next */ // ignore this for Jest until moved into a service
+ async refreshThemeList(search: string = null) {
+ // @todo this might belong in a service?
+ let endpoint = apiEndpoint
+ if (search !== null && search !== '') {
+ endpoint = endpoint + '?_search=' + search
+ }
+ return fetch(
+ endpoint, {
+ method: 'GET',
+ },
+ )
+ .then(
+ (response) => {
+ response.json().then(
+ (data) => {
+ this.setThemeList(data.results)
+ },
+ )
+ },
+ )
+ .catch(
+ (err) => {
+ console.error(err)
+ },
+ )
+ },
+ /* istanbul ignore next */
+ async getAllThemes(options: Options = {}) {
+ const response = await fetch(
+ `${apiEndpoint}`,
+ { method: 'get' },
+ )
+
+ const rawData = await response.json()
+
+ const data = rawData.results.map((themeItem: TTheme) => new Theme(themeItem))
+
+ options.doNotSetStore !== true && this.setThemeList(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async getOneTheme(id: number, options: Options = {}) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'get' },
+ )
+
+ const data = new Theme(await response.json())
+
+ options.doNotSetStore !== true && this.setThemeItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async addTheme(item: Theme) {
+ if (!(item instanceof Theme)) {
+ throw Error('Please pass a Theme item from the Theme class')
+ }
+
+ const validateResult = item.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(apiEndpoint,
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Theme(await response.json())
+
+ this.refreshThemeList()
+ this.setThemeItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async editTheme(themeItem: Theme) {
+ if (!(themeItem instanceof Theme)) {
+ throw Error('Please pass a Theme item from the Theme class')
+ }
+
+ const validateResult = themeItem.validate()
+ if (!validateResult.success) {
+ throw Error(validateResult.error.issues[0].message)
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${themeItem.id}`,
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(validateResult.data),
+ },
+ )
+
+ const data = new Theme(await response.json())
+
+ this.refreshThemeList()
+ this.setThemeItem(data)
+
+ return { response, data }
+ },
+ /* istanbul ignore next */
+ async deleteTheme(id: number) {
+ if (!id) {
+ throw Error('Passed id is falsy')
+ }
+
+ const response = await fetch(
+ `${apiEndpoint}/${id}`,
+ { method: 'DELETE' },
+ )
+
+ this.refreshThemeList()
+ this.setThemeItem(null)
+
+ return { response }
+ },
+ },
+})
diff --git a/src/store/store.js b/src/store/store.js
index 18c2d3d4..945e95ae 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -1,15 +1,19 @@
-/* eslint-disable no-console */
+/* eslint-disable n/no-missing-import */
+/* eslint-disable import/no-unresolved */
+/* eslint-disable import/extensions */
+// fk these rules above here
+
// The store script handles app wide variables (or state), for the use of these variables and there governing concepts read the design.md
import pinia from '../pinia.js'
-import { useCatalogiStore } from './modules/catalogi.js'
-import { useConfigurationStore } from './modules/configuration.js'
-import { useDirectoryStore } from './modules/directory.js'
-import { useMetadataStore } from './modules/metadata.js'
-import { useNavigationStore } from './modules/navigation.js'
-import { useOrganisationStore } from './modules/organisation.js'
-import { usePublicationStore } from './modules/publication.js'
-import { useSearchStore } from './modules/search.js'
-import { useThemeStore } from './modules/theme.js'
+import { useCatalogiStore } from './modules/catalogi'
+import { useConfigurationStore } from './modules/configuration'
+import { useDirectoryStore } from './modules/directory'
+import { useMetadataStore } from './modules/metadata'
+import { useNavigationStore } from './modules/navigation'
+import { useOrganisationStore } from './modules/organisation'
+import { usePublicationStore } from './modules/publication'
+import { useSearchStore } from './modules/search'
+import { useThemeStore } from './modules/theme'
const navigationStore = useNavigationStore(pinia)
const searchStore = useSearchStore(pinia)
diff --git a/src/views/catalogi/CatalogiDetails.vue b/src/views/catalogi/CatalogiDetails.vue
index 8caea070..b016fa4e 100644
--- a/src/views/catalogi/CatalogiDetails.vue
+++ b/src/views/catalogi/CatalogiDetails.vue
@@ -1,5 +1,5 @@
@@ -55,12 +55,39 @@ import { catalogiStore, metadataStore, navigationStore } from '../../store/store