chore(settings): Switch to NcSelect

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Jul 31, 2023 · a57490e · a57490e
1 parent b548434
commit a57490e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
@@ -171,7 +171,7 @@
 							{{ t('richdocuments', 'Loading available demo servers …') }}
 						</p>
 						<p v-else-if="demoServers.length > 0">
-							<NcMultiselect v-if="serverMode === 'demo'"
+							<NcSelect v-if="serverMode === 'demo'"
 								v-model="settings.demoUrl"
 								:custom-label="demoServerLabel"
 								track-by="demo_url"
@@ -335,7 +335,7 @@
 					:disabled="updating"
 					@input="update" />
 				<p v-if="settings.watermark.allTags" class="checkbox-details">
-					<SettingsSelectTag v-model="settings.watermark.allTagsList" :label="t('richdocuments', 'Select tags to enforce watermarking')" @input="update" />
+					<NcSelectTags v-model="settings.watermark.allTagsList" :label="t('richdocuments', 'Select tags to enforce watermarking')" @input="update" />
 				</p>
 				<SettingsCheckbox v-model="settings.watermark.allGroups"
 					:label="t('richdocuments', 'Show watermark for users of groups')"
@@ -386,7 +386,7 @@
 					:disabled="updating"
 					@input="update" />
 				<p v-if="!settings.watermark.linkAll && settings.watermark.linkTags" class="checkbox-details">
-					<SettingsSelectTag v-model="settings.watermark.linkTagsList" :label="t('richdocuments', 'Select tags to enforce watermarking')" @input="update" />
+					<NcSelectTags v-model="settings.watermark.linkTagsList" :label="t('richdocuments', 'Select tags to enforce watermarking')" @input="update" />
 				</p>
 			</div>
 		</div>
@@ -398,11 +398,10 @@ import Vue from 'vue'
 import { loadState } from '@nextcloud/initial-state'
 import { generateUrl, generateFilePath } from '@nextcloud/router'
 import { showWarning, showError } from '@nextcloud/dialogs'
-import { NcModal, NcMultiselect } from '@nextcloud/vue'
+import { NcModal, NcSelect, NcSelectTags } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import SettingsCheckbox from './SettingsCheckbox.vue'
 import SettingsInputText from './SettingsInputText.vue'
-import SettingsSelectTag from './SettingsSelectTag.vue'
 import SettingsSelectGroup from './SettingsSelectGroup.vue'
 import SettingsExternalApps from './SettingsExternalApps.vue'
 import SettingsInputFile from './SettingsInputFile.vue'
@@ -426,9 +425,9 @@ export default {
 	components: {
 		SettingsCheckbox,
 		SettingsInputText,
-		SettingsSelectTag,
 		SettingsSelectGroup,
-		NcMultiselect,
+		NcSelect,
+		NcSelectTags,
 		SettingsExternalApps,
 		SettingsInputFile,
 		SettingsFontList,

diff --git a/src/components/SettingsSelectGroup.vue b/src/components/SettingsSelectGroup.vue
@@ -21,32 +21,30 @@
   -->
 
 <template>
-	<NcMultiselect v-model="inputValObjects"
+	<NcSelect v-model="inputValObjects"
 		:options="groupsArray"
-		:auto-limit="false"
+		:input-id="uuid"
 		:placeholder="label"
-		track-by="id"
 		label="displayname"
-		class="multiselect-vue"
 		:multiple="true"
 		:close-on-select="false"
 		:disabled="disabled"
 		@input="update"
-		@search-change="asyncFindGroup">
+		@search="asyncFindGroup">
 		<span slot="noResult">{{ t('settings', 'No results') }}</span>
-	</NcMultiselect>
+	</NcSelect>
 </template>
 
 <script>
 import axios from '@nextcloud/axios'
-import { NcMultiselect } from '@nextcloud/vue'
+import { NcSelect } from '@nextcloud/vue'
 import { generateOcsUrl } from '@nextcloud/router'
 
 let uuid = 0
 export default {
 	name: 'SettingsSelectGroup',
 	components: {
-		NcMultiselect,
+		NcSelect,
 	},
 	props: {
 		label: {