Merge pull request #319 from nextcloud/restricted

create restricted instead of invisible tags in approval settings

Author: lukasdotcom

lib/Controller/ConfigController.php

@@ -40,6 +40,7 @@ public function __construct(
 	 * @param string $name of the new tag
 	 * @return DataResponse
 	 */
+	#[AuthorizedAdminSetting(settings: Admin::class)]
 	public function createTag(string $name): DataResponse {
 		$result = $this->utilsService->createTag($name);
 		if (isset($result['error'])) {

lib/Service/UtilsService.php

@@ -172,7 +172,7 @@ public function userHasAccessTo(int $fileId, ?string $userId): bool {
 	 */
 	public function createTag(string $name): array {
 		try {
-			$tag = $this->tagManager->createTag($name, false, false);
+			$tag = $this->tagManager->createTag($name, true, false);
 			return ['id' => $tag->getId()];
 		} catch (TagAlreadyExistsException $e) {
 			return ['error' => 'Tag already exists'];

lib/Settings/Admin.php

@@ -10,25 +10,19 @@
 use OCA\Approval\AppInfo\Application;
 use OCP\AppFramework\Http\TemplateResponse;
 
-use OCP\AppFramework\Services\IInitialState;
-use OCP\IGroupManager;
 use OCP\Settings\IDelegatedSettings;
 
 class Admin implements IDelegatedSettings {
 
 	public function __construct(
 		private string $appName,
-		private IGroupManager $groupManager,
-		private IInitialState $initialStateService,
-		private ?string $userId,
 	) {
 	}
 
 	/**
 	 * @return TemplateResponse
 	 */
 	public function getForm(): TemplateResponse {
-		$this->initialStateService->provideInitialState('is-admin', $this->groupManager->isAdmin($this->userId));
 		return new TemplateResponse(Application::APP_ID, 'adminSettings');
 	}
 

src/components/AdminSettings.vue

@@ -30,7 +30,6 @@
 				<ApprovalRule v-for="(rule, id) in rules"
 					:key="id"
 					v-model:value="rules[id]"
-					:is-admin="isAdmin"
 					class="approval-rule"
 					@input="onRuleInput(id, $event)"
 					@add-tag="onAddTagClick">
@@ -55,7 +54,6 @@
 				<div v-if="newRule" class="new-rule">
 					<ApprovalRule
 						v-model:value="newRule"
-						:is-admin="isAdmin"
 						:delete-rule-label="newRuleDeleteLabel"
 						:focus="true"
 						@add-tag="onAddTagClick">
@@ -91,10 +89,10 @@
 				</template>
 				{{ t('approval', 'New workflow') }}
 			</NcButton>
-			<div v-if="isAdmin" class="create-tag">
+			<div class="create-tag">
 				<label for="create-tag-input">
 					<TagIcon :size="16" />
-					{{ t('approval', 'Create new hidden tag') }}
+					{{ t('approval', 'Create new restricted tag') }}
 				</label>
 				<input id="create-tag-input"
 					ref="createTagInput"
@@ -129,7 +127,6 @@ import ApprovalRule from './ApprovalRule.vue'
 import { generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 import { showSuccess, showError } from '@nextcloud/dialogs'
-import { loadState } from '@nextcloud/initial-state'
 
 export default {
 	name: 'AdminSettings',
@@ -148,7 +145,6 @@ export default {
 
 	data() {
 		return {
-			isAdmin: loadState('approval', 'is-admin'),
 			showRules: true,
 			newTagName: '',
 			rules: {},

src/components/ApprovalRule.vue

@@ -22,7 +22,6 @@
 					{{ pendingLabel }}
 					<div class="spacer" />
 					<span
-						v-if="isAdmin"
 						:title="t('approval', 'Create new hidden tag')"
 						class="add-tag-button"
 						@click="$emit('add-tag')">
@@ -75,7 +74,6 @@
 					{{ approvedLabel }}
 					<div class="spacer" />
 					<span
-						v-if="isAdmin"
 						:title="t('approval', 'Create new hidden tag')"
 						class="add-tag-button"
 						@click="$emit('add-tag')">
@@ -99,7 +97,6 @@
 					{{ rejectedLabel }}
 					<div class="spacer" />
 					<span
-						v-if="isAdmin"
 						:title="t('approval', 'Create new hidden tag')"
 						class="add-tag-button"
 						@click="$emit('add-tag')">
@@ -163,10 +160,6 @@ export default {
 			type: Boolean,
 			default: false,
 		},
-		isAdmin: {
-			type: Boolean,
-			default: true,
-		},
 	},
 
 	emits: ['add-tag', 'input', 'update:value'],