From 06b2d2da38ccd43fb972afa044f8720278f048bc Mon Sep 17 00:00:00 2001
From: Philipp Hempel <Philipp.Hempel1@web.de>
Date: Fri, 16 Jun 2023 16:35:14 +0200
Subject: [PATCH 1/8] Enables creating, editing and deleting views

Signed-off-by: Philipp Hempel <Philipp.Hempel1@web.de>
---
 src/modules/main/modals/CreateView.vue     | 187 +++++++++++++++++++
 src/modules/main/modals/EditView.vue       | 202 +++++++++++++++++++++
 src/modules/navigation/modals/EditView.vue | 142 +++++++++++++++
 3 files changed, 531 insertions(+)
 create mode 100644 src/modules/main/modals/CreateView.vue
 create mode 100644 src/modules/main/modals/EditView.vue
 create mode 100644 src/modules/navigation/modals/EditView.vue

diff --git a/src/modules/main/modals/CreateView.vue b/src/modules/main/modals/CreateView.vue
new file mode 100644
index 000000000..0d96186b9
--- /dev/null
+++ b/src/modules/main/modals/CreateView.vue
@@ -0,0 +1,187 @@
+<template>
+	<NcModal v-if="showModal" @close="actionCancel">
+		<div class="modal__content">
+			<div class="row">
+				<div class="col-4">
+					<h2 style="padding: 0">
+						{{ t('tables', 'Create view') }}
+					</h2>
+				</div>
+			</div>
+
+			<div class="row space-T">
+				<div class="col-4 mandatory">
+					{{ t('tables', 'Title') }}
+				</div>
+				<div class="col-4" style="display: inline-flex;">
+					<NcEmojiPicker :close-on-select="true" @select="setIcon">
+						<NcButton type="tertiary"
+							:aria-label="t('tables', 'Select emoji for view')"
+							:title="t('tables', 'Select emoji')"
+							@click.prevent>
+							{{ icon }}
+						</NcButton>
+					</NcEmojiPicker>
+					<input v-model="title"
+						:class="{missing: errorTitle}"
+						type="text"
+						:placeholder="t('tables', 'Title of the new view')">
+				</div>
+			</div>
+			<div class="col-4 mandatory">
+				{{ t('tables', 'Columns to be displayed') }}
+			</div>
+			<div v-for="column in columns" :key="column.id" style="display: flex; align-items: center;">
+				<NcCheckboxRadioSwitch
+					:checked="selectedColumns.includes(column.id)"
+					style="padding-right: 10px;"
+					@update:checked="onToggle(column.id)" />
+				{{ column.title }}
+			</div>
+			<div class="row">
+				<div class="fix-col-4 space-T end">
+					<button v-if="!localLoading" class="primary" :aria-label="t('tables', 'Save View')" @click="actionConfirm()">
+						{{ t('tables', 'Save') }}
+					</button>
+				</div>
+			</div>
+		</div>
+	</NcModal>
+</template>
+
+<script>
+import { NcModal, NcEmojiPicker, NcButton, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { showError } from '@nextcloud/dialogs'
+import '@nextcloud/dialogs/dist/index.css'
+import { mapGetters } from 'vuex'
+
+export default {
+	name: 'CreateView',
+	components: {
+		NcModal,
+		NcEmojiPicker,
+		NcButton,
+		NcCheckboxRadioSwitch,
+	},
+	props: {
+		showModal: {
+			type: Boolean,
+			default: false,
+		},
+		columns: {
+			type: Array,
+			default: null,
+		},
+	},
+	data() {
+		return {
+			title: '',
+			icon: '',
+			errorTitle: false,
+			selectedColumns: this.columns.map(col => col.id),
+			localLoading: false,
+		}
+	},
+	computed: {
+		...mapGetters(['activeTable']),
+	},
+	watch: {
+		title() {
+			if (this.title.length >= 200) {
+				showError(t('tables', 'The title limit is reached with 200 characters. Please use a shorter title.'))
+				this.title = this.title.slice(0, 199)
+			}
+		},
+		showModal() {
+			this.reset()
+			this.loadEmoji()
+		},
+	},
+	methods: {
+		setIcon(icon) {
+			this.icon = icon
+		},
+		loadEmoji() {
+			const emojis = ['😀', '😃', '😄', '😁', '😆', '😅', '🤣', '😂', '🙂', '🙃', '🫠', '😉', '😊', '😇']
+			this.icon = emojis[~~(Math.random() * emojis.length)]
+		},
+		actionCancel() {
+			this.reset()
+			this.$emit('close')
+			console.debug('Closed')
+		},
+		onToggle(columnId) {
+			if (this.selectedColumns.includes(columnId)) {
+				this.selectedColumns.splice(this.selectedColumns.indexOf(columnId), 1)
+			} else {
+				this.selectedColumns.push(columnId)
+			}
+		},
+		isValueValidForColumn(value, column) {
+			if (column.type === 'selection') {
+				if (
+					(value instanceof Array && value.length > 0)
+					|| (value === parseInt(value))
+				) {
+					return true
+				}
+				return false
+			}
+			return !!value || value === 0
+		},
+		async actionConfirm() {
+			if (this.title === '') {
+				showError(t('tables', 'Cannot create new view. Title is missing.'))
+				this.errorTitle = true
+			} else {
+				this.localLoading = true
+				const newViewId = await this.sendNewViewToBE()
+				const success = await this.updateViewColumnsToBE(newViewId)
+				this.localLoading = false
+				if (success) {
+					await this.$router.push('/view/' + newViewId)
+					this.actionCancel()
+				}
+			}
+		},
+		async sendNewViewToBE() {
+			const data = {
+				tableId: this.activeTable.id,
+				title: this.title,
+				emoji: this.icon,
+			}
+			const res = await this.$store.dispatch('insertNewView', { data })
+			if (res) {
+				return res
+			} else {
+				showError(t('tables', 'Could not create new view'))
+			}
+		},
+		async updateViewColumnsToBE(id) {
+			const data = {
+				data: { columns: JSON.stringify(this.selectedColumns) },
+			}
+			const res = await this.$store.dispatch('updateView', { id, data })
+			if (res) {
+				return res
+			} else {
+				showError(t('tables', 'Could not update view'))
+			}
+		},
+		reset() {
+			this.title = ''
+			this.icon = ''
+			this.errorTitle = false
+			this.selectedColumns = this.columns.map(col => col.id)
+			this.localLoading = false
+		},
+	},
+}
+</script>
+<style lang="scss" scoped>
+
+.padding-right {
+	padding-right: calc(var(--default-grid-baseline) * 3);
+}
+
+</style>
diff --git a/src/modules/main/modals/EditView.vue b/src/modules/main/modals/EditView.vue
new file mode 100644
index 000000000..d65d58d89
--- /dev/null
+++ b/src/modules/main/modals/EditView.vue
@@ -0,0 +1,202 @@
+<template>
+	<NcModal v-if="showModal" @close="actionCancel">
+		<div class="modal__content">
+			<div class="row">
+				<div class="col-4">
+					<h2 style="padding: 0">
+						{{ t('tables', 'Edit view') }}
+					</h2>
+				</div>
+			</div>
+
+			<div class="row space-T">
+				<div class="col-4 mandatory">
+					{{ t('tables', 'Title') }}
+				</div>
+				<div class="col-4" style="display: inline-flex;">
+					<NcEmojiPicker :close-on-select="true" @select="setIcon">
+						<NcButton type="tertiary"
+							:aria-label="t('tables', 'Select emoji for view')"
+							:title="t('tables', 'Select emoji')"
+							@click.prevent>
+							{{ icon }}
+						</NcButton>
+					</NcEmojiPicker>
+					<input v-model="title"
+						:class="{missing: errorTitle}"
+						type="text"
+						:placeholder="t('tables', 'Title of the new view')">
+				</div>
+			</div>
+			<div class="col-4 mandatory">
+				{{ t('tables', 'Columns to be displayed') }}
+			</div>
+			<div v-if="columns==null"> Loading ...</div>
+			<div v-else v-for="column in columns" :key="column.id" style="display: flex; align-items: center;">
+				<NcCheckboxRadioSwitch
+					:checked="selectedColumns.includes(column.id)"
+					style="padding-right: 10px;"
+					@update:checked="onToggle(column.id)" />
+				{{ column.title }}
+			</div>
+			<!-- <div class="row">
+				<div class="fix-col-4 space-T" :class="{'justify-between': showDeleteButton, 'end': !showDeleteButton}">
+					<div v-if="showDeleteButton">
+						<NcButton v-if="!prepareDeleteRow" type="error" @click="prepareDeleteRow = true">
+							{{ t('tables', 'Delete') }}
+						</NcButton>
+						<NcButton v-if="prepareDeleteRow"
+							:wide="true"
+							type="error"
+							@click="actionDeleteView">
+							{{ t('tables', 'I really want to delete this view!') }}
+						</NcButton>
+					</div>
+					<NcButton v-if="canUpdateDataActiveTable && !localLoading" type="primary" @click="actionConfirm">
+						{{ t('tables', 'Save') }}
+					</NcButton>
+					<div v-if="localLoading" class="icon-loading" style="margin-left: 20px;" />
+				</div>
+			</div> -->
+
+			<div class="row">
+				<div class="fix-col-4 space-T end">
+					<button v-if="!localLoading" class="primary" :aria-label="t('tables', 'Save View')" @click="actionConfirm()">
+						{{ t('tables', 'Save') }}
+					</button>
+				</div>
+			</div>
+		</div>
+	</NcModal>
+</template>
+
+<script>
+import { NcModal, NcEmojiPicker, NcButton, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { showError } from '@nextcloud/dialogs'
+import '@nextcloud/dialogs/dist/index.css'
+import { mapGetters } from 'vuex'
+import tablePermissions from '../mixins/tablePermissions.js'
+
+export default {
+	name: 'EditView',
+	components: {
+		NcModal,
+		NcEmojiPicker,
+		NcButton,
+		NcCheckboxRadioSwitch,
+	},
+	mixins: [tablePermissions],
+	props: {
+		showModal: {
+			type: Boolean,
+			default: false,
+		},
+		view: {
+			type: Object,
+			default: null,
+		},
+	},
+	data() {
+		return {
+			title: '',
+			icon: '',
+			errorTitle: false,
+			selectedColumns: [],
+			localLoading: false,
+			prepareDelete: false,
+			columns: null,
+		}
+	},
+	computed: {
+		...mapGetters(['activeTable']),
+		showDeleteButton() {
+			return true // TODO
+			// return this.canDeleteDataActiveTable && !this.localLoading
+		},
+	},
+	watch: {
+		title() {
+			if (this.title.length >= 200) {
+				showError(t('tables', 'The title limit is reached with 200 characters. Please use a shorter title.'))
+				this.title = this.title.slice(0, 199)
+			}
+		},
+		async showModal() {
+			if (this.columns == null) {
+				await this.loadTableColumnsFromBE()
+			}
+			this.reset()
+		},
+	},
+	methods: {
+		setIcon(icon) {
+			this.icon = icon
+		},
+		actionCancel() {
+			this.reset()
+			this.$emit('close')
+		},
+		onToggle(columnId) {
+			if (this.selectedColumns.includes(columnId)) {
+				this.selectedColumns.splice(this.selectedColumns.indexOf(columnId), 1)
+			} else {
+				this.selectedColumns.push(columnId)
+			}
+		},
+		isValueValidForColumn(value, column) {
+			if (column.type === 'selection') {
+				if (
+					(value instanceof Array && value.length > 0)
+					|| (value === parseInt(value))
+				) {
+					return true
+				}
+				return false
+			}
+			return !!value || value === 0
+		},
+		async loadTableColumnsFromBE() {
+			this.columns = await this.$store.dispatch('getColumnsFromBE', { tableId: this.view.tableId })
+		},
+		async actionConfirm() {
+			if (this.title === '') {
+				showError(t('tables', 'Cannot update view. Title is missing.'))
+				this.errorTitle = true
+			} else {
+				this.localLoading = true
+				const success = await this.updateViewToBE(this.view.id)
+				this.localLoading = false
+				if (success) {
+					this.actionCancel()
+				}
+			}
+		},
+		async updateViewToBE(id) {
+			const data = {
+				data: {
+					title: this.title,
+					emoji: this.icon,
+					columns: JSON.stringify(this.selectedColumns),
+				},
+			}
+			const res = await this.$store.dispatch('updateView', { id, data })
+			if (res) {
+				console.debug(res, this.view)
+				if (this.selectedColumns !== this.view.columns) {
+					await this.$store.dispatch('loadColumnsFromBE', { viewId: this.view.id })
+				}
+				return res
+			} else {
+				showError(t('tables', 'Could not update view'))
+			}
+		},
+		reset() {
+			this.title = this.view.title
+			this.icon = this.view.emoji
+			this.errorTitle = false
+			this.selectedColumns = [...this.view.columns]
+			this.localLoading = false
+		},
+	},
+}
+</script>
diff --git a/src/modules/navigation/modals/EditView.vue b/src/modules/navigation/modals/EditView.vue
new file mode 100644
index 000000000..44c19ff4f
--- /dev/null
+++ b/src/modules/navigation/modals/EditView.vue
@@ -0,0 +1,142 @@
+<template>
+	<NcModal v-if="showModal"
+		size="normal"
+		@close="actionCancel">
+		<div class="modal__content">
+			<div class="row">
+				<div class="col-4">
+					<h2>{{ t('tables', 'Edit view') }}</h2>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-4 mandatory">
+					{{ t('tables', 'Title') }}
+				</div>
+				<div class="col-3 inline">
+					<NcEmojiPicker :close-on-select="true" @select="emoji => icon = emoji">
+						<NcButton type="tertiary"
+							:aria-label="t('tables', 'Select emoji for view')"
+							:title="t('tables', 'Select emoji')"
+							@click.prevent>
+							{{ icon ? icon : '...' }}
+						</NcButton>
+					</NcEmojiPicker>
+					<input v-model="title"
+						:class="{missing: errorTitle}"
+						type="text"
+						:placeholder="t('tables', 'Title of the new view')">
+				</div>
+			</div>
+			<div class="row">
+				<div class="fix-col-4 space-T justify-between">
+					<NcButton v-if="!prepareDelete" type="error" @click="prepareDelete = true">
+						{{ t('tables', 'Delete') }}
+					</NcButton>
+					<NcButton v-if="prepareDelete"
+						:wide="true"
+						type="error"
+						@click="actionDeleteView">
+						{{ t('tables', 'I really want to delete this view!') }}
+					</NcButton>
+					<NcButton type="primary" @click="submit">
+						{{ t('tables', 'Save') }}
+					</NcButton>
+				</div>
+			</div>
+		</div>
+	</NcModal>
+</template>
+
+<script>
+import { NcModal, NcEmojiPicker, NcButton } from '@nextcloud/vue'
+import { showError, showSuccess } from '@nextcloud/dialogs'
+import '@nextcloud/dialogs/dist/index.css'
+import { mapGetters } from 'vuex'
+
+export default {
+	name: 'EditView',
+	components: {
+		NcModal,
+		NcEmojiPicker,
+		NcButton,
+	},
+	props: {
+		showModal: {
+			type: Boolean,
+			default: false,
+		},
+		viewId: {
+			type: Number,
+			default: null,
+		},
+	},
+	data() {
+		return {
+			title: '',
+			icon: '',
+			errorTitle: false,
+			prepareDelete: false,
+		}
+	},
+	computed: {
+		...mapGetters(['getView', 'activeView']),
+	},
+	watch: {
+		title() {
+			if (this.title && this.title.length >= 200) {
+				showError(t('tables', 'The title limit is reached with 200 characters. Please use a shorter title.'))
+				this.title = this.title.slice(0, 199)
+			}
+		},
+		viewId() {
+			if (this.viewId) {
+				const view = this.getView(this.viewId)
+				this.title = view.title
+				this.icon = view.emoji
+			}
+		},
+	},
+	methods: {
+		actionCancel() {
+			this.reset()
+			this.$emit('close')
+		},
+		async submit() {
+			if (this.title === '') {
+				showError(t('tables', 'Cannot update view. Title is missing.'))
+				this.errorTitle = true
+			} else {
+				const res = await this.$store.dispatch('updateView', { id: this.viewId, data: { data: { title: this.title, emoji: this.icon } } })
+				if (res) {
+					showSuccess(t('tables', 'Updated view "{emoji}{view}".', { emoji: this.icon ? this.icon + ' ' : '', view: this.title }))
+					this.actionCancel()
+				}
+			}
+		},
+		reset() {
+			this.title = ''
+			this.errorTitle = false
+			this.templateChoice = 'custom'
+			this.icon = ''
+			this.prepareDelete = false
+		},
+		async actionDeleteView() {
+			const deleteId = this.viewId
+			const activeViewId = this.activeView.id
+			this.prepareDelete = false
+			const res = await this.$store.dispatch('removeView', { viewId: this.viewId })
+			if (res) {
+				showSuccess(t('tables', 'View "{emoji}{view}" removed.', { emoji: this.icon ? this.icon + ' ' : '', view: this.title }))
+
+				// if the actual view was deleted, go to startpage
+				if (deleteId === activeViewId) {
+					await this.$router.push('/').catch(err => err)
+				}
+
+				this.actionCancel()
+			}
+
+		},
+	},
+}
+</script>

From 8a2c76b200b2698af394dafda475b2178b229186 Mon Sep 17 00:00:00 2001
From: Philipp Hempel <Philipp.Hempel1@web.de>
Date: Mon, 26 Jun 2023 08:12:47 +0200
Subject: [PATCH 2/8] enh(view): Enables sharing and integration of views

Signed-off-by: Philipp Hempel <Philipp.Hempel1@web.de>
---
 lib/Controller/ColumnController.php | 1 +
 lib/Controller/TableController.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/Controller/ColumnController.php b/lib/Controller/ColumnController.php
index eb6326211..7239faa9d 100644
--- a/lib/Controller/ColumnController.php
+++ b/lib/Controller/ColumnController.php
@@ -40,6 +40,7 @@ public function index(int $tableId, int $viewId): DataResponse {
 
 	/**
 	 * @NoAdminRequired
+	 * @NoCSRFRequired
 	 */
 	public function indexView(int $viewId): DataResponse {
 		return $this->handleError(function () use ($viewId) {
diff --git a/lib/Controller/TableController.php b/lib/Controller/TableController.php
index 7d03ff4cc..b0b046030 100644
--- a/lib/Controller/TableController.php
+++ b/lib/Controller/TableController.php
@@ -33,6 +33,7 @@ public function __construct(
 
 	/**
 	 * @NoAdminRequired
+	 * @NoCSRFRequired
 	 */
 	public function index(): DataResponse {
 		return $this->handleError(function () {

From 2521807541c1741bc5f81f703f7917fce9a790d3 Mon Sep 17 00:00:00 2001
From: Florian Steffens <florian.steffens@nextcloud.com>
Date: Mon, 31 Jul 2023 16:15:35 +0200
Subject: [PATCH 3/8] adjust, shorten menus, change icon and fix typo

Signed-off-by: Florian Steffens <florian.steffens@nextcloud.com>
---
 .../main/sections/ElementDescription.vue      | 37 +++++-------
 .../ncTable/partials/TableHeader.vue          | 60 +++----------------
 2 files changed, 24 insertions(+), 73 deletions(-)

diff --git a/src/modules/main/sections/ElementDescription.vue b/src/modules/main/sections/ElementDescription.vue
index 0f93593e8..4e31b6121 100644
--- a/src/modules/main/sections/ElementDescription.vue
+++ b/src/modules/main/sections/ElementDescription.vue
@@ -3,21 +3,8 @@
 		<h1>
 			{{ activeView.emoji }}&nbsp;{{ activeView.title }}
 		</h1>
-		<div v-if="!activeView.isShared || (activeView.isShared && activeView.onSharePermissions.manage)" class="light">
-			<NcButton
-				:aria-label="activeView.isBaseView ? t('tables', 'Edit table') : t('tables', 'Edit view')"
-				type="tertiary"
-				@click="editElement">
-				<template #icon>
-					<Pencil :size="20" />
-				</template>
-				{{ activeView.isBaseView ? t('tables', 'Edit table') : t('tables', 'Edit view') }}
-			</NcButton>
-		</div>
-		<div v-if="isFiltered" style="padding: 0 8px">
-			<InformationOutline :size="20" />
-		</div>
-		<div v-if="isFiltered">
+		<div v-if="isFiltered" class="info">
+			<FilterMultipleOutline :size="20" />
 			{{ t('tables', 'Filtered view') }}
 		</div>
 		<div v-if="activeView.isShared" class="user-bubble">
@@ -33,17 +20,14 @@
 
 import { mapGetters } from 'vuex'
 import { emit } from '@nextcloud/event-bus'
-import { NcButton, NcUserBubble } from '@nextcloud/vue'
-import Pencil from 'vue-material-design-icons/Pencil.vue'
-import InformationOutline from 'vue-material-design-icons/InformationOutline.vue'
+import { NcUserBubble } from '@nextcloud/vue'
+import FilterMultipleOutline from 'vue-material-design-icons/FilterMultipleOutline.vue'
 
 export default {
 	name: 'ElementDescription',
 	components: {
-		NcButton,
 		NcUserBubble,
-		Pencil,
-		InformationOutline,
+		FilterMultipleOutline,
 	},
 	computed: {
 		...mapGetters(['activeView']),
@@ -83,4 +67,15 @@ export default {
 	padding-left: calc(var(--default-grid-baseline) * 2);
 }
 
+.info {
+	display: inline-flex;
+	margin-left: calc(var(--default-grid-baseline) * 2);
+	align-items: center;
+	color: var(--color-text-maxcontrast);
+}
+
+.info span {
+	padding: calc(var(--default-grid-baseline) * 1);
+}
+
 </style>
diff --git a/src/shared/components/ncTable/partials/TableHeader.vue b/src/shared/components/ncTable/partials/TableHeader.vue
index 6859987df..98a34a1a2 100644
--- a/src/shared/components/ncTable/partials/TableHeader.vue
+++ b/src/shared/components/ncTable/partials/TableHeader.vue
@@ -6,7 +6,7 @@
 				<div v-if="hasRightHiddenNeighbor(-1)" class="hidden-indicator-first" @click="unhide(-1)" />
 			</div>
 		</th>
-		<th v-for="col in visibleColums" :key="col.id">
+		<th v-for="col in visibleColumns" :key="col.id">
 			<div class="cell-wrapper">
 				<div class="cell-options-wrapper">
 					<div class="cell">
@@ -16,7 +16,7 @@
 						<TableHeaderColumnOptions
 							:column="col"
 							:open-state.sync="openedColumnHeaderMenus[col.id]"
-							:can-hide="visibleColums.length > 1"
+							:can-hide="visibleColumns.length > 1"
 							@add-filter="filter => $emit('add-filter', filter)" />
 					</div>
 					<div v-if="getFilterForColumn(col)" class="filter-wrapper">
@@ -34,55 +34,18 @@
 		<th data-cy="customTableAction">
 			<NcActions :force-menu="true" :type="isViewSettingSet ? 'secondary' : 'tertiary'">
 				<NcActionCaption v-if="canManageElement(view)" :title="t('tables', 'Manage view')" />
-				<NcActionButton v-if="isViewSettingSet"
-					:close-after-click="true"
-					class="view-changed"
-					@click="resetView">
-					<template #icon>
-						<ArrowULeftTop :size="20" decorative />
-					</template>
-					{{ t('tables', 'Reset view config') }}
-				</NcActionButton>
-				<NcActionButton v-if="isViewSettingSet && !activeView.isBaseView && canManageElement(view)"
-					:close-after-click="true"
-					class="view-changed"
-					@click="applyViewConfig">
-					<template #icon>
-						<TableCheck :size="20" decorative />
-					</template>
-					{{ t('tables', 'Apply view config') }}
-				</NcActionButton>
-				<NcActionButton v-if="isViewSettingSet && canManageElement(view)"
-					:close-after-click="true"
-					class="view-changed"
-					@click="createWithViewConfig">
-					<template #icon>
-						<TablePlus :size="20" decorative />
-					</template>
-					{{ t('tables', 'Create view with config') }}
-				</NcActionButton>
-
-				<NcActionSeparator v-if="isViewSettingSet" />
-
-				<NcActionButton v-if="canManageTable(view)" :close-after-click="true" @click="$emit('create-column')">
-					<template #icon>
-						<TableColumnPlusAfter :size="20" decorative title="" />
-					</template>
-					{{ t('tables', 'Create column') }}
-				</NcActionButton>
 				<NcActionButton v-if="canManageElement(view)"
 					:close-after-click="true"
+					:type="isViewSettingSet ? 'secondary' : 'tertiary'"
 					icon="icon-rename"
 					@click="editView()">
 					{{ t('tables', 'Edit view') }}
 				</NcActionButton>
-				<NcActionButton v-if="canManageTable(view)"
-					:close-after-click="true"
-					@click="createView()">
+				<NcActionButton v-if="canManageTable(view)" :close-after-click="true" @click="$emit('create-column')">
 					<template #icon>
-						<TablePlus :size="20" decorative />
+						<TableColumnPlusAfter :size="20" decorative title="" />
 					</template>
-					{{ t('tables', 'Create view') }}
+					{{ t('tables', 'Create column') }}
 				</NcActionButton>
 
 				<NcActionCaption :title="t('tables', 'Integration')" />
@@ -119,14 +82,11 @@
 </template>
 
 <script>
-import { NcCheckboxRadioSwitch, NcActions, NcActionButton, NcActionSeparator, NcActionCaption } from '@nextcloud/vue'
+import { NcCheckboxRadioSwitch, NcActions, NcActionButton, NcActionCaption } from '@nextcloud/vue'
 import { emit } from '@nextcloud/event-bus'
 import TableColumnPlusAfter from 'vue-material-design-icons/TableColumnPlusAfter.vue'
 import IconImport from 'vue-material-design-icons/Import.vue'
 import Creation from 'vue-material-design-icons/Creation.vue'
-import ArrowULeftTop from 'vue-material-design-icons/TableRefresh.vue'
-import TableCheck from 'vue-material-design-icons/TableCheck.vue'
-import TablePlus from 'vue-material-design-icons/TablePlus.vue'
 import TableHeaderColumnOptions from './TableHeaderColumnOptions.vue'
 import FilterLabel from './FilterLabel.vue'
 import permissionsMixin from '../mixins/permissionsMixin.js'
@@ -142,11 +102,7 @@ export default {
 		TableHeaderColumnOptions,
 		NcActions,
 		NcActionButton,
-		NcActionSeparator,
 		TableColumnPlusAfter,
-		ArrowULeftTop,
-		TableCheck,
-		TablePlus,
 		NcActionCaption,
 		Creation,
 	},
@@ -191,7 +147,7 @@ export default {
 				return false
 			}
 		},
-		visibleColums() {
+		visibleColumns() {
 			return this.columns.filter(col => !this.viewSetting?.hiddenColumns?.includes(col.id))
 		},
 		isViewSettingSet() {

From 804577a996d12c5d8d6203b0154cd6772fe554e5 Mon Sep 17 00:00:00 2001
From: Florian Steffens <florian.steffens@nextcloud.com>
Date: Tue, 1 Aug 2023 08:23:40 +0200
Subject: [PATCH 4/8] changed icon, add button to reset local view config

Signed-off-by: Florian Steffens <florian.steffens@nextcloud.com>
---
 .../main/sections/ElementDescription.vue      | 26 ++++++++++++---
 src/pages/DefaultMainView.vue                 |  2 +-
 .../ncSmallButton/NcSmallButton.vue           | 32 +++++++++++++++++++
 .../ncTable/partials/TableHeader.vue          | 18 +++++++++--
 4 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100644 src/shared/components/ncSmallButton/NcSmallButton.vue

diff --git a/src/modules/main/sections/ElementDescription.vue b/src/modules/main/sections/ElementDescription.vue
index 4e31b6121..9fb4d7805 100644
--- a/src/modules/main/sections/ElementDescription.vue
+++ b/src/modules/main/sections/ElementDescription.vue
@@ -4,8 +4,11 @@
 			{{ activeView.emoji }}&nbsp;{{ activeView.title }}
 		</h1>
 		<div v-if="isFiltered" class="info">
-			<FilterMultipleOutline :size="20" />
-			{{ t('tables', 'Filtered view') }}
+			<TextIcon :size="15" />
+			{{ t('tables', 'Filtered view') }}&nbsp;&nbsp;
+			<NcSmallButton v-if="isViewSettingSet">
+				🔙 {{ t('tables', 'Reset local adjustments') }}
+			</NcSmallButton>
 		</div>
 		<div v-if="activeView.isShared" class="user-bubble">
 			<NcUserBubble
@@ -21,19 +24,34 @@
 import { mapGetters } from 'vuex'
 import { emit } from '@nextcloud/event-bus'
 import { NcUserBubble } from '@nextcloud/vue'
-import FilterMultipleOutline from 'vue-material-design-icons/FilterMultipleOutline.vue'
+import TextIcon from 'vue-material-design-icons/Text.vue'
+import NcSmallButton from '../../../shared/components/ncSmallButton/NcSmallButton.vue'
 
 export default {
 	name: 'ElementDescription',
+
 	components: {
 		NcUserBubble,
-		FilterMultipleOutline,
+		TextIcon,
+		NcSmallButton,
+	},
+
+	props: {
+		viewSetting: {
+			type: Object,
+			default: null,
+		},
 	},
+
 	computed: {
 		...mapGetters(['activeView']),
 		isFiltered() {
 			return this.activeView.filter && this.activeView.filter[0]?.length > 0
 		},
+
+		isViewSettingSet() {
+			return !(!this.viewSetting || ((!this.viewSetting.hiddenColumns || this.viewSetting.hiddenColumns.length === 0) && (!this.viewSetting.sorting) && (!this.viewSetting.filter || this.viewSetting.filter.length === 0)))
+		},
 	},
 
 	methods: {
diff --git a/src/pages/DefaultMainView.vue b/src/pages/DefaultMainView.vue
index 5228313df..c380f8488 100644
--- a/src/pages/DefaultMainView.vue
+++ b/src/pages/DefaultMainView.vue
@@ -3,7 +3,7 @@
 		<div v-if="isLoading" class="icon-loading" />
 
 		<div v-if="!isLoading && activeView">
-			<ElementDescription />
+			<ElementDescription :view-setting="viewSetting" />
 
 			<div class="table-wrapper">
 				<NcView v-if="columns.length > 0"
diff --git a/src/shared/components/ncSmallButton/NcSmallButton.vue b/src/shared/components/ncSmallButton/NcSmallButton.vue
new file mode 100644
index 000000000..9da6cffe1
--- /dev/null
+++ b/src/shared/components/ncSmallButton/NcSmallButton.vue
@@ -0,0 +1,32 @@
+<template>
+	<NcButton :aria-label="ariaLabel" class="button-small">
+		<slot />
+	</NcButton>
+</template>
+<script>
+import { NcButton } from '@nextcloud/vue'
+
+export default {
+
+	components: {
+		NcButton,
+	},
+
+	props: {
+		ariaLabel: {
+		      type: String,
+		      default: null,
+		    },
+	},
+
+}
+</script>
+<style lang="scss" scoped>
+
+	.button-small {
+		min-height: auto !important;
+		padding: 1px 2px !important;
+		margin: 0 0 0 4px !important;
+	}
+
+</style>
diff --git a/src/shared/components/ncTable/partials/TableHeader.vue b/src/shared/components/ncTable/partials/TableHeader.vue
index 98a34a1a2..c7387618e 100644
--- a/src/shared/components/ncTable/partials/TableHeader.vue
+++ b/src/shared/components/ncTable/partials/TableHeader.vue
@@ -36,11 +36,21 @@
 				<NcActionCaption v-if="canManageElement(view)" :title="t('tables', 'Manage view')" />
 				<NcActionButton v-if="canManageElement(view)"
 					:close-after-click="true"
-					:type="isViewSettingSet ? 'secondary' : 'tertiary'"
-					icon="icon-rename"
 					@click="editView()">
+					<template #icon>
+						<PlaylistEdit :size="20" decorative />
+					</template>
 					{{ t('tables', 'Edit view') }}
 				</NcActionButton>
+				<NcActionButton v-if="canManageElement(view)"
+					:close-after-click="true"
+					class="view-changed"
+					@click="createWithViewConfig">
+					<template #icon>
+						<PlaylistPlus :size="20" decorative />
+					</template>
+					{{ t('tables', 'Create view') }}
+				</NcActionButton>
 				<NcActionButton v-if="canManageTable(view)" :close-after-click="true" @click="$emit('create-column')">
 					<template #icon>
 						<TableColumnPlusAfter :size="20" decorative title="" />
@@ -85,6 +95,8 @@
 import { NcCheckboxRadioSwitch, NcActions, NcActionButton, NcActionCaption } from '@nextcloud/vue'
 import { emit } from '@nextcloud/event-bus'
 import TableColumnPlusAfter from 'vue-material-design-icons/TableColumnPlusAfter.vue'
+import PlaylistEdit from 'vue-material-design-icons/PlaylistEdit.vue'
+import PlaylistPlus from 'vue-material-design-icons/PlaylistPlus.vue'
 import IconImport from 'vue-material-design-icons/Import.vue'
 import Creation from 'vue-material-design-icons/Creation.vue'
 import TableHeaderColumnOptions from './TableHeaderColumnOptions.vue'
@@ -96,6 +108,8 @@ import { showSuccess, showError } from '@nextcloud/dialogs'
 export default {
 
 	components: {
+		PlaylistEdit,
+		PlaylistPlus,
 		IconImport,
 		FilterLabel,
 		NcCheckboxRadioSwitch,

From 99fa761a03e22b22dd25dba2b9e6a5f427a54369 Mon Sep 17 00:00:00 2001
From: Florian Steffens <florian.steffens@nextcloud.com>
Date: Tue, 1 Aug 2023 13:50:53 +0200
Subject: [PATCH 5/8] changed icon, add button to reset local view config

Signed-off-by: Florian Steffens <florian.steffens@nextcloud.com>
---
 .../main/sections/ElementDescription.vue      | 19 +++++++++++---
 .../partials/NavigationBaseViewItem.vue       |  8 ++++--
 .../partials/NavigationViewItem.vue           | 26 +++++++++++--------
 .../ncSmallButton/NcSmallButton.vue           |  8 +++++-
 .../ncTable/partials/TableHeader.vue          |  5 +---
 5 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/modules/main/sections/ElementDescription.vue b/src/modules/main/sections/ElementDescription.vue
index 9fb4d7805..1681d58f7 100644
--- a/src/modules/main/sections/ElementDescription.vue
+++ b/src/modules/main/sections/ElementDescription.vue
@@ -3,10 +3,12 @@
 		<h1>
 			{{ activeView.emoji }}&nbsp;{{ activeView.title }}
 		</h1>
-		<div v-if="isFiltered" class="info">
-			<TextIcon :size="15" />
-			{{ t('tables', 'Filtered view') }}&nbsp;&nbsp;
-			<NcSmallButton v-if="isViewSettingSet">
+		<div class="info">
+			<div v-if="isFiltered">
+				<TextIcon :size="15" />
+				{{ t('tables', 'Filtered view') }}&nbsp;&nbsp;
+			</div>
+			<NcSmallButton v-if="isViewSettingSet" @click="resetLocalAdjustments">
 				🔙 {{ t('tables', 'Reset local adjustments') }}
 			</NcSmallButton>
 		</div>
@@ -58,6 +60,10 @@ export default {
 		editElement() {
 			emit('tables:view:edit', this.activeView)
 		},
+
+		resetLocalAdjustments() {
+			this.$store.dispatch('resetViewSetting')
+		},
 	},
 }
 </script>
@@ -92,6 +98,11 @@ export default {
 	color: var(--color-text-maxcontrast);
 }
 
+.info > div {
+	display: inline-flex;
+	width: max-content;
+}
+
 .info span {
 	padding: calc(var(--default-grid-baseline) * 1);
 }
diff --git a/src/modules/navigation/partials/NavigationBaseViewItem.vue b/src/modules/navigation/partials/NavigationBaseViewItem.vue
index bc9aa559a..00ef8c27e 100644
--- a/src/modules/navigation/partials/NavigationBaseViewItem.vue
+++ b/src/modules/navigation/partials/NavigationBaseViewItem.vue
@@ -28,12 +28,14 @@
 
 		<template #actions>
 			<NcActionButton v-if="canManageTable(baseView)"
-				icon="icon-add"
 				:close-after-click="true"
 				@click="createView">
+				<template #icon>
+					<PlaylistPlus :size="20" />
+				</template>
 				{{ t('tables', 'Create view') }}
 			</NcActionButton>
-			<NcActionButton v-if="canManageElement(baseView)"
+			<NcActionButton v-if="canManageElement(baseView) && false"
 				icon="icon-rename"
 				:close-after-click="true"
 				@click="editView">
@@ -94,6 +96,7 @@ import { getCurrentUser } from '@nextcloud/auth'
 import Creation from 'vue-material-design-icons/Creation.vue'
 import Import from 'vue-material-design-icons/Import.vue'
 import NavigationViewItem from './NavigationViewItem.vue'
+import PlaylistPlus from 'vue-material-design-icons/PlaylistPlus.vue'
 
 export default {
 	name: 'NavigationBaseViewItem',
@@ -109,6 +112,7 @@ export default {
 		NcCounterBubble,
 		NcAvatar,
 		Creation,
+		PlaylistPlus,
 	},
 
 	filters: {
diff --git a/src/modules/navigation/partials/NavigationViewItem.vue b/src/modules/navigation/partials/NavigationViewItem.vue
index 31a94f7a2..32830725a 100644
--- a/src/modules/navigation/partials/NavigationViewItem.vue
+++ b/src/modules/navigation/partials/NavigationViewItem.vue
@@ -24,11 +24,21 @@
 		</template>
 		<template #actions>
 			<NcActionButton v-if="canManageElement(view)"
-				icon="icon-rename"
 				:close-after-click="true"
 				@click="editView">
+				<template #icon>
+					<PlaylistEdit :size="20" />
+				</template>
 				{{ t('tables', 'Edit view') }}
 			</NcActionButton>
+			<NcActionButton v-if="canManageTable(view)"
+				:close-after-click="true"
+				@click="cloneView">
+				<template #icon>
+					<PlaylistPlay :size="20" decorative />
+				</template>
+				{{ t('tables', 'Clone view') }}
+			</NcActionButton>
 			<NcActionButton v-if="canShareElement(view)"
 				icon="icon-share"
 				:close-after-click="true"
@@ -43,14 +53,6 @@
 					<Creation :size="20" />
 				</template>
 			</NcActionButton>
-			<NcActionButton v-if="canManageTable(view)"
-				:close-after-click="true"
-				@click="cloneView">
-				<template #icon>
-					<TableMultiple :size="20" decorative />
-				</template>
-				{{ t('tables', 'Duplicate view') }}
-			</NcActionButton>
 			<NcActionButton v-if="canManageElement(view)"
 				icon="icon-delete"
 				:close-after-click="true"
@@ -78,13 +80,15 @@ import Table from 'vue-material-design-icons/Table.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
 import DialogConfirmation from '../../../shared/modals/DialogConfirmation.vue'
 import Creation from 'vue-material-design-icons/Creation.vue'
-import TableMultiple from 'vue-material-design-icons/TableMultiple.vue'
+import PlaylistPlay from 'vue-material-design-icons/PlaylistPlay.vue'
 import { emit } from '@nextcloud/event-bus'
+import PlaylistEdit from 'vue-material-design-icons/PlaylistEdit.vue'
 
 export default {
 	name: 'NavigationViewItem',
 
 	components: {
+		PlaylistEdit,
 		// eslint-disable-next-line vue/no-reserved-component-names
 		Table,
 		NcAppNavigationItem,
@@ -93,7 +97,7 @@ export default {
 		NcActionButton,
 		Creation,
 		NcAvatar,
-		TableMultiple,
+		PlaylistPlay,
 	},
 
 	filters: {
diff --git a/src/shared/components/ncSmallButton/NcSmallButton.vue b/src/shared/components/ncSmallButton/NcSmallButton.vue
index 9da6cffe1..296f0cd6a 100644
--- a/src/shared/components/ncSmallButton/NcSmallButton.vue
+++ b/src/shared/components/ncSmallButton/NcSmallButton.vue
@@ -1,5 +1,5 @@
 <template>
-	<NcButton :aria-label="ariaLabel" class="button-small">
+	<NcButton :aria-label="ariaLabel" class="button-small" @click="submit">
 		<slot />
 	</NcButton>
 </template>
@@ -19,6 +19,12 @@ export default {
 		    },
 	},
 
+	methods: {
+		submit() {
+			this.$emit('click')
+		},
+	},
+
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/shared/components/ncTable/partials/TableHeader.vue b/src/shared/components/ncTable/partials/TableHeader.vue
index c7387618e..8858adbfd 100644
--- a/src/shared/components/ncTable/partials/TableHeader.vue
+++ b/src/shared/components/ncTable/partials/TableHeader.vue
@@ -42,7 +42,7 @@
 					</template>
 					{{ t('tables', 'Edit view') }}
 				</NcActionButton>
-				<NcActionButton v-if="canManageElement(view)"
+				<NcActionButton v-if="canManageElement(view) && false"
 					:close-after-click="true"
 					class="view-changed"
 					@click="createWithViewConfig">
@@ -192,9 +192,6 @@ export default {
 		unhide(colId) {
 			this.$store.dispatch('unhideColumn', { columnId: this.columns[this.columns.indexOf(this.columns.find(col => col.id === colId)) + 1]?.id })
 		},
-		resetView() {
-			this.$store.dispatch('resetViewSetting')
-		},
 		createView() {
 			emit('create-view', this.activeView.tableId)
 		},

From 88347a08722574164501ae40e2f0f46eb3e3e994 Mon Sep 17 00:00:00 2001
From: Florian Steffens <florian.steffens@nextcloud.com>
Date: Tue, 1 Aug 2023 14:56:08 +0200
Subject: [PATCH 6/8] changed icon, add button to reset local view config

Signed-off-by: Florian Steffens <florian.steffens@nextcloud.com>
---
 .../editViewPartials/SelectedViewColumns.vue  | 116 ++++++++++--------
 .../editViewPartials/filter/FilterForm.vue    |   7 +-
 2 files changed, 73 insertions(+), 50 deletions(-)

diff --git a/src/modules/main/partials/editViewPartials/SelectedViewColumns.vue b/src/modules/main/partials/editViewPartials/SelectedViewColumns.vue
index 9b446ac9b..f8471f4d7 100644
--- a/src/modules/main/partials/editViewPartials/SelectedViewColumns.vue
+++ b/src/modules/main/partials/editViewPartials/SelectedViewColumns.vue
@@ -7,7 +7,7 @@
 			@dragover="dragOver(index)" @dragend="dragEnd(index)">
 			<div class="row-elements">
 				<NcButton
-					aria-label="Move"
+					aria-label="t('tables', 'Move')"
 					type="tertiary-no-background"
 					class="move-button">
 					<template #icon>
@@ -24,7 +24,7 @@
 					({{ t('tables', 'Metadata') }})
 				</div>
 			</div>
-			<div class="row-elements">
+			<div class="row-elements move">
 				<NcButton
 					:disabled="index === 0"
 					aria-label="Move"
@@ -126,62 +126,80 @@ export default {
 
 <style lang="scss" scoped>
 
-.column-entry {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: calc(var(--default-grid-baseline) * 1) 0;
-}
+	.column-entry {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: calc(var(--default-grid-baseline) * 1) 0;
+		border-radius: var(--border-radius-large);
+	}
 
-.display-checkbox {
-	padding-right: calc(var(--default-grid-baseline) * 4);
-}
+	.column-entry:hover {
+		background-color: var(--color-background-dark);
+	}
 
-:deep(.modal-container) {
-	min-width: 60% !important;
-}
+	.display-checkbox {
+		padding-right: calc(var(--default-grid-baseline) * 4);
+	}
 
-:deep(.button-vue) {
-	cursor: move !important;
-	min-height: auto !important;
-	min-width: auto !important;
-}
+	:deep(.modal-container) {
+		min-width: 60% !important;
+	}
 
-:deep(.button-vue__icon) {
-	height: auto !important;
-	width: auto !important;
-	min-height: auto !important;
-	min-width: auto !important;
-}
+	:deep(.button-vue) {
+		cursor: move !important;
+		min-height: auto !important;
+		min-width: auto !important;
+	}
 
-:deep(.checkbox-radio-switch__label) {
-	min-height: auto;
-	padding: 4px;
-}
+	:deep(.button-vue__icon) {
+		height: auto !important;
+		width: auto !important;
+		min-height: auto !important;
+		min-width: auto !important;
+	}
 
-:deep(.checkbox-radio-switch__icon) {
-	margin-right: 0 !important;
-	margin-left: 0 !important;
-}
+	:deep(.checkbox-radio-switch__label) {
+		min-height: auto;
+		padding: 4px;
+	}
 
-.selected-columns-wrapper {
-	display: flex;
-	flex-direction: column;
-}
+	:deep(.checkbox-radio-switch__icon) {
+		margin-right: 0 !important;
+		margin-left: 0 !important;
+	}
 
-.move-button {
-	padding-right: 10px !important;
-	cursor: move !important;
-}
+	.selected-columns-wrapper {
+		display: flex;
+		flex-direction: column;
+	}
 
-.meta-info {
-	font-style: italic;
-	padding-left:  calc(var(--default-grid-baseline) * 1);
-	color: var(--color-info);
-}
+	.move-button {
+		padding-right: 10px !important;
+		cursor: move !important;
+	}
 
-.row-elements {
-	display: flex;
-}
+	.move-button:hover {
+		cursor: move !important;
+	}
+
+	.meta-info {
+		font-style: italic;
+		padding-left:  calc(var(--default-grid-baseline) * 1);
+		color: var(--color-info);
+	}
+
+	.row-elements {
+		display: flex;
+		align-items: center;
+	}
+
+	.row-elements.move {
+		display: none;
+	}
+
+	.column-entry:hover .row-elements.move, .column-entry:focus-within .row-elements.move {
+		display: flex;
+	}
 
 </style>
diff --git a/src/modules/main/partials/editViewPartials/filter/FilterForm.vue b/src/modules/main/partials/editViewPartials/filter/FilterForm.vue
index 4c8fe178e..c306f0539 100644
--- a/src/modules/main/partials/editViewPartials/filter/FilterForm.vue
+++ b/src/modules/main/partials/editViewPartials/filter/FilterForm.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="filter-section">
-		<div class="filter-text">
+		<div v-if="hasFilter" class="filter-text">
 			{{ t('tables', 'Filtering rows') }}
 		</div>
 		<div v-for="(filterGroup, i) in mutableFilters" :key="i">
@@ -55,8 +55,13 @@ export default {
 			mutableFilters: this.filters,
 		}
 	},
+
 	computed: {
+		hasFilter() {
+			return (this.mutableFilters !== null && this.mutableFilters.length > 0)
+		},
 	},
+
 	methods: {
 		deleteFilterGroup(index) {
 			this.mutableFilters.splice(index, 1)

From aaff1d928b8287512202e5f54f778b3aa0b0f1fa Mon Sep 17 00:00:00 2001
From: Florian Steffens <florian.steffens@nextcloud.com>
Date: Tue, 1 Aug 2023 15:01:31 +0200
Subject: [PATCH 7/8] wording: clone -> duplicate

Signed-off-by: Florian Steffens <florian.steffens@nextcloud.com>
---
 src/modules/navigation/partials/NavigationViewItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/navigation/partials/NavigationViewItem.vue b/src/modules/navigation/partials/NavigationViewItem.vue
index 32830725a..386de8090 100644
--- a/src/modules/navigation/partials/NavigationViewItem.vue
+++ b/src/modules/navigation/partials/NavigationViewItem.vue
@@ -37,7 +37,7 @@
 				<template #icon>
 					<PlaylistPlay :size="20" decorative />
 				</template>
-				{{ t('tables', 'Clone view') }}
+				{{ t('tables', 'Duplicate view') }}
 			</NcActionButton>
 			<NcActionButton v-if="canShareElement(view)"
 				icon="icon-share"

From 40c044490cfa2d048c60ecaaf9bc09c6c60dc30d Mon Sep 17 00:00:00 2001
From: Florian Steffens <florian.steffens@nextcloud.com>
Date: Tue, 1 Aug 2023 16:29:20 +0200
Subject: [PATCH 8/8] cleanup

Signed-off-by: Florian Steffens <florian.steffens@nextcloud.com>
---
 lib/Controller/ColumnController.php           |   3 +-
 lib/Controller/TableController.php            |   1 -
 src/modules/main/modals/CreateView.vue        | 187 ----------------
 src/modules/main/modals/EditView.vue          | 202 ------------------
 src/modules/navigation/modals/EditView.vue    | 142 ------------
 .../partials/NavigationBaseViewItem.vue       |   6 -
 .../ncTable/partials/TableHeader.vue          |   9 -
 7 files changed, 1 insertion(+), 549 deletions(-)
 delete mode 100644 src/modules/main/modals/CreateView.vue
 delete mode 100644 src/modules/main/modals/EditView.vue
 delete mode 100644 src/modules/navigation/modals/EditView.vue

diff --git a/lib/Controller/ColumnController.php b/lib/Controller/ColumnController.php
index 7239faa9d..81114f3d0 100644
--- a/lib/Controller/ColumnController.php
+++ b/lib/Controller/ColumnController.php
@@ -13,7 +13,7 @@ class ColumnController extends Controller {
 	private ColumnService $service;
 
 	private string $userId;
-	
+
 	protected LoggerInterface $logger;
 
 	use Errors;
@@ -40,7 +40,6 @@ public function index(int $tableId, int $viewId): DataResponse {
 
 	/**
 	 * @NoAdminRequired
-	 * @NoCSRFRequired
 	 */
 	public function indexView(int $viewId): DataResponse {
 		return $this->handleError(function () use ($viewId) {
diff --git a/lib/Controller/TableController.php b/lib/Controller/TableController.php
index b0b046030..7d03ff4cc 100644
--- a/lib/Controller/TableController.php
+++ b/lib/Controller/TableController.php
@@ -33,7 +33,6 @@ public function __construct(
 
 	/**
 	 * @NoAdminRequired
-	 * @NoCSRFRequired
 	 */
 	public function index(): DataResponse {
 		return $this->handleError(function () {
diff --git a/src/modules/main/modals/CreateView.vue b/src/modules/main/modals/CreateView.vue
deleted file mode 100644
index 0d96186b9..000000000
--- a/src/modules/main/modals/CreateView.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-	<NcModal v-if="showModal" @close="actionCancel">
-		<div class="modal__content">
-			<div class="row">
-				<div class="col-4">
-					<h2 style="padding: 0">
-						{{ t('tables', 'Create view') }}
-					</h2>
-				</div>
-			</div>
-
-			<div class="row space-T">
-				<div class="col-4 mandatory">
-					{{ t('tables', 'Title') }}
-				</div>
-				<div class="col-4" style="display: inline-flex;">
-					<NcEmojiPicker :close-on-select="true" @select="setIcon">
-						<NcButton type="tertiary"
-							:aria-label="t('tables', 'Select emoji for view')"
-							:title="t('tables', 'Select emoji')"
-							@click.prevent>
-							{{ icon }}
-						</NcButton>
-					</NcEmojiPicker>
-					<input v-model="title"
-						:class="{missing: errorTitle}"
-						type="text"
-						:placeholder="t('tables', 'Title of the new view')">
-				</div>
-			</div>
-			<div class="col-4 mandatory">
-				{{ t('tables', 'Columns to be displayed') }}
-			</div>
-			<div v-for="column in columns" :key="column.id" style="display: flex; align-items: center;">
-				<NcCheckboxRadioSwitch
-					:checked="selectedColumns.includes(column.id)"
-					style="padding-right: 10px;"
-					@update:checked="onToggle(column.id)" />
-				{{ column.title }}
-			</div>
-			<div class="row">
-				<div class="fix-col-4 space-T end">
-					<button v-if="!localLoading" class="primary" :aria-label="t('tables', 'Save View')" @click="actionConfirm()">
-						{{ t('tables', 'Save') }}
-					</button>
-				</div>
-			</div>
-		</div>
-	</NcModal>
-</template>
-
-<script>
-import { NcModal, NcEmojiPicker, NcButton, NcCheckboxRadioSwitch } from '@nextcloud/vue'
-import { showError } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
-import { mapGetters } from 'vuex'
-
-export default {
-	name: 'CreateView',
-	components: {
-		NcModal,
-		NcEmojiPicker,
-		NcButton,
-		NcCheckboxRadioSwitch,
-	},
-	props: {
-		showModal: {
-			type: Boolean,
-			default: false,
-		},
-		columns: {
-			type: Array,
-			default: null,
-		},
-	},
-	data() {
-		return {
-			title: '',
-			icon: '',
-			errorTitle: false,
-			selectedColumns: this.columns.map(col => col.id),
-			localLoading: false,
-		}
-	},
-	computed: {
-		...mapGetters(['activeTable']),
-	},
-	watch: {
-		title() {
-			if (this.title.length >= 200) {
-				showError(t('tables', 'The title limit is reached with 200 characters. Please use a shorter title.'))
-				this.title = this.title.slice(0, 199)
-			}
-		},
-		showModal() {
-			this.reset()
-			this.loadEmoji()
-		},
-	},
-	methods: {
-		setIcon(icon) {
-			this.icon = icon
-		},
-		loadEmoji() {
-			const emojis = ['😀', '😃', '😄', '😁', '😆', '😅', '🤣', '😂', '🙂', '🙃', '🫠', '😉', '😊', '😇']
-			this.icon = emojis[~~(Math.random() * emojis.length)]
-		},
-		actionCancel() {
-			this.reset()
-			this.$emit('close')
-			console.debug('Closed')
-		},
-		onToggle(columnId) {
-			if (this.selectedColumns.includes(columnId)) {
-				this.selectedColumns.splice(this.selectedColumns.indexOf(columnId), 1)
-			} else {
-				this.selectedColumns.push(columnId)
-			}
-		},
-		isValueValidForColumn(value, column) {
-			if (column.type === 'selection') {
-				if (
-					(value instanceof Array && value.length > 0)
-					|| (value === parseInt(value))
-				) {
-					return true
-				}
-				return false
-			}
-			return !!value || value === 0
-		},
-		async actionConfirm() {
-			if (this.title === '') {
-				showError(t('tables', 'Cannot create new view. Title is missing.'))
-				this.errorTitle = true
-			} else {
-				this.localLoading = true
-				const newViewId = await this.sendNewViewToBE()
-				const success = await this.updateViewColumnsToBE(newViewId)
-				this.localLoading = false
-				if (success) {
-					await this.$router.push('/view/' + newViewId)
-					this.actionCancel()
-				}
-			}
-		},
-		async sendNewViewToBE() {
-			const data = {
-				tableId: this.activeTable.id,
-				title: this.title,
-				emoji: this.icon,
-			}
-			const res = await this.$store.dispatch('insertNewView', { data })
-			if (res) {
-				return res
-			} else {
-				showError(t('tables', 'Could not create new view'))
-			}
-		},
-		async updateViewColumnsToBE(id) {
-			const data = {
-				data: { columns: JSON.stringify(this.selectedColumns) },
-			}
-			const res = await this.$store.dispatch('updateView', { id, data })
-			if (res) {
-				return res
-			} else {
-				showError(t('tables', 'Could not update view'))
-			}
-		},
-		reset() {
-			this.title = ''
-			this.icon = ''
-			this.errorTitle = false
-			this.selectedColumns = this.columns.map(col => col.id)
-			this.localLoading = false
-		},
-	},
-}
-</script>
-<style lang="scss" scoped>
-
-.padding-right {
-	padding-right: calc(var(--default-grid-baseline) * 3);
-}
-
-</style>
diff --git a/src/modules/main/modals/EditView.vue b/src/modules/main/modals/EditView.vue
deleted file mode 100644
index d65d58d89..000000000
--- a/src/modules/main/modals/EditView.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-	<NcModal v-if="showModal" @close="actionCancel">
-		<div class="modal__content">
-			<div class="row">
-				<div class="col-4">
-					<h2 style="padding: 0">
-						{{ t('tables', 'Edit view') }}
-					</h2>
-				</div>
-			</div>
-
-			<div class="row space-T">
-				<div class="col-4 mandatory">
-					{{ t('tables', 'Title') }}
-				</div>
-				<div class="col-4" style="display: inline-flex;">
-					<NcEmojiPicker :close-on-select="true" @select="setIcon">
-						<NcButton type="tertiary"
-							:aria-label="t('tables', 'Select emoji for view')"
-							:title="t('tables', 'Select emoji')"
-							@click.prevent>
-							{{ icon }}
-						</NcButton>
-					</NcEmojiPicker>
-					<input v-model="title"
-						:class="{missing: errorTitle}"
-						type="text"
-						:placeholder="t('tables', 'Title of the new view')">
-				</div>
-			</div>
-			<div class="col-4 mandatory">
-				{{ t('tables', 'Columns to be displayed') }}
-			</div>
-			<div v-if="columns==null"> Loading ...</div>
-			<div v-else v-for="column in columns" :key="column.id" style="display: flex; align-items: center;">
-				<NcCheckboxRadioSwitch
-					:checked="selectedColumns.includes(column.id)"
-					style="padding-right: 10px;"
-					@update:checked="onToggle(column.id)" />
-				{{ column.title }}
-			</div>
-			<!-- <div class="row">
-				<div class="fix-col-4 space-T" :class="{'justify-between': showDeleteButton, 'end': !showDeleteButton}">
-					<div v-if="showDeleteButton">
-						<NcButton v-if="!prepareDeleteRow" type="error" @click="prepareDeleteRow = true">
-							{{ t('tables', 'Delete') }}
-						</NcButton>
-						<NcButton v-if="prepareDeleteRow"
-							:wide="true"
-							type="error"
-							@click="actionDeleteView">
-							{{ t('tables', 'I really want to delete this view!') }}
-						</NcButton>
-					</div>
-					<NcButton v-if="canUpdateDataActiveTable && !localLoading" type="primary" @click="actionConfirm">
-						{{ t('tables', 'Save') }}
-					</NcButton>
-					<div v-if="localLoading" class="icon-loading" style="margin-left: 20px;" />
-				</div>
-			</div> -->
-
-			<div class="row">
-				<div class="fix-col-4 space-T end">
-					<button v-if="!localLoading" class="primary" :aria-label="t('tables', 'Save View')" @click="actionConfirm()">
-						{{ t('tables', 'Save') }}
-					</button>
-				</div>
-			</div>
-		</div>
-	</NcModal>
-</template>
-
-<script>
-import { NcModal, NcEmojiPicker, NcButton, NcCheckboxRadioSwitch } from '@nextcloud/vue'
-import { showError } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
-import { mapGetters } from 'vuex'
-import tablePermissions from '../mixins/tablePermissions.js'
-
-export default {
-	name: 'EditView',
-	components: {
-		NcModal,
-		NcEmojiPicker,
-		NcButton,
-		NcCheckboxRadioSwitch,
-	},
-	mixins: [tablePermissions],
-	props: {
-		showModal: {
-			type: Boolean,
-			default: false,
-		},
-		view: {
-			type: Object,
-			default: null,
-		},
-	},
-	data() {
-		return {
-			title: '',
-			icon: '',
-			errorTitle: false,
-			selectedColumns: [],
-			localLoading: false,
-			prepareDelete: false,
-			columns: null,
-		}
-	},
-	computed: {
-		...mapGetters(['activeTable']),
-		showDeleteButton() {
-			return true // TODO
-			// return this.canDeleteDataActiveTable && !this.localLoading
-		},
-	},
-	watch: {
-		title() {
-			if (this.title.length >= 200) {
-				showError(t('tables', 'The title limit is reached with 200 characters. Please use a shorter title.'))
-				this.title = this.title.slice(0, 199)
-			}
-		},
-		async showModal() {
-			if (this.columns == null) {
-				await this.loadTableColumnsFromBE()
-			}
-			this.reset()
-		},
-	},
-	methods: {
-		setIcon(icon) {
-			this.icon = icon
-		},
-		actionCancel() {
-			this.reset()
-			this.$emit('close')
-		},
-		onToggle(columnId) {
-			if (this.selectedColumns.includes(columnId)) {
-				this.selectedColumns.splice(this.selectedColumns.indexOf(columnId), 1)
-			} else {
-				this.selectedColumns.push(columnId)
-			}
-		},
-		isValueValidForColumn(value, column) {
-			if (column.type === 'selection') {
-				if (
-					(value instanceof Array && value.length > 0)
-					|| (value === parseInt(value))
-				) {
-					return true
-				}
-				return false
-			}
-			return !!value || value === 0
-		},
-		async loadTableColumnsFromBE() {
-			this.columns = await this.$store.dispatch('getColumnsFromBE', { tableId: this.view.tableId })
-		},
-		async actionConfirm() {
-			if (this.title === '') {
-				showError(t('tables', 'Cannot update view. Title is missing.'))
-				this.errorTitle = true
-			} else {
-				this.localLoading = true
-				const success = await this.updateViewToBE(this.view.id)
-				this.localLoading = false
-				if (success) {
-					this.actionCancel()
-				}
-			}
-		},
-		async updateViewToBE(id) {
-			const data = {
-				data: {
-					title: this.title,
-					emoji: this.icon,
-					columns: JSON.stringify(this.selectedColumns),
-				},
-			}
-			const res = await this.$store.dispatch('updateView', { id, data })
-			if (res) {
-				console.debug(res, this.view)
-				if (this.selectedColumns !== this.view.columns) {
-					await this.$store.dispatch('loadColumnsFromBE', { viewId: this.view.id })
-				}
-				return res
-			} else {
-				showError(t('tables', 'Could not update view'))
-			}
-		},
-		reset() {
-			this.title = this.view.title
-			this.icon = this.view.emoji
-			this.errorTitle = false
-			this.selectedColumns = [...this.view.columns]
-			this.localLoading = false
-		},
-	},
-}
-</script>
diff --git a/src/modules/navigation/modals/EditView.vue b/src/modules/navigation/modals/EditView.vue
deleted file mode 100644
index 44c19ff4f..000000000
--- a/src/modules/navigation/modals/EditView.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-	<NcModal v-if="showModal"
-		size="normal"
-		@close="actionCancel">
-		<div class="modal__content">
-			<div class="row">
-				<div class="col-4">
-					<h2>{{ t('tables', 'Edit view') }}</h2>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-4 mandatory">
-					{{ t('tables', 'Title') }}
-				</div>
-				<div class="col-3 inline">
-					<NcEmojiPicker :close-on-select="true" @select="emoji => icon = emoji">
-						<NcButton type="tertiary"
-							:aria-label="t('tables', 'Select emoji for view')"
-							:title="t('tables', 'Select emoji')"
-							@click.prevent>
-							{{ icon ? icon : '...' }}
-						</NcButton>
-					</NcEmojiPicker>
-					<input v-model="title"
-						:class="{missing: errorTitle}"
-						type="text"
-						:placeholder="t('tables', 'Title of the new view')">
-				</div>
-			</div>
-			<div class="row">
-				<div class="fix-col-4 space-T justify-between">
-					<NcButton v-if="!prepareDelete" type="error" @click="prepareDelete = true">
-						{{ t('tables', 'Delete') }}
-					</NcButton>
-					<NcButton v-if="prepareDelete"
-						:wide="true"
-						type="error"
-						@click="actionDeleteView">
-						{{ t('tables', 'I really want to delete this view!') }}
-					</NcButton>
-					<NcButton type="primary" @click="submit">
-						{{ t('tables', 'Save') }}
-					</NcButton>
-				</div>
-			</div>
-		</div>
-	</NcModal>
-</template>
-
-<script>
-import { NcModal, NcEmojiPicker, NcButton } from '@nextcloud/vue'
-import { showError, showSuccess } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/dist/index.css'
-import { mapGetters } from 'vuex'
-
-export default {
-	name: 'EditView',
-	components: {
-		NcModal,
-		NcEmojiPicker,
-		NcButton,
-	},
-	props: {
-		showModal: {
-			type: Boolean,
-			default: false,
-		},
-		viewId: {
-			type: Number,
-			default: null,
-		},
-	},
-	data() {
-		return {
-			title: '',
-			icon: '',
-			errorTitle: false,
-			prepareDelete: false,
-		}
-	},
-	computed: {
-		...mapGetters(['getView', 'activeView']),
-	},
-	watch: {
-		title() {
-			if (this.title && this.title.length >= 200) {
-				showError(t('tables', 'The title limit is reached with 200 characters. Please use a shorter title.'))
-				this.title = this.title.slice(0, 199)
-			}
-		},
-		viewId() {
-			if (this.viewId) {
-				const view = this.getView(this.viewId)
-				this.title = view.title
-				this.icon = view.emoji
-			}
-		},
-	},
-	methods: {
-		actionCancel() {
-			this.reset()
-			this.$emit('close')
-		},
-		async submit() {
-			if (this.title === '') {
-				showError(t('tables', 'Cannot update view. Title is missing.'))
-				this.errorTitle = true
-			} else {
-				const res = await this.$store.dispatch('updateView', { id: this.viewId, data: { data: { title: this.title, emoji: this.icon } } })
-				if (res) {
-					showSuccess(t('tables', 'Updated view "{emoji}{view}".', { emoji: this.icon ? this.icon + ' ' : '', view: this.title }))
-					this.actionCancel()
-				}
-			}
-		},
-		reset() {
-			this.title = ''
-			this.errorTitle = false
-			this.templateChoice = 'custom'
-			this.icon = ''
-			this.prepareDelete = false
-		},
-		async actionDeleteView() {
-			const deleteId = this.viewId
-			const activeViewId = this.activeView.id
-			this.prepareDelete = false
-			const res = await this.$store.dispatch('removeView', { viewId: this.viewId })
-			if (res) {
-				showSuccess(t('tables', 'View "{emoji}{view}" removed.', { emoji: this.icon ? this.icon + ' ' : '', view: this.title }))
-
-				// if the actual view was deleted, go to startpage
-				if (deleteId === activeViewId) {
-					await this.$router.push('/').catch(err => err)
-				}
-
-				this.actionCancel()
-			}
-
-		},
-	},
-}
-</script>
diff --git a/src/modules/navigation/partials/NavigationBaseViewItem.vue b/src/modules/navigation/partials/NavigationBaseViewItem.vue
index 00ef8c27e..4ef3223b8 100644
--- a/src/modules/navigation/partials/NavigationBaseViewItem.vue
+++ b/src/modules/navigation/partials/NavigationBaseViewItem.vue
@@ -35,12 +35,6 @@
 				</template>
 				{{ t('tables', 'Create view') }}
 			</NcActionButton>
-			<NcActionButton v-if="canManageElement(baseView) && false"
-				icon="icon-rename"
-				:close-after-click="true"
-				@click="editView">
-				{{ t('tables', 'Edit table') }}
-			</NcActionButton>
 			<NcActionButton v-if="canShareElement(baseView)"
 				icon="icon-share"
 				:close-after-click="true"
diff --git a/src/shared/components/ncTable/partials/TableHeader.vue b/src/shared/components/ncTable/partials/TableHeader.vue
index 8858adbfd..02a7d6906 100644
--- a/src/shared/components/ncTable/partials/TableHeader.vue
+++ b/src/shared/components/ncTable/partials/TableHeader.vue
@@ -42,15 +42,6 @@
 					</template>
 					{{ t('tables', 'Edit view') }}
 				</NcActionButton>
-				<NcActionButton v-if="canManageElement(view) && false"
-					:close-after-click="true"
-					class="view-changed"
-					@click="createWithViewConfig">
-					<template #icon>
-						<PlaylistPlus :size="20" decorative />
-					</template>
-					{{ t('tables', 'Create view') }}
-				</NcActionButton>
 				<NcActionButton v-if="canManageTable(view)" :close-after-click="true" @click="$emit('create-column')">
 					<template #icon>
 						<TableColumnPlusAfter :size="20" decorative title="" />