From 7f8da4a7d6920eb50fb60829ac83030920653dcd Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Fri, 16 Aug 2024 20:18:54 +0100
Subject: [PATCH 01/18] feat: add UI elements to change nav display

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/CreateContext.vue          | 26 +++++++++++++++++--
 .../partials/NavigationContextItem.vue        | 19 ++++++++++++--
 src/shared/constants.js                       |  6 +++++
 src/store/store.js                            | 17 +++++++++---
 4 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index 04df5de6a..17cf8a85a 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -42,6 +42,24 @@
 				</div>
 				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
+			<div class="row space-T">
+				<div>
+					{{ t('tables', 'Navigation bar entry') }}
+				</div>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_HIDDEN"
+					name="NAV_ENTRY_MODE_HIDDEN" type="radio">
+					No navigation bar entry
+				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_RECIPIENTS"
+					name="NAV_ENTRY_MODE_RECIPIENTS" type="radio">
+					Navigation bar entry for share recipients, but not the owner
+				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_ALL" name="NAV_ENTRY_MODE_ALL"
+					type="radio">
+					Navigation bar entry for everybody
+				</NcCheckboxRadioSwitch>
+				<br>
+			</div>
 			<div class="row space-R row space-T">
 				<div class="fix-col-4 end">
 					<NcButton type="primary" :aria-label="t('tables', 'Create application')" data-cy="createContextSubmitBtn" @click="submit">
@@ -54,13 +72,14 @@
 </template>
 
 <script>
