diff --git a/apps/files/js/dist/personal-settings.js b/apps/files/js/dist/personal-settings.js
index 36a55892bb6227ff7677a3c469be40b426ce9ba9..bd3b1461a528aa16c7d4cd52e996a72724580c25 100644
Binary files a/apps/files/js/dist/personal-settings.js and b/apps/files/js/dist/personal-settings.js differ
diff --git a/apps/files/js/dist/personal-settings.js.map b/apps/files/js/dist/personal-settings.js.map
index e03ec3a3e92520fb9dc37c52a0437086254ec66d..5898880cfa8c581d01cc833280b91ed32d87395b 100644
Binary files a/apps/files/js/dist/personal-settings.js.map and b/apps/files/js/dist/personal-settings.js.map differ
diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js
index ab36d31cb7ad75bfa340184ea9c63b94bf12c0cc..90ba2fad138caa1b417aed59fabaa718242d2b30 100644
Binary files a/apps/files/js/dist/sidebar.js and b/apps/files/js/dist/sidebar.js differ
diff --git a/apps/files/js/dist/sidebar.js.map b/apps/files/js/dist/sidebar.js.map
index 1f5016f792a310b423a8e46081dffadc9c7ee8c6..0674f6915b4db2d7560923d11414380bf77fe11c 100644
Binary files a/apps/files/js/dist/sidebar.js.map and b/apps/files/js/dist/sidebar.js.map differ
diff --git a/apps/files/src/components/LegacyTab.vue b/apps/files/src/components/LegacyTab.vue
index e358499cb69961169fc7fdaf7b1d484f2f73b585..32c644ed806466d92326aac41e95fc3ac6530b1b 100644
--- a/apps/files/src/components/LegacyTab.vue
+++ b/apps/files/src/components/LegacyTab.vue
@@ -26,7 +26,7 @@
:active-tab="activeTab" />
</template>
<script>
-import AppSidebarTab from 'nextcloud-vue/dist/Components/AppSidebarTab'
+import AppSidebarTab from '@nextcloud/vue/dist/Components/AppSidebarTab'
export default {
name: 'LegacyTab',
diff --git a/apps/files/src/components/TransferOwnershipDialogue.vue b/apps/files/src/components/TransferOwnershipDialogue.vue
index f11c4b6bb8283c2dcc00d47d5ac27bebc94fd2ef..5a897d4d92473bbdead153abeca3180b030c30ed 100644
--- a/apps/files/src/components/TransferOwnershipDialogue.vue
+++ b/apps/files/src/components/TransferOwnershipDialogue.vue
@@ -70,7 +70,7 @@ import axios from '@nextcloud/axios'
import debounce from 'debounce'
import { generateOcsUrl } from '@nextcloud/router'
import { getFilePickerBuilder } from '@nextcloud/dialogs'
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import Vue from 'vue'
import logger from '../logger'
diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue
index 5f07138ea80f9fae3f960e9406cef79d0e1e5d22..c55e1671178097002aca000867b6314a6dae06d0 100644
--- a/apps/files/src/views/Sidebar.vue
+++ b/apps/files/src/views/Sidebar.vue
@@ -73,8 +73,8 @@
<script>
import $ from 'jquery'
import axios from '@nextcloud/axios'
-import AppSidebar from 'nextcloud-vue/dist/Components/AppSidebar'
-import ActionButton from 'nextcloud-vue/dist/Components/ActionButton'
+import AppSidebar from '@nextcloud/vue/dist/Components/AppSidebar'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import FileInfo from '../services/FileInfo'
import LegacyTab from '../components/LegacyTab'
import LegacyView from '../components/LegacyView'
@@ -240,6 +240,35 @@ export default {
},
},
+ watch: {
+ // update the sidebar data
+ async file(curr, prev) {
+ this.resetData()
+ if (curr && curr.trim() !== '') {
+ try {
+ this.fileInfo = await FileInfo(this.davPath)
+ // adding this as fallback because other apps expect it
+ this.fileInfo.dir = this.file.split('/').slice(0, -1).join('/')
+
+ // DEPRECATED legacy views
+ // TODO: remove
+ this.views.forEach(view => {
+ view.setFileInfo(this.fileInfo)
+ })
+
+ this.$nextTick(() => {
+ if (this.$refs.sidebar) {
+ this.$refs.sidebar.updateTabs()
+ }
+ })
+ } catch (error) {
+ this.error = t('files', 'Error while loading the file data')
+ console.error('Error while loading the file data', error)
+ }
+ }
+ },
+ },
+
methods: {
/**
* Can this tab be displayed ?
diff --git a/apps/files_sharing/js/dist/additionalScripts.js b/apps/files_sharing/js/dist/additionalScripts.js
index 276bc48924dccf5660ab0dfb719afad6279971d6..3d37eb6efccd341dbce4380fcaa8e2fbe2439e4e 100644
Binary files a/apps/files_sharing/js/dist/additionalScripts.js and b/apps/files_sharing/js/dist/additionalScripts.js differ
diff --git a/apps/files_sharing/js/dist/additionalScripts.js.map b/apps/files_sharing/js/dist/additionalScripts.js.map
index 55cc851dd6ac6c7e844837e8208f8b7c30481f8f..7b6692fb3c7cda0ee6d4068f15f3e15940132b70 100644
Binary files a/apps/files_sharing/js/dist/additionalScripts.js.map and b/apps/files_sharing/js/dist/additionalScripts.js.map differ
diff --git a/apps/files_sharing/js/dist/collaboration.js b/apps/files_sharing/js/dist/collaboration.js
index 5085b9427e2fa8781e17ec051b1acc48011d0baa..c9d83015bc510c295f29ac680ab9654adc413ff3 100644
Binary files a/apps/files_sharing/js/dist/collaboration.js and b/apps/files_sharing/js/dist/collaboration.js differ
diff --git a/apps/files_sharing/js/dist/collaboration.js.map b/apps/files_sharing/js/dist/collaboration.js.map
index 8eca22d32040aee13849e8731ed4cc9b7990ccd9..83ae91103c3e2328a453e87667deff7572022199 100644
Binary files a/apps/files_sharing/js/dist/collaboration.js.map and b/apps/files_sharing/js/dist/collaboration.js.map differ
diff --git a/apps/files_sharing/js/dist/files_sharing.js b/apps/files_sharing/js/dist/files_sharing.js
index 2f7e2a6253e1509864a741ee0787b7c6080462fe..f3528e869091557326cd9d1bf972324de205bae3 100644
Binary files a/apps/files_sharing/js/dist/files_sharing.js and b/apps/files_sharing/js/dist/files_sharing.js differ
diff --git a/apps/files_sharing/js/dist/files_sharing.js.map b/apps/files_sharing/js/dist/files_sharing.js.map
index fdc725be46182c5531b58473e56934724db9f3c3..029367f5c02975c7b06b2eba97a969c84bac68bf 100644
Binary files a/apps/files_sharing/js/dist/files_sharing.js.map and b/apps/files_sharing/js/dist/files_sharing.js.map differ
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
index f7d0cd960ce0485c68faa6436aed6578a46d83d2..7edc5334db2a8d64a0af9707000fdc96b57ca9c3 100644
Binary files a/apps/files_sharing/js/dist/files_sharing_tab.js and b/apps/files_sharing/js/dist/files_sharing_tab.js differ
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
index 278dbb020a75eb917823bc1fffc254b4403f025e..908f2cf2a314dd51b034cebde66939115db2ffda 100644
Binary files a/apps/files_sharing/js/dist/files_sharing_tab.js.map and b/apps/files_sharing/js/dist/files_sharing_tab.js.map differ
diff --git a/apps/files_sharing/js/dist/main.js b/apps/files_sharing/js/dist/main.js
index ee990a8e6ede5188ad9e3f37e367113c8162f595..91174174b0964fc4ffa8d6089575d81c75d7780e 100644
Binary files a/apps/files_sharing/js/dist/main.js and b/apps/files_sharing/js/dist/main.js differ
diff --git a/apps/files_sharing/js/dist/main.js.map b/apps/files_sharing/js/dist/main.js.map
index 11716315fc044ef866662d09a54db01ec0c533dd..37ded4476d7faa9a84525c029468b8e4b8c01c37 100644
Binary files a/apps/files_sharing/js/dist/main.js.map and b/apps/files_sharing/js/dist/main.js.map differ
diff --git a/apps/files_sharing/js/dist/personal-settings.js b/apps/files_sharing/js/dist/personal-settings.js
index 5375f3f242b9426120087b8cc4e808ec5b67d701..6ccbfa658fb0b742557372e812c5010fb03bd17c 100644
Binary files a/apps/files_sharing/js/dist/personal-settings.js and b/apps/files_sharing/js/dist/personal-settings.js differ
diff --git a/apps/files_sharing/js/dist/personal-settings.js.map b/apps/files_sharing/js/dist/personal-settings.js.map
index 7907b4585fadcaf4ac703c6cf12b1e54d7c82152..307e8a7f8e35f649ca2fabf0c76b57b147aac381 100644
Binary files a/apps/files_sharing/js/dist/personal-settings.js.map and b/apps/files_sharing/js/dist/personal-settings.js.map differ
diff --git a/apps/files_sharing/src/collaborationresources.js b/apps/files_sharing/src/collaborationresources.js
index 9c31f21bee5699455dc003461cb1f0818e988c0b..68cea9e59d3bd5ba9b05d5f0347fcc4c68048855 100644
--- a/apps/files_sharing/src/collaborationresources.js
+++ b/apps/files_sharing/src/collaborationresources.js
@@ -22,7 +22,8 @@
import Vue from 'vue'
import Vuex from 'vuex'
-import { Tooltip, PopoverMenu } from 'nextcloud-vue'
+import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import ClickOutside from 'vue-click-outside'
import View from './views/CollaborationView'
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
index ee944a76258944da69fb576d4b4a704e500f0e94..1daec4be4794b66f9383bf17cccd4c02f018e065 100644
--- a/apps/files_sharing/src/components/SharingEntry.vue
+++ b/apps/files_sharing/src/components/SharingEntry.vue
@@ -135,13 +135,13 @@
</template>
<script>
-import Avatar from 'nextcloud-vue/dist/Components/Avatar'
-import Actions from 'nextcloud-vue/dist/Components/Actions'
-import ActionButton from 'nextcloud-vue/dist/Components/ActionButton'
-import ActionCheckbox from 'nextcloud-vue/dist/Components/ActionCheckbox'
-import ActionInput from 'nextcloud-vue/dist/Components/ActionInput'
-import ActionTextEditable from 'nextcloud-vue/dist/Components/ActionTextEditable'
-import Tooltip from 'nextcloud-vue/dist/Directives/Tooltip'
+import Avatar from '@nextcloud/vue/dist/Components/Avatar'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import ActionCheckbox from '@nextcloud/vue/dist/Components/ActionCheckbox'
+import ActionInput from '@nextcloud/vue/dist/Components/ActionInput'
+import ActionTextEditable from '@nextcloud/vue/dist/Components/ActionTextEditable'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import SharesMixin from '../mixins/SharesMixin'
diff --git a/apps/files_sharing/src/components/SharingEntryInherited.vue b/apps/files_sharing/src/components/SharingEntryInherited.vue
index 2c08b43d0cda3845a72e9b99fb5e16dfb031277f..259599359d43e88dfb71c4a6057d11d4226d57a1 100644
--- a/apps/files_sharing/src/components/SharingEntryInherited.vue
+++ b/apps/files_sharing/src/components/SharingEntryInherited.vue
@@ -50,10 +50,10 @@
<script>
import { generateUrl } from '@nextcloud/router'
-import Avatar from 'nextcloud-vue/dist/Components/Avatar'
-import ActionButton from 'nextcloud-vue/dist/Components/ActionButton'
-import ActionLink from 'nextcloud-vue/dist/Components/ActionLink'
-import ActionText from 'nextcloud-vue/dist/Components/ActionText'
+import Avatar from '@nextcloud/vue/dist/Components/Avatar'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
+import ActionText from '@nextcloud/vue/dist/Components/ActionText'
// eslint-disable-next-line no-unused-vars
import Share from '../models/Share'
diff --git a/apps/files_sharing/src/components/SharingEntryInternal.vue b/apps/files_sharing/src/components/SharingEntryInternal.vue
index d727e6b9e5450c8dc7cb9cbee6e517c353740444..af677eca8436edefbc27971efdd7496753e63099 100644
--- a/apps/files_sharing/src/components/SharingEntryInternal.vue
+++ b/apps/files_sharing/src/components/SharingEntryInternal.vue
@@ -20,7 +20,7 @@
<script>
import { generateUrl } from '@nextcloud/router'
-import ActionLink from 'nextcloud-vue/dist/Components/ActionLink'
+import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
import SharingEntrySimple from './SharingEntrySimple'
export default {
diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue
index 45565ab22cbd0cc2f26eb79a2b81d7aaff231856..e2c1ec63364972c095ef769f2fcb9bbf4861cb6f 100644
--- a/apps/files_sharing/src/components/SharingEntryLink.vue
+++ b/apps/files_sharing/src/components/SharingEntryLink.vue
@@ -299,16 +299,16 @@
import { generateUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
-import ActionButton from 'nextcloud-vue/dist/Components/ActionButton'
-import ActionCheckbox from 'nextcloud-vue/dist/Components/ActionCheckbox'
-import ActionRadio from 'nextcloud-vue/dist/Components/ActionRadio'
-import ActionInput from 'nextcloud-vue/dist/Components/ActionInput'
-import ActionText from 'nextcloud-vue/dist/Components/ActionText'
-import ActionTextEditable from 'nextcloud-vue/dist/Components/ActionTextEditable'
-import ActionLink from 'nextcloud-vue/dist/Components/ActionLink'
-import Actions from 'nextcloud-vue/dist/Components/Actions'
-import Avatar from 'nextcloud-vue/dist/Components/Avatar'
-import Tooltip from 'nextcloud-vue/dist/Directives/Tooltip'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import ActionCheckbox from '@nextcloud/vue/dist/Components/ActionCheckbox'
+import ActionRadio from '@nextcloud/vue/dist/Components/ActionRadio'
+import ActionInput from '@nextcloud/vue/dist/Components/ActionInput'
+import ActionText from '@nextcloud/vue/dist/Components/ActionText'
+import ActionTextEditable from '@nextcloud/vue/dist/Components/ActionTextEditable'
+import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import Avatar from '@nextcloud/vue/dist/Components/Avatar'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import Share from '../models/Share'
import SharesMixin from '../mixins/SharesMixin'
diff --git a/apps/files_sharing/src/components/SharingEntrySimple.vue b/apps/files_sharing/src/components/SharingEntrySimple.vue
index 78fa865d1389d60edc73dd0a2485b5263c022397..5cdce17bf0c27482a8ee36c4abae0be6803106fa 100644
--- a/apps/files_sharing/src/components/SharingEntrySimple.vue
+++ b/apps/files_sharing/src/components/SharingEntrySimple.vue
@@ -36,8 +36,8 @@
</template>
<script>
-import Actions from 'nextcloud-vue/dist/Components/Actions'
-import Tooltip from 'nextcloud-vue/dist/Directives/Tooltip'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
export default {
name: 'SharingEntrySimple',
diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index 6b597267de8c3d54ce2912065bfeaf90e161b1f0..833264f0ad21b13ebe51f30cd6c540c3bbd1b32b 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -50,7 +50,7 @@ import { generateOcsUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
import axios from '@nextcloud/axios'
import debounce from 'debounce'
-import Multiselect from 'nextcloud-vue/dist/Components/Multiselect'
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import Config from '../services/ConfigService'
import Share from '../models/Share'
diff --git a/apps/files_sharing/src/views/SharingInherited.vue b/apps/files_sharing/src/views/SharingInherited.vue
index 5c46620260699826f0fae79beded51d12b2ff968..67a57a96b62ac30984f6200909907f48a9632563 100644
--- a/apps/files_sharing/src/views/SharingInherited.vue
+++ b/apps/files_sharing/src/views/SharingInherited.vue
@@ -44,7 +44,7 @@
<script>
import { generateOcsUrl } from '@nextcloud/router'
-import ActionButton from 'nextcloud-vue/dist/Components/ActionButton'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import axios from '@nextcloud/axios'
import Share from '../models/Share'
diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
index e77c25919393e8efec492dc792dc5c54e4e278e3..4cd61c005c2ce16d043b91ef328bce6d911718e1 100644
--- a/apps/files_sharing/src/views/SharingTab.vue
+++ b/apps/files_sharing/src/views/SharingTab.vue
@@ -87,9 +87,9 @@
<script>
import { CollectionList } from 'nextcloud-vue-collections'
import { generateOcsUrl } from '@nextcloud/router'
-import Avatar from 'nextcloud-vue/dist/Components/Avatar'
+import Avatar from '@nextcloud/vue/dist/Components/Avatar'
import axios from '@nextcloud/axios'
-import Tab from 'nextcloud-vue/dist/Components/AppSidebarTab'
+import Tab from '@nextcloud/vue/dist/Components/AppSidebarTab'
import { shareWithTitle } from '../utils/SharedWithMe'
import Share from '../models/Share'
diff --git a/apps/settings/js/vue-0.js b/apps/settings/js/vue-0.js
index 5cfdbd1bb714926afa7a5959c5bc5caec2152a41..e2cd56c0a53ac64ffe0ee2286c7be267d1e81712 100644
Binary files a/apps/settings/js/vue-0.js and b/apps/settings/js/vue-0.js differ
diff --git a/apps/settings/js/vue-0.js.map b/apps/settings/js/vue-0.js.map
index b893a9cb9433c3eff97fca84b86805e0c4d2b0f3..e3ea1cc09b5e440b6facc7418ae28c282ce8d91d 100644
Binary files a/apps/settings/js/vue-0.js.map and b/apps/settings/js/vue-0.js.map differ
diff --git a/apps/settings/js/vue-4.js b/apps/settings/js/vue-4.js
index d66bed4b7d1db5875893aec4617810719a3d2436..f2f76c35e105eb24047c1aec5f054300cde11a20 100644
Binary files a/apps/settings/js/vue-4.js and b/apps/settings/js/vue-4.js differ
diff --git a/apps/settings/js/vue-4.js.map b/apps/settings/js/vue-4.js.map
index 2c9c5517a616258eb5ceac5f07ef19eed40f1468..4d0fb3e80362f70ccd508fe9f8e11a9cb4b87e72 100644
Binary files a/apps/settings/js/vue-4.js.map and b/apps/settings/js/vue-4.js.map differ
diff --git a/apps/settings/js/vue-5.js b/apps/settings/js/vue-5.js
index 0f9b37755b2ce4601d72f0a63b9d89885caea1bb..ba2e1779544a792e191c5f5c29bad04a07a39be0 100644
Binary files a/apps/settings/js/vue-5.js and b/apps/settings/js/vue-5.js differ
diff --git a/apps/settings/js/vue-5.js.map b/apps/settings/js/vue-5.js.map
index 18dbd7dc0db7b97a236c9d4ba70d031e3e939d67..2fc4ceb5bff62d818e5c4cea4238d7c7f9ed8d43 100644
Binary files a/apps/settings/js/vue-5.js.map and b/apps/settings/js/vue-5.js.map differ
diff --git a/apps/settings/js/vue-6.js b/apps/settings/js/vue-6.js
index 97d1275318b2a6690a14251363e44a77e8869b33..6693961ea7a363fc7f7169fbea6f4b4cd4e9d69e 100644
Binary files a/apps/settings/js/vue-6.js and b/apps/settings/js/vue-6.js differ
diff --git a/apps/settings/js/vue-6.js.map b/apps/settings/js/vue-6.js.map
index 88d4caad089597ca29a931f58fbd90660353dcfe..db4f112de18971b42286be162fc9d5d5c95b7fac 100644
Binary files a/apps/settings/js/vue-6.js.map and b/apps/settings/js/vue-6.js.map differ
diff --git a/apps/settings/js/vue-7.js b/apps/settings/js/vue-7.js
index d71a71102373023b4f8897006bed985a0011580f..868e70a465cfa1d6ce761c55f45e89280c52ebfc 100644
Binary files a/apps/settings/js/vue-7.js and b/apps/settings/js/vue-7.js differ
diff --git a/apps/settings/js/vue-7.js.map b/apps/settings/js/vue-7.js.map
index 73504148e3838aa6724bd1af5fab799ce963053b..dfd57004ee90758948517192337fc3aaccac685e 100644
Binary files a/apps/settings/js/vue-7.js.map and b/apps/settings/js/vue-7.js.map differ
diff --git a/apps/settings/js/vue-settings-admin-security.js b/apps/settings/js/vue-settings-admin-security.js
index 11d2c6962f3c15fd06b24f1dd7b0b7db78448265..f7270b883c0efd73e63f3bde5b9f913cf2679fe4 100644
Binary files a/apps/settings/js/vue-settings-admin-security.js and b/apps/settings/js/vue-settings-admin-security.js differ
diff --git a/apps/settings/js/vue-settings-admin-security.js.map b/apps/settings/js/vue-settings-admin-security.js.map
index 72c544eb922dd0c793339b9b50c6c21f4aa0a3bd..f60f52d7dc7ab309d3a44e8fb8c146059c3c6acc 100644
Binary files a/apps/settings/js/vue-settings-admin-security.js.map and b/apps/settings/js/vue-settings-admin-security.js.map differ
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
index 30c2218f8892ef0babbcbdf623d93314ecb202b8..539398655a0fd4576611252bcd32f5cdce049c56 100644
Binary files a/apps/settings/js/vue-settings-apps-users-management.js and b/apps/settings/js/vue-settings-apps-users-management.js differ
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
index e407b284eb82b31ae5057650296cd3525d2c0e6a..7391c560ff21b721f3573b1428af7b7af2d07c27 100644
Binary files a/apps/settings/js/vue-settings-apps-users-management.js.map and b/apps/settings/js/vue-settings-apps-users-management.js.map differ
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
index 820fa1282d3119b2bc2b1bce92c10deb03ae3b30..8034aa9547d07a404457a190d7d6186d79a78aa2 100644
Binary files a/apps/settings/js/vue-settings-personal-security.js and b/apps/settings/js/vue-settings-personal-security.js differ
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
index 1256d3797d526c9ffc31e3e6a6a82dd6c6fcc13f..7c652f3570297c223f566dab2978ebf0c29f77b9 100644
Binary files a/apps/settings/js/vue-settings-personal-security.js.map and b/apps/settings/js/vue-settings-personal-security.js.map differ
diff --git a/apps/settings/src/components/AdminTwoFactor.vue b/apps/settings/src/components/AdminTwoFactor.vue
index 45643dc84b6d71758bdff9c990e86f9930c19c7f..04764dc63599651a7b7c100dff9236a583c5067f 100644
--- a/apps/settings/src/components/AdminTwoFactor.vue
+++ b/apps/settings/src/components/AdminTwoFactor.vue
@@ -67,7 +67,7 @@
<script>
import axios from '@nextcloud/axios'
-import { Multiselect } from 'nextcloud-vue'
+import { Multiselect } from '@nextcloud/vue'
import _ from 'lodash'
export default {
diff --git a/apps/settings/src/components/AppDetails.vue b/apps/settings/src/components/AppDetails.vue
index c20819f297e91dff57bef57103efeb9a71680ee0..2756d31429fdd43c57830af13d2ff73b9ca6f8ab 100644
--- a/apps/settings/src/components/AppDetails.vue
+++ b/apps/settings/src/components/AppDetails.vue
@@ -187,7 +187,7 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue'
+import { Multiselect } from '@nextcloud/vue'
import marked from 'marked'
import dompurify from 'dompurify'
diff --git a/apps/settings/src/components/AuthToken.vue b/apps/settings/src/components/AuthToken.vue
index 7486aa6089acc8fb210c5acd26f6c4dae0552ae1..c155a73b4fce4cfb16c76bf755974d4c4341400c 100644
--- a/apps/settings/src/components/AuthToken.vue
+++ b/apps/settings/src/components/AuthToken.vue
@@ -89,7 +89,7 @@ import {
Actions,
ActionButton,
ActionCheckbox,
-} from 'nextcloud-vue'
+} from '@nextcloud/vue'
const userAgentMap = {
ie: /(?:MSIE|Trident|Trident\/7.0; rv)[ :](\d+)/,
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
index 6b41ba0552a78cd7a789e7ae63aa28e2acd65817..15462a1e7ae854b9feb1a8a4839999c7e287e43d 100644
--- a/apps/settings/src/components/UserList.vue
+++ b/apps/settings/src/components/UserList.vue
@@ -242,7 +242,7 @@
<script>
import userRow from './UserList/UserRow'
-import { Multiselect, Actions, ActionButton } from 'nextcloud-vue'
+import { Multiselect, Actions, ActionButton } from '@nextcloud/vue'
import InfiniteLoading from 'vue-infinite-loading'
import Vue from 'vue'
diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue
index e7c039376f5a3b28754b9fa2fb549ae1ad0faf43..0fe438752eeeba59a9eee9375a5aae80c41cbda0 100644
--- a/apps/settings/src/components/UserList/UserRow.vue
+++ b/apps/settings/src/components/UserList/UserRow.vue
@@ -246,7 +246,7 @@ import {
Multiselect,
Actions,
ActionButton,
-} from 'nextcloud-vue'
+} from '@nextcloud/vue'
import UserRowSimple from './UserRowSimple'
import UserRowMixin from '../../mixins/UserRowMixin'
diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
index 758047affad71ba7a41ef329b190ab1e232a458d..f163ea64f472c387ff51772f87441631ed37347d 100644
--- a/apps/settings/src/components/UserList/UserRowSimple.vue
+++ b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -75,7 +75,7 @@
</template>
<script>
-import { PopoverMenu, Actions, ActionButton } from 'nextcloud-vue'
+import { PopoverMenu, Actions, ActionButton } from '@nextcloud/vue'
import ClickOutside from 'vue-click-outside'
import { getCurrentUser } from '@nextcloud/auth'
diff --git a/apps/settings/src/views/Apps.vue b/apps/settings/src/views/Apps.vue
index 74b5fbde0fa4e48901ddc913b1cae49947e3a118..c125edcb93cb4f1b3a1056dd287db10f10c3e666 100644
--- a/apps/settings/src/views/Apps.vue
+++ b/apps/settings/src/views/Apps.vue
@@ -27,7 +27,57 @@
:navigation-class="{ 'icon-loading': loading }">
<AppNavigation>
<ul id="appscategories">
- <AppNavigationItem v-for="item in menu" :key="item.key" :item="item" />
+ <AppNavigationItem
+ id="app-category-your-apps"
+ :to="{ name: 'apps' }"
+ :exact="true"
+ icon="icon-category-installed"
+ :title="t('settings', 'Your apps')" />
+ <AppNavigationItem
+ id="app-category-enabled"
+ :to="{ name: 'apps-category', params: { category: 'enabled' } }"
+ icon="icon-category-enabled"
+ :title="t('settings', 'Active apps')" />
+ <AppNavigationItem
+ id="app-category-disabled"
+ :to="{ name: 'apps-category', params: { category: 'disabled' } }"
+ icon="icon-category-disabled"
+ :title="t('settings', 'Disabled apps')" />
+ <AppNavigationItem
+ v-if="updateCount > 0"
+ id="app-category-updates"
+ :to="{ name: 'apps-category', params: { category: 'updates' } }"
+ icon="icon-download"
+ :title="t('settings', 'Updates')">
+ <AppNavigationCounter slot="counter">
+ {{ updateCount }}
+ </AppNavigationCounter>
+ </AppNavigationItem>
+ <AppNavigationItem
+ id="app-category-your-bundles"
+ :to="{ name: 'apps-category', params: { category: 'app-bundles' } }"
+ icon="icon-category-app-bundles"
+ :title="t('settings', 'App bundles')" />
+
+ <AppNavigationSpacer />
+
+ <!-- App store categories -->
+ <template v-if="settings.appstoreEnabled">
+ <AppNavigationItem
+ v-for="cat in categories"
+ :key="'icon-category-' + cat.ident"
+ :icon="'icon-category-' + cat.ident"
+ :to="{
+ name: 'apps-category',
+ params: { category: cat.ident },
+ }"
+ :title="cat.displayName" />
+ </template>
+
+ <AppNavigationItem
+ id="app-developer-docs"
+ href="settings.developerDocumentation"
+ :title="t('settings', 'Developer documentation') + ' ↗'" />
</ul>
</AppNavigation>
<AppContent class="app-settings-content" :class="{ 'icon-loading': loadingList }">
@@ -40,16 +90,17 @@
</template>
<script>
-import {
- AppContent,
- AppNavigation,
- AppNavigationItem,
- AppSidebar,
- Content,
-} from 'nextcloud-vue'
-import AppList from '../components/AppList'
+import AppContent from '@nextcloud/vue/dist/Components/AppContent'
+import AppNavigation from '@nextcloud/vue/dist/Components/AppNavigation'
+import AppNavigationCounter from '@nextcloud/vue/dist/Components/AppNavigationCounter'
+import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
+import AppNavigationSpacer from '@nextcloud/vue/dist/Components/AppNavigationSpacer'
+import AppSidebar from '@nextcloud/vue/dist/Components/AppSidebar'
+import Content from '@nextcloud/vue/dist/Components/Content'
import Vue from 'vue'
import VueLocalStorage from 'vue-localstorage'
+
+import AppList from '../components/AppList'
import AppDetails from '../components/AppDetails'
Vue.use(VueLocalStorage)
@@ -58,12 +109,14 @@ export default {
name: 'Apps',
components: {
AppContent,
+ AppDetails,
+ AppList,
AppNavigation,
+ AppNavigationCounter,
AppNavigationItem,
+ AppNavigationSpacer,
AppSidebar,
Content,
- AppDetails,
- AppList,
},
props: {
category: {
@@ -102,95 +155,6 @@ export default {
settings() {
return this.$store.getters.getServerData
},
-
- // BUILD APP NAVIGATION MENU OBJECT
- menu() {
- // Data provided php side
- let categories = this.$store.getters.getCategories
- categories = Array.isArray(categories) ? categories : []
-
- // Map groups
- categories = categories.map(category => {
- const item = {}
- item.id = 'app-category-' + category.ident
- item.icon = 'icon-category-' + category.ident
- item.classes = [] // empty classes, active will be set later
- item.router = { // router link to
- name: 'apps-category',
- params: { category: category.ident },
- }
- item.text = category.displayName
-
- return item
- })
-
- // Add everyone group
- const defaultCategories = [
- {
- id: 'app-category-your-apps',
- classes: [],
- router: { name: 'apps' },
- icon: 'icon-category-installed',
- text: t('settings', 'Your apps'),
- },
- {
- id: 'app-category-enabled',
- classes: [],
- icon: 'icon-category-enabled',
- router: { name: 'apps-category', params: { category: 'enabled' } },
- text: t('settings', 'Active apps'),
- }, {
- id: 'app-category-disabled',
- classes: [],
- icon: 'icon-category-disabled',
- router: { name: 'apps-category', params: { category: 'disabled' } },
- text: t('settings', 'Disabled apps'),
- },
- ]
-
- if (!this.settings.appstoreEnabled) {
- return defaultCategories
- }
-
- if (this.$store.getters.getUpdateCount > 0) {
- defaultCategories.push({
- id: 'app-category-updates',
- classes: [],
- icon: 'icon-download',
- router: { name: 'apps-category', params: { category: 'updates' } },
- text: t('settings', 'Updates'),
- utils: { counter: this.$store.getters.getUpdateCount },
- })
- }
-
- defaultCategories.push({
- id: 'app-category-app-bundles',
- classes: [],
- icon: 'icon-category-app-bundles',
- router: { name: 'apps-category', params: { category: 'app-bundles' } },
- text: t('settings', 'App bundles'),
- })
-
- categories = defaultCategories.concat(categories)
-
- // Set current group as active
- const activeGroup = categories.findIndex(group => group.id === 'app-category-' + this.category)
- if (activeGroup >= 0) {
- categories[activeGroup].classes.push('active')
- } else {
- categories[0].classes.push('active')
- }
-
- categories.push({
- id: 'app-developer-docs',
- classes: [],
- href: this.settings.developerDocumentation,
- text: t('settings', 'Developer documentation') + ' ↗',
- })
-
- // Return
- return categories
- },
},
watch: {
category: function(val, old) {
diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue
index 7954cf429058467bb0a7e2bf23ac3f3f1ecf8fe7..01fb9a9b48ad3fbfaf88c7fec1b0b5e386339950 100644
--- a/apps/settings/src/views/Users.vue
+++ b/apps/settings/src/views/Users.vue
@@ -28,7 +28,70 @@
button-class="icon-add"
@click="toggleNewUserMenu" />
<ul id="usergrouplist">
- <AppNavigationItem v-for="item in menu" :key="item.key" :item="item" />
+ <AppNavigationItem
+ id="addgroup"
+ ref="addGroup"
+ :edit-placeholder="t('settings', 'Enter group name')"
+ :editable="true"
+ :loading="loadingAddGroup"
+ :title="t('settings', 'Add group')"
+ icon="icon-add"
+ @click="toggleAddGroupEntry(true)"
+ @update:title="createGroup" />
+ <AppNavigationItem
+ id="everyone"
+ :exact="true"
+ :title="t('settings', 'Everyone')"
+ :to="{ name: 'users' }"
+ icon="icon-contacts-dark">
+ <AppNavigationCounter v-if="userCount > 0" slot="counter">
+ {{ userCount }}
+ </AppNavigationCounter>
+ </AppNavigationItem>
+ <AppNavigationItem
+ id="admin"
+ :exact="true"
+ :title="t('settings', 'Admins')"
+ :to="{ name: 'users', params: { selectedGroup: 'admin' } }"
+ icon="icon-user-admin">
+ <AppNavigationCounter v-if="adminGroupMenu.count" slot="counter">
+ {{ adminGroupMenu.count }}
+ </AppNavigationCounter>
+ </AppNavigationItem>
+
+ <!-- Hide the disabled if none, if we don't have the data (-1) show it -->
+ <AppNavigationItem
+ v-if="disabledGroupMenu.usercount > 0 || disabledGroupMenu.usercount === -1"
+ id="disabled"
+ :exact="true"
+ :title="t('settings', 'Disabled users')"
+ :to="{ name: 'users', params: { selectedGroup: 'disabled' } }"
+ icon="icon-disabled-users">
+ <AppNavigationCounter v-if="disabledGroupMenu.usercount > 0" slot="counter">
+ {{ disabledGroupMenu.usercount }}
+ </AppNavigationCounter>
+ </AppNavigationItem>
+
+ <AppNavigationCaption v-if="groupList.length > 0" :title="t('settings', 'Groups')" />
+ <AppNavigationItem
+ v-for="group in groupList"
+ :id="group.id"
+ :key="group.id"
+ :exact="true"
+ :title="group.title"
+ :to="{ name: 'users', params: { selectedGroup: group.id } }">
+ <AppNavigationCounter v-if="group.count" slot="counter">
+ {{ group.count }}
+ </AppNavigationCounter>
+ <template slot="actions">
+ <ActionButton
+ v-if="group.id !== 'admin' && group.id !== 'disabled' && settings.isAdmin"
+ icon="icon-delete"
+ @click="removeGroup(group.id)">
+ {{ t('settings', 'Remove group') }}
+ </ActionButton>
+ </template>
+ </AppNavigationItem>
</ul>
<AppNavigationSettings>
<div>
@@ -85,17 +148,19 @@
</template>
<script>
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import AppContent from '@nextcloud/vue/dist/Components/AppContent'
+import AppNavigation from '@nextcloud/vue/dist/Components/AppNavigation'
+import AppNavigationCaption from '@nextcloud/vue/dist/Components/AppNavigationCaption'
+import AppNavigationCounter from '@nextcloud/vue/dist/Components/AppNavigationCounter'
+import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
+import AppNavigationNew from '@nextcloud/vue/dist/Components/AppNavigationNew'
+import AppNavigationSettings from '@nextcloud/vue/dist/Components/AppNavigationSettings'
+import Content from '@nextcloud/vue/dist/Components/Content'
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import Vue from 'vue'
import VueLocalStorage from 'vue-localstorage'
-import {
- AppContent,
- AppNavigation,
- AppNavigationItem,
- AppNavigationNew,
- AppNavigationSettings,
- Content,
- Multiselect,
-} from 'nextcloud-vue'
+
import UserList from '../components/UserList'
Vue.use(VueLocalStorage)
@@ -103,14 +168,17 @@ Vue.use(VueLocalStorage)
export default {
name: 'Users',
components: {
+ ActionButton,
AppContent,
AppNavigation,
+ AppNavigationCaption,
+ AppNavigationCounter,
AppNavigationItem,
AppNavigationNew,
AppNavigationSettings,
Content,
- UserList,
Multiselect,
+ UserList,
},
props: {
selectedGroup: {
@@ -125,7 +193,6 @@ export default {
// temporary value used for multiselect change
selectedQuota: false,
externalActions: [],
- showAddGroupEntry: false,
loadingAddGroup: false,
showConfig: {
showStoragePath: false,
@@ -140,6 +207,9 @@ export default {
users() {
return this.$store.getters.getUsers
},
+ groups() {
+ return this.$store.getters.getGroups
+ },
usersOffset() {
return this.$store.getters.getUsersOffset
},
@@ -206,134 +276,20 @@ export default {
},
- // BUILD APP NAVIGATION MENU OBJECT
- menu() {
- // Data provided php side
- const self = this
- let groups = this.$store.getters.getGroups
- groups = Array.isArray(groups) ? groups : []
-
- // Map groups
- groups = groups.map(group => {
- const item = {}
- item.id = group.id.replace(' ', '_')
- item.key = item.id
- item.utils = {}
-
- // router link to
- item.router = {
- name: 'group',
- params: { selectedGroup: group.id },
- }
-
- // group name
- item.text = group.name
- item.title = group.name
-
- // users count for all groups
- if (group.usercount - group.disabled > 0 || group.usercount === -1) {
- item.utils.counter = group.usercount - group.disabled
- }
-
- if (item.id !== 'admin' && item.id !== 'disabled' && this.settings.isAdmin) {
- // add delete button on real groups
- item.utils.actions = [{
- icon: 'icon-delete',
- text: t('settings', 'Remove group'),
- action: function() {
- self.removeGroup(group.id)
- },
- }]
- }
- return item
- })
-
- // Every item is added on top of the array, so we're going backward
- // Groups, separator, disabled, admin, everyone
-
- // Add separator
- let realGroups = groups.find((group) => { return group.id !== 'disabled' && group.id !== 'admin' })
- realGroups = typeof realGroups === 'undefined' ? [] : realGroups
- realGroups = Array.isArray(realGroups) ? realGroups : [realGroups]
- if (realGroups.length > 0) {
- const separator = {
- caption: true,
- text: t('settings', 'Groups'),
- }
- groups.unshift(separator)
- }
-
- // Adjust admin and disabled groups
- const adminGroup = groups.find(group => group.id === 'admin')
- const disabledGroup = groups.find(group => group.id === 'disabled')
-
- // filter out admin and disabled
- groups = groups.filter(group => ['admin', 'disabled'].indexOf(group.id) === -1)
-
- if (adminGroup && adminGroup.text) {
- adminGroup.text = t('settings', 'Admins') // rename admin group
- adminGroup.icon = 'icon-user-admin' // set icon
- groups.unshift(adminGroup) // add admin group if present
- }
- if (disabledGroup && disabledGroup.text) {
- disabledGroup.text = t('settings', 'Disabled users') // rename disabled group
- disabledGroup.icon = 'icon-disabled-users' // set icon
- if (disabledGroup.utils && (
- disabledGroup.utils.counter > 0 // add disabled if not empty
- || disabledGroup.utils.counter === -1) // add disabled if ldap enabled
- ) {
- groups.unshift(disabledGroup)
- if (disabledGroup.utils.counter === -1) {
- // hides the counter instead of showing -1
- delete disabledGroup.utils.counter
- }
- }
- }
-
- // Add everyone group
- const everyoneGroup = {
- id: 'everyone',
- key: 'everyone',
- icon: 'icon-contacts-dark',
- router: { name: 'users' },
- text: t('settings', 'Everyone'),
- }
- // users count
- if (this.userCount > 0) {
- Vue.set(everyoneGroup, 'utils', {
- counter: this.userCount,
- })
- }
- groups.unshift(everyoneGroup)
-
- const addGroup = {
- id: 'addgroup',
- key: 'addgroup',
- icon: 'icon-add',
- text: t('settings', 'Add group'),
- classes: this.loadingAddGroup ? 'icon-loading-small' : '',
- }
- if (this.showAddGroupEntry) {
- Vue.set(addGroup, 'edit', {
- text: t('settings', 'Add group'),
- action: this.createGroup,
- reset: function() {
- self.showAddGroupEntry = false
- },
- })
- addGroup.classes = 'editing'
- } else {
- Vue.set(addGroup, 'action', function() {
- self.showAddGroupEntry = true
- // focus input
- Vue.nextTick(() => {
- window.addgroup.querySelector('form > input[type="text"]').focus()
- })
- })
- }
- groups.unshift(addGroup)
+ groupList() {
+ const groups = Array.isArray(this.groups) ? this.groups : []
return groups
+ // filter out disabled and admin
+ .filter(group => group.id !== 'disabled' && group.id !== 'admin')
+ .map(group => this.formatGroupMenu(group))
+ },
+
+ adminGroupMenu() {
+ return this.formatGroupMenu(this.groups.find(group => group.id === 'admin'))
+ },
+ disabledGroupMenu() {
+ return this.formatGroupMenu(this.groups.find(group => group.id === 'disabled'))
},
},
beforeMount() {
@@ -446,26 +402,81 @@ export default {
/**
* Create a new group
*
- * @param {Object} event The form submit event
+ * @param {string} gid The group id
*/
- createGroup(event) {
- const gid = event.target[0].value
- this.loadingAddGroup = true
- this.$store.dispatch('addGroup', gid)
- .then(() => {
- this.showAddGroupEntry = false
- this.loadingAddGroup = false
- this.$router.push({
- name: 'group',
- params: {
- selectedGroup: gid,
- },
- })
+ async createGroup(gid) {
+ // group is not valid
+ if (gid.trim() === '') {
+ Vue.nextTick(() => {
+ this.toggleAddGroupEntry(true)
})
- .catch(() => {
- this.loadingAddGroup = false
+ return
+ }
+
+ try {
+ this.loadingAddGroup = true
+ await this.$store.dispatch('addGroup', gid.trim())
+
+ this.toggleAddGroupEntry(false)
+ this.$router.push({
+ name: 'group',
+ params: {
+ selectedGroup: gid.trim(),
+ },
})
+ } catch {
+ this.toggleAddGroupEntry(true)
+ } finally {
+ this.loadingAddGroup = false
+ }
+ },
+
+ /**
+ * Toggle the add group entry editing state
+ * @param {boolean} [state] set state instead of toggling
+ */
+ toggleAddGroupEntry(state) {
+ if (state === undefined) {
+ state = !this.$refs.addGroup.editing
+ }
+ this.$refs.addGroup.editing = state
+
+ // focus input
+ Vue.nextTick(() => {
+ if (this.$refs.addGroup.$el) {
+ const input = this.$refs.addGroup.$el.querySelector('form > input[type="text"]')
+ if (input) {
+ input.focus()
+ }
+ }
+ })
+ },
+
+ /**
+ * Format a group to a menu entry
+ * @param {Object} group the group
+ * @returns {Object}
+ */
+ formatGroupMenu(group) {
+ const item = {}
+ item.id = group.id.replace(' ', '_')
+ item.title = group.name
+ item.usercount = group.usercount
+
+ // users count for all groups
+ if (group.usercount - group.disabled > 0) {
+ item.count = group.usercount - group.disabled
+ }
+
+ return item
},
},
}
</script>
+
+<style lang="scss" scoped>
+// force hiding the editing action for the add group entry
+#usergrouplist #addgroup::v-deep .app-navigation-entry__utils {
+ display: none;
+}
+</style>
diff --git a/apps/updatenotification/js/updatenotification.js b/apps/updatenotification/js/updatenotification.js
index e733644cb9311d96b4fbb077c3bcea25a5cc2899..3e67d83dafc725c716b5ce8092efcee8965c8547 100644
Binary files a/apps/updatenotification/js/updatenotification.js and b/apps/updatenotification/js/updatenotification.js differ
diff --git a/apps/updatenotification/js/updatenotification.js.map b/apps/updatenotification/js/updatenotification.js.map
index 4762bd708daffeeb074f88f8f3d75cd6e15af623..657c77c299191f75446e15d3f0276c5364c04f1d 100644
Binary files a/apps/updatenotification/js/updatenotification.js.map and b/apps/updatenotification/js/updatenotification.js.map differ
diff --git a/apps/updatenotification/src/components/UpdateNotification.vue b/apps/updatenotification/src/components/UpdateNotification.vue
index 3b8a473ae2e45de4baac16a87ae0939ec4587508..a90c0ed3a9d1291461d0727d2faebc0ad585b1dc 100644
--- a/apps/updatenotification/src/components/UpdateNotification.vue
+++ b/apps/updatenotification/src/components/UpdateNotification.vue
@@ -109,7 +109,7 @@
</template>
<script>
-import { PopoverMenu, Multiselect } from 'nextcloud-vue'
+import { PopoverMenu, Multiselect } from '@nextcloud/vue'
import { VTooltip } from 'v-tooltip'
import ClickOutside from 'vue-click-outside'
diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
index fdb9f6a8fc42e9818c89482d2507fe933c681d84..6bff4ac58ee0dfece72978e0a74358b716b6596f 100644
Binary files a/apps/workflowengine/js/workflowengine.js and b/apps/workflowengine/js/workflowengine.js differ
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
index 92e1e3354188b56d8058f7850ba1326cc6469a6d..077f80786ba832f66a0740901d6ae60b761c2934 100644
Binary files a/apps/workflowengine/js/workflowengine.js.map and b/apps/workflowengine/js/workflowengine.js.map differ
diff --git a/apps/workflowengine/src/components/Check.vue b/apps/workflowengine/src/components/Check.vue
index cfd0f034adf79b4d826f2314d305fc65f1e29e4f..f737bc2f1a9cabfc623a0aa131652e676ecaa6a7 100644
--- a/apps/workflowengine/src/components/Check.vue
+++ b/apps/workflowengine/src/components/Check.vue
@@ -41,9 +41,9 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
-import { Actions } from 'nextcloud-vue/dist/Components/Actions'
-import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
+import { Actions } from '@nextcloud/vue/dist/Components/Actions'
+import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
import ClickOutside from 'vue-click-outside'
export default {
diff --git a/apps/workflowengine/src/components/Checks/FileMimeType.vue b/apps/workflowengine/src/components/Checks/FileMimeType.vue
index 1124f37e16cbd89728ef480b22ff7d044f0b55b2..fbe63f28ec8b6a8371597c798ed760ca6a475641 100644
--- a/apps/workflowengine/src/components/Checks/FileMimeType.vue
+++ b/apps/workflowengine/src/components/Checks/FileMimeType.vue
@@ -51,7 +51,7 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import valueMixin from './../../mixins/valueMixin'
export default {
diff --git a/apps/workflowengine/src/components/Checks/MultiselectTag/MultiselectTag.vue b/apps/workflowengine/src/components/Checks/MultiselectTag/MultiselectTag.vue
index a95bf207724b9d42c7152c01179d477e025edf65..435818633626bb7d60bc2768ea21dcd22cffaa6d 100644
--- a/apps/workflowengine/src/components/Checks/MultiselectTag/MultiselectTag.vue
+++ b/apps/workflowengine/src/components/Checks/MultiselectTag/MultiselectTag.vue
@@ -41,7 +41,7 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import { searchTags } from './api'
let uuid = 0
diff --git a/apps/workflowengine/src/components/Checks/RequestTime.vue b/apps/workflowengine/src/components/Checks/RequestTime.vue
index 42f5ff20671fc926cc040f5a276496e84c6046d5..57f79357ccc8297945e82ffe905c43fc3a1d8325 100644
--- a/apps/workflowengine/src/components/Checks/RequestTime.vue
+++ b/apps/workflowengine/src/components/Checks/RequestTime.vue
@@ -20,7 +20,7 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import moment from 'moment-timezone'
import valueMixin from '../../mixins/valueMixin'
diff --git a/apps/workflowengine/src/components/Checks/RequestURL.vue b/apps/workflowengine/src/components/Checks/RequestURL.vue
index 8685b051ff696fc05a05684e82186d8a16b35520..5daf535b3ba2d780478b98d71c9481ab8e1ff5f4 100644
--- a/apps/workflowengine/src/components/Checks/RequestURL.vue
+++ b/apps/workflowengine/src/components/Checks/RequestURL.vue
@@ -51,7 +51,7 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import valueMixin from '../../mixins/valueMixin'
export default {
diff --git a/apps/workflowengine/src/components/Checks/RequestUserAgent.vue b/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
index d762443f6b83ac06866076816ff9a492485843db..e6c252dbf18229a65d6545994c2480a63e229192 100644
--- a/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
+++ b/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
@@ -53,7 +53,7 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import valueMixin from '../../mixins/valueMixin'
export default {
diff --git a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
index c24143c6a7aa7c813757df4dbf5e4779f49f63cd..885ea0a60c83f98b696a4b642bb818ebce458467 100644
--- a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
+++ b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
@@ -34,7 +34,7 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import axios from '@nextcloud/axios'
const groups = []
diff --git a/apps/workflowengine/src/components/Event.vue b/apps/workflowengine/src/components/Event.vue
index bf8e06e5df1eb939877e38584105284d96a77adb..aeabf151427fb29015f9354460bb19d8f060d192 100644
--- a/apps/workflowengine/src/components/Event.vue
+++ b/apps/workflowengine/src/components/Event.vue
@@ -27,7 +27,7 @@
</template>
<script>
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
export default {
name: 'Event',
diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue
index c6e23a8f180f3d6253db774a5fa9e6edf6f02048..54e38b45b40528e80816658ddb876def96a9577b 100644
--- a/apps/workflowengine/src/components/Rule.vue
+++ b/apps/workflowengine/src/components/Rule.vue
@@ -51,9 +51,9 @@
</template>
<script>
-import { Tooltip } from 'nextcloud-vue/dist/Directives/Tooltip'
-import { Actions } from 'nextcloud-vue/dist/Components/Actions'
-import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
+import { Tooltip } from '@nextcloud/vue/dist/Directives/Tooltip'
+import { Actions } from '@nextcloud/vue/dist/Components/Actions'
+import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
import Event from './Event'
import Check from './Check'
import Operation from './Operation'
diff --git a/package-lock.json b/package-lock.json
index a9cd9e69781bc991f5de6e6ada7ab7d3fb2127d9..91aad71ab221aaa8e18e6e225715ea9a35905337 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3025,12 +3025,12 @@
}
},
"@nextcloud/vue": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-1.2.2.tgz",
- "integrity": "sha512-9yrW7K7Fsfj5/s01+5V/a3AO9WxLK8NaiWc/ZYM63bvJ8gKzPqrtU0S0hhZRdO492DYSdeUNAA4nIorTsN1A7Q==",
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-1.2.5.tgz",
+ "integrity": "sha512-PW7QKBYFoUwU3TuKx3qAVm/7bNENh7jiMO/atkAAstWgupXiqv59j24mejZRQeGECsP2AzF9nWbbwT6iM7YcwQ==",
"requires": {
- "@nextcloud/axios": "^0.5.0",
- "@nextcloud/router": "^0.1.0",
+ "@nextcloud/axios": "^1.1.0",
+ "@nextcloud/router": "^1.0.0",
"core-js": "^3.4.4",
"escape-html": "^1.0.3",
"hammerjs": "^2.0.8",
@@ -3045,63 +3045,10 @@
"vue2-datepicker": "^2.10.0"
},
"dependencies": {
- "@nextcloud/auth": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-0.3.1.tgz",
- "integrity": "sha512-kx5VfB2SWG+BNudoggnjQrmxr559rCDANVLnaDDKmCujToxv0l3kNMTBUUcYhSvv8dyYaD/ZTaXBUON9ZLm9lw==",
- "requires": {
- "@nextcloud/event-bus": "^0.2.0",
- "core-js": "3.2.1"
- },
- "dependencies": {
- "@nextcloud/event-bus": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-0.2.1.tgz",
- "integrity": "sha512-yerEPTA5lnJ1JV8qYK6sHMWW8m6fxuMEtptVgv7WnGCy2l5rvxDh9vqwk72qX/Z9i2OrC7Jy382TMYbke8b2Qw==",
- "requires": {
- "core-js": "^3.1.4"
- }
- },
- "core-js": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
- "integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="
- }
- }
- },
- "@nextcloud/axios": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-0.5.0.tgz",
- "integrity": "sha512-cnf/bgyOpiUty50VMfmtWYNvq0n2G4YJpNldUcY/LJrB5ENyuiv7vJbOl9R40pb6NztWkmDyTK8Ycl1VlzcYrA==",
- "requires": {
- "@babel/cli": "^7.6.2",
- "@babel/core": "^7.6.2",
- "@babel/preset-env": "^7.6.2",
- "@babel/preset-typescript": "^7.6.0",
- "@nextcloud/auth": "^0.3.1",
- "axios": "^0.19.0",
- "core-js": "^3.2.1"
- }
- },
- "@nextcloud/router": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-0.1.0.tgz",
- "integrity": "sha512-adHnDQrnSMX/O9hYJfLVj9PnNJBISLchbzltKvI7s/WJhKF6++qFTx3G5eNEeXbI52Yb8lKIyLRrqC4JWyLmvA==",
- "requires": {
- "core-js": "3.1.4"
- },
- "dependencies": {
- "core-js": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",
- "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ=="
- }
- }
- },
"core-js": {
- "version": "3.4.7",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.7.tgz",
- "integrity": "sha512-qaPVGw30J1wQ0GR3GvoPqlGf9GZfKKF4kFC7kiHlcsPTqH3txrs9crCp3ZiMAXuSenhz89Jnl4GZs/67S5VOSg=="
+ "version": "3.6.4",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+ "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
},
"v-click-outside": {
"version": "3.0.0",
@@ -7948,14 +7895,6 @@
"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
"integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
},
- "nextcloud-axios": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/nextcloud-axios/-/nextcloud-axios-0.2.1.tgz",
- "integrity": "sha512-gzW/TXXGkxSgaIhLyPGOZ8Gs8t43i7cUpZNtDQh/UGecSn62AqjpSms+8YRw0NSJ0nhOdlqhFCFw/wb9XfYVjg==",
- "requires": {
- "axios": "^0.19.0"
- }
- },
"nextcloud-password-confirmation": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/nextcloud-password-confirmation/-/nextcloud-password-confirmation-0.4.2.tgz",
@@ -7976,24 +7915,6 @@
}
}
},
- "nextcloud-vue": {
- "version": "0.12.11",
- "resolved": "https://registry.npmjs.org/nextcloud-vue/-/nextcloud-vue-0.12.11.tgz",
- "integrity": "sha512-3zzgSRpWtPMqIi+DpZsh0YxACACHv+j8bWmMYyiUJVB2JjVADYpzb/lbUxQCE/A8rB3N75zIfkQOf0gd9BC9oA==",
- "requires": {
- "@babel/polyfill": "^7.4.4",
- "escape-html": "^1.0.3",
- "hammerjs": "^2.0.8",
- "md5": "^2.2.1",
- "nextcloud-axios": "^0.2.0",
- "v-click-outside": "^2.1.4",
- "v-tooltip": "^2.0.0-rc.33",
- "vue": "^2.6.7",
- "vue-multiselect": "^2.1.3",
- "vue-visible": "^1.0.2",
- "vue2-datepicker": "^2.10.0"
- }
- },
"nextcloud-vue-collections": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.7.1.tgz",
@@ -10661,11 +10582,6 @@
"integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
"dev": true
},
- "v-click-outside": {
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-2.1.5.tgz",
- "integrity": "sha512-VPNCOTZK6WZy73lcWc+R7IW1uaBFEO3/Csrs5CzWVOdvE30V8Y1+BE/BtTlcEmeDGx0eqdE7bSCg55Jj37PMJg=="
- },
"v-tooltip": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.2.tgz",
diff --git a/package.json b/package.json
index 0549b4b86861f57ca1f1965ba4922106505948a7..043bc2aab052b5da54c3178a87ddc4093fc9c0e8 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
"@nextcloud/logger": "^1.0.0",
"@nextcloud/paths": "^1.1.0",
"@nextcloud/router": "^1.0.0",
+ "@nextcloud/vue": "^1.2.5",
"autosize": "^4.0.2",
"backbone": "^1.4.0",
"blueimp-md5": "^2.12.0",
@@ -56,7 +57,6 @@
"moment-timezone": "^0.5.27",
"nextcloud-password-confirmation": "^0.4.2",
"nextcloud-router": "0.0.9",
- "nextcloud-vue": "^0.12.11",
"nextcloud-vue-collections": "^0.7.1",
"p-limit": "^2.2.2",
"p-queue": "^6.2.1",