From 9d8eb5bcb5fb38b2866575faef67625b59f99efe Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Wed, 12 Jul 2023 15:08:25 +0200
Subject: [PATCH] Pass field context to interface-options in conditions
 (#19147)

Fixes #19145
---
 .changeset/breezy-emus-repair.md              |  6 ++
 .../system-interface-options.vue              | 56 ++++++++++---------
 .../field-detail-advanced-conditions.vue      | 11 ++--
 3 files changed, 42 insertions(+), 31 deletions(-)
 create mode 100644 .changeset/breezy-emus-repair.md

diff --git a/.changeset/breezy-emus-repair.md b/.changeset/breezy-emus-repair.md
new file mode 100644
index 0000000000..5563d915ef
--- /dev/null
+++ b/.changeset/breezy-emus-repair.md
@@ -0,0 +1,6 @@
+---
+'@directus/app': patch
+---
+
+Fixed issue that caused interface options within conditions to operate against a different field context, making some
+options unavailable
diff --git a/app/src/interfaces/_system/system-interface-options/system-interface-options.vue b/app/src/interfaces/_system/system-interface-options/system-interface-options.vue
index fe54835b0a..51d164f481 100644
--- a/app/src/interfaces/_system/system-interface-options/system-interface-options.vue
+++ b/app/src/interfaces/_system/system-interface-options/system-interface-options.vue
@@ -29,6 +29,7 @@
 
 <script setup lang="ts">
 import { useExtension } from '@/composables/use-extension';
+import { ExtensionOptionsContext } from '@directus/types';
 import { isVueComponent } from '@directus/utils';
 import { computed, inject, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
@@ -39,6 +40,7 @@ const props = defineProps<{
 	interface?: string;
 	collection?: string;
 	disabled?: boolean;
+	context?: ExtensionOptionsContext;
 }>();
 
 const emit = defineEmits<{
@@ -73,32 +75,34 @@ const optionsFields = computed(() => {
 	let optionsObjectOrArray;
 
 	if (typeof selectedInterface.value.options === 'function') {
-		optionsObjectOrArray = selectedInterface.value.options({
-			field: {
-				type: 'unknown',
-			},
-			editing: '+',
-			collection: props.collection,
-			relations: {
-				o2m: undefined,
-				m2o: undefined,
-				m2a: undefined,
-			},
-			collections: {
-				related: undefined,
-				junction: undefined,
-			},
-			fields: {
-				corresponding: undefined,
-				junctionCurrent: undefined,
-				junctionRelated: undefined,
-				sort: undefined,
-			},
-			items: {},
-			localType: 'standard',
-			autoGenerateJunctionRelation: false,
-			saving: false,
-		});
+		optionsObjectOrArray = selectedInterface.value.options(
+			props.context ?? {
+				field: {
+					type: 'unknown',
+				},
+				editing: '+',
+				collection: props.collection,
+				relations: {
+					o2m: undefined,
+					m2o: undefined,
+					m2a: undefined,
+				},
+				collections: {
+					related: undefined,
+					junction: undefined,
+				},
+				fields: {
+					corresponding: undefined,
+					junctionCurrent: undefined,
+					junctionRelated: undefined,
+					sort: undefined,
+				},
+				items: {},
+				localType: 'standard',
+				autoGenerateJunctionRelation: false,
+				saving: false,
+			}
+		);
 	} else {
 		optionsObjectOrArray = selectedInterface.value.options;
 	}
diff --git a/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue b/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue
index 5d10d545db..fec2d0f808 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue
@@ -5,13 +5,13 @@
 </template>
 
 <script setup lang="ts">
-import { computed, unref } from 'vue';
-import { Field, DeepPartial } from '@directus/types';
-import { useI18n } from 'vue-i18n';
-import { useFieldDetailStore, syncFieldDetailStoreProperty } from '../store';
-import { storeToRefs } from 'pinia';
 import { useExtension } from '@/composables/use-extension';
+import { DeepPartial, Field } from '@directus/types';
 import { isVueComponent } from '@directus/utils';
+import { storeToRefs } from 'pinia';
+import { computed, unref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { syncFieldDetailStoreProperty, useFieldDetailStore } from '../store';
 
 const { t } = useI18n();
 
@@ -92,6 +92,7 @@ const repeaterFields = computed<DeepPartial<Field>[]>(() => [
 			interface: 'system-interface-options',
 			options: {
 				interface: interfaceId.value,
+				context: fieldDetailStore,
 			},
 		},
 	},