From b74891217f82e3a83de06125fd48e660d64051df Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Thu, 17 Feb 2022 22:17:40 +0800
Subject: [PATCH] Fix alias fields not showing up in permissions (#11685)

---
 app/src/composables/use-field-tree.ts | 6 +++++-
 app/src/stores/fields.ts              | 8 +-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/composables/use-field-tree.ts b/app/src/composables/use-field-tree.ts
index e829c80c5f..22b136fc9e 100644
--- a/app/src/composables/use-field-tree.ts
+++ b/app/src/composables/use-field-tree.ts
@@ -45,7 +45,11 @@ export function useFieldTree(
 		const fields = fieldsStore
 			.getFieldsForCollectionSorted(collection!)
 			.concat(injectedFields || [])
-			.filter((field) => !field.meta?.special?.includes('alias') && !field.meta?.special?.includes('no-data'))
+			.filter(
+				(field) =>
+					field.meta?.special?.includes('group') ||
+					(!field.meta?.special?.includes('alias') && !field.meta?.special?.includes('no-data'))
+			)
 			.filter(filter)
 			.flatMap((field) => makeNode(field, parent));
 
diff --git a/app/src/stores/fields.ts b/app/src/stores/fields.ts
index a1e439b274..74dd42e551 100644
--- a/app/src/stores/fields.ts
+++ b/app/src/stores/fields.ts
@@ -267,13 +267,7 @@ export const useFieldsStore = defineStore({
 		 * fields inside groups starts their sort number from 1 to N again.
 		 */
 		getFieldsForCollectionSorted(collection: string): Field[] {
-			const fields = this.fields
-				.filter((field) => field.collection === collection)
-				.filter(
-					(field: Field) =>
-						field.meta?.special?.includes('group') ||
-						(!field.meta?.special?.includes('alias') && !field.meta?.special?.includes('no-data'))
-				);
+			const fields = this.fields.filter((field) => field.collection === collection);
 
 			const nonGroupFields = fields.filter((field: Field) => !field.meta?.group);