From 98b9578b83a0845316c217c2e5b4003c6311d4ee Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Tue, 18 Jul 2023 16:35:16 -0300 Subject: [PATCH] Imports render function (h) and disables buefy temporaly on Roles. --- package.json | 4 ++-- src/views/admin/js/admin-main.js | 6 +++--- .../blocks/carousel-collections-list/theme.js | 4 ++-- .../blocks/carousel-items-list/theme.js | 4 ++-- .../blocks/carousel-terms-list/theme.js | 4 ++-- .../blocks/dynamic-items-list/theme.js | 4 ++-- .../blocks/faceted-search/theme.js | 6 +++--- .../blocks/facets-list/theme.js | 4 ++-- .../blocks/item-submission-form/theme.js | 6 +++--- src/views/reports/js/reports-main.js | 4 ++-- src/views/roles/js/roles-main.js | 19 ++++++++++--------- src/views/roles/pages/roles-list.vue | 11 +++++++---- src/views/roles/roles.vue | 4 +--- webpack.common.js | 4 +++- 14 files changed, 44 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index ebb76a1de..7ac8a2751 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,9 @@ "build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js --progress --mode production" }, "dependencies": { + "@vue-leaflet/vue-leaflet": "^0.10.1", "@vue/compat": "^3.3.4", + "another-vue3-blurhash": "^0.0.1", "apexcharts": "^3.41.0", "axios": "^1.4.0", "blurhash": "^2.0.5", @@ -31,11 +33,9 @@ "swiper": "^8.4.5", "vue": "^3.3.4", "vue-apexcharts": "^1.6.2", - "another-vue3-blurhash": "^0.0.1", "vue-countup-v3": "^1.3.0", "vue-router": "^4.2.4", "vue-the-mask": "^0.11.1", - "@vue-leaflet/vue-leaflet": "^0.10.1", "vuedraggable": "^4.1.0", "vuex": "^4.1.0" }, diff --git a/src/views/admin/js/admin-main.js b/src/views/admin/js/admin-main.js index d8cc877a6..4963caaf5 100644 --- a/src/views/admin/js/admin-main.js +++ b/src/views/admin/js/admin-main.js @@ -3,7 +3,7 @@ //window.underscore = _.noConflict(); // Main imports -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import { Field, Input, @@ -103,7 +103,7 @@ export default (element) => { el: '#tainacan-admin-app', router, store, - render: h => h(AdminPage) + render: () => h(AdminPage) }); app.use(router); @@ -246,7 +246,7 @@ export default (element) => { next(); }); - app.mount(); + app.mount('#tainacan-admin-app'); // Initialize Ponyfill for Custom CSS properties cssVars({ diff --git a/src/views/gutenberg-blocks/blocks/carousel-collections-list/theme.js b/src/views/gutenberg-blocks/blocks/carousel-collections-list/theme.js index 14d65e083..c594a730d 100644 --- a/src/views/gutenberg-blocks/blocks/carousel-collections-list/theme.js +++ b/src/views/gutenberg-blocks/blocks/carousel-collections-list/theme.js @@ -1,4 +1,4 @@ -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import CarouselCollectionsListTheme from './theme.vue'; import { ThumbnailHelperPlugin } from '../../../admin/js/utilities.js'; import VueBlurHash from 'another-vue3-blurhash'; @@ -42,7 +42,7 @@ export default (element) => { className: '', style: '' }, - render(h) { + render() { return h(CarouselCollectionsListTheme, { props: { blockId: blockId, diff --git a/src/views/gutenberg-blocks/blocks/carousel-items-list/theme.js b/src/views/gutenberg-blocks/blocks/carousel-items-list/theme.js index 0abbd41be..458ba2d5a 100644 --- a/src/views/gutenberg-blocks/blocks/carousel-items-list/theme.js +++ b/src/views/gutenberg-blocks/blocks/carousel-items-list/theme.js @@ -1,4 +1,4 @@ -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import CarouselItemsListTheme from './theme.vue'; import { ThumbnailHelperPlugin } from '../../../admin/js/utilities.js'; @@ -48,7 +48,7 @@ export default (element) => { className: '', style: '' }, - render(h){ + render(){ return h(CarouselItemsListTheme, { props: { blockId: blockId, diff --git a/src/views/gutenberg-blocks/blocks/carousel-terms-list/theme.js b/src/views/gutenberg-blocks/blocks/carousel-terms-list/theme.js index be156a48b..7f3eaf43f 100644 --- a/src/views/gutenberg-blocks/blocks/carousel-terms-list/theme.js +++ b/src/views/gutenberg-blocks/blocks/carousel-terms-list/theme.js @@ -1,4 +1,4 @@ -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import CarouselTermsListTheme from './theme.vue'; import { ThumbnailHelperPlugin } from '../../../admin/js/utilities.js'; import VueBlurHash from 'another-vue3-blurhash'; @@ -43,7 +43,7 @@ export default (element) => { taxonomyId: '', style: '' }, - render(h){ + render(){ return h(CarouselTermsListTheme, { props: { blockId: blockId, diff --git a/src/views/gutenberg-blocks/blocks/dynamic-items-list/theme.js b/src/views/gutenberg-blocks/blocks/dynamic-items-list/theme.js index 8edcb7adb..3ffa129da 100644 --- a/src/views/gutenberg-blocks/blocks/dynamic-items-list/theme.js +++ b/src/views/gutenberg-blocks/blocks/dynamic-items-list/theme.js @@ -1,4 +1,4 @@ -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import DynamicItemsListTheme from './theme.vue'; import { ThumbnailHelperPlugin } from '../../../admin/js/utilities.js'; @@ -54,7 +54,7 @@ export default (element) => { className: '', style: '' }, - render(h){ + render(){ return h(DynamicItemsListTheme, { props: { collectionId: this.collectionId, diff --git a/src/views/gutenberg-blocks/blocks/faceted-search/theme.js b/src/views/gutenberg-blocks/blocks/faceted-search/theme.js index 68826c044..f8753cebf 100644 --- a/src/views/gutenberg-blocks/blocks/faceted-search/theme.js +++ b/src/views/gutenberg-blocks/blocks/faceted-search/theme.js @@ -1,5 +1,5 @@ // Main imports -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import { Field, Input, @@ -176,7 +176,7 @@ export default (element) => { } } }, - render: h => h(ThemeSearch) + render: () => h(ThemeSearch) }); VueItemsList.use(store); @@ -285,7 +285,7 @@ export default (element) => { VueItemsList.use(eventBusSearch, { store: store, router: routerTheme }); - VueItemsList.mount(); + VueItemsList.mount('#tainacan-items-page'); // Initialize Ponyfill for Custom CSS properties cssVars({ diff --git a/src/views/gutenberg-blocks/blocks/facets-list/theme.js b/src/views/gutenberg-blocks/blocks/facets-list/theme.js index afe8c4cbf..550316939 100644 --- a/src/views/gutenberg-blocks/blocks/facets-list/theme.js +++ b/src/views/gutenberg-blocks/blocks/facets-list/theme.js @@ -1,4 +1,4 @@ -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import FacetsListTheme from './theme.vue'; import FacetsListThemeUnit from './facet-unit.vue'; @@ -47,7 +47,7 @@ export default (element) => { className: '', style: '' }, - render(h){ + render(){ return h(FacetsListTheme, { props: { metadatumId: this.metadatumId, diff --git a/src/views/gutenberg-blocks/blocks/item-submission-form/theme.js b/src/views/gutenberg-blocks/blocks/item-submission-form/theme.js index 5009645d2..d88f29de4 100644 --- a/src/views/gutenberg-blocks/blocks/item-submission-form/theme.js +++ b/src/views/gutenberg-blocks/blocks/item-submission-form/theme.js @@ -1,5 +1,5 @@ // Main imports -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import { Field, Numberinput, @@ -152,7 +152,7 @@ export default (element) => { return (value == true || value == 'true' || value == '1' || value == 1) ? true : false; } }, - render: h => h(ItemSubmission) + render: () => h(ItemSubmission) }); VueItemSubmission.use(store); @@ -239,7 +239,7 @@ export default (element) => { VueItemSubmission.component('term-creation-panel', TermCreationPanel); VueItemSubmission.component('help-button', HelpButton); - VueItemSubmission.mount(); + VueItemSubmission.mount('#tainacan-item-submission-form'); // Initialize Ponyfill for Custom CSS properties cssVars({ diff --git a/src/views/reports/js/reports-main.js b/src/views/reports/js/reports-main.js index eabc7a938..dc3176675 100644 --- a/src/views/reports/js/reports-main.js +++ b/src/views/reports/js/reports-main.js @@ -1,4 +1,4 @@ -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import store from '../../admin/js/store/store'; import router from './reports-router'; import { Snackbar, Modal } from 'buefy'; @@ -71,7 +71,7 @@ export default (element) => { const VueReports = createApp({ el: '#tainacan-reports-app', - render: h => h(ReportsPage) + render: () => h(ReportsPage) }); VueReports.use(store); diff --git a/src/views/roles/js/roles-main.js b/src/views/roles/js/roles-main.js index 3902c2d64..df51f0acd 100644 --- a/src/views/roles/js/roles-main.js +++ b/src/views/roles/js/roles-main.js @@ -1,8 +1,8 @@ -import { createApp } from 'vue'; +import { createApp, h } from 'vue'; import store from '../../admin/js/store/store'; import router from './roles-router'; -import VTooltip from 'floating-vue'; -import { Snackbar, Modal } from 'buefy'; +import FloatingVue from 'floating-vue'; +//import { Snackbar, Modal } from 'buefy'; import { I18NPlugin } from './wp-i18n-plugin'; @@ -20,11 +20,11 @@ export default (element) => { const VueRoles = createApp({ el: '#tainacan-roles-app', - render: h => h(RolesPage) + render: () => h(RolesPage) }); VueRoles.use(I18NPlugin); - VueRoles.use(VTooltip, { + VueRoles.use(FloatingVue, { popperTriggers: ['hover'], themes: { 'taianacan-tooltip': { @@ -35,8 +35,8 @@ export default (element) => { } } }); - VueRoles.use(Snackbar); - VueRoles.use(Modal); + // VueRoles.use(Snackbar); + // VueRoles.use(Modal); // Changing title of pages router.beforeEach((to, from, next) => { @@ -44,10 +44,11 @@ export default (element) => { if (next() != undefined) next(); }); - + VueRoles.use(router); VueRoles.use(store); - + + VueRoles.mount('#tainacan-roles-app'); }; }; diff --git a/src/views/roles/pages/roles-list.vue b/src/views/roles/pages/roles-list.vue index ffab01e37..7a6927dcc 100644 --- a/src/views/roles/pages/roles-list.vue +++ b/src/views/roles/pages/roles-list.vue @@ -59,7 +59,9 @@ v-model="searchString">

