fix: update usergroup column elements

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>

src/shared/components/ncTable/mixins/columnsTypes/usergroup.js

@@ -13,6 +13,10 @@ export default class UsergroupColumn extends AbstractUsergroupColumn {
 		this.usergroupSelectGroups = data.usergroupSelectGroups
 	}
 
+	// TODO consider if we want to sort, and how
+	// sort(mode) {
+	// }
+
 	getValueString(valueObject) {
 		valueObject = valueObject || this.value || null
 
@@ -22,7 +26,7 @@ export default class UsergroupColumn extends AbstractUsergroupColumn {
 			if (ret === '') {
 				ret = obj.id
 			} else {
-				ret += ', ' + obj.display
+				ret += ', ' + obj.id
 			}
 		})
 		return ret

src/shared/components/ncTable/mixins/filter.js

@@ -49,7 +49,7 @@ export const Filters = {
 	Contains: new Filter({
 		id: FilterIds.Contains,
 		label: t('tables', 'Contains'),
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLong, ColumnTypes.TextLink, ColumnTypes.TextRich, ColumnTypes.SelectionMulti, ColumnTypes.Usergroup],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLong, ColumnTypes.TextLink, ColumnTypes.TextRich, ColumnTypes.SelectionMulti],
 		incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual],
 	}),
 	BeginsWith: new Filter({
@@ -68,7 +68,7 @@ export const Filters = {
 		id: FilterIds.IsEqual,
 		label: t('tables', 'Is equal'),
 		shortLabel: '=',
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.Number, ColumnTypes.SelectionCheck, ColumnTypes.TextLink, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.Usergroup],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.Number, ColumnTypes.SelectionCheck, ColumnTypes.TextLink, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.Selection, ColumnTypes.SelectionMulti],
 		incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.Contains, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
 	}),
 	IsGreaterThan: new Filter({
@@ -102,7 +102,7 @@ export const Filters = {
 	IsEmpty: new Filter({
 		id: FilterIds.IsEmpty,
 		label: t('tables', 'Is empty'),
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextRich, ColumnTypes.Number, ColumnTypes.TextLink, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.SelectionCheck, ColumnTypes.Usergroup],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.TextRich, ColumnTypes.Number, ColumnTypes.TextLink, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.SelectionCheck],
 		incompatibleWith: [FilterIds.Contains, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual, FilterIds.IsEmpty],
 		noSearchValue: true,
 	}),

src/shared/components/ncTable/mixins/magicFields.js

@@ -34,14 +34,14 @@ export const MagicFields = {
 		id: 'me',
 		label: t('tables', 'Me (user ID)'),
 		icon: 'icon-user',
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.TextRich, ColumnTypes.TextLink, ColumnTypes.Usergroup],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.TextRich, ColumnTypes.TextLink],
 		replace: getCurrentUser()?.uid,
 	}),
 	MyName: new MagicField({
 		id: 'my-name',
 		label: t('tables', 'Me (name)'),
 		icon: 'icon-user',
-		goodFor: [ColumnTypes.TextLine, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.TextRich, ColumnTypes.TextLink, ColumnTypes.Usergroup],
+		goodFor: [ColumnTypes.TextLine, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.TextRich, ColumnTypes.TextLink],
 		replace: getCurrentUser()?.displayName,
 	}),
 	Checked: new MagicField({

src/shared/components/ncTable/partials/TableCellUsergroup.vue

@@ -8,6 +8,7 @@
 				{{ item.id }}
 			</span> -->
 			<NcUserBubble :display-name="item.id" :show-user-status="column.showUserStatus" :user="item.type === 0 ? item.id: ''">
+				<h3> User </h3>
 				@{{ item.id }}
 			</NcUserBubble>
 		</div>
@@ -37,7 +38,7 @@ export default {
 		},
 	},
 	mounted() {
-		console.log(value)
+		console.log(this.value)
 	}
 }
 </script>

src/shared/components/ncTable/partials/columnTypePartials/forms/UsergroupForm.vue

@@ -24,7 +24,7 @@
 					<!-- TODO: Add prop for single or multiple -->
 					<NcSelect v-model="value" style="width: 100%;" :loading="loading" :options="options"
 						:placeholder="getPlaceholder()" :searchable="true" :get-option-key="(option) => option.key"
-						label="displayName" :aria-label-combobox="getPlaceholder()"
+						label="id" :aria-label-combobox="getPlaceholder()"
 						:user-select="mutableColumn.usergroupSelectUsers"
 						:group-select="mutableColumn.usergroupSelectGroups" :close-on-select="false"
 						:multiple="mutableColumn.usergroupMultipleItems" @search="asyncFind" @input="addItem">
@@ -83,7 +83,7 @@ export default {
 	data() {
 		return {
 			mutableColumn: this.column,
-			value: [],
+			value: this.column.usergroupDefault,
 		}
 	},
 	computed: {
@@ -95,10 +95,10 @@ export default {
 				// TODO update to get groups too
 				if (Array.isArray(v)) {
 					this.column.usergroupDefault = v.map(o => {
-						return {type: o.isUser ? 0 : 1, id: o.user }
+						return o
 					})
 				} else {
-					this.column.usergroupDefault = [{ type: v.isUser ? 0 : 1, id: v.user }]
+					this.column.usergroupDefault = [v]
 				}
 
 			},

src/shared/components/ncTable/partials/rowTypePartials/UsergroupForm.vue

@@ -2,7 +2,7 @@
 	<RowFormWrapper :title="column.title" :mandatory="column.mandatory" :description="column.description" :width="2">
 		<NcSelect v-model="localValue" style="width: 100%;" :loading="loading" :options="options"
 			:placeholder="getPlaceholder()" :searchable="true" :get-option-key="(option) => option.key"
-			label="displayName" :aria-label-combobox="getPlaceholder()"
+			label="id" :aria-label-combobox="getPlaceholder()"
 			:user-select="column.usergroupSelectUsers" :group-select="column.usergroupSelectGroups"
 			:close-on-select="false" :multiple="column.usergroupMultipleItems" @search="asyncFind"
 			@input="addItem">
@@ -48,13 +48,14 @@ export default {
 			},
 			set(v) {
 				// TODO update to get groups too
-				let formattedValue = []
+				console.log('v', v)
+				let formattedValue = null
 				if (Array.isArray(v)) {
 					formattedValue = v.map(o => {
-						return {displayName: o.displayName, type: o.isUser ? 0 : 1, id: o.user }
+						return o
 					})
 				} else {
-					formattedValue = [{ displayName: v.displayName, type: v.isUser ? 0 : 1, id: v.user }]
+					formattedValue = [v]
 				}
 				console.log(formattedValue)
 				this.$emit('update:value', formattedValue)

src/shared/mixins/searchUserGroup.js

@@ -80,11 +80,9 @@ export default {
 				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,
+						id: autocompleteResult.id,
+						type: autocompleteResult.source.startsWith('users') ? 0 : 1,
+						key: autocompleteResult.id,
 					}
 				})
 				this.suggestions = this.filterOutUnwantedItems(rawSuggestions)