From 8fd398aeae221f8176299883500ba92f93389055 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Tue, 2 Apr 2024 14:00:58 +0200
Subject: [PATCH 01/19] feat(Context): add share logic for contexts

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

diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
index 5bef54b46..a73c6b86d 100644
--- a/lib/Service/PermissionsService.php
+++ b/lib/Service/PermissionsService.php
@@ -164,6 +164,14 @@ public function canAccessContextById(int $contextId, ?string $userId = null): bo
 		}
 	}
 
+		try {
+			$this->contextMapper->findById($contextId, $userId ?? $this->userId);
+			return true;
+		} catch (NotFoundError $e) {
+			return false;
+		}
+	}
+
 	public function canAccessView(View $view, ?string $userId = null): bool {
 		return $this->canAccessNodeById(Application::NODE_TYPE_VIEW, $view->getId(), $userId);
 	}

From b51977652dfb22832e8002101d6e70e0423feabf Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Fri, 5 Apr 2024 07:49:31 +0100
Subject: [PATCH 02/19] feat: UI elements

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 .../ncContextResource/NcContextResource.vue   |  10 +
 .../ResourceSharePermissions.vue              | 106 ++++++++++
 .../ncContextResource/ResourceSharees.vue     | 187 ++++++++++++++++++
 3 files changed, 303 insertions(+)
 create mode 100644 src/shared/components/ncContextResource/ResourceSharePermissions.vue
 create mode 100644 src/shared/components/ncContextResource/ResourceSharees.vue

diff --git a/src/shared/components/ncContextResource/NcContextResource.vue b/src/shared/components/ncContextResource/NcContextResource.vue
index 9bb0ad7a9..1b2b78a2a 100644
--- a/src/shared/components/ncContextResource/NcContextResource.vue
+++ b/src/shared/components/ncContextResource/NcContextResource.vue
@@ -3,6 +3,8 @@
 		<div>
 			<ResourceForm :resources="localResource" @add="addResource" />
 			<ResourceList :resources="localResource" @remove="removeResource" />
+			<ResourceSharees :select-users="true" :select-groups="false" :sharees.sync="sharees" />
+			<ResourceSharePermissions :resources="localResource" />
 		</div>
 	</div>
 </template>
@@ -11,11 +13,15 @@
 import { mapGetters } from 'vuex'
 import ResourceForm from './ResourceForm.vue'
 import ResourceList from './ResourceList.vue'
