From dc338572dd0a9aa76a568a844bce65fe6c8ce569 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Mon, 19 Feb 2024 13:18:56 +0100
Subject: [PATCH] enh: clean up

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/main/sections/MainWrapper.vue        |  4 ++++
 src/shared/components/ncTable/NcTable.vue        | 16 ++++++++--------
 .../components/ncTable/sections/CustomTable.vue  |  3 ---
 src/store/data.js                                |  6 ------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
index a6216c139..684a204dc 100644
--- a/src/modules/main/sections/MainWrapper.vue
+++ b/src/modules/main/sections/MainWrapper.vue
@@ -109,9 +109,13 @@ export default {
 
 			// Used to reload View from backend, in case there are Filter updates
 			const isLastElementSameAndView = this.element.id === this.lastActiveElement?.id && this.isView === this.lastActiveElement?.isView
+
 			if (!this.lastActiveElement || this.element.id !== this.lastActiveElement.id || isLastElementSameAndView || this.isView !== this.lastActiveElement.isView || force) {
 				this.localLoading = true
 
+				// Since we show one page at a time, no need keep other tables in the store
+				await this.$store.dispatch('clearState')
+
 				this.viewSetting = {}
 
 				await this.$store.dispatch('loadColumnsFromBE', {
diff --git a/src/shared/components/ncTable/NcTable.vue b/src/shared/components/ncTable/NcTable.vue
index b3e557d0a..0d371c1ea 100644
--- a/src/shared/components/ncTable/NcTable.vue
+++ b/src/shared/components/ncTable/NcTable.vue
@@ -41,19 +41,19 @@ deselect-all-rows        -> unselect all rows, e.g. after deleting selected rows
 		<div class="options row" style="padding-right: calc(var(--default-grid-baseline) * 2);">
 			<Options :rows="rows" :columns="parsedColumns" :element-id="elementId" :is-view="isView"
 				:selected-rows="localSelectedRows" :show-options="parsedColumns.length !== 0"
-				:view-setting.sync="localViewSetting" :config="config" @create-row="$emit('create-row', elementId, isView)"
+				:view-setting.sync="localViewSetting" :config="config" @create-row="$emit('create-row')"
 				@download-csv="data => downloadCsv(data, parsedColumns, downloadTitle)"
 				@set-search-string="str => setSearchString(str)"
-				@delete-selected-rows="rowIds => $emit('delete-selected-rows', rowIds, elementId, isView)" />
+				@delete-selected-rows="rowIds => $emit('delete-selected-rows', rowIds)" />
 		</div>
 		<div class="custom-table row">
 			<CustomTable v-if="config.canReadRows || (config.canCreateRows && rows.length > 0)" :columns="parsedColumns"
 				:rows="rows" :is-view="isView" :element-id="elementId" :view-setting.sync="localViewSetting"
-				:config="config" @create-row="$emit('create-row', elementId, isView)"
-				@edit-row="rowId => $emit('edit-row', rowId, elementId, isView)"
-				@create-column="$emit('create-column', elementId, isView)"
-				@edit-column="col => $emit('edit-column', col, elementId, isView)"
-				@delete-column="col => $emit('delete-column', col, elementId, isView)"
+				:config="config" @create-row="$emit('create-row')"
+				@edit-row="rowId => $emit('edit-row', rowId)"
+				@create-column="$emit('create-column')"
+				@edit-column="col => $emit('edit-column', col)"
+				@delete-column="col => $emit('delete-column', col)"
 				@update-selected-rows="rowIds => localSelectedRows = rowIds"
 				@download-csv="data => downloadCsv(data, parsedColumns, table)">
 				<template #actions>
@@ -68,7 +68,7 @@ deselect-all-rows        -> unselect all rows, e.g. after deleting selected rows
 				</template>
 				<template #action>
 					<NcButton :aria-label="t('tables', 'Create row')" type="primary"
-						@click="$emit('create-row', elementId, isView)">
+						@click="$emit('create-row')">
 						<template #icon>
 							<Plus :size="25" />
 						</template>
diff --git a/src/shared/components/ncTable/sections/CustomTable.vue b/src/shared/components/ncTable/sections/CustomTable.vue
index c50886001..8ca1337d7 100644
--- a/src/shared/components/ncTable/sections/CustomTable.vue
+++ b/src/shared/components/ncTable/sections/CustomTable.vue
@@ -38,7 +38,6 @@
 import TableHeader from '../partials/TableHeader.vue'
 import TableRow from '../partials/TableRow.vue'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
-import { mapGetters } from 'vuex'
 import { MagicFields } from '../mixins/magicFields.js'
 
 export default {
@@ -85,8 +84,6 @@ export default {
 	},
 
 	computed: {
-
-		...mapGetters(['getColumnById']),
 		sorting() {
 			return this.viewSetting?.sorting
 		},
diff --git a/src/store/data.js b/src/store/data.js
index 919343781..dd2bac91c 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -40,12 +40,6 @@ export default {
 
 	},
 
-	getters: {
-		getColumnById: (state) => (id) => {
-			return state.columns.filter(column => column.id === id)[0]
-		},
-	},
-
 	actions: {
 		clearState({ commit }) {
 			commit('clearLoading')