diff --git a/app/src/components/nanomine/ImageUpload.vue b/app/src/components/nanomine/ImageUpload.vue index 76ecfc46..c5af2b9f 100644 --- a/app/src/components/nanomine/ImageUpload.vue +++ b/app/src/components/nanomine/ImageUpload.vue @@ -13,41 +13,60 @@ --> diff --git a/app/src/pages/explorer/chart/editor/Chart.vue b/app/src/pages/explorer/chart/editor/Chart.vue index f5c9a479..35179a94 100644 --- a/app/src/pages/explorer/chart/editor/Chart.vue +++ b/app/src/pages/explorer/chart/editor/Chart.vue @@ -123,19 +123,19 @@ diff --git a/app/src/store/modules/explorer/gallery/actions.js b/app/src/store/modules/explorer/gallery/actions.js index 18ec06e8..c444b339 100644 --- a/app/src/store/modules/explorer/gallery/actions.js +++ b/app/src/store/modules/explorer/gallery/actions.js @@ -1,52 +1,52 @@ -import router from '@/router' +import router from '@/router'; export default { - async loadItems ({ commit, getters, dispatch }, { page = 1 } = {}) { + async loadItems({ commit, getters, dispatch }, { page = 1 } = {}) { if (getters.totalPages > 0) { if (page < 1 || (page > 1 && page > getters.totalPages)) { throw new Error( `Invalid Page Number: ${page}. Must be number from 1 to ${getters.totalPages}` - ) + ); } } - const url = `/api/knowledge/charts/?page=${page}&pageSize=${getters.pageSize}` + const url = `/api/knowledge/charts/?page=${page}&pageSize=${getters.pageSize}`; const response = await fetch(url, { method: 'GET' - }) + }); if (!response || response?.statusText !== 'OK') { - const error = new Error(response.message || 'Something went wrong!') - throw error + const error = new Error(response.message || 'Something went wrong!'); + throw error; } if (response.status === 201) { - return + return; } - const responseData = await response.json() - commit('setTotal', responseData.total) - commit('setPage', page) + const responseData = await response.json(); + commit('setTotal', responseData.total); + commit('setPage', page); if (!responseData.data) { - commit('setItems', []) - return dispatch('fetchFavoriteCharts') + commit('setItems', []); + return dispatch('fetchFavoriteCharts'); } commit( 'setItems', responseData.data.map((el) => el._source) - ) - return dispatch('fetchFavoriteCharts') + ); + return dispatch('fetchFavoriteCharts'); }, - async fetchFavoriteCharts ({ commit, rootGetters, dispatch }, root = true) { - const token = rootGetters['auth/token'] - const name = rootGetters['auth/displayName'] - const isAdmin = rootGetters['auth/isAdmin'] + async fetchFavoriteCharts({ commit, rootGetters, dispatch }, root = true) { + const token = rootGetters['auth/token']; + const name = rootGetters['auth/displayName']; + const isAdmin = rootGetters['auth/isAdmin']; try { - if (!token) return + if (!token) return; // Route the user to the correct route depending on isAdmin status - const favoriteUrl = isAdmin ? '/favoritechart' : '/user/favorite-charts' + const favoriteUrl = isAdmin ? '/favoritechart' : '/user/favorite-charts'; const response = await fetch( '/api/knowledge/charts/favorites?pageSize=50', @@ -56,28 +56,24 @@ export default { Authorization: `Bearer ${token}` } } - ) + ); if (response.status !== 200) { - console.log('tolu01', response.message) const error = new Error( `Server error - ${response.message ?? response.statusText}` - ) - throw error + ); + throw error; } - const responseData = await response.json() + const responseData = await response.json(); commit( 'setfavoriteChartItems', responseData.data.map((el) => el._source) - ) - commit('setTotalFavorites', responseData.total) - commit('setMissingCharts', responseData.missingCharts) + ); + commit('setTotalFavorites', responseData.total); + commit('setMissingCharts', responseData.missingCharts); - console.log('1', responseData) - if (!root) return - console.log('2', responseData) - const faveLength = responseData.total - console.log('faveLength', faveLength) + if (!root) return; + const faveLength = responseData.total; commit( 'setSnackbar', { @@ -89,7 +85,7 @@ export default { }) }, { root: true } - ) + ); } catch (error) { return commit( 'setSnackbar', @@ -99,17 +95,17 @@ export default { callToActionText: 'Retry' }, { root: true } - ) + ); } }, - async bookmarkChart ({ commit, rootGetters, dispatch }, { chart }) { - const token = rootGetters['auth/token'] - const storeCharts = rootGetters['explorer/gallery/favoriteChartItems'] - let totalData = [] + async bookmarkChart({ commit, rootGetters, dispatch }, { chart }) { + const token = rootGetters['auth/token']; + const storeCharts = rootGetters['explorer/gallery/favoriteChartItems']; + let totalData = []; try { - if (!token) return + if (!token) return; const response = await fetch('/api/knowledge/charts/favorites', { method: 'POST', body: JSON.stringify({ chartId: chart.identifier }), @@ -117,13 +113,13 @@ export default { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` } - }) - if (response.status !== 200) return - const responseData = await response.json() + }); + if (response.status !== 200) return; + const responseData = await response.json(); - totalData = [...storeCharts, { chartId: chart.identifier }] - commit('setfavoriteChartItems', totalData) - commit('setSnackbar', { message: responseData.message }, { root: true }) + totalData = [...storeCharts, { chartId: chart.identifier }]; + commit('setfavoriteChartItems', totalData); + commit('setSnackbar', { message: responseData.message }, { root: true }); } catch (error) { return commit( 'setSnackbar', @@ -133,7 +129,7 @@ export default { callToActionText: 'Retry' }, { root: true } - ) + ); } } -} +}; diff --git a/resfulservice/spec/controllers/favouritesController.spec.js b/resfulservice/spec/controllers/favouritesController.spec.js index c55b4265..f6aca76e 100644 --- a/resfulservice/spec/controllers/favouritesController.spec.js +++ b/resfulservice/spec/controllers/favouritesController.spec.js @@ -104,7 +104,6 @@ describe('Favourites Controllers Unit Tests:', function () { .returns(mockElasticSearchChartsResult); sinon.stub(latency, 'latencyCalculator').returns(true); const result = await getFavoriteCharts(req, res, next); - console.log(result); expect(result).to.be.an('Object'); expect(result).to.have.property('data'); expect(result).to.have.property('total');