chore: Move to new file picker api for esm compatibility

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Feb 13, 2024 · 44acae1 · 44acae1
1 parent 0ec6d5f
commit 44acae1
Show file tree

Hide file tree

Showing 20 changed files with 395 additions and 1,656 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,6 @@
   "dependencies": {
     "@nextcloud/auth": "^2.2.1",
     "@nextcloud/axios": "^2.4.0",
-    "@nextcloud/dialogs": "^4.2.5",
     "@nextcloud/event-bus": "^3.1.0",
     "@nextcloud/l10n": "^2.2.0",
     "@nextcloud/moment": "^1.3.1",
@@ -55,6 +54,7 @@
     "@nextcloud/babel-config": "^1.0.0",
     "@nextcloud/browserslist-config": "^3.0.0",
     "@nextcloud/cypress": "^1.0.0-beta.7",
+    "@nextcloud/dialogs": "^5.1.1",
     "@nextcloud/eslint-config": "^8.3.0",
     "@nextcloud/stylelint-config": "^2.4.0",
     "@nextcloud/vite-config": "^1.2.2",

diff --git a/src/modules/main/partials/ColumnTypeSelection.vue b/src/modules/main/partials/ColumnTypeSelection.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import TextLongIcon from 'vue-material-design-icons/TextLong.vue'
 import LinkIcon from 'vue-material-design-icons/Link.vue'
 import CounterIcon from 'vue-material-design-icons/Counter.vue'

diff --git a/src/modules/modals/CreateColumn.vue b/src/modules/modals/CreateColumn.vue
@@ -103,7 +103,7 @@ import { NcModal, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import SelectionForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/SelectionForm.vue'
 import SelectionMultiForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/SelectionMultiForm.vue'
 import { showError, showInfo, showSuccess, showWarning } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { mapGetters } from 'vuex'
 import ColumnTypeSelection from '../main/partials/ColumnTypeSelection.vue'
 import TextRichForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/TextRichForm.vue'

diff --git a/src/modules/modals/CreateRow.vue b/src/modules/modals/CreateRow.vue
@@ -36,7 +36,7 @@
 <script>
 import { NcModal, NcCheckboxRadioSwitch, NcNoteCard, NcButton } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { mapGetters } from 'vuex'
 import ColumnFormComponent from '../main/partials/ColumnFormComponent.vue'
 

diff --git a/src/modules/modals/CreateTable.vue b/src/modules/modals/CreateTable.vue
@@ -59,7 +59,7 @@
 <script>
 import { NcModal, NcEmojiPicker, NcButton } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import NcTile from '../../shared/components/ncTile/NcTile.vue'

diff --git a/src/modules/modals/DeleteColumn.vue b/src/modules/modals/DeleteColumn.vue
@@ -13,7 +13,7 @@
 
 import DialogConfirmation from '../../shared/modals/DialogConfirmation.vue'
 import { showError } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { mapGetters } from 'vuex'
 
 export default {

diff --git a/src/modules/modals/DeleteRows.vue b/src/modules/modals/DeleteRows.vue
@@ -13,7 +13,7 @@
 
 import DialogConfirmation from '../../shared/modals/DialogConfirmation.vue'
 import { showError } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { emit } from '@nextcloud/event-bus'
 import { mapGetters } from 'vuex'
 

diff --git a/src/modules/modals/DeleteTable.vue b/src/modules/modals/DeleteTable.vue
@@ -15,7 +15,7 @@
 
 import DialogConfirmation from '../../shared/modals/DialogConfirmation.vue'
 import { showSuccess } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { mapGetters } from 'vuex'
 
 export default {

diff --git a/src/modules/modals/DeleteView.vue b/src/modules/modals/DeleteView.vue
@@ -15,7 +15,7 @@
 
 import DialogConfirmation from '../../shared/modals/DialogConfirmation.vue'
 import { showSuccess } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { mapGetters } from 'vuex'
 
 export default {

diff --git a/src/modules/modals/EditColumn.vue b/src/modules/modals/EditColumn.vue
@@ -48,7 +48,7 @@
 <script>
 import { NcModal, NcActions, NcActionButton, NcButton, NcUserBubble } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import ColumnInfoPopover from '../main/partials/ColumnInfoPopover.vue'
 import NumberForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/NumberForm.vue'
 import NumberStarsForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/NumberStarsForm.vue'

diff --git a/src/modules/modals/EditRow.vue b/src/modules/modals/EditRow.vue
@@ -48,7 +48,7 @@
 <script>
 import { NcModal, NcButton, NcNoteCard } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import ColumnFormComponent from '../main/partials/ColumnFormComponent.vue'
 import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
 import { mapGetters } from 'vuex'

diff --git a/src/modules/modals/EditTable.vue b/src/modules/modals/EditTable.vue
@@ -67,7 +67,7 @@
 <script>
 import { NcModal, NcEmojiPicker, NcButton, NcUserBubble } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { mapGetters } from 'vuex'
 import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
 import { emit } from '@nextcloud/event-bus'

diff --git a/src/modules/modals/Import.vue b/src/modules/modals/Import.vue
@@ -133,7 +133,7 @@
 
 <script>
 import { NcModal, NcButton, NcCheckboxRadioSwitch, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
-import { FilePicker, FilePickerType, showError, showWarning } from '@nextcloud/dialogs'
+import { getFilePickerBuilder, FilePickerType, showError, showWarning } from '@nextcloud/dialogs'
 import RowFormWrapper from '../../shared/components/ncTable/partials/rowTypePartials/RowFormWrapper.vue'
 import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
 import IconFolder from 'vue-material-design-icons/Folder.vue'
@@ -202,6 +202,10 @@ export default {
 
 	methods: {
 		async actionCloseAndReload() {
+			if (!this?.activeElement) {
+				return
+			}
+
 			// reload data if active element was affected
 			if ((this.isView && this.isElementView && this.activeElement.tableId === this.element.tableId)
 			|| (this.isView && !this.isElementView && this.activeElement.tableId === this.element.id)
@@ -271,22 +275,19 @@ export default {
 			this.loading = false
 		},
 		pickFile() {
-			const filePicker = new FilePicker(
-				t('text', 'Select file for the import'),
-				false, // multiselect
-				[
+			const filePicker = getFilePickerBuilder(t('text', 'Select file for the import'))
+				.setMultiSelect(false)
+				.setMimeTypeFilter([
 					'text/csv',
 					'application/vnd.ms-excel',
 					'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
 					'application/xml',
 					'text/html',
 					'application/vnd.oasis.opendocument.spreadsheet',
-				], // mime filter
-				true, // modal
-				FilePickerType.Choose, // type
-				false, // directories
-				this.path, // path
-			)
+				])
+				.setType(FilePickerType.Choose)
+				.startAt(this.path)
+				.build()
 
 			filePicker.pick().then((file) => {
 				const client = OC.Files.getClient()

diff --git a/src/modules/modals/TransferTable.vue b/src/modules/modals/TransferTable.vue
@@ -26,7 +26,7 @@
 <script>
 import { NcModal, NcButton } from '@nextcloud/vue'
 import { showSuccess } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
 import NcUserAndGroupPicker from '../../shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue'
 import { mapGetters } from 'vuex'

diff --git a/src/modules/modals/ViewSettings.vue b/src/modules/modals/ViewSettings.vue
@@ -64,7 +64,7 @@
 <script>
 import { NcAppSettingsDialog, NcAppSettingsSection, NcEmojiPicker, NcButton } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import FilterForm from '../main/partials/editViewPartials/filter/FilterForm.vue'
 import SortForm from '../main/partials/editViewPartials/sort/SortForm.vue'
 import SelectedViewColumns from '../main/partials/editViewPartials/SelectedViewColumns.vue'

diff --git a/src/modules/navigation/partials/NavigationTableItem.vue b/src/modules/navigation/partials/NavigationTableItem.vue
@@ -80,7 +80,7 @@
 </template>
 <script>
 import { NcActionButton, NcAppNavigationItem, NcCounterBubble, NcAvatar } from '@nextcloud/vue'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { mapGetters, mapState } from 'vuex'
 import { emit } from '@nextcloud/event-bus'
 import Table from 'vue-material-design-icons/Table.vue'

diff --git a/src/modules/navigation/partials/NavigationViewItem.vue b/src/modules/navigation/partials/NavigationViewItem.vue
@@ -72,7 +72,7 @@
 </template>
 <script>
 import { NcAppNavigationItem, NcActionButton, NcCounterBubble, NcAvatar } from '@nextcloud/vue'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { getCurrentUser } from '@nextcloud/auth'
 import { mapGetters } from 'vuex'
 import { showError } from '@nextcloud/dialogs'

diff --git a/src/modules/sidebar/mixins/shareAPI.js b/src/modules/sidebar/mixins/shareAPI.js
@@ -1,6 +1,6 @@
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import displayError from '../../../shared/utils/displayError.js'
 
 export default {

diff --git a/src/store/store.js b/src/store/store.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
 import axios from '@nextcloud/axios'
 import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import data from './data.js'
 import displayError from '../shared/utils/displayError.js'