diff --git a/packages/piveau-hub-ui-modules/lib/data-provider-interface/CatalogueMQA.vue b/packages/piveau-hub-ui-modules/lib/data-provider-interface/CatalogueMQA.vue index fbc96f6a073f355768423a70f06928044cedc00b..fd0b2ef33f915d7ffac023538139749786adcc8f 100644 --- a/packages/piveau-hub-ui-modules/lib/data-provider-interface/CatalogueMQA.vue +++ b/packages/piveau-hub-ui-modules/lib/data-provider-interface/CatalogueMQA.vue @@ -291,6 +291,7 @@ const postNotificationSettings = async () => { url: `${notificationBaseUrl}/catalogue/${catalogId}/setting`, headers: { Authorization: `Bearer ${token.value}`, + 'Content-Type': 'application/json', }, withCredentials: true, data: JSON.stringify({ @@ -311,7 +312,6 @@ const postNotificationSettings = async () => { router.push({ name: 'DataProviderInterface-UserCatalogues' }); return response.data - } catch (error) { triggerSnackbar({ message: 'Error updating settings.', @@ -320,11 +320,8 @@ const postNotificationSettings = async () => { console.log('Error updating settings:', error) - throw error - + throw error } - - } fetchNotificationInfo() @@ -336,6 +333,7 @@ const postDeactive = async () => { url: `${notificationBaseUrl}/catalogue/${catalogId}/setting`, headers: { Authorization: `Bearer ${token.value}`, + 'Content-Type': 'application/json', }, withCredentials: true, data: JSON.stringify({ diff --git a/packages/piveau-hub-ui-modules/lib/services/catalogService.ts b/packages/piveau-hub-ui-modules/lib/services/catalogService.ts index 6775c420e28a55d247705cc6591c205d04bd286f..14de51ed5aab79ef3a8b85303b9df3ec149d3a71 100644 --- a/packages/piveau-hub-ui-modules/lib/services/catalogService.ts +++ b/packages/piveau-hub-ui-modules/lib/services/catalogService.ts @@ -79,10 +79,11 @@ export default class Catalogs { * @param q * @returns {Promise} */ - get(q, limit, page = 1, sort = 'relevance+desc,modified+desc,title+asc', facetOperator = 'AND', facetGroupOperator = 'AND', facets) { + get(q, fields, limit, page = 1, sort = 'relevance+desc,modified+desc,title+asc', facetOperator = 'AND', facetGroupOperator = 'AND', facets) { // The request parameters const params = { q, + fields, filter: 'catalogue', sort, limit, diff --git a/packages/piveau-hub-ui-modules/lib/store/modules/cataloguesStore.ts b/packages/piveau-hub-ui-modules/lib/store/modules/cataloguesStore.ts index d2ff82ca9f0dee8475f3213823df201d605000e9..eaa36ae20fdbdf1c47a35437a5c4f8bcbe997291 100644 --- a/packages/piveau-hub-ui-modules/lib/store/modules/cataloguesStore.ts +++ b/packages/piveau-hub-ui-modules/lib/store/modules/cataloguesStore.ts @@ -15,6 +15,7 @@ const state = { loading: false, searchParameters: { query: '', + fields: undefined, limit: RESULTS_PER_PAGE, offset: 0, facets: [], @@ -32,6 +33,7 @@ const GETTERS = { getCatalogs: state => state.catalogs, getCatalogsCount: state => state.catalogsCount, getQuery: state => state.searchParameters.query, + getFields: state => state.searchParameters.fields, getLimit: state => state.searchParameters.limit, getLoading: state => state.loading, getOffset: state => state.searchParameters.offset, @@ -62,6 +64,7 @@ const actions = { * @param state * @param options {Object} - Given search parameters * @param options.query {String} - The given query string + * @param options.fields {String} - The given fields * @param options.facets {Array} - The active facets * @param options.limit {Number} - The maximum amount of catalogs to fetch * @param options.page {Number} - The current page @@ -72,6 +75,7 @@ const actions = { { commit, state }, { query = GETTERS.getQuery(state), + fields = GETTERS.getFields(state), limit = GETTERS.getLimit(state), page = GETTERS.getPage(state), sort = GETTERS.getSort(state), @@ -83,8 +87,9 @@ const actions = { ) { commit('SET_LOADING', true); return new Promise((resolve, reject) => { - this.$catalogService.get(query, limit, page, sort, facetOperator, facetGroupOperator, facets) + this.$catalogService.get(query, fields, limit, page, sort, facetOperator, facetGroupOperator, facets) .then((response) => { + commit('SET_FIEELDS', response.fields); commit('SET_AVAILABLE_FACETS', response.availableFacets); commit('SET_catalogS_COUNT', response.catalogsCount); if (append) commit('ADD_catalogS', response.catalogs); @@ -198,6 +203,9 @@ const actions = { setQuery({ commit }, query) { commit('SET_QUERY', query); }, + setFields({ commit }, fields) { + commit('SET_FIELDS', fields); + }, /** * @description Replace the current sort method * @param commit @@ -270,6 +278,9 @@ const mutations = { SET_QUERY(state, query) { state.searchParameters.query = query; }, + SET_FIELDS(state, fields) { + state.searchParameters.fields = fields; + }, SET_SORT(state, sort) { state.searchParameters.sort = sort; }, diff --git a/packages/piveau-hub-ui-modules/lib/store/modules/datasetsStore.ts b/packages/piveau-hub-ui-modules/lib/store/modules/datasetsStore.ts index b126f888d8b516efc8b13f6b428b2b4d2ef49dc9..1321407d0dbb582585f520ec0cfdc8434ac9efc8 100644 --- a/packages/piveau-hub-ui-modules/lib/store/modules/datasetsStore.ts +++ b/packages/piveau-hub-ui-modules/lib/store/modules/datasetsStore.ts @@ -9,7 +9,7 @@ const state = { loading: false, searchParameters: { query: '', - fields: undefined, // how to get the query from url here? + fields: undefined, limit: RESULTS_PER_PAGE, offset: 0, // The Facets to filter for