-
+

{{ $i18n.get('Create and edit roles for users') }}

@@ -201,6 +203,7 @@
@@ -230,7 +233,7 @@ roles() { let roles = this.getRoles(); - if (this.searchString) { + if (this.searchString && roles) { let searchedRoles = {} for (let [roleKey, role] of Object.entries(roles)) { if (role.name.toLowerCase().match(this.searchString)) @@ -239,7 +242,7 @@ roles = searchedRoles; } - if (this.relatedEntities.length) { + if (this.relatedEntities.length && roles) { let filteredRoles = {}; for (let [roleKey, role] of Object.entries(roles)) { for (let entity of this.relatedEntities) { @@ -253,7 +256,7 @@ roles = filteredRoles; } - return roles; + return roles ? roles : {}; } }, created() { diff --git a/src/views/roles/roles.vue b/src/views/roles/roles.vue index 3834021b2..1c7c35758 100644 --- a/src/views/roles/roles.vue +++ b/src/views/roles/roles.vue @@ -1,7 +1,5 @@ diff --git a/webpack.common.js b/webpack.common.js index ea905a083..674e81a18 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -106,7 +106,9 @@ module.exports = { }, plugins: [ new webpack.DefinePlugin({ - 'TAINACAN_ENV': JSON.stringify(process.env.NODE_ENV) + 'TAINACAN_ENV': JSON.stringify(process.env.NODE_ENV), + __VUE_OPTIONS_API__: true, + __VUE_PROD_DEVTOOLS__: true, }), new VueLoaderPlugin({ prettify: false