-import { NcDialog, NcButton, NcIconSvgWrapper } from '@nextcloud/vue'
+import { NcModal, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
 import '@nextcloud/dialogs/style.css'
 import NcContextResource from '../../shared/components/ncContextResource/NcContextResource.vue'
 import NcIconPicker from '../../shared/components/ncIconPicker/NcIconPicker.vue'
 import svgHelper from '../../shared/components/ncIconPicker/mixins/svgHelper.js'
 import permissionBitmask from '../../shared/components/ncContextResource/mixins/permissionBitmask.js'
+import { NAV_ENTRY_MODE } from '../../shared/constants.js'
 
 export default {
 	name: 'CreateContext',
@@ -70,6 +89,7 @@ export default {
 		NcButton,
 		NcIconSvgWrapper,
 		NcContextResource,
+		NcCheckboxRadioSwitch,
 	},
 	mixins: [svgHelper, permissionBitmask],
 	props: {
@@ -90,6 +110,7 @@ export default {
 			description: '',
 			resources: [],
 			receivers: [],
+			displayMode: 'NAV_ENTRY_MODE_HIDDEN',
 		}
 	},
 	watch: {
@@ -150,7 +171,7 @@ export default {
 				description: this.description,
 				nodes: dataResources,
 			}
-			const res = await this.$store.dispatch('insertNewContext', { data, previousReceivers: [], receivers: this.receivers })
+			const res = await this.$store.dispatch('insertNewContext', { data, previousReceivers: [], receivers: this.receivers, displayMode: NAV_ENTRY_MODE[this.displayMode] })
 			if (res) {
 				return res.id
 			} else {
@@ -162,6 +183,7 @@ export default {
 			this.errorTitle = false
 			this.setIcon(this.randomIcon())
 			this.customTitleChosen = false
+			this.displayMode = 'NAV_ENTRY_MODE_HIDDEN'
 		},
 	},
 }
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 6af944d01..1651fd3e8 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -33,12 +33,15 @@
 				</template>
 				{{ t('tables', 'Delete application') }}
 			</NcActionButton>
+			<NcActionCheckbox :value="showInNavigation" @change="updateDisplayMode">
+				Show in Navigation
+			</NcActionCheckbox>
 		</template>
 	</NcAppNavigationItem>
 </template>
 <script>
-import { NcAppNavigationItem, NcActionButton, NcIconSvgWrapper } from '@nextcloud/vue'
-import '@nextcloud/dialogs/style.css'
+import { NcAppNavigationItem, NcActionButton, NcIconSvgWrapper, NcActionCheckbox } from '@nextcloud/vue'
+import '@nextcloud/dialogs/dist/index.css'
 import { mapGetters } from 'vuex'
 import TableIcon from 'vue-material-design-icons/Table.vue'
 import { emit } from '@nextcloud/event-bus'
@@ -47,6 +50,7 @@ import FileSwap from 'vue-material-design-icons/FileSwap.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
 import svgHelper from '../../../shared/components/ncIconPicker/mixins/svgHelper.js'
+import { getCurrentUser } from '@nextcloud/auth'
 
 export default {
 	name: 'NavigationContextItem',
@@ -59,6 +63,7 @@ export default {
 		NcIconSvgWrapper,
 		NcAppNavigationItem,
 		NcActionButton,
+		NcActionCheckbox,
 	},
 
 	mixins: [permissionsMixin, svgHelper],
@@ -73,6 +78,7 @@ export default {
 	data() {
 		return {
 			icon: null,
+			showInNavigation: false,
 		}
 	},
 	computed: {
@@ -99,6 +105,15 @@ export default {
 		deleteContext() {
 			emit('tables:context:delete', this.context)
 		},
+		updateDisplayMode() {
+			this.showInNavigation = !this.showInNavigation
+			if (this.context) {
+				const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
+				if (share) {
+					this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode: this.showInNavigation ? 1 : 0, userId: getCurrentUser().uid })
+				}
+			}
+		},
 	},
 
 }
diff --git a/src/shared/constants.js b/src/shared/constants.js
index d6bdba2cf..0a2d23910 100644
--- a/src/shared/constants.js
+++ b/src/shared/constants.js
@@ -25,3 +25,9 @@ export const TYPE_TEXT = 'text'
 export const TYPE_NUMBER = 'number'
 export const TYPE_DATETIME = 'datetime'
 export const TYPE_USERGROUP = 'usergroup'
+
+export const NAV_ENTRY_MODE = {
+	NAV_ENTRY_MODE_HIDDEN: 0,
+	NAV_ENTRY_MODE_RECIPIENTS: 1,
+	NAV_ENTRY_MODE_ALL: 2,
+}
diff --git a/src/store/store.js b/src/store/store.js
index 03d6ed4b4..ff5cdbd2c 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -346,11 +346,11 @@ export default new Vuex.Store({
 
 			return true
 		},
-		async shareContext({ dispatch }, { id, previousReceivers, receivers }) {
+		async shareContext({ dispatch }, { id, previousReceivers, receivers, displayMode }) {
 			const share = {
 				nodeType: 'context',
 				nodeId: id,
-				displayMode: 2,
+				displayMode,
 			}
 			try {
 				for (const receiver of receivers) {
@@ -380,7 +380,16 @@ export default new Vuex.Store({
 				displayError(e, t('tables', 'Could not remove application share.'))
 			}
 		},
-		async insertNewContext({ commit, state, dispatch }, { data, receivers }) {
+
+		async updateDisplayMode({ dispatch }, { shareId, displayMode, userId }) {
+			try {
+				await axios.put(generateUrl('/apps/tables/share/' + shareId + '/display-mode'), { displayMode, userId })
+			} catch (e) {
+				displayError(e, t('tables', 'Could not update display mode.'))
+			}
+		},
+
+		async insertNewContext({ commit, state, dispatch }, { data, receivers, displayMode }) {
 			commit('setLoading', { key: 'contexts', value: true })
 			let res = null
 
@@ -388,7 +397,7 @@ export default new Vuex.Store({
 				res = await axios.post(generateOcsUrl('/apps/tables/api/2/contexts'), data)
 				const id = res?.data?.ocs?.data?.id
 				if (id) {
-					await dispatch('shareContext', { id, previousReceivers: [], receivers })
+					await dispatch('shareContext', { id, previousReceivers: [], receivers, displayMode })
 				}
 			} catch (e) {
 				displayError(e, t('tables', 'Could not insert application.'))

From afcbe455a3b396fad95f89a84a427eac143c17ed Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 22 Aug 2024 09:50:50 +0100
Subject: [PATCH 02/18] fix: update context navigation display elements

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 lib/Service/ShareService.php                  |  1 +
 src/modules/modals/CreateContext.vue          |  8 +++---
 src/modules/modals/EditContext.vue            | 24 ++++++++++++++--
 .../partials/NavigationContextItem.vue        | 28 ++++++++++++-------
 src/shared/constants.js                       |  6 ++--
 src/store/store.js                            |  4 +--
 6 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index d4780fd24..82ec9e7fe 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -339,6 +339,7 @@ public function updateDisplayMode(int $shareId, int $displayMode, string $userId
 				}
 			} else {
 				// setting user display mode override only requires access
+				// this does not seem to work
 				if (!$this->permissionsService->canAccessContextById($item->getId())) {
 					throw new PermissionError(sprintf('PermissionError: can not update share with id %d', $shareId));
 				}
diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index 17cf8a85a..a02674418 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -44,19 +44,19 @@
 			</div>
 			<div class="row space-T">
 				<div>
-					{{ t('tables', 'Navigation bar entry') }}
+					{{ t('tables', 'Navigation bar display') }}
 				</div>
 				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_HIDDEN"
 					name="NAV_ENTRY_MODE_HIDDEN" type="radio">
-					No navigation bar entry
+					Hide navigation entry for everybody
 				</NcCheckboxRadioSwitch>
 				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_RECIPIENTS"
 					name="NAV_ENTRY_MODE_RECIPIENTS" type="radio">
-					Navigation bar entry for share recipients, but not the owner
+					Show navigation entry for everybody, except me
 				</NcCheckboxRadioSwitch>
 				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_ALL" name="NAV_ENTRY_MODE_ALL"
 					type="radio">
-					Navigation bar entry for everybody
+					Show navigation entry for everybody
 				</NcCheckboxRadioSwitch>
 				<br>
 			</div>
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index b3307b5bf..d23a52c52 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -38,7 +38,24 @@
 				</div>
 				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
-
+			<div class="row space-T">
+				<div>
+					{{ t('tables', 'Navigation bar display') }}
+				</div>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_HIDDEN"
+					name="NAV_ENTRY_MODE_HIDDEN" type="radio">
+					Hide navigation entry for everybody
+				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_RECIPIENTS"
+					name="NAV_ENTRY_MODE_RECIPIENTS" type="radio">
+					Show navigation entry for everybody, except me
+				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_ALL" name="NAV_ENTRY_MODE_ALL"
+					type="radio">
+					Show navigation entry for everybody
+				</NcCheckboxRadioSwitch>
+				<br>
+			</div>
 			<div class="row space-T">
 				<div class="fix-col-4 space-T justify-between">
 					<NcButton v-if="!prepareDeleteContext" type="error" @click="prepareDeleteContext = true">
@@ -62,7 +79,7 @@
 </template>
 
 <script>
-import { NcDialog, NcButton, NcIconSvgWrapper } from '@nextcloud/vue'
+import { NcModal, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { getCurrentUser } from '@nextcloud/auth'
 import '@nextcloud/dialogs/style.css'
@@ -74,6 +91,7 @@ import svgHelper from '../../shared/components/ncIconPicker/mixins/svgHelper.js'
 import permissionBitmask from '../../shared/components/ncContextResource/mixins/permissionBitmask.js'
 import { emit } from '@nextcloud/event-bus'
 import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
+import { NAV_ENTRY_MODE } from '../../shared/constants.js'
 
 export default {
 	name: 'EditContext',
@@ -83,6 +101,7 @@ export default {
 		NcIconPicker,
 		NcIconSvgWrapper,
 		NcContextResource,
+		NcCheckboxRadioSwitch,
 	},
 	mixins: [svgHelper, permissionBitmask, permissionsMixin],
 	props: {
@@ -111,6 +130,7 @@ export default {
 			PERMISSION_UPDATE,
 			PERMISSION_DELETE,
 			prepareDeleteContext: false,
+			displayMode: 'NAV_ENTRY_MODE_HIDDEN', // TODO: get the actual saved display mode
 		}
 	},
 	computed: {
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 1651fd3e8..681215421 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -15,7 +15,8 @@
 			</template>
 		</template>
 		<template #actions>
-			<NcActionButton v-if="ownsContext(context)" :close-after-click="true" data-cy="navigationContextEditBtn" @click="editContext">
+			<NcActionButton v-if="ownsContext(context)" :close-after-click="true" data-cy="navigationContextEditBtn"
+				@click="editContext">
 				<template #icon>
 					<PlaylistEdit :size="20" />
 				</template>
@@ -27,13 +28,14 @@
 				</template>
 				{{ t('tables', 'Transfer application') }}
 			</NcActionButton>
-			<NcActionButton v-if="ownsContext(context)" :close-after-click="true" data-cy="navigationContextDeleteBtn" @click="deleteContext">
+			<NcActionButton v-if="ownsContext(context)" :close-after-click="true" data-cy="navigationContextDeleteBtn"
+				@click="deleteContext">
 				<template #icon>
 					<Delete :size="20" />
 				</template>
 				{{ t('tables', 'Delete application') }}
 			</NcActionButton>
-			<NcActionCheckbox :value="showInNavigation" @change="updateDisplayMode">
+			<NcActionCheckbox v-if="!ownsContext(context)" :value="showInNavigation" @change="updateDisplayMode">
 				Show in Navigation
 			</NcActionCheckbox>
 		</template>
@@ -51,6 +53,7 @@ import Delete from 'vue-material-design-icons/Delete.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
 import svgHelper from '../../../shared/components/ncIconPicker/mixins/svgHelper.js'
 import { getCurrentUser } from '@nextcloud/auth'
+import { NAV_ENTRY_MODE } from '../../../shared/constants.js'
 
 export default {
 	name: 'NavigationContextItem',
@@ -78,7 +81,7 @@ export default {
 	data() {
 		return {
 			icon: null,
-			showInNavigation: false,
+			showInNavigation: this.getDisplayMode(),
 		}
 	},
 	computed: {
@@ -105,13 +108,18 @@ export default {
 		deleteContext() {
 			emit('tables:context:delete', this.context)
 		},
+		getDisplayMode() {
+			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
+			if (share) {
+				return share.display_mode
+			}
+			return 0
+		},
 		updateDisplayMode() {
-			this.showInNavigation = !this.showInNavigation
-			if (this.context) {
-				const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
-				if (share) {
-					this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode: this.showInNavigation ? 1 : 0, userId: getCurrentUser().uid })
-				}
+			this.showInNavigation = this.showInNavigation ? 0 : 1
+			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
+			if (share) {
+				this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode: this.showInNavigation ? NAV_ENTRY_MODE['NAV_ENTRY_MODE_RECIPIENTS'] : NAV_ENTRY_MODE['NAV_ENTRY_MODE_HIDDEN'], target: 'self' })
 			}
 		},
 	},
diff --git a/src/shared/constants.js b/src/shared/constants.js
index 0a2d23910..c3bb66cc2 100644
--- a/src/shared/constants.js
+++ b/src/shared/constants.js
@@ -27,7 +27,7 @@ export const TYPE_DATETIME = 'datetime'
 export const TYPE_USERGROUP = 'usergroup'
 
 export const NAV_ENTRY_MODE = {
-	NAV_ENTRY_MODE_HIDDEN: 0,
-	NAV_ENTRY_MODE_RECIPIENTS: 1,
-	NAV_ENTRY_MODE_ALL: 2,
+	NAV_ENTRY_MODE_HIDDEN: 0, // no nav bar entry
+	NAV_ENTRY_MODE_RECIPIENTS: 1, // nav bar entry for share recipients, but not the owner
+	NAV_ENTRY_MODE_ALL: 2, // nav bar entry for everybody
 }
diff --git a/src/store/store.js b/src/store/store.js
index ff5cdbd2c..3fbbab65f 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -381,9 +381,9 @@ export default new Vuex.Store({
 			}
 		},
 
-		async updateDisplayMode({ dispatch }, { shareId, displayMode, userId }) {
+		async updateDisplayMode({ dispatch }, { shareId, displayMode, target }) {
 			try {
-				await axios.put(generateUrl('/apps/tables/share/' + shareId + '/display-mode'), { displayMode, userId })
+				await axios.put(generateUrl('/apps/tables/share/' + shareId + '/display-mode'), { displayMode, target })
 			} catch (e) {
 				displayError(e, t('tables', 'Could not update display mode.'))
 			}

From e05745a449f21e7a9720ee88bf442e26152c1883 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Wed, 4 Sep 2024 12:06:23 +0200
Subject: [PATCH 03/18] fix(Context): fix wrong parameters to permission check

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Service/ShareService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index 82ec9e7fe..1555bd981 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -340,7 +340,7 @@ public function updateDisplayMode(int $shareId, int $displayMode, string $userId
 			} else {
 				// setting user display mode override only requires access
 				// this does not seem to work
-				if (!$this->permissionsService->canAccessContextById($item->getId())) {
+				if (!$this->permissionsService->canAccessContextById($item->getNodeId(), $userId)) {
 					throw new PermissionError(sprintf('PermissionError: can not update share with id %d', $shareId));
 				}
 			}

From 6a693aa1e64aa7735d4455eacd055e512b4d81e0 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Wed, 4 Sep 2024 12:07:02 +0200
Subject: [PATCH 04/18] fix(DB): override mapper::update() where tables has no
 id column

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Db/ContextNavigationMapper.php | 35 ++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/lib/Db/ContextNavigationMapper.php b/lib/Db/ContextNavigationMapper.php
index f32a53f59..85d60bd89 100644
--- a/lib/Db/ContextNavigationMapper.php
+++ b/lib/Db/ContextNavigationMapper.php
@@ -7,6 +7,7 @@
  */
 namespace OCA\Tables\Db;
 
+use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\Exception;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -41,4 +42,38 @@ public function setDisplayModeByShareId(int $shareId, int $displayMode, string $
 
 		return $this->insertOrUpdate($entity);
 	}
+
+	// we have to overwrite QBMapper`s update() because we do not have
+	// an id column in this table. Sad.
+	public function update(Entity $entity): ContextNavigation {
+		if (!$entity instanceof ContextNavigation) {
+			throw new \LogicException('Can only update context navigation entities');
+		}
+
+		// if entity wasn't changed it makes no sense to run a db query
+		$properties = $entity->getUpdatedFields();
+		if (\count($properties) === 0) {
+			return $entity;
+		}
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->update($this->tableName);
+
+		// build the fields
+		foreach ($properties as $property => $updated) {
+			$column = $entity->propertyToColumn($property);
+			$getter = 'get' . ucfirst($property);
+			$value = $entity->$getter();
+
+			$type = $this->getParameterTypeForProperty($entity, $property);
+			$qb->set($column, $qb->createNamedParameter($value, $type));
+		}
+
+		$qb->where($qb->expr()->eq('share_id', $qb->createNamedParameter($entity->getShareId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('user_id', $qb->createNamedParameter($entity->getUserId(), IQueryBuilder::PARAM_STR)));
+
+		$qb->executeStatement();
+
+		return $entity;
+	}
 }

From 04cd53ec82470343428f497578832e4984cf149d Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Mon, 9 Sep 2024 05:59:51 +0100
Subject: [PATCH 05/18] fix: use NcDialog

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/CreateContext.vue                      | 2 +-
 src/modules/modals/EditContext.vue                        | 2 +-
 src/modules/navigation/partials/NavigationContextItem.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index a02674418..ca7dbc038 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -72,7 +72,7 @@
 </template>
 
 <script>
-import { NcModal, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcDialog, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
 import '@nextcloud/dialogs/style.css'
 import NcContextResource from '../../shared/components/ncContextResource/NcContextResource.vue'
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index d23a52c52..2d8387331 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -79,7 +79,7 @@
 </template>
 
 <script>
-import { NcModal, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcDialog, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { getCurrentUser } from '@nextcloud/auth'
 import '@nextcloud/dialogs/style.css'
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 681215421..023a96743 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -43,7 +43,7 @@
 </template>
 <script>
 import { NcAppNavigationItem, NcActionButton, NcIconSvgWrapper, NcActionCheckbox } from '@nextcloud/vue'
-import '@nextcloud/dialogs/dist/index.css'
+import '@nextcloud/dialogs/style.css'
 import { mapGetters } from 'vuex'
 import TableIcon from 'vue-material-design-icons/Table.vue'
 import { emit } from '@nextcloud/event-bus'

From 41b5b24841088ab71dbae68e6d7d8086a62bcb78 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 19 Sep 2024 15:03:04 +0100
Subject: [PATCH 06/18] fix: properly update navigation display via checkbox

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 .../navigation/partials/NavigationContextItem.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 023a96743..6d41914c8 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -35,7 +35,7 @@
 				</template>
 				{{ t('tables', 'Delete application') }}
 			</NcActionButton>
-			<NcActionCheckbox v-if="!ownsContext(context)" :value="showInNavigation" @change="updateDisplayMode">
+			<NcActionCheckbox :checked="showInNavigation" @change="updateDisplayMode">
 				Show in Navigation
 			</NcActionCheckbox>
 		</template>
@@ -81,7 +81,7 @@ export default {
 	data() {
 		return {
 			icon: null,
-			showInNavigation: this.getDisplayMode(),
+			showInNavigation: this.getNavDisplay(),
 		}
 	},
 	computed: {
@@ -108,18 +108,19 @@ export default {
 		deleteContext() {
 			emit('tables:context:delete', this.context)
 		},
-		getDisplayMode() {
+		getNavDisplay() {
 			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
 			if (share) {
-				return share.display_mode
+				return share?.display_mode !== NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
 			}
-			return 0
+			return false
 		},
 		updateDisplayMode() {
-			this.showInNavigation = this.showInNavigation ? 0 : 1
+			const value = !this.showInNavigation
 			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
 			if (share) {
-				this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode: this.showInNavigation ? NAV_ENTRY_MODE['NAV_ENTRY_MODE_RECIPIENTS'] : NAV_ENTRY_MODE['NAV_ENTRY_MODE_HIDDEN'], target: 'self' })
+				this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode: value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_RECIPIENTS : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN, target: 'self' })
+				this.showInNavigation = value
 			}
 		},
 	},

From 4be1a7c4ed24f6bc8732f6ade77f60508c773b35 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 19 Sep 2024 15:03:51 +0100
Subject: [PATCH 07/18] enh: add share to oneself to control context nav
 display

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/CreateContext.vue | 10 ++++++++++
 src/modules/modals/EditContext.vue   | 22 +++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index ca7dbc038..1c3149b23 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -79,6 +79,7 @@ import NcContextResource from '../../shared/components/ncContextResource/NcConte
 import NcIconPicker from '../../shared/components/ncIconPicker/NcIconPicker.vue'
 import svgHelper from '../../shared/components/ncIconPicker/mixins/svgHelper.js'
 import permissionBitmask from '../../shared/components/ncContextResource/mixins/permissionBitmask.js'
+import { getCurrentUser } from '@nextcloud/auth'
 import { NAV_ENTRY_MODE } from '../../shared/constants.js'
 
 export default {
@@ -171,6 +172,15 @@ export default {
 				description: this.description,
 				nodes: dataResources,
 			}
+			// adding share to oneself to have navigation display control
+			this.receivers.push(
+				{
+					id: getCurrentUser().uid,
+					displayName: getCurrentUser().uid,
+					icon: 'icon-user',
+					isUser: true,
+					key: 'user-' + getCurrentUser().uid,
+				})
 			const res = await this.$store.dispatch('insertNewContext', { data, previousReceivers: [], receivers: this.receivers, displayMode: NAV_ENTRY_MODE[this.displayMode] })
 			if (res) {
 				return res.id
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 2d8387331..d452396f1 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -86,12 +86,11 @@ import '@nextcloud/dialogs/style.css'
 import { mapGetters, mapState } from 'vuex'
 import NcContextResource from '../../shared/components/ncContextResource/NcContextResource.vue'
 import NcIconPicker from '../../shared/components/ncIconPicker/NcIconPicker.vue'
-import { NODE_TYPE_TABLE, NODE_TYPE_VIEW, PERMISSION_READ, PERMISSION_CREATE, PERMISSION_UPDATE, PERMISSION_DELETE } from '../../shared/constants.js'
+import { NODE_TYPE_TABLE, NODE_TYPE_VIEW, PERMISSION_READ, PERMISSION_CREATE, PERMISSION_UPDATE, PERMISSION_DELETE, NAV_ENTRY_MODE } from '../../shared/constants.js'
 import svgHelper from '../../shared/components/ncIconPicker/mixins/svgHelper.js'
 import permissionBitmask from '../../shared/components/ncContextResource/mixins/permissionBitmask.js'
 import { emit } from '@nextcloud/event-bus'
 import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
-import { NAV_ENTRY_MODE } from '../../shared/constants.js'
 
 export default {
 	name: 'EditContext',
@@ -186,7 +185,15 @@ export default {
 					nodes: dataResources,
 				}
 				const context = this.getContext(this.contextId)
-
+				// adding share to oneself to have navigation display control
+				this.receivers.push(
+					{
+						id: getCurrentUser().uid,
+						displayName: getCurrentUser().uid,
+						icon: 'icon-user',
+						isUser: true,
+						key: 'user-' + getCurrentUser().uid,
+					})
 				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, previousReceivers: Object.values(context.sharing), receivers: this.receivers })
 				if (res) {
 					showSuccess(t('tables', 'Updated application "{contextTitle}".', { contextTitle: this.title }))
@@ -204,6 +211,15 @@ export default {
 			this.receivers = context ? this.getContextReceivers(context) : []
 			this.prepareDeleteContext = false
 		},
+		getDisplayMode(context) {
+			const shares = Object.keys(context.sharing || {})
+			if (shares.length) {
+				print('vals', context.sharing[shares[0]])
+				const displayMode = context.sharing[shares[0]].display_mode_default
+				return Object.keys(NAV_ENTRY_MODE).find(key => NAV_ENTRY_MODE[key] === displayMode)
+			}
+			return 'NAV_ENTRY_MODE_HIDDEN'
+		},
 		getContextReceivers(context) {
 			let sharing = Object.values(context.sharing)
 			sharing = sharing.filter((share) => !(getCurrentUser().uid === share.receiver && share.receiver_type === 'user'))

From bd37dafd0b836dcd41339e6c703ba97b4dced8f3 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Fri, 20 Sep 2024 13:46:47 +0100
Subject: [PATCH 08/18] enh: use checkbox for default nav display mode

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/CreateContext.vue          | 44 +++++++--------
 src/modules/modals/EditContext.vue            | 53 ++++++++++---------
 .../partials/NavigationContextItem.vue        |  2 +-
 src/store/store.js                            |  4 +-
 4 files changed, 55 insertions(+), 48 deletions(-)

diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index 1c3149b23..db1959036 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -43,22 +43,12 @@
 				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
 			<div class="row space-T">
-				<div>
-					{{ t('tables', 'Navigation bar display') }}
-				</div>
-				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_HIDDEN"
-					name="NAV_ENTRY_MODE_HIDDEN" type="radio">
-					Hide navigation entry for everybody
-				</NcCheckboxRadioSwitch>
-				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_RECIPIENTS"
-					name="NAV_ENTRY_MODE_RECIPIENTS" type="radio">
-					Show navigation entry for everybody, except me
-				</NcCheckboxRadioSwitch>
-				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_ALL" name="NAV_ENTRY_MODE_ALL"
-					type="radio">
-					Show navigation entry for everybody
-				</NcCheckboxRadioSwitch>
-				<br>
+				<NcActionCheckbox :checked="showInNavigationDefault" @change="updateDisplayMode">
+					Show in app list
+				</NcActionCheckbox>
+				<p class="nav-display-subtext">
+					This can be overridden by a per-account preference
+				</p>
 			</div>
 			<div class="row space-R row space-T">
 				<div class="fix-col-4 end">
@@ -72,7 +62,7 @@
 </template>
 
 <script>
-import { NcDialog, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcDialog, NcButton, NcIconSvgWrapper, NcActionCheckbox } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
 import '@nextcloud/dialogs/style.css'
 import NcContextResource from '../../shared/components/ncContextResource/NcContextResource.vue'
@@ -90,7 +80,7 @@ export default {
 		NcButton,
 		NcIconSvgWrapper,
 		NcContextResource,
-		NcCheckboxRadioSwitch,
+		NcActionCheckbox,
 	},
 	mixins: [svgHelper, permissionBitmask],
 	props: {
@@ -111,7 +101,7 @@ export default {
 			description: '',
 			resources: [],
 			receivers: [],
-			displayMode: 'NAV_ENTRY_MODE_HIDDEN',
+			showInNavigationDefault: false,
 		}
 	},
 	watch: {
@@ -181,19 +171,23 @@ export default {
 					isUser: true,
 					key: 'user-' + getCurrentUser().uid,
 				})
-			const res = await this.$store.dispatch('insertNewContext', { data, previousReceivers: [], receivers: this.receivers, displayMode: NAV_ENTRY_MODE[this.displayMode] })
+			const displayMode = this.showInNavigation ? 'NAV_ENTRY_MODE_ALL' : 'NAV_ENTRY_MODE_HIDDEN'
+			const res = await this.$store.dispatch('insertNewContext', { data, previousReceivers: [], receivers: this.receivers, displayMode: NAV_ENTRY_MODE[displayMode] })
 			if (res) {
 				return res.id
 			} else {
 				showError(t('tables', 'Could not create new application'))
 			}
 		},
+		updateDisplayMode() {
+			this.showInNavigation = !this.showInNavigation
+		},
 		reset() {
 			this.title = ''
 			this.errorTitle = false
 			this.setIcon(this.randomIcon())
 			this.customTitleChosen = false
-			this.displayMode = 'NAV_ENTRY_MODE_HIDDEN'
+			this.showInNavigationDefault = false
 		},
 	},
 }
@@ -207,5 +201,13 @@ export default {
 		display: inline-flex;
 		align-items: center;
 	}
+
+	.nav-display-subtext {
+		color: var(--color-text-maxcontrast)
+	}
+
+	li {
+		list-style: none;
+	}
 }
 </style>
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index d452396f1..1aeede715 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -39,22 +39,14 @@
 				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
 			<div class="row space-T">
-				<div>
-					{{ t('tables', 'Navigation bar display') }}
-				</div>
-				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_HIDDEN"
-					name="NAV_ENTRY_MODE_HIDDEN" type="radio">
-					Hide navigation entry for everybody
-				</NcCheckboxRadioSwitch>
-				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_RECIPIENTS"
-					name="NAV_ENTRY_MODE_RECIPIENTS" type="radio">
-					Show navigation entry for everybody, except me
-				</NcCheckboxRadioSwitch>
-				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_ALL" name="NAV_ENTRY_MODE_ALL"
-					type="radio">
-					Show navigation entry for everybody
-				</NcCheckboxRadioSwitch>
-				<br>
+				<NcActions>
+					<NcActionCheckbox :checked="showInNavigationDefault" @change="updateDisplayMode">
+						Show in app list
+					</NcActionCheckbox>
+				</NcActions>
+				<p class="nav-display-subtext">
+					This can be overridden by a per-account preference
+				</p>
 			</div>
 			<div class="row space-T">
 				<div class="fix-col-4 space-T justify-between">
@@ -79,7 +71,7 @@
 </template>
 
 <script>
-import { NcDialog, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcDialog, NcButton, NcIconSvgWrapper, NcActionCheckbox } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { getCurrentUser } from '@nextcloud/auth'
 import '@nextcloud/dialogs/style.css'
@@ -100,7 +92,7 @@ export default {
 		NcIconPicker,
 		NcIconSvgWrapper,
 		NcContextResource,
-		NcCheckboxRadioSwitch,
+		NcActionCheckbox,
 	},
 	mixins: [svgHelper, permissionBitmask, permissionsMixin],
 	props: {
@@ -129,7 +121,7 @@ export default {
 			PERMISSION_UPDATE,
 			PERMISSION_DELETE,
 			prepareDeleteContext: false,
-			displayMode: 'NAV_ENTRY_MODE_HIDDEN', // TODO: get the actual saved display mode
+			showInNavigationDefault: false,
 		}
 	},
 	computed: {
@@ -154,6 +146,7 @@ export default {
 				this.description = context.description
 				this.resources = context ? this.getContextResources(context) : []
 				this.receivers = context ? this.getContextReceivers(context) : []
+				this.showInNavigationDefault = this.getNavDisplay(context)
 			}
 		},
 	},
@@ -194,7 +187,8 @@ export default {
 						isUser: true,
 						key: 'user-' + getCurrentUser().uid,
 					})
-				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, previousReceivers: Object.values(context.sharing), receivers: this.receivers })
+				const displayMode = this.showInNavigation ? 'NAV_ENTRY_MODE_ALL' : 'NAV_ENTRY_MODE_HIDDEN'
+				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, previousReceivers: Object.values(context.sharing), receivers: this.receivers, displayMode: NAV_ENTRY_MODE[displayMode] })
 				if (res) {
 					showSuccess(t('tables', 'Updated application "{contextTitle}".', { contextTitle: this.title }))
 					this.actionCancel()
@@ -210,15 +204,15 @@ export default {
 			this.resources = context ? this.getContextResources(context) : []
 			this.receivers = context ? this.getContextReceivers(context) : []
 			this.prepareDeleteContext = false
+			this.showInNavigationDefault = this.getNavDisplay(context)
 		},
-		getDisplayMode(context) {
+		getNavDisplay(context) {
 			const shares = Object.keys(context.sharing || {})
 			if (shares.length) {
-				print('vals', context.sharing[shares[0]])
 				const displayMode = context.sharing[shares[0]].display_mode_default
-				return Object.keys(NAV_ENTRY_MODE).find(key => NAV_ENTRY_MODE[key] === displayMode)
+				return displayMode !== 0
 			}
-			return 'NAV_ENTRY_MODE_HIDDEN'
+			return false
 		},
 		getContextReceivers(context) {
 			let sharing = Object.values(context.sharing)
@@ -276,6 +270,9 @@ export default {
 			}
 
 		},
+		updateDisplayMode() {
+			this.showInNavigation = !this.showInNavigation
+		},
 		actionTransfer() {
 			emit('tables:context:edit', null)
 			emit('tables:context:transfer', this.localContext)
@@ -296,4 +293,12 @@ export default {
 	padding-inline: 0 !important;
 	max-width: 100%;
 }
+
+.nav-display-subtext {
+	color: var(--color-text-maxcontrast)
+}
+
+li {
+	list-style: none;
+}
 </style>
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 6d41914c8..8ede7d058 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -36,7 +36,7 @@
 				{{ t('tables', 'Delete application') }}
 			</NcActionButton>
 			<NcActionCheckbox :checked="showInNavigation" @change="updateDisplayMode">
-				Show in Navigation
+				Show in app list
 			</NcActionCheckbox>
 		</template>
 	</NcAppNavigationItem>
diff --git a/src/store/store.js b/src/store/store.js
index 3fbbab65f..b80bff150 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -410,11 +410,11 @@ export default new Vuex.Store({
 			commit('setLoading', { key: 'contexts', value: false })
 			return res.data.ocs.data
 		},
-		async updateContext({ state, commit, dispatch }, { id, data, previousReceivers, receivers }) {
+		async updateContext({ state, commit, dispatch }, { id, data, previousReceivers, receivers, displayMode }) {
 			let res = null
 			try {
 				res = await axios.put(generateOcsUrl('/apps/tables/api/2/contexts/' + id), data)
-				await dispatch('shareContext', { id, previousReceivers, receivers })
+				await dispatch('shareContext', { id, previousReceivers, receivers, displayMode })
 
 			} catch (e) {
 				displayError(e, t('tables', 'Could not update application.'))

From 1ab79e7ce17e15d6cb7759be337a82f4144af810 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 3 Oct 2024 10:21:21 +0200
Subject: [PATCH 09/18] enh: modify display mode update for owner

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/EditContext.vue                        | 8 +++-----
 src/modules/navigation/partials/NavigationContextItem.vue | 6 +++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 1aeede715..b7eb13abf 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -39,11 +39,9 @@
 				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
 			<div class="row space-T">
-				<NcActions>
-					<NcActionCheckbox :checked="showInNavigationDefault" @change="updateDisplayMode">
-						Show in app list
-					</NcActionCheckbox>
-				</NcActions>
+				<NcActionCheckbox :checked="showInNavigationDefault" @change="updateDisplayMode">
+					Show in app list
+				</NcActionCheckbox>
 				<p class="nav-display-subtext">
 					This can be overridden by a per-account preference
 				</p>
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 8ede7d058..ce4b4ba52 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -117,9 +117,13 @@ export default {
 		},
 		updateDisplayMode() {
 			const value = !this.showInNavigation
+			let displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_RECIPIENTS : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
+			if (this.ownsContext(this.context)) {
+				displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_ALL : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
+			}
 			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
 			if (share) {
-				this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode: value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_RECIPIENTS : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN, target: 'self' })
+				this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode, target: 'self' })
 				this.showInNavigation = value
 			}
 		},

From b00f1c058c1a91e2bb5c4567b39d686d19f9ca98 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 4 Oct 2024 12:00:13 +0200
Subject: [PATCH 10/18] fix(Navigation): use default display mode when there is
 no user override

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Db/ContextMapper.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Db/ContextMapper.php b/lib/Db/ContextMapper.php
index a957c7238..a7e314346 100644
--- a/lib/Db/ContextMapper.php
+++ b/lib/Db/ContextMapper.php
@@ -96,6 +96,9 @@ protected function formatResultRows(array $rows, ?string $userId) {
 				'display_mode_default' => (int)$item['display_mode_default'],
 			];
 			if ($userId !== null) {
+				if ($item['display_mode'] === null) {
+					$item['display_mode'] = $item['display_mode_default'];
+				}
 				$carry[$item['share_id']]['display_mode'] = (int)$item['display_mode'];
 			}
 			return $carry;

From 454844e55449dc2ebc69cb961b5f8b641679d864 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 4 Oct 2024 12:01:00 +0200
Subject: [PATCH 11/18] fix(DB): NavigationMapper has to override insert due to
 not having an id
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… column

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Db/ContextNavigationMapper.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lib/Db/ContextNavigationMapper.php b/lib/Db/ContextNavigationMapper.php
index 85d60bd89..be304fb05 100644
--- a/lib/Db/ContextNavigationMapper.php
+++ b/lib/Db/ContextNavigationMapper.php
@@ -43,6 +43,31 @@ public function setDisplayModeByShareId(int $shareId, int $displayMode, string $
 		return $this->insertOrUpdate($entity);
 	}
 
+	// we have to overwrite QBMapper`s insert() because we do not have
+	// an id column in this table. Sad.
+	public function insert(Entity $entity): Entity {
+		// get updated fields to save, fields have to be set using a setter to
+		// be saved
+		$properties = $entity->getUpdatedFields();
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->insert($this->tableName);
+
+		// build the fields
+		foreach ($properties as $property => $updated) {
+			$column = $entity->propertyToColumn($property);
+			$getter = 'get' . ucfirst($property);
+			$value = $entity->$getter();
+
+			$type = $this->getParameterTypeForProperty($entity, $property);
+			$qb->setValue($column, $qb->createNamedParameter($value, $type));
+		}
+
+		$qb->executeStatement();
+
+		return $entity;
+	}
+
 	// we have to overwrite QBMapper`s update() because we do not have
 	// an id column in this table. Sad.
 	public function update(Entity $entity): ContextNavigation {

From efab19c790b24fd7acb33cd7b049ffd609e17fe6 Mon Sep 17 00:00:00 2001
From: "Cleopatra Enjeck M." <patrathewhiz@gmail.com>
Date: Mon, 16 Dec 2024 07:30:44 +0100
Subject: [PATCH 12/18] fix: update display mode when editing context

Signed-off-by: Cleopatra Enjeck M. <patrathewhiz@gmail.com>
---
 src/modules/modals/CreateContext.vue             |  2 +-
 src/modules/modals/EditContext.vue               |  4 ++--
 .../partials/NavigationContextItem.vue           |  4 ++--
 src/store/store.js                               | 16 ++++++++++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index db1959036..6bbdc1b6a 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -171,7 +171,7 @@ export default {
 					isUser: true,
 					key: 'user-' + getCurrentUser().uid,
 				})
-			const displayMode = this.showInNavigation ? 'NAV_ENTRY_MODE_ALL' : 'NAV_ENTRY_MODE_HIDDEN'
+			const displayMode = this.showInNavigation ? 'NAV_ENTRY_MODE_RECIPIENTS' : 'NAV_ENTRY_MODE_HIDDEN'
 			const res = await this.$store.dispatch('insertNewContext', { data, previousReceivers: [], receivers: this.receivers, displayMode: NAV_ENTRY_MODE[displayMode] })
 			if (res) {
 				return res.id
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index b7eb13abf..baf08618f 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -185,7 +185,7 @@ export default {
 						isUser: true,
 						key: 'user-' + getCurrentUser().uid,
 					})
-				const displayMode = this.showInNavigation ? 'NAV_ENTRY_MODE_ALL' : 'NAV_ENTRY_MODE_HIDDEN'
+				const displayMode = this.showInNavigationDefault ? 'NAV_ENTRY_MODE_RECIPIENTS' : 'NAV_ENTRY_MODE_HIDDEN'
 				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, previousReceivers: Object.values(context.sharing), receivers: this.receivers, displayMode: NAV_ENTRY_MODE[displayMode] })
 				if (res) {
 					showSuccess(t('tables', 'Updated application "{contextTitle}".', { contextTitle: this.title }))
@@ -269,7 +269,7 @@ export default {
 
 		},
 		updateDisplayMode() {
-			this.showInNavigation = !this.showInNavigation
+			this.showInNavigationDefault = !this.showInNavigationDefault
 		},
 		actionTransfer() {
 			emit('tables:context:edit', null)
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index ce4b4ba52..2894134ff 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -117,9 +117,9 @@ export default {
 		},
 		updateDisplayMode() {
 			const value = !this.showInNavigation
-			let displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_RECIPIENTS : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
+			let displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_ALL : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
 			if (this.ownsContext(this.context)) {
-				displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_ALL : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
+				displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_RECIPIENTS : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
 			}
 			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
 			if (share) {
diff --git a/src/store/store.js b/src/store/store.js
index b80bff150..3dc9a5575 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -10,7 +10,8 @@ import { showError } from '@nextcloud/dialogs'
 import '@nextcloud/dialogs/style.css'
 import data from './data.js'
 import displayError from '../shared/utils/displayError.js'
-import { NODE_TYPE_TABLE, NODE_TYPE_VIEW } from '../shared/constants.js'
+import { NODE_TYPE_TABLE, NODE_TYPE_VIEW, NAV_ENTRY_MODE } from '../shared/constants.js'
+import { getCurrentUser } from '@nextcloud/auth'
 
 Vue.use(Vuex)
 
@@ -359,7 +360,15 @@ export default new Vuex.Store({
 					// Avoid duplicate shares by checking if share exists first
 					const existingShare = previousReceivers.find((p) => p.receiver === share.receiver && p.receiver_type === share.receiverType)
 					if (!existingShare) {
-						await axios.post(generateUrl('/apps/tables/share'), share)
+						const createdShare = await axios.post(generateUrl('/apps/tables/share'), share)
+						if (createdShare?.data && createdShare?.data?.id) {
+							const shareId = createdShare.data.id
+							await dispatch('updateDisplayMode', { shareId, displayMode, target: 'default' })
+							// since we switch between NAV_ENTRY_MODE_HIDDEN and NAV_ENTRY_MODE_RECIPIENTS, we need to handle owner separately
+							if (receiver.id === getCurrentUser().uid) {
+								await dispatch('updateDisplayMode', { shareId, displayMode: displayMode === NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN : NAV_ENTRY_MODE.NAV_ENTRY_MODE_ALL, target: 'self' })
+							}
+						}
 					}
 				}
 			} catch (e) {
@@ -374,6 +383,9 @@ export default new Vuex.Store({
 					})
 					if (!currentShare) {
 						await axios.delete(generateUrl('/apps/tables/share/' + previousReceiver.share_id))
+					} else {
+						const shareId = previousReceiver.share_id
+						await dispatch('updateDisplayMode', { shareId, displayMode, target: 'default' })
 					}
 				}
 			} catch (e) {

From f4f32770355cfd4389a04587d4e9a6a7dc11892c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Tue, 17 Dec 2024 18:40:15 +0100
Subject: [PATCH 13/18] enh: set visibility also when context is provided by
 group shares
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- removed to only fetch the one share that matches the user id. Group
  shares my be present and only those relevant to the current user are
  being fetched.
- setting the override now against any share. There might be more and some
  might be dropped – the override is working against any of them
- one none-hidden setting wins
- dropped using the NAV_ENTRY_MODE_RECIPIENTS as it is not needed anymore

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 .../partials/NavigationContextItem.vue        | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 2894134ff..f5ddabb39 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -52,7 +52,6 @@ import FileSwap from 'vue-material-design-icons/FileSwap.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
 import svgHelper from '../../../shared/components/ncIconPicker/mixins/svgHelper.js'
-import { getCurrentUser } from '@nextcloud/auth'
 import { NAV_ENTRY_MODE } from '../../../shared/constants.js'
 
 export default {
@@ -109,23 +108,28 @@ export default {
 			emit('tables:context:delete', this.context)
 		},
 		getNavDisplay() {
-			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
-			if (share) {
-				return share?.display_mode !== NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
+			for (const share of Object.values(this.context.sharing || {})) {
+				if (share?.display_mode !== NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN) {
+					return true
+				}
 			}
 			return false
 		},
 		updateDisplayMode() {
 			const value = !this.showInNavigation
-			let displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_ALL : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
-			if (this.ownsContext(this.context)) {
-				displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_RECIPIENTS : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
-			}
-			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
-			if (share) {
+			const displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_ALL : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
+			let hadAtLeastOneEntry = false
+			for (const share of Object.values(this.context.sharing || {})) {
+				if (!share) {
+					continue
+				}
+				hadAtLeastOneEntry = true
 				this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode, target: 'self' })
 				this.showInNavigation = value
 			}
+			if (!hadAtLeastOneEntry) {
+				console.error('No share found ' + this.context.sharing)
+			}
 		},
 	},
 

From 4ab44af016a17a2a540088babbb1c5671a79f09e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Tue, 17 Dec 2024 21:58:41 +0100
Subject: [PATCH 14/18] feat(Contexts): dynamic navigation bar update on config
 toggle

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 appinfo/routes.php                            |  2 +
 lib/Controller/NavigationController.php       | 38 ++++++++++
 .../BeforeTemplateRenderedListener.php        | 32 +-------
 lib/Service/ContextService.php                | 75 ++++++++++---------
 .../partials/NavigationContextItem.vue        |  9 ++-
 src/service/rebuild-navigation.js             | 19 +++++
 6 files changed, 109 insertions(+), 66 deletions(-)
 create mode 100644 lib/Controller/NavigationController.php
 create mode 100644 src/service/rebuild-navigation.js

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 488a0f849..6017a9b12 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -121,6 +121,8 @@
 		['name' => 'search#all', 'url' => '/search/all', 'verb' => 'GET'],
 	],
 	'ocs' => [
+		['name' => 'navigation#getAppsNavigation', 'url' => '/navigation', 'verb' => 'GET'],
+
 		// API v2
 		['name' => 'ApiGeneral#index', 'url' => '/api/2/init', 'verb' => 'GET'],
 		// -> tables
diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
new file mode 100644
index 000000000..bb5a79433
--- /dev/null
+++ b/lib/Controller/NavigationController.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace OCA\Tables\Controller;
+
+use OCA\Tables\Service\ContextService;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\INavigationManager;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUserSession;
+
+/**
+ * This is a workaround until https://github.com/nextcloud/server/pull/49904 is
+ * settled in all covered NC versions; expected >= 31.
+ */
+class NavigationController extends \OC\Core\Controller\NavigationController {
+	public function __construct(
+		protected ContextService $contextService,
+		protected IUserSession $userSession,
+		string $appName,
+		IRequest $request,
+		INavigationManager $navigationManager,
+		IURLGenerator $urlGenerator
+	) {
+		parent::__construct($appName, $request, $navigationManager, $urlGenerator);
+	}
+
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
+	public function getAppsNavigation(bool $absolute = false): DataResponse {
+		$this->contextService->addToNavigation($this->userSession->getUser()?->getUID());
+		return parent::getAppsNavigation($absolute);
+	}
+}
diff --git a/lib/Listener/BeforeTemplateRenderedListener.php b/lib/Listener/BeforeTemplateRenderedListener.php
index b26bc6592..d34836518 100644
--- a/lib/Listener/BeforeTemplateRenderedListener.php
+++ b/lib/Listener/BeforeTemplateRenderedListener.php
@@ -7,13 +7,10 @@
 
 namespace OCA\Tables\Listener;
 
-use OCA\Tables\AppInfo\Application;
 use OCA\Tables\Service\ContextService;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use OCP\INavigationManager;
-use OCP\IURLGenerator;
 use OCP\IUserSession;
 
 /**
@@ -21,10 +18,8 @@
  */
 class BeforeTemplateRenderedListener implements IEventListener {
 	public function __construct(
-		protected INavigationManager $navigationManager,
-		protected IURLGenerator      $urlGenerator,
-		protected IUserSession       $userSession,
-		protected ContextService     $contextService,
+		protected IUserSession   $userSession,
+		protected ContextService $contextService,
 	) {
 	}
 
@@ -41,27 +36,6 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		$contexts = $this->contextService->findForNavigation($user->getUID());
-		foreach ($contexts as $context) {
-			$this->navigationManager->add(function () use ($context) {
-				$iconRelPath = 'material/' . $context->getIcon() . '.svg';
-				if (file_exists(__DIR__ . '/../../img/' . $iconRelPath)) {
-					$iconUrl = $this->urlGenerator->imagePath(Application::APP_ID, $iconRelPath);
-				} else {
-					$iconUrl = $this->urlGenerator->imagePath('core', 'places/default-app-icon.svg');
-				}
-
-				$contextUrl = $this->urlGenerator->linkToRoute('tables.page.context', ['contextId' => $context->getId()]);
-
-				return [
-					'id' => Application::APP_ID . '_application_' . $context->getId(),
-					'name' => $context->getName(),
-					'href' => $contextUrl,
-					'icon' => $iconUrl,
-					'order' => 500,
-					'type' => 'link',
-				];
-			});
-		}
+		$this->contextService->addToNavigation($user->getUID());
 	}
 }
diff --git a/lib/Service/ContextService.php b/lib/Service/ContextService.php
index 41f7eaac0..07b102f26 100644
--- a/lib/Service/ContextService.php
+++ b/lib/Service/ContextService.php
@@ -27,49 +27,31 @@
 use OCP\DB\Exception;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
+use OCP\INavigationManager;
+use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Log\Audit\CriticalActionPerformedEvent;
 use Psr\Log\LoggerInterface;
 
 class ContextService {
 
-	private ContextMapper $contextMapper;
-	private bool $isCLI;
-	private LoggerInterface $logger;
-	private ContextNodeRelationMapper $contextNodeRelMapper;
-	private PageMapper $pageMapper;
-	private PageContentMapper $pageContentMapper;
-	private PermissionsService $permissionsService;
-	private IUserManager $userManager;
-	private IEventDispatcher $eventDispatcher;
-	private IDBConnection $dbc;
-	private ShareService $shareService;
-
 	public function __construct(
-		ContextMapper             $contextMapper,
-		ContextNodeRelationMapper $contextNodeRelationMapper,
-		PageMapper                $pageMapper,
-		PageContentMapper         $pageContentMapper,
-		LoggerInterface           $logger,
-		PermissionsService        $permissionsService,
-		IUserManager              $userManager,
-		IEventDispatcher          $eventDispatcher,
-		IDBConnection             $dbc,
-		ShareService              $shareService,
-		bool                      $isCLI,
+		private ContextMapper             $contextMapper,
+		private ContextNodeRelationMapper $contextNodeRelMapper,
+		private PageMapper                $pageMapper,
+		private PageContentMapper         $pageContentMapper,
+		private LoggerInterface           $logger,
+		private PermissionsService        $permissionsService,
+		private IUserManager              $userManager,
+		private IEventDispatcher          $eventDispatcher,
+		private IDBConnection             $dbc,
+		private ShareService              $shareService,
+		private bool                      $isCLI,
+		protected INavigationManager      $navigationManager,
+		protected IURLGenerator $urlGenerator,
 	) {
-		$this->contextMapper = $contextMapper;
-		$this->isCLI = $isCLI;
-		$this->logger = $logger;
-		$this->contextNodeRelMapper = $contextNodeRelationMapper;
-		$this->pageMapper = $pageMapper;
-		$this->pageContentMapper = $pageContentMapper;
-		$this->permissionsService = $permissionsService;
-		$this->userManager = $userManager;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->dbc = $dbc;
-		$this->shareService = $shareService;
 	}
+
 	use TTransactional;
 
 	/**
@@ -93,6 +75,31 @@ public function findForNavigation(string $userId): array {
 		return $this->contextMapper->findForNavBar($userId);
 	}
 
+	public function addToNavigation(string $userId): void {
+		$contexts = $this->findForNavigation($userId);
+		foreach ($contexts as $context) {
+			$this->navigationManager->add(function () use ($context) {
+				$iconRelPath = 'material/' . $context->getIcon() . '.svg';
+				if (file_exists(__DIR__ . '/../../img/' . $iconRelPath)) {
+					$iconUrl = $this->urlGenerator->imagePath(Application::APP_ID, $iconRelPath);
+				} else {
+					$iconUrl = $this->urlGenerator->imagePath('core', 'places/default-app-icon.svg');
+				}
+
+				$contextUrl = $this->urlGenerator->linkToRoute('tables.page.context', ['contextId' => $context->getId()]);
+
+				return [
+					'id' => Application::APP_ID . '_application_' . $context->getId(),
+					'name' => $context->getName(),
+					'href' => $contextUrl,
+					'icon' => $iconUrl,
+					'order' => 500,
+					'type' => 'link',
+				];
+			});
+		}
+	}
+
 	/**
 	 * @throws Exception
 	 * @throws InternalError
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index f5ddabb39..d173c6703 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -53,6 +53,7 @@ import Delete from 'vue-material-design-icons/Delete.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
 import svgHelper from '../../../shared/components/ncIconPicker/mixins/svgHelper.js'
 import { NAV_ENTRY_MODE } from '../../../shared/constants.js'
+import rebuildNavigation from '../../../service/rebuild-navigation.js'
 
 export default {
 	name: 'NavigationContextItem',
@@ -115,7 +116,7 @@ export default {
 			}
 			return false
 		},
-		updateDisplayMode() {
+		async updateDisplayMode() {
 			const value = !this.showInNavigation
 			const displayMode = value ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_ALL : NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN
 			let hadAtLeastOneEntry = false
@@ -124,10 +125,12 @@ export default {
 					continue
 				}
 				hadAtLeastOneEntry = true
-				this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode, target: 'self' })
+				await this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode, target: 'self' })
 				this.showInNavigation = value
 			}
-			if (!hadAtLeastOneEntry) {
+			if (hadAtLeastOneEntry) {
+				await rebuildNavigation()
+			} else {
 				console.error('No share found ' + this.context.sharing)
 			}
 		},
diff --git a/src/service/rebuild-navigation.js b/src/service/rebuild-navigation.js
new file mode 100644
index 000000000..a17c3ccbd
--- /dev/null
+++ b/src/service/rebuild-navigation.js
@@ -0,0 +1,19 @@
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+import axios from '@nextcloud/axios'
+import { generateOcsUrl } from '@nextcloud/router'
+import { emit } from '@nextcloud/event-bus'
+
+export default () => {
+	return axios.get(generateOcsUrl('apps/tables/navigation') + '?format=json')
+		.then(({ data }) => {
+			if (data.ocs.meta.statuscode !== 200) {
+				return
+			}
+
+			emit('nextcloud:app-menu.refresh', { apps: data.ocs.data })
+			window.dispatchEvent(new Event('resize'))
+		})
+}

From e1e37377dd1c54aa35ae46cb3d1034e6536d358d Mon Sep 17 00:00:00 2001
From: "Cleopatra Enjeck M." <patrathewhiz@gmail.com>
Date: Mon, 30 Dec 2024 06:47:27 +0100
Subject: [PATCH 15/18] enh: remove usages of NAV_ENTRY_MODE_RECIPIENTS

Signed-off-by: Cleopatra Enjeck M. <patrathewhiz@gmail.com>
---
 src/modules/modals/CreateContext.vue | 2 +-
 src/modules/modals/EditContext.vue   | 2 +-
 src/shared/constants.js              | 2 +-
 src/store/store.js                   | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index 6bbdc1b6a..db1959036 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -171,7 +171,7 @@ export default {
 					isUser: true,
 					key: 'user-' + getCurrentUser().uid,
 				})
-			const displayMode = this.showInNavigation ? 'NAV_ENTRY_MODE_RECIPIENTS' : 'NAV_ENTRY_MODE_HIDDEN'
+			const displayMode = this.showInNavigation ? 'NAV_ENTRY_MODE_ALL' : 'NAV_ENTRY_MODE_HIDDEN'
 			const res = await this.$store.dispatch('insertNewContext', { data, previousReceivers: [], receivers: this.receivers, displayMode: NAV_ENTRY_MODE[displayMode] })
 			if (res) {
 				return res.id
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index baf08618f..29479ed23 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -185,7 +185,7 @@ export default {
 						isUser: true,
 						key: 'user-' + getCurrentUser().uid,
 					})
-				const displayMode = this.showInNavigationDefault ? 'NAV_ENTRY_MODE_RECIPIENTS' : 'NAV_ENTRY_MODE_HIDDEN'
+				const displayMode = this.showInNavigationDefault ? 'NAV_ENTRY_MODE_ALL' : 'NAV_ENTRY_MODE_HIDDEN'
 				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, previousReceivers: Object.values(context.sharing), receivers: this.receivers, displayMode: NAV_ENTRY_MODE[displayMode] })
 				if (res) {
 					showSuccess(t('tables', 'Updated application "{contextTitle}".', { contextTitle: this.title }))
diff --git a/src/shared/constants.js b/src/shared/constants.js
index c3bb66cc2..4ebc9ff5b 100644
--- a/src/shared/constants.js
+++ b/src/shared/constants.js
@@ -28,6 +28,6 @@ export const TYPE_USERGROUP = 'usergroup'
 
 export const NAV_ENTRY_MODE = {
 	NAV_ENTRY_MODE_HIDDEN: 0, // no nav bar entry
-	NAV_ENTRY_MODE_RECIPIENTS: 1, // nav bar entry for share recipients, but not the owner
+	// NAV_ENTRY_MODE_RECIPIENTS: 1, // nav bar entry for share recipients, but not the owner. Currently unused.
 	NAV_ENTRY_MODE_ALL: 2, // nav bar entry for everybody
 }
diff --git a/src/store/store.js b/src/store/store.js
index 3dc9a5575..a427f8d73 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -10,7 +10,7 @@ import { showError } from '@nextcloud/dialogs'
 import '@nextcloud/dialogs/style.css'
 import data from './data.js'
 import displayError from '../shared/utils/displayError.js'
-import { NODE_TYPE_TABLE, NODE_TYPE_VIEW, NAV_ENTRY_MODE } from '../shared/constants.js'
+import { NODE_TYPE_TABLE, NODE_TYPE_VIEW } from '../shared/constants.js'
 import { getCurrentUser } from '@nextcloud/auth'
 
 Vue.use(Vuex)
@@ -364,9 +364,8 @@ export default new Vuex.Store({
 						if (createdShare?.data && createdShare?.data?.id) {
 							const shareId = createdShare.data.id
 							await dispatch('updateDisplayMode', { shareId, displayMode, target: 'default' })
-							// since we switch between NAV_ENTRY_MODE_HIDDEN and NAV_ENTRY_MODE_RECIPIENTS, we need to handle owner separately
 							if (receiver.id === getCurrentUser().uid) {
-								await dispatch('updateDisplayMode', { shareId, displayMode: displayMode === NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN ? NAV_ENTRY_MODE.NAV_ENTRY_MODE_HIDDEN : NAV_ENTRY_MODE.NAV_ENTRY_MODE_ALL, target: 'self' })
+								await dispatch('updateDisplayMode', { shareId, displayMode, target: 'self' })
 							}
 						}
 					}

From 30748c4c19f6df4e22c51a7d6bb5ba983b35e5bd Mon Sep 17 00:00:00 2001
From: "Cleopatra Enjeck M." <patrathewhiz@gmail.com>
Date: Sat, 4 Jan 2025 19:58:59 +0000
Subject: [PATCH 16/18] fix: add copyright and update openapi

Signed-off-by: Cleopatra Enjeck M. <patrathewhiz@gmail.com>
---
 cypress/e2e/context.cy.js               | 1 -
 lib/Controller/NavigationController.php | 5 +++++
 openapi.json                            | 7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/context.cy.js b/cypress/e2e/context.cy.js
index e3444a02c..6363d2ef8 100644
--- a/cypress/e2e/context.cy.js
+++ b/cypress/e2e/context.cy.js
@@ -188,7 +188,6 @@ describe('Manage a context', () => {
         cy.login(nonLocalUser)
         cy.visit('apps/tables')
         cy.loadContext(contextTitle)
-        cy.contains('header .app-menu-entry', contextTitle).should('exist')
         cy.contains('h1', contextTitle).should('exist')
         cy.contains('h1', tableTitle).should('exist')
         cy.get('button').contains('Create row').click()
diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
index bb5a79433..db07f0752 100644
--- a/lib/Controller/NavigationController.php
+++ b/lib/Controller/NavigationController.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 namespace OCA\Tables\Controller;
 
 use OCA\Tables\Service\ContextService;
diff --git a/openapi.json b/openapi.json
index fddafc065..9ac287457 100644
--- a/openapi.json
+++ b/openapi.json
@@ -10074,5 +10074,10 @@
             }
         }
     },
-    "tags": []
+    "tags": [
+        {
+            "name": "navigation",
+            "description": "This is a workaround until https://github.com/nextcloud/server/pull/49904 is settled in all covered NC versions; expected >= 31."
+        }
+    ]
 }

From c925f42a9df032910f63b3937cd7cecdfcbc5399 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Mon, 6 Jan 2025 16:47:03 +0100
Subject: [PATCH 17/18] ci: suppress psalm warning against private
 NavigationController class

this can be removed once >=NC31 is supported and our NavigationController
is adjusted

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 tests/psalm-baseline.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index bab25d5b6..47f0999d1 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -3,4 +3,10 @@
   - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-<files psalm-version="dev-master@"/>
+<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
+  <file src="lib/Controller/NavigationController.php">
+    <UndefinedClass>
+      <code><![CDATA[\OC\Core\Controller\NavigationController]]></code>
+    </UndefinedClass>
+  </file>
+</files>

From 4d5a063557dd46d1cefeeb072910f35176a94c62 Mon Sep 17 00:00:00 2001
From: Julius Knorr <jus@bitgrid.net>
Date: Thu, 9 Jan 2025 16:32:49 +0100
Subject: [PATCH 18/18] fix: Make labels translatable

Signed-off-by: Julius Knorr <jus@bitgrid.net>
---
 lib/Service/ShareService.php                              | 1 -
 src/modules/modals/CreateContext.vue                      | 4 ++--
 src/modules/modals/EditContext.vue                        | 4 ++--
 src/modules/navigation/partials/NavigationContextItem.vue | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index 1555bd981..566355cd5 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -339,7 +339,6 @@ public function updateDisplayMode(int $shareId, int $displayMode, string $userId
 				}
 			} else {
 				// setting user display mode override only requires access
-				// this does not seem to work
 				if (!$this->permissionsService->canAccessContextById($item->getNodeId(), $userId)) {
 					throw new PermissionError(sprintf('PermissionError: can not update share with id %d', $shareId));
 				}
diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index db1959036..457b00d92 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -44,10 +44,10 @@
 			</div>
 			<div class="row space-T">
 				<NcActionCheckbox :checked="showInNavigationDefault" @change="updateDisplayMode">
-					Show in app list
+					{{ t('tables', 'Show in app list') }}
 				</NcActionCheckbox>
 				<p class="nav-display-subtext">
-					This can be overridden by a per-account preference
+					{{ t('tables', 'This can be overridden by a per-account preference') }}
 				</p>
 			</div>
 			<div class="row space-R row space-T">
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 29479ed23..d532d57c3 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -40,10 +40,10 @@
 			</div>
 			<div class="row space-T">
 				<NcActionCheckbox :checked="showInNavigationDefault" @change="updateDisplayMode">
-					Show in app list
+					{{ t('tables', 'Show in app list') }}
 				</NcActionCheckbox>
 				<p class="nav-display-subtext">
-					This can be overridden by a per-account preference
+					{{ t('tables', 'This can be overridden by a per-account preference') }}
 				</p>
 			</div>
 			<div class="row space-T">
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index d173c6703..8ada727e5 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -36,7 +36,7 @@
 				{{ t('tables', 'Delete application') }}
 			</NcActionButton>
 			<NcActionCheckbox :checked="showInNavigation" @change="updateDisplayMode">
-				Show in app list
+				{{ t('tables', 'Show in app list') }}
 			</NcActionCheckbox>
 		</template>
 	</NcAppNavigationItem>