Admin and User UI Improvements

SebastianKrupinski · Oct 11, 2023 · ae55797 · ae55797
1 parent edee965
commit ae55797
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 21 deletions.
diff --git a/js/data-AdminSettings.js b/js/data-AdminSettings.js
diff --git a/js/data-AdminSettings.js.map b/js/data-AdminSettings.js.map
diff --git a/js/data-UserSettings.js b/js/data-UserSettings.js
diff --git a/js/data-UserSettings.js.map b/js/data-UserSettings.js.map
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -287,6 +287,8 @@ public function deleteService($data): DataResponse {
 	/**
 	 * handles fetch settings requests
 	 * 
+	 * @NoAdminRequired
+	 * 
 	 * @return DataResponse
 	 */
 	public function fetchSystemSettings(): DataResponse {

diff --git a/lib/Service/ConfigurationService.php b/lib/Service/ConfigurationService.php
@@ -44,6 +44,7 @@ class ConfigurationService {
 	private const _SYSTEM = [
 		'permissions_user_create' => '1',
 		'permissions_user_modify' => '1',
+		'permissions_user_delete' => '1',
 	];
 
 	/**

diff --git a/src/AdminSettings.vue b/src/AdminSettings.vue
@@ -42,6 +42,11 @@
 						{{ t('data_service', 'Allow users to modify services') }}
 					</NcCheckboxRadioSwitch>
 				</div>
+				<div>
+					<NcCheckboxRadioSwitch type="switch" :checked.sync="permissionsUserDelete" @update:checked="depositSettings">
+						{{ t('data_service', 'Allow users to delete services') }}
+					</NcCheckboxRadioSwitch>
+				</div>
 			</div>
 			<div class="data-settings-section-services">
 				<div class="data-settings-hint">
@@ -324,6 +329,14 @@ export default {
 				this.configuredSettings.permissions_user_modify = (value === true) ? '1' : '0'
 			},
 		},
+		permissionsUserDelete: {
+			get() {
+				return (this.configuredSettings.permissions_user_delete === '1')
+			},
+			set(value) {
+				this.configuredSettings.permissions_user_delete = (value === true) ? '1' : '0'
+			},
+		},
 	},
 
 	watch: {

diff --git a/src/UserSettings.vue b/src/UserSettings.vue
@@ -61,13 +61,15 @@
 									<template #icon>
 										<IconActions />
 									</template>
-									<NcActionButton @click="onEditClick(item.id)">
+									<NcActionButton v-if="configuredSettings.permissions_user_modify === '1'"
+										@click="onModifyClick(item.id)">
 										<template #icon>
-											<IconEdit />
+											<IconModify />
 										</template>
-										Edit
+										Modify
 									</NcActionButton>
-									<NcActionButton @click="onDeleteClick(item.id)">
+									<NcActionButton v-if="configuredSettings.permissions_user_delete === '1'"
+										@click="onDeleteClick(item.id)">
 										<template #icon>
 											<IconDelete />
 										</template>
@@ -83,7 +85,7 @@
 				<h3>{{ t('data_service', 'No data services have been created for this account') }}</h3>
 			</div>
 			<br>
-			<div class="data-settings-content-actions">
+			<div v-if="configuredSettings.permissions_user_create === '1'" class="data-settings-content-actions">
 				<NcButton class="app-settings-button" @click="onAddClick()">
 					<template #icon>
 						<IconAdd :size="24" />
@@ -219,7 +221,7 @@ import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 import IconApp from 'vue-material-design-icons/DatabaseOutline.vue'
 import IconAdd from 'vue-material-design-icons/DatabaseExportOutline.vue'
-import IconEdit from 'vue-material-design-icons/DatabaseEditOutline.vue'
+import IconModify from 'vue-material-design-icons/DatabaseEditOutline.vue'
 import IconDelete from 'vue-material-design-icons/DatabaseRemoveOutline.vue'
 import IconSave from 'vue-material-design-icons/Check.vue'
 import IconCancel from 'vue-material-design-icons/Close.vue'
@@ -236,7 +238,7 @@ export default {
 		NcSelect,
 		IconApp,
 		IconAdd,
-		IconEdit,
+		IconModify,
 		IconDelete,
 		IconSave,
 		IconCancel,
@@ -251,6 +253,7 @@ export default {
 			availableTypes: [],
 			availableCollections: [],
 			availableFormats: [],
+			configuredSettings: [],
 			configuredServices: [],
 			selectedId: '',
 			selectedServiceId: '',
@@ -276,14 +279,15 @@ export default {
 
 	methods: {
 		loadData() {
+			this.fetchSettings()
 			this.listTypes()
 			this.listServices()
 		},
 		onAddClick() {
 			this.clearSelected()
 			this.dialogServiceSettings = true
 		},
-		onEditClick(id) {
+		onModifyClick(id) {
 			// clear values
 			this.clearSelected()
 			// find item
@@ -482,6 +486,23 @@ export default {
 				})
 				.then(() => {})
 		},
+		fetchSettings() {
+			const uri = generateUrl('/apps/data/fetch-system-settings')
+			axios.get(uri)
+				.then((response) => {
+					if (response.data) {
+						this.configuredSettings = response.data
+					}
+				})
+				.catch((error) => {
+					showError(
+						t('data_service', 'Failed to retrieve system settings')
+						+ ': ' + error.response.request.responseText
+					)
+				})
+				.then(() => {
+				})
+		},
 		formatDate(dt) {
 			if (dt) {
 				return (new Date(dt * 1000)).toLocaleString()
@@ -527,6 +548,8 @@ export default {
 		width: auto;
 		padding-left: 10px;
 		padding-right: 10px;
+		padding-top: 5px;
+		padding-bottom: 5px;
 	}
 	.data-settings-button {
 		display:inline-flex;