Merge pull request #2794 from nextcloud/chore/create-new-album

chore: Move Create new album action out of menu
nextcloud · Feb 5, 2025 · e681945 · e681945
2 parents e6a2e36 + 7d9da1f
commit e681945
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 25 deletions.
diff --git a/cypress/e2e/albumsUtils.ts b/cypress/e2e/albumsUtils.ts
@@ -6,7 +6,6 @@
 import { selectMedia } from './photosUtils'
 
 export function createAnAlbumFromTimeline(albumName: string) {
-	cy.contains('Add').click()
 	cy.contains('Create new album').click()
 	cy.get('form [name="name"]').type(albumName)
 	cy.contains('Create album').click()

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/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/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/src/views/Timeline.vue b/src/views/Timeline.vue
@@ -25,22 +25,15 @@
 			@refresh="resetFetchFilesState">
 			<div class="timeline__header__left">
 				<!-- TODO: UploadPicker -->
-				<NcActions v-if="selectedFileIds.length === 0"
-					ref="addActions"
-					:force-menu="true"
-					:menu-name="t('photos', 'Add')">
+				<NcButton v-if="selectedFileIds.length === 0"
+					ref="newAlbumButton"
+					:aria-label="t('photos', 'Create new album')"
+					@click="showAlbumCreationForm = true">
+					{{ t('photos', 'Create new album') }}
 					<template #icon>
-						<Plus />
+						<PlusBoxMultiple />
 					</template>
-					<NcActionButton :close-after-click="true"
-						:aria-label="t('photos', 'Create new album')"
-						@click="showAlbumCreationForm = true">
-						{{ t('photos', 'Create new album') }}
-						<template #icon>
-							<PlusBoxMultiple />
-						</template>
-					</NcActionButton>
-				</NcActions>
+				</NcButton>
 
 				<template v-else>
 					<NcButton :close-after-click="true"
@@ -114,7 +107,7 @@
 
 		<NcModal v-if="showAlbumCreationForm"
 			key="albumCreationForm"
-			:set-return-focus="$refs.addActions?.$refs.menuButton?.$el"
+			:set-return-focus="$refs.newAlbumButton?.$el"
 			@close="showAlbumCreationForm = false">
 			<h2 class="timeline__heading">
 				{{ t('photos', 'New album') }}