From b64e1cdcf591297ec15d2056b41d2cdffa60313f Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Thu, 24 Sep 2020 15:56:59 -0400
Subject: [PATCH] Cleanup filter

---
 .../composables/use-field-tree/use-field-tree.ts   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/composables/use-field-tree/use-field-tree.ts b/app/src/composables/use-field-tree/use-field-tree.ts
index 6c6c7c79c8..b15696504c 100644
--- a/app/src/composables/use-field-tree/use-field-tree.ts
+++ b/app/src/composables/use-field-tree/use-field-tree.ts
@@ -10,11 +10,15 @@ export default function useFieldTree(collection: Ref<string>, showHidden = false
 	const tree = computed<FieldTree[]>(() => {
 		return fieldsStore
 			.getFieldsForCollection(collection.value)
-			.filter(
-				(field: Field) =>
-					showHidden ||
-					(field.meta?.hidden === false && (field.meta?.special || []).includes('alias') === false)
-			)
+			.filter((field: Field) => {
+				let shown = (field.meta?.special || []).includes('alias') === false;
+
+				if (showHidden === false && field.meta?.hidden === false) {
+					shown = false;
+				}
+
+				return shown;
+			})
 			.map((field: Field) => parseField(field, []));
 
 		function parseField(field: Field, parents: Field[]) {