From 14f7a232aa16f1fd7faf09eaf88d124f62ec1630 Mon Sep 17 00:00:00 2001
From: Gerard Lamusse <gerardlamo@gmail.com>
Date: Tue, 5 Apr 2022 17:11:54 +0200
Subject: [PATCH] Disable fields that are groups to be selected in field list
 (#12539)

* By default disable fields that are groups to be selected in field list, since they anyways can't be filtered on.

* Don't include functions for group fields.
Refactor FieldInfo to extend already defined FieldNode type

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 app/src/components/v-field-list/v-field-list-item.vue | 11 +++--------
 app/src/components/v-field-list/v-field-list.vue      |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/src/components/v-field-list/v-field-list-item.vue b/app/src/components/v-field-list/v-field-list-item.vue
index 9c58708e4f..cb6454fa22 100644
--- a/app/src/components/v-field-list/v-field-list-item.vue
+++ b/app/src/components/v-field-list/v-field-list-item.vue
@@ -58,17 +58,12 @@ export default {
 
 <script lang="ts" setup>
 import formatTitle from '@directus/format-title';
-import { Type } from '@directus/shared/types';
 import { getFunctionsForType } from '@directus/shared/utils';
+import { FieldNode } from '@/composables/use-field-tree';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-type FieldInfo = {
-	field: string;
-	name: string;
-	key: string;
-	path: string;
-	type: Type;
+type FieldInfo = FieldNode & {
 	disabled?: boolean;
 	children?: FieldInfo[];
 };
@@ -86,7 +81,7 @@ defineEmits(['add']);
 const { t } = useI18n();
 
 const supportedFunctions = computed(() => {
-	if (!props.includeFunctions) return [];
+	if (!props.includeFunctions || props.field.group) return [];
 	return getFunctionsForType(props.field.type);
 });
 </script>
diff --git a/app/src/components/v-field-list/v-field-list.vue b/app/src/components/v-field-list/v-field-list.vue
index fd37a8435a..45accd266f 100644
--- a/app/src/components/v-field-list/v-field-list.vue
+++ b/app/src/components/v-field-list/v-field-list.vue
@@ -72,7 +72,7 @@ const treeList = computed(() => {
 	function setDisabled(
 		field: typeof treeListOriginal.value[number]
 	): typeof treeListOriginal.value[number] & { disabled: boolean } {
-		let disabled = false;
+		let disabled = field.group || false;
 
 		if (props.disabledFields?.includes(field.key)) disabled = true;