+import ResourceSharePermissions from './ResourceSharePermissions.vue'
+import ResourceSharees from './ResourceSharees.vue'
 
 export default {
 	components: {
 		ResourceForm,
 		ResourceList,
+		ResourceSharePermissions,
+		ResourceSharees,
 	},
 
 	props: {
@@ -29,6 +35,10 @@ export default {
 			type: Array,
 			default: () => ([]),
 		},
+		sharees: {
+			type: Array,
+			default: () => ([]),
+		},
 	},
 
 	data() {
diff --git a/src/shared/components/ncContextResource/ResourceSharePermissions.vue b/src/shared/components/ncContextResource/ResourceSharePermissions.vue
new file mode 100644
index 000000000..0f8b51267
--- /dev/null
+++ b/src/shared/components/ncContextResource/ResourceSharePermissions.vue
@@ -0,0 +1,106 @@
+<template>
+	<div>
+		<h3>{{ t('tables', 'Sharing') }}</h3>
+		<ul v-if="resources && resources.length > 0" class="shares-list">
+			<div v-for="resource in resources"
+				:key="resource.key"
+				class="row">
+				<div class="fix-col-2">
+					<div style="display:flex; align-items: center; padding: 10px;">
+						{{ resource.emoji }} &nbsp; {{ resource.title }}
+					</div>
+				</div>
+				<div class="fix-col-2" style="justify-content: end;">
+					<NcActions :force-menu="true">
+						<template>
+							<NcActionCaption :name="t('tables', 'Permissions')" />
+							<NcActionCheckbox
+								:disabled="true"
+								@check="updatePermission(resource, 'read', true)"
+								@uncheck="updatePermission(resource, 'read', false)">
+								{{ t('tables', 'Read data') }}
+							</NcActionCheckbox>
+							<!-- <NcActionCheckbox :checked.sync="share.permissionRead"
+								:disabled="share.permissionManage || share.permissionUpdate || share.permissionDelete"
+								@check="updatePermission(share, 'read', true)"
+								@uncheck="updatePermission(share, 'read', false)">
+								{{ t('tables', 'Read data') }}
+							</NcActionCheckbox>
+							<NcActionCheckbox :checked.sync="share.permissionCreate"
+								:disabled="share.permissionManage"
+								@check="updatePermission(share, 'create', true)"
+								@uncheck="updatePermission(share, 'create', false)">
+								{{ t('tables', 'Create data') }}
+							</NcActionCheckbox>
+							<NcActionCheckbox :checked.sync="share.permissionUpdate"
+								:disabled="share.permissionManage"
+								@check="updatePermission(share, 'update', true)"
+								@uncheck="updatePermission(share, 'update', false)">
+								{{ t('tables', 'Update data') }}
+							</NcActionCheckbox>
+							<NcActionCheckbox :checked.sync="share.permissionDelete"
+								:disabled="share.permissionManage"
+								@check="updatePermission(share, 'delete', true)"
+								@uncheck="updatePermission(share, 'delete', false)">
+								{{ t('tables', 'Delete data') }}
+							</NcActionCheckbox> -->
+						</template>
+					</NcActions>
+				</div>
+			</div>
+		</ul>
+		<div v-else>
+			{{ t('tables', 'No shares') }}
+		</div>
+	</div>
+</template>
+
+<script>
+import { NcActions, NcActionCheckbox, NcActionCaption } from '@nextcloud/vue'
+
+export default {
+	components: {
+		NcActions,
+		NcActionCheckbox,
+		NcActionCaption,
+	},
+
+	props: {
+		resources: {
+			type: Array,
+			default: () => ([]),
+		},
+	},
+
+	data() {
+		return {
+			loading: false,
+		}
+	},
+
+	methods: {
+		updatePermission(share, permission, value) {
+			this.$emit('update', { id: share.id, permission, value })
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+
+	.shares-list li {
+		display: flex;
+		justify-content: space-between;
+		line-height: 44px;
+	}
+
+	.high-line-height {
+		line-height: 35px;
+	}
+
+	.manage-button {
+		display: flex;
+		justify-content: center;
+	}
+
+</style>
diff --git a/src/shared/components/ncContextResource/ResourceSharees.vue b/src/shared/components/ncContextResource/ResourceSharees.vue
new file mode 100644
index 000000000..74042fd0b
--- /dev/null
+++ b/src/shared/components/ncContextResource/ResourceSharees.vue
@@ -0,0 +1,187 @@
+<template>
+	<div class="row space-B">
+		<h3>{{ t('tables', 'Share with accounts or groups') }}</h3>
+		<NcSelect v-model="value" style="width: 100%;" :loading="loading" :options="options"
+			:value="sharees"
+			:placeholder="getPlaceholder()"
+			:searchable="true" :get-option-key="(option) => option.key"
+			label="displayName"
+			:aria-label-combobox="getPlaceholder()" :user-select="true"
+			:close-on-select="false"
+			:multiple="true"
+			@search="asyncFind" @input="addShare">
+			<template #noResult>
+				{{ noResultText }}
+			</template>
+		</NcSelect>
+	</div>
+</template>
+
+<script>
+import { generateOcsUrl } from '@nextcloud/router'
+import { getCurrentUser } from '@nextcloud/auth'
+import axios from '@nextcloud/axios'
+import debounce from 'debounce'
+import { NcSelect } from '@nextcloud/vue'
+import formatting from '../../../shared/mixins/formatting.js'
+import ShareTypes from '../../mixins/shareTypesMixin.js'
+import { showError } from '@nextcloud/dialogs'
+import '@nextcloud/dialogs/style.css'
+
+export default {
+
+	components: {
+		NcSelect,
+	},
+
+	mixins: [ShareTypes, formatting],
+
+	props: {
+		sharees: {
+			type: Array,
+			default: () => ([]),
+		},
+		selectUsers: {
+			type: Boolean,
+			default: true,
+		},
+		selectGroups: {
+			type: Boolean,
+			default: false,
+		},
+	},
+
+	data() {
+		return {
+			query: '',
+			value: '',
+			loading: false,
+			minSearchStringLength: 1,
+			maxAutocompleteResults: 20,
+			suggestions: [],
+		}
+	},
+
+	computed: {
+		localValue: {
+			get() {
+				return this.newOwnerUserId
+			},
+			set(v) {
+				console.info('newOwnerUserId set to ', v)
+				this.$emit('update:newOwnerUserId', v)
+			},
+		},
+
+		isValidQuery() {
+			return this.query?.trim() && this.query.length >= this.minSearchStringLength
+		},
+
+		options() {
+			if (this.isValidQuery) {
+				return this.suggestions
+			}
+			return []
+		},
+
+		noResultText() {
+			if (this.loading) {
+				return t('tables', 'Searching …')
+			}
+			return t('tables', 'No elements found.')
+		},
+
+		userId() {
+			return getCurrentUser().uid
+		},
+	},
+
+	methods: {
+		addShare(selectedItem) {
+			if (selectedItem) {
+				this.localValue = selectedItem.user
+			} else {
+				this.localValue = ''
+			}
+		},
+
+		getShareTypes() {
+			const types = []
+			if (this.selectUsers) {
+				types.push(this.SHARE_TYPES.SHARE_TYPE_USER)
+			}
+			if (this.selectGroups) {
+				types.push(this.SHARE_TYPES.SHARE_TYPE_GROUP)
+			}
+			return types
+		},
+
+		getShareTypeString() {
+			if (this.selectUsers && !this.selectGroups) {
+				return 'User'
+			} else if (!this.selectUsers && this.selectGroups) {
+				return 'Group'
+			} else {
+				return 'User or group'
+			}
+		},
+
+		getPlaceholder() {
+			return t('tables', '{shareTypeString}...', { shareTypeString: this.getShareTypeString() })
+		},
+
+		async asyncFind(query) {
+			this.query = query.trim()
+			if (this.isValidQuery) {
+				this.loading = true
+				await this.debounceGetSuggestions(query)
+			}
+		},
+
+		async getSuggestions(search) {
+			this.loading = true
+			const shareTypes = this.getShareTypes()
+			let shareTypeQueryString = ''
+			shareTypes.forEach(shareType => {
+				shareTypeQueryString += `&shareTypes[]=${shareType}`
+			})
+			const url = generateOcsUrl(`core/autocomplete/get?search=${search}${shareTypeQueryString}&limit=${this.maxAutocompleteResults}`)
+
+			try {
+				const res = await axios.get(url)
+				const rawSuggestions = res.data.ocs.data.map(autocompleteResult => {
+					return {
+						user: autocompleteResult.id,
+						displayName: autocompleteResult.label,
+						icon: autocompleteResult.icon,
+						isUser: autocompleteResult.source.startsWith('users'),
+						key: autocompleteResult.source + '-' + autocompleteResult.id,
+					}
+				})
+
+				this.suggestions = this.filterOutCurrentUser(rawSuggestions)
+				this.loading = false
+			} catch (err) {
+				console.debug(err)
+				showError(t('tables', 'Failed to fetch {shareTypeString}', { shareTypeString: this.getShareTypeString().toLowerCase() }))
+			}
+		},
+
+		debounceGetSuggestions: debounce(function(...args) {
+			this.getSuggestions(...args)
+		}, 300),
+
+		filterOutCurrentUser(list) {
+			return list.filter((item) => !(item.isUser && item.user === getCurrentUser().uid))
+		},
+
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.multiselect {
+	width: 100% !important;
+	max-width: 100% !important;
+}
+</style>

From a5127f4c1e98a4bfa29d496cf794623a907ff79d Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Mon, 8 Apr 2024 07:22:31 +0100
Subject: [PATCH 03/19] enh: dont show already selected sharing users

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/EditContext.vue            |  2 +-
 .../ncContextResource/NcContextResource.vue   | 19 ++++++++++++++++++-
 .../ncContextResource/ResourceSharees.vue     | 19 ++++++++++++-------
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index b6df8bc71..3db4d7a57 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -125,7 +125,7 @@ export default {
 			this.reset()
 			this.$emit('close')
 		},
-		// TODO show edited changes if we're currently viewing the active context
+		// TODO show edited changes without having to reload
 		async submit() {
 			if (this.title === '') {
 				showError(t('tables', 'Cannot update context. Title is missing.'))
diff --git a/src/shared/components/ncContextResource/NcContextResource.vue b/src/shared/components/ncContextResource/NcContextResource.vue
index 1b2b78a2a..1c120942c 100644
--- a/src/shared/components/ncContextResource/NcContextResource.vue
+++ b/src/shared/components/ncContextResource/NcContextResource.vue
@@ -3,7 +3,7 @@
 		<div>
 			<ResourceForm :resources="localResource" @add="addResource" />
 			<ResourceList :resources="localResource" @remove="removeResource" />
-			<ResourceSharees :select-users="true" :select-groups="false" :sharees.sync="sharees" />
+			<ResourceSharees :select-users="true" :select-groups="false" :sharees.sync="currentSharees" />
 			<ResourceSharePermissions :resources="localResource" />
 		</div>
 	</div>
@@ -45,6 +45,23 @@ export default {
 		return {
 			loading: false,
 			contextResource: this.resources,
+			// currentSharees: [...this.sharees],
+			currentSharees: [
+				{
+					user: 'user2',
+					displayName: 'user2',
+					icon: 'icon-user',
+					isUser: true,
+					key: 'users-user2',
+				},
+				{
+					user: 'user1',
+					displayName: 'user1',
+					icon: 'icon-user',
+					isUser: true,
+					key: 'users-user1',
+				},
+			],
 		}
 	},
 
diff --git a/src/shared/components/ncContextResource/ResourceSharees.vue b/src/shared/components/ncContextResource/ResourceSharees.vue
index 74042fd0b..698bba79f 100644
--- a/src/shared/components/ncContextResource/ResourceSharees.vue
+++ b/src/shared/components/ncContextResource/ResourceSharees.vue
@@ -1,8 +1,7 @@
 <template>
 	<div class="row space-B">
 		<h3>{{ t('tables', 'Share with accounts or groups') }}</h3>
-		<NcSelect v-model="value" style="width: 100%;" :loading="loading" :options="options"
-			:value="sharees"
+		<NcSelect v-model="preExistingSharees" style="width: 100%;" :loading="loading" :options="options"
 			:placeholder="getPlaceholder()"
 			:searchable="true" :get-option-key="(option) => option.key"
 			label="displayName"
@@ -59,17 +58,19 @@ export default {
 			minSearchStringLength: 1,
 			maxAutocompleteResults: 20,
 			suggestions: [],
+			preExistingSharees: [...this.sharees],
+			localSharees: this.sharees.map(userObject => userObject.user),
 		}
 	},
 
 	computed: {
 		localValue: {
 			get() {
-				return this.newOwnerUserId
+				return this.localSharees
 			},
 			set(v) {
-				console.info('newOwnerUserId set to ', v)
-				this.$emit('update:newOwnerUserId', v)
+				this.localSharees = v.map(userObject => userObject.user)
+				this.$emit('update:sharees', v)
 			},
 		},
 
@@ -99,9 +100,9 @@ export default {
 	methods: {
 		addShare(selectedItem) {
 			if (selectedItem) {
-				this.localValue = selectedItem.user
+				this.localValue = selectedItem
 			} else {
-				this.localValue = ''
+				this.localValue = []
 			}
 		},
 
@@ -160,6 +161,7 @@ export default {
 				})
 
 				this.suggestions = this.filterOutCurrentUser(rawSuggestions)
+				this.suggestions = this.filterOutSelectedUsers(this.suggestions)
 				this.loading = false
 			} catch (err) {
 				console.debug(err)
@@ -174,6 +176,9 @@ export default {
 		filterOutCurrentUser(list) {
 			return list.filter((item) => !(item.isUser && item.user === getCurrentUser().uid))
 		},
+		filterOutSelectedUsers(list) {
+			return list.filter((item) => !(item.isUser && this.localSharees.includes(item.user)))
+		},
 
 	},
 }

From 21a08963e0b7b2d5ec42459e2becd52494cb2c4b Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 11 Apr 2024 08:39:42 +0100
Subject: [PATCH 04/19] enh: share context via api request

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/EditContext.vue            | 21 ++++++----
 .../ncContextResource/NcContextResource.vue   | 40 ++++++++++---------
 .../ncContextResource/ResourceSharees.vue     |  8 ++--
 src/store/store.js                            |  7 +++-
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 3db4d7a57..09b50cb3a 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -12,11 +12,8 @@
 				</div>
 				<div class="col-4" style="display: inline-flex;">
 					<NcIconPicker :close-on-select="true" @select="setIcon">
-						<NcButton
-							type="tertiary"
-							:aria-label="t('tables', 'Select an icon for application')"
-							:title="t('tables', 'Select icon')"
-							@click.prevent>
+						<NcButton type="tertiary" :aria-label="t('tables', 'Select an icon for application')"
+							:title="t('tables', 'Select icon')" @click.prevent>
 							<template #icon>
 								<NcIconSvgWrapper :svg="icon.svg" />
 							</template>
@@ -36,7 +33,7 @@
 				<div class="col-4">
 					{{ t('tables', 'Resources') }}
 				</div>
-				<NcContextResource :resources.sync="resources" />
+				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
 
 			<div class="row space-R">
@@ -90,6 +87,7 @@ export default {
 			description: '',
 			errorTitle: false,
 			resources: [],
+			receivers: [],
 		}
 	},
 	computed: {
@@ -113,6 +111,7 @@ export default {
 				this.setIcon(this.localContext.iconName)
 				this.description = context.description
 				this.resources = context ? [...this.getContextResources(context)] : []
+				this.receivers = context && context?.sharing ? [...context.sharing] : []
 			}
 		},
 	},
@@ -145,7 +144,14 @@ export default {
 					description: this.description,
 					nodes: dataResources,
 				}
-				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data })
+
+				const share = {
+					nodeType: 'context',
+					nodeId: this.contextId,
+					receiverType: 'user',
+					displayMode: 2,
+				}
+				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, share, receivers: this.receivers })
 				if (res) {
 					showSuccess(t('tables', 'Updated context "{contextTitle}".', { contextTitle: this.title }))
 					this.actionCancel()
@@ -159,6 +165,7 @@ export default {
 			this.icon.name = 'equalizer'
 			this.description = ''
 			this.resources = context ? [...this.getContextResources(context)] : []
+			this.receivers = context && context?.sharing ? [...context.sharing] : []
 		},
 		getContextResources(context) {
 			const resources = []
diff --git a/src/shared/components/ncContextResource/NcContextResource.vue b/src/shared/components/ncContextResource/NcContextResource.vue
index 1c120942c..10d7fecb7 100644
--- a/src/shared/components/ncContextResource/NcContextResource.vue
+++ b/src/shared/components/ncContextResource/NcContextResource.vue
@@ -3,7 +3,7 @@
 		<div>
 			<ResourceForm :resources="localResource" @add="addResource" />
 			<ResourceList :resources="localResource" @remove="removeResource" />
-			<ResourceSharees :select-users="true" :select-groups="false" :sharees.sync="currentSharees" />
+			<ResourceSharees :select-users="true" :select-groups="false" :receivers="localReceivers" @update="updateReceivers" />
 			<ResourceSharePermissions :resources="localResource" />
 		</div>
 	</div>
@@ -35,7 +35,7 @@ export default {
 			type: Array,
 			default: () => ([]),
 		},
-		sharees: {
+		receivers: {
 			type: Array,
 			default: () => ([]),
 		},
@@ -45,22 +45,14 @@ export default {
 		return {
 			loading: false,
 			contextResource: this.resources,
-			// currentSharees: [...this.sharees],
-			currentSharees: [
-				{
-					user: 'user2',
-					displayName: 'user2',
-					icon: 'icon-user',
-					isUser: true,
-					key: 'users-user2',
-				},
-				{
-					user: 'user1',
-					displayName: 'user1',
-					icon: 'icon-user',
-					isUser: true,
-					key: 'users-user1',
-				},
+			contextReceivers: [
+				// {
+				// 	user: 'user2',
+				// 	displayName: 'user2',
+				// 	icon: 'icon-user',
+				// 	isUser: true,
+				// 	key: 'users-user2',
+				// },
 			],
 		}
 	},
@@ -75,6 +67,14 @@ export default {
 				this.$emit('update:resources', v)
 			},
 		},
+		localReceivers: {
+			get() {
+				return this.contextReceivers
+			},
+			set(v) {
+				this.$emit('update:receivers', v)
+			},
+		},
 	},
 
 	methods: {
@@ -85,7 +85,9 @@ export default {
 		addResource(resource) {
 			this.contextResource.push(resource)
 			this.localResource = this.contextResource
-
+		},
+		updateReceivers(receivers) {
+			this.localReceivers = receivers
 		},
 
 	},
diff --git a/src/shared/components/ncContextResource/ResourceSharees.vue b/src/shared/components/ncContextResource/ResourceSharees.vue
index 698bba79f..314ac5d4b 100644
--- a/src/shared/components/ncContextResource/ResourceSharees.vue
+++ b/src/shared/components/ncContextResource/ResourceSharees.vue
@@ -36,7 +36,7 @@ export default {
 	mixins: [ShareTypes, formatting],
 
 	props: {
-		sharees: {
+		receivers: {
 			type: Array,
 			default: () => ([]),
 		},
@@ -58,8 +58,8 @@ export default {
 			minSearchStringLength: 1,
 			maxAutocompleteResults: 20,
 			suggestions: [],
-			preExistingSharees: [...this.sharees],
-			localSharees: this.sharees.map(userObject => userObject.user),
+			preExistingSharees: [...this.receivers],
+			localSharees: this.receivers.map(userObject => userObject.user),
 		}
 	},
 
@@ -70,7 +70,7 @@ export default {
 			},
 			set(v) {
 				this.localSharees = v.map(userObject => userObject.user)
-				this.$emit('update:sharees', v)
+				this.$emit('update', v)
 			},
 		},
 
diff --git a/src/store/store.js b/src/store/store.js
index 02c6a72d5..7a4ce2ef3 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -339,11 +339,16 @@ export default new Vuex.Store({
 
 			return true
 		},
-		async updateContext({ state, commit, dispatch }, { id, data }) {
+		async updateContext({ state, commit, dispatch }, { id, data, share, receivers }) {
 			let res = null
 
 			try {
 				res = await axios.put(generateOcsUrl('/apps/tables/api/2/contexts/' + id), data)
+				for (const receiver of receivers) {
+					share.receiverType = receiver.isUser ? 'user' : 'group'
+					share.receiver = receiver.user
+					await axios.post(generateUrl('/apps/tables/share'), share)
+				}
 			} catch (e) {
 				displayError(e, t('tables', 'Could not update application.'))
 				return false

From 517ef2e3ac0f3aa717312225fca8ffb42b4f2230 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 11 Apr 2024 11:18:55 +0100
Subject: [PATCH 05/19] enh: share context to user

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

diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 09b50cb3a..36b17d1df 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -145,13 +145,7 @@ export default {
 					nodes: dataResources,
 				}
 
-				const share = {
-					nodeType: 'context',
-					nodeId: this.contextId,
-					receiverType: 'user',
-					displayMode: 2,
-				}
-				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, share, receivers: this.receivers })
+				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, receivers: this.receivers })
 				if (res) {
 					showSuccess(t('tables', 'Updated context "{contextTitle}".', { contextTitle: this.title }))
 					this.actionCancel()
diff --git a/src/store/store.js b/src/store/store.js
index 7a4ce2ef3..4e065ee5b 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -339,8 +339,13 @@ export default new Vuex.Store({
 
 			return true
 		},
-		async updateContext({ state, commit, dispatch }, { id, data, share, receivers }) {
+		async updateContext({ state, commit, dispatch }, { id, data, receivers }) {
 			let res = null
+			let share = {
+				nodeType: 'context',
+				nodeId: id,
+				displayMode: 2,
+			}
 
 			try {
 				res = await axios.put(generateOcsUrl('/apps/tables/api/2/contexts/' + id), data)

From a844d78e4f9cbea3e7a5230025d67039a7031d1e Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 18 Apr 2024 04:32:07 +0100
Subject: [PATCH 06/19] enh: properly share and unshare context

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/CreateContext.vue          |  6 +-
 src/modules/modals/EditContext.vue            | 24 ++++--
 src/pages/Context.vue                         |  3 +-
 .../ncContextResource/NcContextResource.vue   | 10 +--
 src/store/store.js                            | 77 +++++++++++++------
 5 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index fa5960675..e7ce10c31 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -37,7 +37,7 @@
 				<div class="col-4">
 					{{ t('tables', 'Resources') }}
 				</div>
-				<NcContextResource :resources.sync="resources" />
+				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
 			<div class="row space-R">
 				<div class="fix-col-4 end">
@@ -86,6 +86,7 @@ export default {
 			errorTitle: false,
 			description: '',
 			resources: [],
+			receivers: [],
 		}
 	},
 	watch: {
@@ -130,6 +131,7 @@ export default {
 				return {
 					id: parseInt(resource.id),
 					type: parseInt(resource.nodeType),
+					// TODO get right permissions for the node
 					permissions: 660,
 				}
 			})
@@ -139,7 +141,7 @@ export default {
 				description: this.description,
 				nodes: dataResources,
 			}
-			const res = await this.$store.dispatch('insertNewContext', { data })
+			const res = await this.$store.dispatch('insertNewContext', { data, previousReceivers: [], receivers: this.receivers })
 			if (res) {
 				return res.id
 			} else {
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 36b17d1df..202a81fcc 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -110,8 +110,8 @@ export default {
 				this.title = context.name
 				this.setIcon(this.localContext.iconName)
 				this.description = context.description
-				this.resources = context ? [...this.getContextResources(context)] : []
-				this.receivers = context && context?.sharing ? [...context.sharing] : []
+				this.resources = context ? this.getContextResources(context) : []
+				this.receivers = context ? this.getContextReceivers(context) : []
 			}
 		},
 	},
@@ -144,8 +144,9 @@ export default {
 					description: this.description,
 					nodes: dataResources,
 				}
+				const context = this.getContext(this.contextId)
 
-				const res = await this.$store.dispatch('updateContext', { id: this.contextId, data, receivers: this.receivers })
+				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 context "{contextTitle}".', { contextTitle: this.title }))
 					this.actionCancel()
@@ -158,8 +159,21 @@ export default {
 			this.errorTitle = false
 			this.icon.name = 'equalizer'
 			this.description = ''
-			this.resources = context ? [...this.getContextResources(context)] : []
-			this.receivers = context && context?.sharing ? [...context.sharing] : []
+			this.resources = context ? this.getContextResources(context) : []
+			this.receivers = context ? this.getContextReceivers(context) : []
+		},
+		getContextReceivers(context) {
+			const sharing = Object.values(context.sharing)
+			const receivers = sharing.map((share) => {
+				return {
+					user: share.receiver,
+					displayName: share.receiver,
+					icon: 'icon-user',
+					isUser: share.receiver_type === 'user',
+					key: share.receiver_type + '-' + share.receiver,
+				}
+			})
+			return receivers
 		},
 		getContextResources(context) {
 			const resources = []
diff --git a/src/pages/Context.vue b/src/pages/Context.vue
index 8b7819f0e..1d06634c4 100644
--- a/src/pages/Context.vue
+++ b/src/pages/Context.vue
@@ -108,7 +108,8 @@ export default {
 	},
 
 	watch: {
-		async activeContextId() {
+		// Watch for changes to active context to make page reactive
+		async activeContext() {
 			if (this.activeContextId && !this.activeContext) {
 				// context does not exists, go to startpage
 				this.$router.push('/').catch(err => err)
diff --git a/src/shared/components/ncContextResource/NcContextResource.vue b/src/shared/components/ncContextResource/NcContextResource.vue
index 10d7fecb7..e9fb93089 100644
--- a/src/shared/components/ncContextResource/NcContextResource.vue
+++ b/src/shared/components/ncContextResource/NcContextResource.vue
@@ -45,15 +45,7 @@ export default {
 		return {
 			loading: false,
 			contextResource: this.resources,
-			contextReceivers: [
-				// {
-				// 	user: 'user2',
-				// 	displayName: 'user2',
-				// 	icon: 'icon-user',
-				// 	isUser: true,
-				// 	key: 'users-user2',
-				// },
-			],
+			contextReceivers: this.receivers,
 		}
 	},
 
diff --git a/src/store/store.js b/src/store/store.js
index 4e065ee5b..87769e7f7 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -121,23 +121,6 @@ export default new Vuex.Store({
 		},
 	},
 	actions: {
-		async insertNewContext({ commit, state, dispatch }, { data }) {
-			commit('setContextsLoading', true)
-			let res = null
-
-			try {
-				res = await axios.post(generateOcsUrl('/apps/tables/api/2/contexts'), data)
-			} catch (e) {
-				displayError(e, t('tables', 'Could not insert application.'))
-				return false
-			}
-			const contexts = state.contexts
-			contexts.push(res.data.ocs.data)
-			commit('setContexts', contexts)
-
-			commit('setContextsLoading', false)
-			return res.data.ocs.data
-		},
 		async insertNewTable({ commit, state, dispatch }, { data }) {
 			let res = null
 
@@ -339,21 +322,61 @@ export default new Vuex.Store({
 
 			return true
 		},
-		async updateContext({ state, commit, dispatch }, { id, data, receivers }) {
-			let res = null
-			let share = {
+		async shareContext({ dispatch }, { id, previousReceivers, receivers }) {
+			const share = {
 				nodeType: 'context',
 				nodeId: id,
 				displayMode: 2,
 			}
+			// TODO use try catch
+			for (const receiver of receivers) {
+				share.receiverType = receiver.isUser ? 'user' : 'group'
+				share.receiver = receiver.user
+				// 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)
+				}
+			}
+
+			// If there's a previous share that wasn't maintained, delete it
+			for (const previousReceiver of previousReceivers) {
+				const currentShare = receivers.find((r) => {
+					const receiverType = r.isUser ? 'user' : 'group'
+					return r.user === previousReceiver.receiver && receiverType === previousReceiver.receiver_type
+				})
+				if (!currentShare) {
+					await axios.delete(generateUrl('/apps/tables/share/' + previousReceiver.share_id))
+				}
+			}
+		},
+		async insertNewContext({ commit, state, dispatch }, { data, receivers }) {
+			commit('setContextsLoading', true)
+			let res = null
 
 			try {
-				res = await axios.put(generateOcsUrl('/apps/tables/api/2/contexts/' + id), data)
-				for (const receiver of receivers) {
-					share.receiverType = receiver.isUser ? 'user' : 'group'
-					share.receiver = receiver.user
-					await axios.post(generateUrl('/apps/tables/share'), share)
+				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 })
 				}
+			} catch (e) {
+				displayError(e, t('tables', 'Could not insert application.'))
+				return false
+			}
+			const contexts = state.contexts
+			contexts.push(res.data.ocs.data)
+			commit('setContexts', contexts)
+
+			commit('setContextsLoading', false)
+			return res.data.ocs.data
+		},
+		async updateContext({ state, commit, dispatch }, { id, data, previousReceivers, receivers }) {
+			let res = null
+			try {
+				res = await axios.put(generateOcsUrl('/apps/tables/api/2/contexts/' + id), data)
+				await dispatch('shareContext', { id, previousReceivers, receivers })
+
 			} catch (e) {
 				displayError(e, t('tables', 'Could not update application.'))
 				return false
@@ -470,6 +493,10 @@ export default new Vuex.Store({
 			return true
 		},
 
+		// TODO, maybe. For shared contexts, need to fetch and store associated context resources
+		async loadContextResources({ state, commit, dispatch }, { id }) {
+		},
+
 		async removeTable({ state, commit }, { tableId }) {
 			try {
 				await axios.delete(generateUrl('/apps/tables/table/' + tableId))

From a91dc050888083fc79006aea830a244904512bf7 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 18 Apr 2024 04:36:34 +0100
Subject: [PATCH 07/19] fix: enable permissions to share context

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 lib/Service/PermissionsService.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
index a73c6b86d..44e2eb81d 100644
--- a/lib/Service/PermissionsService.php
+++ b/lib/Service/PermissionsService.php
@@ -3,6 +3,7 @@
 namespace OCA\Tables\Service;
 
 use OCA\Tables\AppInfo\Application;
+use OCA\Tables\Db\Context;
 use OCA\Tables\Db\ContextMapper;
 use OCA\Tables\Db\Share;
 use OCA\Tables\Db\ShareMapper;
@@ -149,7 +150,8 @@ public function canManageContextById(int $contextId, ?string $userId = null): bo
 			return false;
 		}
 
-		return $context->getOwnerId() === $userId;
+		return $context->getOwnerId() === $userId || $this->canManageContext($context, $userId);
+		;
 	}
 
 	/**
@@ -189,6 +191,8 @@ public function canManageElementById(int $elementId, string $nodeType = 'table',
 			return $this->canManageTableById($elementId, $userId);
 		} elseif ($nodeType === 'view') {
 			return $this->canManageViewById($elementId, $userId);
+		} elseif ($nodeType === 'context') {
+			return $this->canManageContextById($elementId, $userId);
 		} else {
 			throw new InternalError('Cannot read permission for node type '.$nodeType);
 		}
@@ -207,6 +211,10 @@ public function canManageTable(Table $table, ?string $userId = null): bool {
 		return $this->checkPermission($table, 'table', 'manage', $userId);
 	}
 
+	public function canManageContext(Context $context, ?string $userId = null): bool {
+		return $this->checkPermission($context, 'context', 'manage', $userId);
+	}
+
 	public function canManageTableById(int $tableId, ?string $userId = null): bool {
 		try {
 			$table = $this->tableMapper->find($tableId);
@@ -582,7 +590,7 @@ private function checkPermissionById(int $elementId, string $nodeType, string $p
 	}
 
 	/**
-	 * @param Table|View $element
+	 * @param Table|View|Context $element
 	 * @param string $nodeType
 	 * @param string|null $userId
 	 * @return bool
@@ -600,7 +608,7 @@ private function basisCheck($element, string $nodeType, ?string &$userId): bool
 			return true;
 		}
 
-		if ($this->userIsElementOwner($element, $userId)) {
+		if ($this->userIsElementOwner($element, $userId, $nodeType)) {
 			return true;
 		}
 		try {
@@ -641,11 +649,14 @@ private function basisCheckById(int $elementId, string $nodeType, ?string &$user
 	}
 
 	/**
-	 * @param View|Table $element
+	 * @param View|Table|Context $element
 	 * @param string|null $userId
 	 * @return bool
 	 */
-	private function userIsElementOwner($element, string $userId = null): bool {
+	private function userIsElementOwner($element, string $userId = null, ?string $nodeType = null): bool {
+		if ($nodeType === 'context') {
+			return $element->getOwnerId() === $userId;
+		}
 		return $element->getOwnership() === $userId;
 	}
 

From a5707bd77d5c90a9fd4ba23edf8038fbce658570 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Thu, 18 Apr 2024 10:05:47 +0100
Subject: [PATCH 08/19] enh: add permissions for Context resource

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/modules/modals/CreateContext.vue          | 14 ++-
 src/modules/modals/EditContext.vue            | 23 ++++-
 .../ncContextResource/NcContextResource.vue   | 26 +++---
 .../ncContextResource/ResourceForm.vue        |  4 +
 .../ResourceSharePermissions.vue              | 88 +++++++------------
 src/shared/constants.js                       |  8 ++
 6 files changed, 94 insertions(+), 69 deletions(-)

diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index e7ce10c31..b07de8f38 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -57,6 +57,7 @@ import '@nextcloud/dialogs/dist/index.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 { PERMISSION_READ, PERMISSION_CREATE, PERMISSION_UPDATE, PERMISSION_DELETE } from '../../shared/constants.js'
 
 export default {
 	name: 'CreateContext',
@@ -87,6 +88,10 @@ export default {
 			description: '',
 			resources: [],
 			receivers: [],
+			PERMISSION_READ,
+			PERMISSION_CREATE,
+			PERMISSION_UPDATE,
+			PERMISSION_DELETE,
 		}
 	},
 	watch: {
@@ -126,13 +131,20 @@ export default {
 				}
 			}
 		},
+		getPermissionBitmaskFromBools(permissionRead, permissionCreate, permissionUpdate, permissionDelete) {
+			const read = permissionRead ? PERMISSION_READ : 0
+			const create = permissionCreate ? PERMISSION_CREATE : 0
+			const update = permissionUpdate ? PERMISSION_UPDATE : 0
+			const del = permissionDelete ? PERMISSION_DELETE : 0
+			return read | create | update | del
+		},
 		async sendNewContextToBE() {
 			const dataResources = this.resources.map(resource => {
 				return {
 					id: parseInt(resource.id),
 					type: parseInt(resource.nodeType),
 					// TODO get right permissions for the node
-					permissions: 660,
+					permissions: this.getPermissionBitmaskFromBools(true /* ensure permission is always true */, resource.permissionCreate, resource.permissionUpdate, resource.permissionDelete),
 				}
 			})
 			const data = {
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 202a81fcc..0903de839 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -54,7 +54,7 @@ import '@nextcloud/dialogs/dist/index.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 } from '../../shared/constants.js'
+import { NODE_TYPE_TABLE, NODE_TYPE_VIEW, PERMISSION_READ, PERMISSION_CREATE, PERMISSION_UPDATE, PERMISSION_DELETE } from '../../shared/constants.js'
 import svgHelper from '../../shared/components/ncIconPicker/mixins/svgHelper.js'
 
 export default {
@@ -88,6 +88,10 @@ export default {
 			errorTitle: false,
 			resources: [],
 			receivers: [],
+			PERMISSION_READ,
+			PERMISSION_CREATE,
+			PERMISSION_UPDATE,
+			PERMISSION_DELETE,
 		}
 	},
 	computed: {
@@ -135,7 +139,7 @@ export default {
 						id: parseInt(resource.id),
 						type: parseInt(resource.nodeType),
 						// TODO get right permissions for the node
-						permissions: 660,
+						permissions: this.getPermissionBitmaskFromBools(true /* ensure permission is always true */, resource.permissionCreate, resource.permissionUpdate, resource.permissionDelete),
 					}
 				})
 				const data = {
@@ -175,6 +179,17 @@ export default {
 			})
 			return receivers
 		},
+		// TODO use mixin or similar for reusability
+		getPermissionBitmaskFromBools(permissionRead, permissionCreate, permissionUpdate, permissionDelete) {
+			const read = permissionRead ? PERMISSION_READ : 0
+			const create = permissionCreate ? PERMISSION_CREATE : 0
+			const update = permissionUpdate ? PERMISSION_UPDATE : 0
+			const del = permissionDelete ? PERMISSION_DELETE : 0
+			return read | create | update | del
+		},
+		getPermissionFromBitmask(bitmask, permission) {
+			return !!(bitmask & permission)
+		},
 		getContextResources(context) {
 			const resources = []
 			const nodes = Object.values(context.nodes)
@@ -189,6 +204,10 @@ export default {
 							key: `${elementKey}` + element.id,
 							nodeType: parseInt(node.node_type) === NODE_TYPE_TABLE ? NODE_TYPE_TABLE : NODE_TYPE_VIEW,
 							id: (element.id).toString(),
+							permissionRead: this.getPermissionFromBitmask(node.permissions, PERMISSION_READ),
+							permissionCreate: this.getPermissionFromBitmask(node.permissions, PERMISSION_CREATE),
+							permissionUpdate: this.getPermissionFromBitmask(node.permissions, PERMISSION_UPDATE),
+							permissionDelete: this.getPermissionFromBitmask(node.permissions, PERMISSION_DELETE),
 						}
 						resources.push(resource)
 					}
diff --git a/src/shared/components/ncContextResource/NcContextResource.vue b/src/shared/components/ncContextResource/NcContextResource.vue
index e9fb93089..e3e27b024 100644
--- a/src/shared/components/ncContextResource/NcContextResource.vue
+++ b/src/shared/components/ncContextResource/NcContextResource.vue
@@ -1,10 +1,10 @@
 <template>
 	<div>
 		<div>
-			<ResourceForm :resources="localResource" @add="addResource" />
-			<ResourceList :resources="localResource" @remove="removeResource" />
+			<ResourceForm :resources="localResources" @add="addResource" />
+			<ResourceList :resources="localResources" @remove="removeResource" />
 			<ResourceSharees :select-users="true" :select-groups="false" :receivers="localReceivers" @update="updateReceivers" />
-			<ResourceSharePermissions :resources="localResource" />
+			<ResourceSharePermissions :resources="localResources" @update="updateResourcePermissions" />
 		</div>
 	</div>
 </template>
@@ -44,16 +44,16 @@ export default {
 	data() {
 		return {
 			loading: false,
-			contextResource: this.resources,
+			contextResources: this.resources,
 			contextReceivers: this.receivers,
 		}
 	},
 
 	computed: {
 		...mapGetters(['activeContext']),
-		localResource: {
+		localResources: {
 			get() {
-				return this.contextResource
+				return this.contextResources
 			},
 			set(v) {
 				this.$emit('update:resources', v)
@@ -71,16 +71,22 @@ export default {
 
 	methods: {
 		removeResource(resource) {
-			this.contextResource = this.contextResource.filter(r => r.key !== resource.key)
-			this.localResource = this.contextResource
+			this.contextResources = this.contextResources.filter(r => r.key !== resource.key)
+			this.localResources = this.contextResources
 		},
 		addResource(resource) {
-			this.contextResource.push(resource)
-			this.localResource = this.contextResource
+			this.contextResources.push(resource)
+			this.localResources = this.contextResources
 		},
 		updateReceivers(receivers) {
 			this.localReceivers = receivers
 		},
+		updateResourcePermissions({ resourceId, permission, value }) {
+			const resourceIndex = this.localResources.findIndex((resource) => resource.id === resourceId)
+			if (resourceIndex !== -1) {
+				this.localResources[resourceIndex][permission] = value
+			}
+		},
 
 	},
 }
diff --git a/src/shared/components/ncContextResource/ResourceForm.vue b/src/shared/components/ncContextResource/ResourceForm.vue
index 869a1c039..cbce265c3 100644
--- a/src/shared/components/ncContextResource/ResourceForm.vue
+++ b/src/shared/components/ncContextResource/ResourceForm.vue
@@ -124,6 +124,10 @@ export default {
 				type: element.type,
 				label: element.title,
 				subline: '',
+				permissionRead: true,
+				permissionCreate: true,
+				permissionUpdate: true,
+				permissionDelete: false,
 			}
 		},
 
diff --git a/src/shared/components/ncContextResource/ResourceSharePermissions.vue b/src/shared/components/ncContextResource/ResourceSharePermissions.vue
index 0f8b51267..264cd5615 100644
--- a/src/shared/components/ncContextResource/ResourceSharePermissions.vue
+++ b/src/shared/components/ncContextResource/ResourceSharePermissions.vue
@@ -1,10 +1,8 @@
 <template>
 	<div>
-		<h3>{{ t('tables', 'Sharing') }}</h3>
+		<h3>{{ t('tables', 'Shared resources permissions') }}</h3>
 		<ul v-if="resources && resources.length > 0" class="shares-list">
-			<div v-for="resource in resources"
-				:key="resource.key"
-				class="row">
+			<div v-for="resource in resources" :key="resource.key" class="row">
 				<div class="fix-col-2">
 					<div style="display:flex; align-items: center; padding: 10px;">
 						{{ resource.emoji }} &nbsp; {{ resource.title }}
@@ -12,45 +10,33 @@
 				</div>
 				<div class="fix-col-2" style="justify-content: end;">
 					<NcActions :force-menu="true">
-						<template>
-							<NcActionCaption :name="t('tables', 'Permissions')" />
-							<NcActionCheckbox
-								:disabled="true"
-								@check="updatePermission(resource, 'read', true)"
-								@uncheck="updatePermission(resource, 'read', false)">
-								{{ t('tables', 'Read data') }}
-							</NcActionCheckbox>
-							<!-- <NcActionCheckbox :checked.sync="share.permissionRead"
-								:disabled="share.permissionManage || share.permissionUpdate || share.permissionDelete"
-								@check="updatePermission(share, 'read', true)"
-								@uncheck="updatePermission(share, 'read', false)">
-								{{ t('tables', 'Read data') }}
-							</NcActionCheckbox>
-							<NcActionCheckbox :checked.sync="share.permissionCreate"
-								:disabled="share.permissionManage"
-								@check="updatePermission(share, 'create', true)"
-								@uncheck="updatePermission(share, 'create', false)">
-								{{ t('tables', 'Create data') }}
-							</NcActionCheckbox>
-							<NcActionCheckbox :checked.sync="share.permissionUpdate"
-								:disabled="share.permissionManage"
-								@check="updatePermission(share, 'update', true)"
-								@uncheck="updatePermission(share, 'update', false)">
-								{{ t('tables', 'Update data') }}
-							</NcActionCheckbox>
-							<NcActionCheckbox :checked.sync="share.permissionDelete"
-								:disabled="share.permissionManage"
-								@check="updatePermission(share, 'delete', true)"
-								@uncheck="updatePermission(share, 'delete', false)">
-								{{ t('tables', 'Delete data') }}
-							</NcActionCheckbox> -->
-						</template>
+						<NcActionCaption :name="t('tables', 'Permissions')" />
+						<NcActionCheckbox :checked.sync="resource.permissionRead" :disabled="true"
+							@check="updatePermission(resource, 'permissionRead', true)"
+							@uncheck="updatePermission(resource, 'permissionRead', false)">
+							{{ t('tables', 'Read resource') }}
+						</NcActionCheckbox>
+						<NcActionCheckbox :checked.sync="resource.permissionCreate"
+							@check="updatePermission(resource, 'create', true)"
+							@uncheck="updatePermission(resource, 'create', false)">
+							{{ t('tables', 'Create resource') }}
+						</NcActionCheckbox>
+						<NcActionCheckbox :checked.sync="resource.permissionUpdate"
+							@check="updatePermission(resource, 'update', true)"
+							@uncheck="updatePermission(resource, 'update', false)">
+							{{ t('tables', 'Update resource') }}
+						</NcActionCheckbox>
+						<NcActionCheckbox :checked.sync="resource.permissionDelete"
+							@check="updatePermission(resource, 'delete', true)"
+							@uncheck="updatePermission(resource, 'delete', false)">
+							{{ t('tables', 'Delete resource') }}
+						</NcActionCheckbox>
 					</NcActions>
 				</div>
 			</div>
 		</ul>
 		<div v-else>
-			{{ t('tables', 'No shares') }}
+			{{ t('tables', 'No shared resources') }}
 		</div>
 	</div>
 </template>
@@ -79,28 +65,18 @@ export default {
 	},
 
 	methods: {
-		updatePermission(share, permission, value) {
-			this.$emit('update', { id: share.id, permission, value })
+		updatePermission(resource, permission, value) {
+			this.$emit('update', { resourceId: resource.id, permission, value })
 		},
+
 	},
 }
 </script>
 
 <style lang="scss" scoped>
-
-	.shares-list li {
-		display: flex;
-		justify-content: space-between;
-		line-height: 44px;
-	}
-
-	.high-line-height {
-		line-height: 35px;
-	}
-
-	.manage-button {
-		display: flex;
-		justify-content: center;
-	}
-
+.shares-list li {
+	display: flex;
+	justify-content: space-between;
+	line-height: 44px;
+}
 </style>
diff --git a/src/shared/constants.js b/src/shared/constants.js
index 5092fae81..ceb32e169 100644
--- a/src/shared/constants.js
+++ b/src/shared/constants.js
@@ -21,3 +21,11 @@
 
 export const NODE_TYPE_TABLE = 0
 export const NODE_TYPE_VIEW = 1
+
+// from Application.php
+export const PERMISSION_READ = 1
+export const PERMISSION_CREATE = 2
+export const PERMISSION_UPDATE = 4
+export const PERMISSION_DELETE = 8
+export const PERMISSION_MANAGE = 16
+export const PERMISSION_ALL = 31

From 4e233798c59c4db5bbb4fd2c41fd62836c8ba34d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Thu, 18 Apr 2024 21:28:51 +0200
Subject: [PATCH 09/19] fix: rebase conflict

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Service/PermissionsService.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
index 44e2eb81d..26a647f98 100644
--- a/lib/Service/PermissionsService.php
+++ b/lib/Service/PermissionsService.php
@@ -166,14 +166,6 @@ public function canAccessContextById(int $contextId, ?string $userId = null): bo
 		}
 	}
 
-		try {
-			$this->contextMapper->findById($contextId, $userId ?? $this->userId);
-			return true;
-		} catch (NotFoundError $e) {
-			return false;
-		}
-	}
-
 	public function canAccessView(View $view, ?string $userId = null): bool {
 		return $this->canAccessNodeById(Application::NODE_TYPE_VIEW, $view->getId(), $userId);
 	}

From d25e62c26704d2c1c9e35d7f33ce2998eec6c808 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Thu, 18 Apr 2024 21:43:38 +0200
Subject: [PATCH 10/19] feat(Contexts): return received tables and views

- that is through the internal endpoints /tables/table and /tables/view

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Service/ContextService.php |  2 +-
 lib/Service/TableService.php   | 39 ++++++++++++++++++++++------------
 lib/Service/ViewService.php    | 31 +++++++++++++++++++++++----
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/lib/Service/ContextService.php b/lib/Service/ContextService.php
index a0e247bd8..a8fdf944b 100644
--- a/lib/Service/ContextService.php
+++ b/lib/Service/ContextService.php
@@ -422,7 +422,7 @@ protected function insertNodesFromArray(Context $context, array $nodes): void {
 				if (!$this->permissionsService->canManageNodeById($node['type'], $node['id'], $userId)) {
 					throw new PermissionError(sprintf('Owner cannot manage node %d (type %d)', $node['id'], $node['type']));
 				}
-				$contextNodeRel = $this->addNodeToContext($context, $node['id'], $node['type'], $node['permissions'] ?? 660);
+				$contextNodeRel = $this->addNodeToContext($context, $node['id'], $node['type'], $node['permissions'] ?? 0);
 				$addedNodes[] = $contextNodeRel->jsonSerialize();
 			} catch (Exception $e) {
 				$this->logger->warning('Could not add node {ntype}/{nid} to context {cid}, skipping.', [
diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php
index eda2eaa19..493e13ed0 100644
--- a/lib/Service/TableService.php
+++ b/lib/Service/TableService.php
@@ -44,6 +44,7 @@ class TableService extends SuperService {
 
 
 	protected IL10N $l;
+	private ContextService $contextService;
 
 	protected IEventDispatcher $eventDispatcher;
 
@@ -59,8 +60,9 @@ public function __construct(
 		ShareService $shareService,
 		UserHelper $userHelper,
 		FavoritesService $favoritesService,
+		IEventDispatcher $eventDispatcher,
+		ContextService $contextService,
 		IL10N $l,
-		IEventDispatcher $eventDispatcher
 	) {
 		parent::__construct($logger, $userId, $permissionsService);
 		$this->mapper = $mapper;
@@ -73,6 +75,7 @@ public function __construct(
 		$this->favoritesService = $favoritesService;
 		$this->l = $l;
 		$this->eventDispatcher = $eventDispatcher;
+		$this->contextService = $contextService;
 	}
 
 	/**
@@ -91,9 +94,13 @@ public function __construct(
 	public function findAll(?string $userId = null, bool $skipTableEnhancement = false, bool $skipSharedTables = false, bool $createTutorial = true): array {
 		/** @var string $userId */
 		$userId = $this->permissionsService->preCheckUserId($userId); // $userId can be set or ''
+		$allTables = [];
 
 		try {
-			$allTables = $this->mapper->findAll($userId); // get own tables
+			$ownedTables = $this->mapper->findAll($userId); // get own tables
+			foreach ($ownedTables as $ownedTable) {
+				$allTables[$ownedTable->getId()] = $ownedTable;
+			}
 		} catch (OcpDbException $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
 			throw new InternalError($e->getMessage());
@@ -102,7 +109,8 @@ public function findAll(?string $userId = null, bool $skipTableEnhancement = fal
 		// if there are no own tables found, create the tutorial table
 		if (count($allTables) === 0 && $createTutorial) {
 			try {
-				$allTables = [$this->create($this->l->t('Tutorial'), 'tutorial', '🚀')];
+				$tutorialTable = $this->create($this->l->t('Tutorial'), 'tutorial', '🚀');
+				$allTables = [$tutorialTable->getId() => $tutorialTable];
 			} catch (InternalError|PermissionError|DoesNotExistException|MultipleObjectsReturnedException|OcpDbException $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
 				throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());
@@ -114,16 +122,22 @@ public function findAll(?string $userId = null, bool $skipTableEnhancement = fal
 
 			// clean duplicates
 			foreach ($sharedTables as $sharedTable) {
-				$found = false;
-				foreach ($allTables as $table) {
-					if ($sharedTable->getId() === $table->getId()) {
-						$found = true;
-						break;
-					}
+				if (isset($allTables[$sharedTable->getId()])) {
+					$allTables[$sharedTable->getId()] = $sharedTable;
 				}
-				if (!$found) {
-					$allTables[] = $sharedTable;
+			}
+		}
+
+		$contexts = $this->contextService->findAll($userId);
+		foreach ($contexts as $context) {
+			$nodes = $context->getNodes();
+			foreach ($nodes as $node) {
+				if ($node['node_type'] !== Application::NODE_TYPE_TABLE
+					|| isset($allTables[$node['node_id']])
+				) {
+					continue;
 				}
+				$allTables[$node['node_id']] = $this->find($node['node_id'], $skipTableEnhancement, $userId);
 			}
 		}
 
@@ -144,8 +158,7 @@ public function findAll(?string $userId = null, bool $skipTableEnhancement = fal
 			}
 		}
 
-
-		return $allTables;
+		return array_values($allTables);
 	}
 
 	/**
diff --git a/lib/Service/ViewService.php b/lib/Service/ViewService.php
index 83782fd49..bc10a88bb 100644
--- a/lib/Service/ViewService.php
+++ b/lib/Service/ViewService.php
@@ -40,6 +40,7 @@ class ViewService extends SuperService {
 	protected FavoritesService $favoritesService;
 
 	protected IL10N $l;
+	private ContextService $contextService;
 
 	protected IEventDispatcher $eventDispatcher;
 
@@ -52,8 +53,9 @@ public function __construct(
 		RowService $rowService,
 		UserHelper $userHelper,
 		FavoritesService $favoritesService,
-		IL10N $l,
-		IEventDispatcher $eventDispatcher
+		IEventDispatcher $eventDispatcher,
+		ContextService $contextService,
+		IL10N $l
 	) {
 		parent::__construct($logger, $userId, $permissionsService);
 		$this->l = $l;
@@ -63,6 +65,7 @@ public function __construct(
 		$this->userHelper = $userHelper;
 		$this->favoritesService = $favoritesService;
 		$this->eventDispatcher = $eventDispatcher;
+		$this->contextService = $contextService;
 	}
 
 
@@ -148,11 +151,31 @@ public function findSharedViewsWithMe(?string $userId = null): array {
 		if ($userId === '') {
 			return [];
 		}
+
+		$allViews = [];
+
 		$sharedViews = $this->shareService->findViewsSharedWithMe($userId);
-		foreach ($sharedViews as $view) {
+		foreach ($sharedViews as $sharedView) {
+			$allViews[$sharedView->getId()] = $sharedView;
+		}
+
+		$contexts = $this->contextService->findAll($userId);
+		foreach ($contexts as $context) {
+			$nodes = $context->getNodes();
+			foreach ($nodes as $node) {
+				if ($node['node_type'] !== Application::NODE_TYPE_VIEW
+					|| isset($allViews[$node['node_id']])
+				) {
+					continue;
+				}
+				$allViews[$node['node_id']] = $this->find($node['node_id'], false, $userId);
+			}
+		}
+
+		foreach ($allViews as $view) {
 			$this->enhanceView($view, $userId);
 		}
-		return $sharedViews;
+		return array_values($allViews);
 	}
 
 

From 9975fb571dc5a41501a7118348da8f8124aa89d3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 19 Apr 2024 12:39:05 +0200
Subject: [PATCH 11/19] fix(Contexts): also update node permissions

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

diff --git a/lib/Service/ContextService.php b/lib/Service/ContextService.php
index a8fdf944b..57224f92c 100644
--- a/lib/Service/ContextService.php
+++ b/lib/Service/ContextService.php
@@ -160,8 +160,15 @@ public function update(int $contextId, string $userId, ?string $name, ?string $i
 			foreach ($nodes as $node) {
 				$key = sprintf('t%di%d', $node['type'], $node['id']);
 				if (isset($oldNodeResolvableIdMapper[$key])) {
-					unset($oldNodeResolvableIdMapper[$key]);
 					$nodesBeingKept[$key] = $node;
+					if ($node['permissions'] !== $currentNodes[$oldNodeResolvableIdMapper[$key]]['permissions']) {
+						$nodeRel = $this->contextNodeRelMapper->findById($currentNodes[$oldNodeResolvableIdMapper[$key]]['id']);
+						$nodeRel->setPermissions($node['permissions']);
+						$this->contextNodeRelMapper->update($nodeRel);
+						$currentNodes[$oldNodeResolvableIdMapper[$key]]['permissions'] = $nodeRel->getPermissions();
+						$hasUpdatedNodeInformation = true;
+					}
+					unset($oldNodeResolvableIdMapper[$key]);
 					continue;
 				}
 				$nodesBeingAdded[$key] = $node;
@@ -172,7 +179,7 @@ public function update(int $contextId, string $userId, ?string $name, ?string $i
 			}
 			unset($nodesBeingKept);
 
-			$hasUpdatedNodeInformation = !empty($nodesBeingAdded) || !empty($nodesBeingRemoved);
+			$hasUpdatedNodeInformation = $hasUpdatedNodeInformation || !empty($nodesBeingAdded) || !empty($nodesBeingRemoved);
 
 			foreach ($nodesBeingRemoved as $node) {
 				/** @var ContextNodeRelation $removedNode */
@@ -203,10 +210,11 @@ public function update(int $contextId, string $userId, ?string $name, ?string $i
 		}
 
 		$context = $this->contextMapper->update($context);
-		if ($hasUpdatedNodeInformation && isset($currentNodes) && isset($currentPages)) {
+		if (isset($currentNodes, $currentPages) && $hasUpdatedNodeInformation) {
 			$context->setNodes($currentNodes);
 			$context->setPages($currentPages);
 		}
+
 		return $context;
 	}
 

From 3c21982a8bc2a28e3ed35079d4b75ede0af9cea5 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Fri, 19 Apr 2024 16:31:32 +0100
Subject: [PATCH 12/19] enh: clean up

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 lib/Service/PermissionsService.php            |  1 -
 src/modules/modals/CreateContext.vue          | 20 ++-------
 src/modules/modals/EditContext.vue            | 24 ++++------
 .../ResourceSharePermissions.vue              | 16 ++++---
 .../ncContextResource/ResourceSharees.vue     |  4 +-
 .../mixins/permissionBitmask.js               | 21 +++++++++
 src/store/store.js                            | 44 ++++++++++---------
 7 files changed, 69 insertions(+), 61 deletions(-)
 create mode 100644 src/shared/components/ncContextResource/mixins/permissionBitmask.js

diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
index 26a647f98..562129c1f 100644
--- a/lib/Service/PermissionsService.php
+++ b/lib/Service/PermissionsService.php
@@ -151,7 +151,6 @@ public function canManageContextById(int $contextId, ?string $userId = null): bo
 		}
 
 		return $context->getOwnerId() === $userId || $this->canManageContext($context, $userId);
-		;
 	}
 
 	/**
diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index b07de8f38..29109e0f7 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -39,7 +39,7 @@
 				</div>
 				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
-			<div class="row space-R">
+			<div class="row space-R row space-T">
 				<div class="fix-col-4 end">
 					<NcButton type="primary" :aria-label="t('tables', 'Create application')" @click="submit">
 						{{ t('tables', 'Create application') }}
@@ -57,7 +57,7 @@ import '@nextcloud/dialogs/dist/index.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 { PERMISSION_READ, PERMISSION_CREATE, PERMISSION_UPDATE, PERMISSION_DELETE } from '../../shared/constants.js'
+import permissionBitmask from '../../shared/components/ncContextResource/mixins/permissionBitmask.js'
 
 export default {
 	name: 'CreateContext',
@@ -68,7 +68,7 @@ export default {
 		NcIconSvgWrapper,
 		NcContextResource,
 	},
-	mixins: [svgHelper],
+	mixins: [svgHelper, permissionBitmask],
 	props: {
 		showModal: {
 			type: Boolean,
@@ -88,10 +88,6 @@ export default {
 			description: '',
 			resources: [],
 			receivers: [],
-			PERMISSION_READ,
-			PERMISSION_CREATE,
-			PERMISSION_UPDATE,
-			PERMISSION_DELETE,
 		}
 	},
 	watch: {
@@ -131,20 +127,12 @@ export default {
 				}
 			}
 		},
-		getPermissionBitmaskFromBools(permissionRead, permissionCreate, permissionUpdate, permissionDelete) {
-			const read = permissionRead ? PERMISSION_READ : 0
-			const create = permissionCreate ? PERMISSION_CREATE : 0
-			const update = permissionUpdate ? PERMISSION_UPDATE : 0
-			const del = permissionDelete ? PERMISSION_DELETE : 0
-			return read | create | update | del
-		},
 		async sendNewContextToBE() {
 			const dataResources = this.resources.map(resource => {
 				return {
 					id: parseInt(resource.id),
 					type: parseInt(resource.nodeType),
-					// TODO get right permissions for the node
-					permissions: this.getPermissionBitmaskFromBools(true /* ensure permission is always true */, resource.permissionCreate, resource.permissionUpdate, resource.permissionDelete),
+					permissions: this.getPermissionBitmaskFromBools(true /* ensure read permission is always true */, resource.permissionCreate, resource.permissionUpdate, resource.permissionDelete),
 				}
 			})
 			const data = {
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 0903de839..db4f30ca6 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -36,7 +36,7 @@
 				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
 
-			<div class="row space-R">
+			<div class="row space-R row space-T">
 				<div class="fix-col-4 end">
 					<NcButton type="primary" @click="submit">
 						{{ t('tables', 'Save') }}
@@ -50,12 +50,14 @@
 <script>
 import { NcModal, NcButton, NcIconSvgWrapper } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
+import { getCurrentUser } from '@nextcloud/auth'
 import '@nextcloud/dialogs/dist/index.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 svgHelper from '../../shared/components/ncIconPicker/mixins/svgHelper.js'
+import permissionBitmask from '../../shared/components/ncContextResource/mixins/permissionBitmask.js'
 
 export default {
 	name: 'EditContext',
@@ -66,7 +68,7 @@ export default {
 		NcIconSvgWrapper,
 		NcContextResource,
 	},
-	mixins: [svgHelper],
+	mixins: [svgHelper, permissionBitmask],
 	props: {
 		showModal: {
 			type: Boolean,
@@ -92,6 +94,7 @@ export default {
 			PERMISSION_CREATE,
 			PERMISSION_UPDATE,
 			PERMISSION_DELETE,
+
 		}
 	},
 	computed: {
@@ -128,7 +131,6 @@ export default {
 			this.reset()
 			this.$emit('close')
 		},
-		// TODO show edited changes without having to reload
 		async submit() {
 			if (this.title === '') {
 				showError(t('tables', 'Cannot update context. Title is missing.'))
@@ -138,8 +140,7 @@ export default {
 					return {
 						id: parseInt(resource.id),
 						type: parseInt(resource.nodeType),
-						// TODO get right permissions for the node
-						permissions: this.getPermissionBitmaskFromBools(true /* ensure permission is always true */, resource.permissionCreate, resource.permissionUpdate, resource.permissionDelete),
+						permissions: this.getPermissionBitmaskFromBools(true /* ensure read permission is always true */, resource.permissionCreate, resource.permissionUpdate, resource.permissionDelete),
 					}
 				})
 				const data = {
@@ -167,26 +168,19 @@ export default {
 			this.receivers = context ? this.getContextReceivers(context) : []
 		},
 		getContextReceivers(context) {
-			const sharing = Object.values(context.sharing)
+			let sharing = Object.values(context.sharing)
+			sharing = sharing.filter((share) => getCurrentUser().uid !== share.receiver)
 			const receivers = sharing.map((share) => {
 				return {
 					user: share.receiver,
 					displayName: share.receiver,
-					icon: 'icon-user',
+					icon: share.receiver_type === 'user' ? 'icon-user' : 'icon-group',
 					isUser: share.receiver_type === 'user',
 					key: share.receiver_type + '-' + share.receiver,
 				}
 			})
 			return receivers
 		},
-		// TODO use mixin or similar for reusability
-		getPermissionBitmaskFromBools(permissionRead, permissionCreate, permissionUpdate, permissionDelete) {
-			const read = permissionRead ? PERMISSION_READ : 0
-			const create = permissionCreate ? PERMISSION_CREATE : 0
-			const update = permissionUpdate ? PERMISSION_UPDATE : 0
-			const del = permissionDelete ? PERMISSION_DELETE : 0
-			return read | create | update | del
-		},
 		getPermissionFromBitmask(bitmask, permission) {
 			return !!(bitmask & permission)
 		},
diff --git a/src/shared/components/ncContextResource/ResourceSharePermissions.vue b/src/shared/components/ncContextResource/ResourceSharePermissions.vue
index 264cd5615..002dc2c37 100644
--- a/src/shared/components/ncContextResource/ResourceSharePermissions.vue
+++ b/src/shared/components/ncContextResource/ResourceSharePermissions.vue
@@ -1,6 +1,8 @@
 <template>
 	<div>
-		<h3>{{ t('tables', 'Shared resources permissions') }}</h3>
+		<div class="col-4">
+			{{ t('tables', 'Shared resources permissions') }}
+		</div>
 		<ul v-if="resources && resources.length > 0" class="shares-list">
 			<div v-for="resource in resources" :key="resource.key" class="row">
 				<div class="fix-col-2">
@@ -17,18 +19,18 @@
 							{{ t('tables', 'Read resource') }}
 						</NcActionCheckbox>
 						<NcActionCheckbox :checked.sync="resource.permissionCreate"
-							@check="updatePermission(resource, 'create', true)"
-							@uncheck="updatePermission(resource, 'create', false)">
+							@check="updatePermission(resource, 'permissionCreate', true)"
+							@uncheck="updatePermission(resource, 'permissionCreate', false)">
 							{{ t('tables', 'Create resource') }}
 						</NcActionCheckbox>
 						<NcActionCheckbox :checked.sync="resource.permissionUpdate"
-							@check="updatePermission(resource, 'update', true)"
-							@uncheck="updatePermission(resource, 'update', false)">
+							@check="updatePermission(resource, 'permissionUpdate', true)"
+							@uncheck="updatePermission(resource, 'permissionUpdate', false)">
 							{{ t('tables', 'Update resource') }}
 						</NcActionCheckbox>
 						<NcActionCheckbox :checked.sync="resource.permissionDelete"
-							@check="updatePermission(resource, 'delete', true)"
-							@uncheck="updatePermission(resource, 'delete', false)">
+							@check="updatePermission(resource, 'permissionDelete', true)"
+							@uncheck="updatePermission(resource, 'permissionDelete', false)">
 							{{ t('tables', 'Delete resource') }}
 						</NcActionCheckbox>
 					</NcActions>
diff --git a/src/shared/components/ncContextResource/ResourceSharees.vue b/src/shared/components/ncContextResource/ResourceSharees.vue
index 314ac5d4b..254a67a17 100644
--- a/src/shared/components/ncContextResource/ResourceSharees.vue
+++ b/src/shared/components/ncContextResource/ResourceSharees.vue
@@ -1,6 +1,8 @@
 <template>
 	<div class="row space-B">
-		<h3>{{ t('tables', 'Share with accounts or groups') }}</h3>
+		<div class="col-4">
+			{{ t('tables', 'Share with accounts') }}
+		</div>
 		<NcSelect v-model="preExistingSharees" style="width: 100%;" :loading="loading" :options="options"
 			:placeholder="getPlaceholder()"
 			:searchable="true" :get-option-key="(option) => option.key"
diff --git a/src/shared/components/ncContextResource/mixins/permissionBitmask.js b/src/shared/components/ncContextResource/mixins/permissionBitmask.js
new file mode 100644
index 000000000..26912b581
--- /dev/null
+++ b/src/shared/components/ncContextResource/mixins/permissionBitmask.js
@@ -0,0 +1,21 @@
+import { PERMISSION_READ, PERMISSION_CREATE, PERMISSION_UPDATE, PERMISSION_DELETE } from '../../../constants.js'
+
+export default {
+	data() {
+		return {
+			PERMISSION_READ,
+			PERMISSION_CREATE,
+			PERMISSION_UPDATE,
+			PERMISSION_DELETE,
+		}
+	},
+	methods: {
+		getPermissionBitmaskFromBools(permissionRead, permissionCreate, permissionUpdate, permissionDelete) {
+			const read = permissionRead ? PERMISSION_READ : 0
+			const create = permissionCreate ? PERMISSION_CREATE : 0
+			const update = permissionUpdate ? PERMISSION_UPDATE : 0
+			const del = permissionDelete ? PERMISSION_DELETE : 0
+			return read | create | update | del
+		},
+	},
+}
diff --git a/src/store/store.js b/src/store/store.js
index 87769e7f7..c48449f2e 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -328,26 +328,32 @@ export default new Vuex.Store({
 				nodeId: id,
 				displayMode: 2,
 			}
-			// TODO use try catch
-			for (const receiver of receivers) {
-				share.receiverType = receiver.isUser ? 'user' : 'group'
-				share.receiver = receiver.user
-				// 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)
+			try {
+				for (const receiver of receivers) {
+					share.receiverType = receiver.isUser ? 'user' : 'group'
+					share.receiver = receiver.user
+					// 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)
+					}
 				}
+			} catch (e) {
+				displayError(e, t('tables', 'Could not add context share.'))
 			}
-
-			// If there's a previous share that wasn't maintained, delete it
-			for (const previousReceiver of previousReceivers) {
-				const currentShare = receivers.find((r) => {
-					const receiverType = r.isUser ? 'user' : 'group'
-					return r.user === previousReceiver.receiver && receiverType === previousReceiver.receiver_type
-				})
-				if (!currentShare) {
-					await axios.delete(generateUrl('/apps/tables/share/' + previousReceiver.share_id))
+			try {
+				// If there's a previous share that wasn't maintained, delete it
+				for (const previousReceiver of previousReceivers) {
+					const currentShare = receivers.find((r) => {
+						const receiverType = r.isUser ? 'user' : 'group'
+						return r.user === previousReceiver.receiver && receiverType === previousReceiver.receiver_type
+					})
+					if (!currentShare) {
+						await axios.delete(generateUrl('/apps/tables/share/' + previousReceiver.share_id))
+					}
 				}
+			} catch (e) {
+				displayError(e, t('tables', 'Could not remove context share.'))
 			}
 		},
 		async insertNewContext({ commit, state, dispatch }, { data, receivers }) {
@@ -493,10 +499,6 @@ export default new Vuex.Store({
 			return true
 		},
 
-		// TODO, maybe. For shared contexts, need to fetch and store associated context resources
-		async loadContextResources({ state, commit, dispatch }, { id }) {
-		},
-
 		async removeTable({ state, commit }, { tableId }) {
 			try {
 				await axios.delete(generateUrl('/apps/tables/table/' + tableId))

From dae91b988879c74584128a057dddae3c680de516 Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Fri, 19 Apr 2024 16:38:58 +0100
Subject: [PATCH 13/19] enh: use application instead of context in error

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 src/store/store.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/store.js b/src/store/store.js
index c48449f2e..1ab5e0e4d 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -339,7 +339,7 @@ export default new Vuex.Store({
 					}
 				}
 			} catch (e) {
-				displayError(e, t('tables', 'Could not add context share.'))
+				displayError(e, t('tables', 'Could not add application share.'))
 			}
 			try {
 				// If there's a previous share that wasn't maintained, delete it
@@ -353,7 +353,7 @@ export default new Vuex.Store({
 					}
 				}
 			} catch (e) {
-				displayError(e, t('tables', 'Could not remove context share.'))
+				displayError(e, t('tables', 'Could not remove application share.'))
 			}
 		},
 		async insertNewContext({ commit, state, dispatch }, { data, receivers }) {

From 81aa6e0065ee2856bd87cca9617a2a5aec526285 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 19 Apr 2024 15:03:14 +0200
Subject: [PATCH 14/19] test(integration): improve failed test message

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 tests/integration/features/bootstrap/FeatureContext.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index 7a4757e24..f6d3005fd 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -611,7 +611,8 @@ public function userTables(string $user, TableNode $body = null): void {
 			$titles[] = $d['title'];
 		}
 		foreach ($body->getRows()[0] as $tableTitle) {
-			Assert::assertTrue(in_array($tableTitle, $titles, true));
+			$message = sprintf('"%s" not in the list: %s', $tableTitle, implode(', ', $titles));
+			Assert::assertTrue(in_array($tableTitle, $titles, true), $message);
 		}
 	}
 

From 199adf0074b57b91989ea3f74d797a3e72f343c8 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 19 Apr 2024 17:58:59 +0200
Subject: [PATCH 15/19] fix: do not overwrite AllTables with tutorial one

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

diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php
index 493e13ed0..55ad1c64b 100644
--- a/lib/Service/TableService.php
+++ b/lib/Service/TableService.php
@@ -110,7 +110,7 @@ public function findAll(?string $userId = null, bool $skipTableEnhancement = fal
 		if (count($allTables) === 0 && $createTutorial) {
 			try {
 				$tutorialTable = $this->create($this->l->t('Tutorial'), 'tutorial', '🚀');
-				$allTables = [$tutorialTable->getId() => $tutorialTable];
+				$allTables[$tutorialTable->getId()] = $tutorialTable;
 			} catch (InternalError|PermissionError|DoesNotExistException|MultipleObjectsReturnedException|OcpDbException $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
 				throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());

From 0a2f137b762669a238e9894474aae0f33500b4a2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 19 Apr 2024 18:07:25 +0200
Subject: [PATCH 16/19] fix: wrongly inverted condition for adding shared
 tables

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

diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php
index 55ad1c64b..2c3bb2884 100644
--- a/lib/Service/TableService.php
+++ b/lib/Service/TableService.php
@@ -122,7 +122,7 @@ public function findAll(?string $userId = null, bool $skipTableEnhancement = fal
 
 			// clean duplicates
 			foreach ($sharedTables as $sharedTable) {
-				if (isset($allTables[$sharedTable->getId()])) {
+				if (!isset($allTables[$sharedTable->getId()])) {
 					$allTables[$sharedTable->getId()] = $sharedTable;
 				}
 			}

From 54b8ef8612ad0d018feccfbc3ab01349c028cac6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 19 Apr 2024 18:43:39 +0200
Subject: [PATCH 17/19] fix(Permissions): expect "context" in checkPermission

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Service/PermissionsService.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
index 562129c1f..93ed1bb8a 100644
--- a/lib/Service/PermissionsService.php
+++ b/lib/Service/PermissionsService.php
@@ -523,13 +523,13 @@ private function hasPermission(int $existingPermissions, string $permissionName)
 	}
 
 	/**
-	 * @param mixed $element
-	 * @param 'table'|'view' $nodeType
+	 * @param Table|View|Context $element
+	 * @param 'table'|'view'|'context' $nodeType
 	 * @param string $permission
 	 * @param string|null $userId
 	 * @return bool
 	 */
-	private function checkPermission($element, string $nodeType, string $permission, ?string $userId = null): bool {
+	private function checkPermission(Table|View|Context $element, string $nodeType, string $permission, ?string $userId = null): bool {
 		if($this->basisCheck($element, $nodeType, $userId)) {
 			return true;
 		}
@@ -542,7 +542,9 @@ private function checkPermission($element, string $nodeType, string $permission,
 			return $this->getSharedPermissionsIfSharedWithMe($element->getId(), $nodeType, $userId)[$permission];
 		} catch (NotFoundError $e) {
 			try {
-				if ($this->hasPermission($this->getPermissionIfAvailableThroughContext($element->getId(), $nodeType, $userId), $permission)) {
+				if ($nodeType !== 'context'
+					&& $this->hasPermission($this->getPermissionIfAvailableThroughContext($element->getId(), $nodeType, $userId), $permission)
+				) {
 					return true;
 				}
 			} catch (NotFoundError $e) {
@@ -580,13 +582,7 @@ private function checkPermissionById(int $elementId, string $nodeType, string $p
 		return false;
 	}
 
-	/**
-	 * @param Table|View|Context $element
-	 * @param string $nodeType
-	 * @param string|null $userId
-	 * @return bool
-	 */
-	private function basisCheck($element, string $nodeType, ?string &$userId): bool {
+	private function basisCheck(Table|View|Context $element, string $nodeType, ?string &$userId): bool {
 		try {
 			$userId = $this->preCheckUserId($userId);
 		} catch (InternalError $e) {

From dfdcc50cf39407ccd3461c0771ab5b1048be18c0 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Mon, 22 Apr 2024 16:37:26 +0200
Subject: [PATCH 18/19] fix(Contexts): show sharees` displayname in edit modal

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Db/ContextMapper.php           | 10 +++++++---
 src/modules/modals/EditContext.vue |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/Db/ContextMapper.php b/lib/Db/ContextMapper.php
index 964e3d515..15959e767 100644
--- a/lib/Db/ContextMapper.php
+++ b/lib/Db/ContextMapper.php
@@ -6,6 +6,7 @@
 
 use OCA\Tables\AppInfo\Application;
 use OCA\Tables\Errors\NotFoundError;
+use OCA\Tables\Helper\GroupHelper;
 use OCA\Tables\Helper\UserHelper;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\Exception;
@@ -15,10 +16,8 @@
 /** @template-extends QBMapper<Context> */
 class ContextMapper extends QBMapper {
 	protected string $table = 'tables_contexts_context';
-	private UserHelper $userHelper;
 
-	public function __construct(IDBConnection $db, UserHelper $userHelper) {
-		$this->userHelper = $userHelper;
+	public function __construct(IDBConnection $db, protected UserHelper $userHelper, protected GroupHelper $groupHelper) {
 		parent::__construct($db, $this->table, Context::class);
 	}
 
@@ -86,6 +85,11 @@ protected function formatResultRows(array $rows, ?string $userId) {
 				'share_id' => (int)$item['share_id'],
 				'receiver' => $item['receiver'],
 				'receiver_type' => $item['receiver_type'],
+				'receiver_display_name' => match ($item['receiver_type']) {
+					'user' => $this->userHelper->getUserDisplayName($item['receiver']),
+					'group' => $this->groupHelper->getGroupDisplayName($item['receiver']),
+					default => $item['receiver'],
+				},
 				'display_mode_default' => (int)$item['display_mode_default'],
 			];
 			if ($userId !== null) {
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index db4f30ca6..a27036907 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -173,7 +173,7 @@ export default {
 			const receivers = sharing.map((share) => {
 				return {
 					user: share.receiver,
-					displayName: share.receiver,
+					displayName: share.receiver_display_name,
 					icon: share.receiver_type === 'user' ? 'icon-user' : 'icon-group',
 					isUser: share.receiver_type === 'user',
 					key: share.receiver_type + '-' + share.receiver,

From 98a2a8518d047acc215ce22d8c351be5c009ef5f Mon Sep 17 00:00:00 2001
From: Cleopatra Enjeck M <patrathewhiz@gmail.com>
Date: Tue, 23 Apr 2024 15:44:22 +0100
Subject: [PATCH 19/19] remove col style

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
---
 .../components/ncContextResource/ResourceSharePermissions.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/ncContextResource/ResourceSharePermissions.vue b/src/shared/components/ncContextResource/ResourceSharePermissions.vue
index 002dc2c37..7550f5825 100644
--- a/src/shared/components/ncContextResource/ResourceSharePermissions.vue
+++ b/src/shared/components/ncContextResource/ResourceSharePermissions.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<div class="col-4">
+		<div>
 			{{ t('tables', 'Shared resources permissions') }}
 		</div>
 		<ul v-if="resources && resources.length > 0" class="shares-list">