Merge pull request #2296 from nextcloud/enh/migrate-to-ncdialog

enh: Migrate photos picker to use NcDialog
nextcloud · Feb 7, 2024 · 1f85e5b · 1f85e5b
2 parents 8f699e9 + 02170f8
commit 1f85e5b
Show file tree

Hide file tree

Showing 56 changed files with 226 additions and 231 deletions.
diff --git a/cypress/e2e/albums.cy.js b/cypress/e2e/albums.cy.js
@@ -44,30 +44,21 @@ Cypress.on('uncaught:exception', (err) => {
 	}
 })
 
-describe('Manage albums', () => {
+describe('Manage albums', { testIsolation: true }, () => {
 	let user = null
 
-	before(function() {
+	beforeEach(function() {
 		cy.createRandomUser()
 			.then(_user => {
 				user = _user
 				uploadTestMedia(user)
 				cy.login(user)
-				cy.visit('/apps/photos')
 			})
-	})
-
-	beforeEach(() => {
 		cy.visit(`${Cypress.env('baseUrl')}/index.php/apps/photos/albums`)
 		createAnAlbumFromAlbums('albums_test')
 		addFilesToAlbumFromAlbum('albums_test', [0, 1, 2])
 	})
 
-	afterEach(() => {
-		deleteAnAlbumFromAlbumContent()
-		cy.contains('There is no album yet!').click()
-	})
-
 	it('Create an album, populate it and delete it', () => {
 		cy.get('[data-test="media"]').should('have.length', 3)
 	})
@@ -156,7 +147,7 @@ describe('Manage albums', () => {
 	})
 
 	it('Delete a file that was added to an album', () => {
-		addFilesToAlbumFromAlbumFromHeader('albums_test', [0])
+		addFilesToAlbumFromAlbumFromHeader('albums_test', [3])
 		cy.get('[data-test="media"]').should('have.length', 4)
 		cy.visit('/apps/photos')
 		selectMedia([3])

diff --git a/cypress/e2e/albumsUtils.ts b/cypress/e2e/albumsUtils.ts
@@ -69,12 +69,11 @@ export function addFilesToAlbumFromAlbum(albumName: string, itemsIndex: number[]
 
 export function addFilesToAlbumFromAlbumFromHeader(albumName: string, itemsIndex: number[]) {
 	cy.contains('New').click()
-	cy.intercept({ times: 1, method: 'SEARCH', url: '**/dav/' }).as('search')
 	cy.contains('Add photos to this album').click()
-	cy.wait('@search')
 	cy.get('.photos-picker__file-list').within(() => {
 		selectMedia(itemsIndex)
 	})
+
 	cy.intercept({ times: 1, method: 'PROPFIND', url: `**/dav/photos/**/albums/${albumName}` }).as('propFind')
 	cy.contains(`Add to ${albumName}`).click()
 	cy.wait('@propFind')

diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js b/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js
diff --git a/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js.map b/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-3c3243.js.map
diff --git a/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js b/...ue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js
diff --git a/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js.map b/...aterial-design-icons_ArrowLeft_vue-node_modules_vue-material-design-icons_P-e1736f.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Places_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Places_vue.js
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Places_vue.js.map b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Places_vue.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_SharedAlbums_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_SharedAlbums_vue.js
diff --git a/...os-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_SharedAlbums_vue.js.map b/...os-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_SharedAlbums_vue.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-7ffa74.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-934ab5.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-934ab5.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-934ab5.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-934ab5.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_components_Albums_AlbumForm_vue.js b/js/photos-src_components_Albums_AlbumForm_vue.js
diff --git a/js/photos-src_components_Albums_AlbumForm_vue.js.map b/js/photos-src_components_Albums_AlbumForm_vue.js.map
diff --git a/js/photos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js b/js/photos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js
diff --git a/...tos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js.map b/...tos-src_components_Collection_CollectionContent_vue-src_components_FilesPicker_vue.js.map
diff --git a/js/photos-src_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js b/js/photos-src_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js
diff --git a/...components_FilesPicker_vue.js.LICENSE.txt → ...omponents_PhotosPicker_vue.js.LICENSE.txt b/...components_FilesPicker_vue.js.LICENSE.txt → ...omponents_PhotosPicker_vue.js.LICENSE.txt
diff --git a/...os-src_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js.map b/...os-src_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js.map
diff --git a/...rtControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js b/...rtControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js
diff --git a/...ntrollerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.map b/...ntrollerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.map
diff --git a/js/photos-src_mixins_AbortControllerMixin_js-src_views_Faces_vue.js b/js/photos-src_mixins_AbortControllerMixin_js-src_views_Faces_vue.js
diff --git a/js/photos-src_mixins_AbortControllerMixin_js-src_views_Faces_vue.js.map b/js/photos-src_mixins_AbortControllerMixin_js-src_views_Faces_vue.js.map
diff --git a/js/photos-src_services_collectionFetcher_js-src_components_HeaderNavigation_vue.js b/js/photos-src_services_collectionFetcher_js-src_components_HeaderNavigation_vue.js
diff --git a/js/photos-src_services_collectionFetcher_js-src_components_HeaderNavigation_vue.js.map b/js/photos-src_services_collectionFetcher_js-src_components_HeaderNavigation_vue.js.map
diff --git a/js/photos-src_views_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/js/photos-src_views_Albums_vue.js b/js/photos-src_views_Albums_vue.js
diff --git a/js/photos-src_views_Albums_vue.js.map b/js/photos-src_views_Albums_vue.js.map
diff --git a/js/photos-src_views_FaceContent_vue.js b/js/photos-src_views_FaceContent_vue.js
diff --git a/js/photos-src_views_FaceContent_vue.js.map b/js/photos-src_views_FaceContent_vue.js.map
diff --git a/js/photos-src_views_Folders_vue.js b/js/photos-src_views_Folders_vue.js
diff --git a/js/photos-src_views_Folders_vue.js.map b/js/photos-src_views_Folders_vue.js.map
diff --git a/js/photos-src_views_Tags_vue.js b/js/photos-src_views_Tags_vue.js
diff --git a/js/photos-src_views_Tags_vue.js.map b/js/photos-src_views_Tags_vue.js.map
diff --git a/js/photos-vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs.js b/js/photos-vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs.js
diff --git a/...otos-vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs.js.map b/...otos-vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs.js.map
diff --git a/...odules_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f.js b/...odules_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f.js
diff --git a/...es_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f.js.map b/...es_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f.js.map
diff --git a/...odules_vue-material-design-icons_ArrowLeft_vue-node_modules_nextcloud_upload_di-f407f6.js b/...odules_vue-material-design-icons_ArrowLeft_vue-node_modules_nextcloud_upload_di-f407f6.js
diff --git a/...es_vue-material-design-icons_ArrowLeft_vue-node_modules_nextcloud_upload_di-f407f6.js.map b/...es_vue-material-design-icons_ArrowLeft_vue-node_modules_nextcloud_upload_di-f407f6.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "@nextcloud/router": "^2.0.0",
     "@nextcloud/sharing": "^0.1.0",
     "@nextcloud/upload": "^1.0.4",
-    "@nextcloud/vue": "^8.5.0",
+    "@nextcloud/vue": "^8.6.1",
     "camelcase": "^8.0.0",
     "debounce": "^1.2.1",
     "he": "^1.2.0",