@evoke-platform/ui-components 1.14.0 → 1.15.0

package/dist/published/components/custom/FormV2/FormRendererContainer.js

@@ -1,23 +1,29 @@
 import { useApiServices, useApp, useAuthenticationContext, useNavigate, useObject, } from '@evoke-platform/context';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 import axios from 'axios';
 import { cloneDeep, get, isArray, isEmpty, isEqual, omit, pick, set } from 'lodash';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Skeleton, Snackbar } from '../../core';
 import { Box } from '../../layout';
 import ErrorComponent from '../ErrorComponent';
+import ConditionalQueryClientProvider from './components/ConditionalQueryClientProvider';
 import { evalDefaultVals, processValueUpdate } from './components/DefaultValues';
 import Header from './components/Header';
-import { convertPropertiesToParams, createFileLinks, deleteDocuments, encodePageSlug, formatSubmission, getEntryId, getPrefixedUrl, getUnnestedEntries, isAddressProperty, isEmptyWithDefault, plainTextToRtf, } from './components/utils';
+import { convertPropertiesToParams, createFileLinks, deleteDocuments, encodePageSlug, extractAllCriteria, extractPresetValuesFromCriteria, extractPresetValuesFromDynamicDefaultValues, formatSubmission, getEntryId, getPrefixedUrl, getUnnestedEntries, isAddressProperty, isEmptyWithDefault, plainTextToRtf, useFormById, } from './components/utils';
 import FormRenderer from './FormRenderer';
+// Wrapper to provide QueryClient context for FormRendererContainer if this is not a nested form
 function FormRendererContainer(props) {
-    const { instanceId, pageNavigation, dataType, title, display, formId, objectId, actionId, richTextEditor, onSubmit, onDiscardChanges: onDiscardChangesOverride, associatedObject, renderContainer, onSubmitError, sx, renderHeader, renderBody, renderFooter, } = props;
+    return (React.createElement(ConditionalQueryClientProvider, null,
+        React.createElement(FormRendererContainerInner, { ...props })));
+}
+// Inner component that assumes QueryClient context is available
+function FormRendererContainerInner(props) {
+    const { instanceId, pageNavigation, title, display, formId, objectId, actionId, richTextEditor, onSubmit, onDiscardChanges: onDiscardChangesOverride, associatedObject, renderContainer, onSubmitError, sx, renderHeader, renderBody, renderFooter, } = props;
     const apiServices = useApiServices();
     const navigateTo = useNavigate();
+    const queryClient = useQueryClient();
     const { id: appId } = useApp();
-    const [sanitizedObject, setSanitizedObject] = useState();
-    const [navigationSlug, setNavigationSlug] = useState();
     const [parameters, setParameters] = useState();
-    const [instance, setInstance] = useState();
     const formDataRef = useRef();
     // We only need the setter to force a re-render when form data updates; the value itself
     // is intentionally not referenced elsewhere to avoid stale reads (we use formDataRef).
@@ -46,6 +52,8 @@ function FormRendererContainer(props) {
     });
     const [isSaving, setIsSaving] = useState(false);
     const [lastSavedData, setLastSavedData] = useState({});
+    const [uniquePresetValues, setUniquePresetValues] = useState([]);
+    const flattenFormEntries = useMemo(() => getUnnestedEntries(form?.entries || []), [form?.entries]);
     const userAccount = useAuthenticationContext()?.account;
     const objectStore = useObject(form?.objectId ?? objectId);
     const onError = (err) => {
@@ -53,68 +61,84 @@ function FormRendererContainer(props) {
         setSnackbarError({ ...snackbarError, isError: true });
         setError(code ?? err);
     };
+    const { data: sanitizedObject, error: sanitizedObjectError } = useQuery({
+        queryKey: [form?.objectId ?? objectId, ...(instanceId ? [instanceId] : []), 'sanitized'],
+        queryFn: () => 
+        // form?.objectId is needed for subtype forms to get the correct object
+        apiServices.get(getPrefixedUrl(`/objects/${form?.objectId ?? objectId}${instanceId ? `/instances/${instanceId}/object` : '/effective'}`), { params: { sanitizedVersion: true } }),
+        staleTime: Infinity,
+        enabled: !!(form?.objectId || objectId),
+    });
+    // trigger refetch on success
+    const { data: instance, error: instanceError } = useQuery({
+        queryKey: [objectId, instanceId, 'instance'],
+        queryFn: async () => {
+            const instance = await apiServices.get(getPrefixedUrl(`/objects/${objectId}/instances/${instanceId}`), {
+                params: {
+                    expand: uniquePresetValues
+                        .filter((value) => value.startsWith('{{{input.') ||
+                        value.startsWith('{{input.') ||
+                        value.startsWith('{{{instance.'))
+                        .map((value) => {
+                        return value
+                            .replace(/{{{|}}}|{{|}}/g, '')
+                            .split('.')
+                            .slice(1)
+                            .join('.');
+                    }),
+                },
+            });
+            return instance;
+        },
+        staleTime: Infinity,
+        enabled: !!instanceId && !!sanitizedObject,
+    });
     useEffect(() => {
-        (async () => {
-            try {
-                if (instanceId) {
-                    const instance = await objectStore.getInstance(instanceId);
-                    setInstance(instance);
-                }
-                const object = await apiServices.get(getPrefixedUrl(`/objects/${form?.objectId || objectId}${instanceId ? `/instances/${instanceId}/object` : '/effective'}`), { params: { sanitizedVersion: true } });
-                setSanitizedObject(object);
-                const action = object?.actions?.find((a) => a.id === (form?.actionId || actionId));
-                if (action && (instanceId || action.type === 'create')) {
-                    setAction(action);
-                    // Clear error if action is found after being missing
-                    // TODO: This entire effect should take place after form is fetched to avoid an error flickering
-                    // That is, this effect should be merged with the one below that fetches the form
-                    setError((prevError) => prevError === 'Action could not be found' ? undefined : prevError);
-                }
-                else {
-                    setError('Action could not be found');
-                }
-            }
-            catch (error) {
-                onError(error);
-            }
-        })();
-    }, [dataType, form, instanceId]);
+        if (!sanitizedObject)
+            return;
+        const allCriterias = extractAllCriteria(flattenFormEntries, parameters || []);
+        const uniquePresetValues = new Set();
+        for (const criteria of allCriterias) {
+            const presetValues = extractPresetValuesFromCriteria(criteria);
+            presetValues.forEach((value) => uniquePresetValues.add(value));
+        }
+        extractPresetValuesFromDynamicDefaultValues(flattenFormEntries).map((value) => uniquePresetValues.add(value));
+        setUniquePresetValues(Array.from(uniquePresetValues));
+        const action = sanitizedObject.actions?.find((a) => a.id === (form?.actionId || actionId));
+        if (action && (instanceId || action.type === 'create')) {
+            setAction(action);
+            // Clear error if action is found after being missing
+            setError((prevError) => (prevError === 'Action could not be found' ? undefined : prevError));
+        }
+        else {
+            setError('Action could not be found');
+        }
+    }, [sanitizedObject, actionId, form?.actionId, instanceId]);
+    const { data: navigationSlug } = useQuery({
+        queryKey: [appId, 'navigationSlug'],
+        queryFn: () => apiServices.get(getPrefixedUrl(`/apps/${appId}/pages/${encodePageSlug(pageNavigation)}`)),
+        select: (page) => page.slug,
+        staleTime: Infinity,
+        enabled: !!pageNavigation,
+    });
+    const formIdToFetch = formId || action?.defaultFormId;
+    const { data: fetchedForm, error: fetchedFormError } = useFormById(formIdToFetch ?? '', apiServices);
     useEffect(() => {
-        if (pageNavigation) {
-            apiServices
-                .get(getPrefixedUrl(`/apps/${appId}/pages/${encodePageSlug(pageNavigation)}`))
-                .then((page) => {
-                setNavigationSlug(page?.slug);
-            });
+        if (!formIdToFetch && action) {
+            setError('Action form could not be found');
         }
-    }, []);
+    }, [formIdToFetch, action]);
     useEffect(() => {
-        const needsInstance = action?.type !== 'create' && !!instanceId;
-        // Instance and Action are loaded in the side effect above; wait for them to complete.
-        const loading = (actionId && !action) || (needsInstance && !instance);
-        if (form || loading)
-            return;
-        if ((formId || action?.defaultFormId) && formId !== '_auto_') {
-            apiServices
-                .get(getPrefixedUrl(`/forms/${formId || action?.defaultFormId}`))
-                .then((evokeForm) => {
-                // If an actionId is provided, ensure it matches the form's actionId
-                if (!actionId || evokeForm?.actionId === actionId) {
-                    const form = evokeForm;
-                    setForm(form);
-                }
-                else {
-                    setError('Configured action ID does not match form action ID');
-                }
-            })
-                .catch((error) => {
-                onError(error);
-            });
+        if (fetchedForm) {
+            if (actionId && fetchedForm.actionId !== actionId) {
+                setError('Configured action ID does not match form action ID');
+            }
+            setForm(fetchedForm);
         }
-        else if (action?.type === 'delete' && formId === '_auto_') {
+        else if (action?.type === 'delete' && formId === '_auto_' && instance) {
             setForm({
                 id: '',
-                name: '',
+                name: 'Delete',
                 entries: [
                     {
                         type: 'content',
@@ -128,10 +152,12 @@ function FormRendererContainer(props) {
                 },
             });
         }
-        else {
-            setError('Action form could not be found');
-        }
-    }, [action, actionId, objectId, instance]);
+    }, [fetchedForm, instance, action, formId]);
+    useEffect(() => {
+        const error = sanitizedObjectError || fetchedFormError || instanceError;
+        if (error)
+            onError(error);
+    }, [sanitizedObjectError, fetchedFormError, instanceError]);
     useEffect(() => {
         if (!form)
             return;
@@ -141,15 +167,15 @@ function FormRendererContainer(props) {
     }, [form, action?.parameters, sanitizedObject]);
     useEffect(() => {
         const getInitialValues = async () => {
-            if (form && (instance || !instanceId)) {
-                const defaultValues = await getDefaultValues(form.entries, instance || {});
+            if (flattenFormEntries.length && (instance || !instanceId)) {
+                const defaultValues = await getDefaultValues(flattenFormEntries, instance || {});
                 setFormData(defaultValues);
                 // Deep clone to avoid reference issues
                 setLastSavedData(cloneDeep(defaultValues));
             }
         };
         getInitialValues();
-    }, [form, instance, sanitizedObject]);
+    }, [instanceId, instance, flattenFormEntries]);
     const onSubmissionSuccess = (updatedInstance) => {
         setSnackbarError({
             showAlert: true,
@@ -158,14 +184,19 @@ function FormRendererContainer(props) {
         });
         if (navigationSlug) {
             if (navigationSlug.includes(':instanceId')) {
-                const navigateInstanceId = action?.type === 'create' ? updatedInstance?.id : instanceId;
+                const navigateInstanceId = action?.type === 'create' ? updatedInstance.id : instanceId;
                 navigateTo(`/${appId}/${navigationSlug.replace(':instanceId', navigateInstanceId ?? ':instanceId')}`);
             }
             else {
                 navigateTo(`/${appId}/${navigationSlug}`);
             }
         }
-        setInstance(updatedInstance);
+        if (instanceId) {
+            // Invalidate the instance to fetch the latest version
+            queryClient.invalidateQueries({
+                queryKey: [objectId, instanceId, 'instance'],
+            });
+        }
     };
     const linkFiles = async (submission, linkTo) => {
         // Create file links for any uploaded files after instance creation
@@ -227,9 +258,8 @@ function FormRendererContainer(props) {
             throw error; // Throw error so caller knows submission failed
         }
     };
-    const getDefaultValues = async (entries, instanceData) => {
+    const getDefaultValues = async (unnestedEntries, instanceData) => {
         const result = {};
-        const unnestedEntries = getUnnestedEntries(entries);
         for (const entry of unnestedEntries) {
             const fieldId = getEntryId(entry);
             if (!fieldId)
@@ -265,34 +295,36 @@ function FormRendererContainer(props) {
                         console.error(error);
                     }
                 }
-                else if (entry.type !== 'readonlyField' && isEmptyWithDefault(fieldValue, entry, instanceData)) {
-                    if (fieldId && parameters && parameters.length > 0) {
-                        const defaultValuesArray = await evalDefaultVals(parameters, unnestedEntries, entry, fieldValue, fieldId, apiServices, userAccount, instanceData);
-                        for (const { fieldId, fieldValue } of defaultValuesArray) {
-                            const parameter = parameters?.find((param) => param.id === fieldId);
-                            if (parameter?.type === 'object') {
-                                const dependentFields = await processValueUpdate(unnestedEntries, parameters, fieldValue, apiServices, fieldId, formDataRef.current, userAccount);
-                                for (const field of dependentFields) {
-                                    set(result, field.fieldId, field.fieldValue);
+                else if (entry.type !== 'readonlyField') {
+                    if (isEmptyWithDefault(fieldValue, entry, instanceData)) {
+                        if (fieldId && parameters && parameters.length > 0) {
+                            const defaultValuesArray = await evalDefaultVals(parameters, unnestedEntries, entry, fieldValue, fieldId, apiServices, userAccount, instanceData);
+                            for (const { fieldId, fieldValue } of defaultValuesArray) {
+                                const parameter = parameters?.find((param) => param.id === fieldId);
+                                if (parameter?.type === 'object') {
+                                    const dependentFields = await processValueUpdate(unnestedEntries, parameters, fieldValue, apiServices, fieldId, formDataRef.current, userAccount);
+                                    for (const field of dependentFields) {
+                                        set(result, field.fieldId, field.fieldValue);
+                                    }
                                 }
+                                set(result, fieldId, fieldValue);
                             }
-                            set(result, fieldId, fieldValue);
                         }
                     }
-                }
-                else if (parameter?.type === 'boolean' && (fieldValue === undefined || fieldValue === null)) {
-                    result[fieldId] = false;
-                }
-                else if (fieldValue !== undefined && fieldValue !== null) {
-                    if (parameter?.type === 'richText' && typeof fieldValue === 'string') {
-                        let RTFFieldValue = fieldValue;
-                        if (!fieldValue.trim().startsWith('{\\rtf')) {
-                            RTFFieldValue = plainTextToRtf(fieldValue);
-                        }
-                        result[fieldId] = RTFFieldValue;
+                    else if (parameter?.type === 'boolean' && (fieldValue === undefined || fieldValue === null)) {
+                        result[fieldId] = false;
                     }
-                    else {
-                        result[fieldId] = fieldValue;
+                    else if (fieldValue !== undefined && fieldValue !== null) {
+                        if (parameter?.type === 'richText' && typeof fieldValue === 'string') {
+                            let RTFFieldValue = fieldValue;
+                            if (!fieldValue.trim().startsWith('{\\rtf')) {
+                                RTFFieldValue = plainTextToRtf(fieldValue);
+                            }
+                            result[fieldId] = RTFFieldValue;
+                        }
+                        else {
+                            result[fieldId] = fieldValue;
+                        }
                     }
                 }
             }
@@ -349,15 +381,14 @@ function FormRendererContainer(props) {
     const onAutosave = form?.autosaveActionId ? handleAutosave : undefined;
     async function onChange(id, value) {
         const parameter = parameters?.find((param) => param.id === id);
-        const entries = getUnnestedEntries(form.entries);
-        const isReadOnlyField = entries.some((e) => e.type === 'readonlyField' && e.propertyId === id) &&
-            !entries.some((e) => (e.type === 'input' && e.parameterId === id) || (e.type === 'inputField' && e.input.id === id));
+        const isReadOnlyField = flattenFormEntries.some((e) => e.type === 'readonlyField' && e.propertyId === id) &&
+            !flattenFormEntries.some((e) => (e.type === 'input' && e.parameterId === id) || (e.type === 'inputField' && e.input.id === id));
         if (isReadOnlyField)
             return;
         if (parameter) {
             if (parameter.type === 'object' && parameters && parameters.length > 0) {
                 // On change of a related object, update default values dependent on that object
-                const dependentFields = await processValueUpdate(entries, parameters, value, apiServices, id, formDataRef.current, userAccount);
+                const dependentFields = await processValueUpdate(flattenFormEntries, parameters, value, apiServices, id, formDataRef.current, userAccount);
                 for (const field of dependentFields) {
                     onChange(field.fieldId, field.fieldValue);
                 }
@@ -387,7 +418,7 @@ function FormRendererContainer(props) {
         ? onDiscardChangesOverride
         : async () => {
             if (form) {
-                const defaultValues = await getDefaultValues(form.entries, instance || {});
+                const defaultValues = await getDefaultValues(flattenFormEntries, instance || {});
                 setFormData(defaultValues);
             }
         };

package/dist/published/components/custom/FormV2/components/ConditionalQueryClientProvider.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+declare function ConditionalQueryClientProvider({ children }: {
+    children: React.ReactNode;
+}): React.JSX.Element;
+export default ConditionalQueryClientProvider;

package/dist/published/components/custom/FormV2/components/ConditionalQueryClientProvider.js

@@ -0,0 +1,21 @@
+import { QueryCache, QueryClient, QueryClientContext, QueryClientProvider } from '@tanstack/react-query';
+import React, { useContext, useState } from 'react';
+// If FormRenderer is rendered outside a QueryClientProvider (e.g. standalone usage),
+// we create a local QueryClient so React Query hooks still work.
+// If a provider already exists, we reuse it to avoid fragmenting the cache.
+function ConditionalQueryClientProvider({ children }) {
+    const existingQueryClient = useContext(QueryClientContext);
+    const [localQueryClient] = useState(() => new QueryClient({
+        queryCache: new QueryCache({
+            onError: (error, query) => {
+                const message = query.meta?.errorMessage ?? 'Something went wrong:';
+                console.error(message, error);
+            },
+        }),
+    }));
+    if (existingQueryClient) {
+        return React.createElement(React.Fragment, null, children);
+    }
+    return React.createElement(QueryClientProvider, { client: localQueryClient }, children);
+}
+export default ConditionalQueryClientProvider;

package/dist/published/components/custom/FormV2/components/FormFieldTypes/CollectionFiles/DropdownRepeatableField.js

@@ -1,24 +1,21 @@
 import { useApiServices, useNotification, } from '@evoke-platform/context';
-import { debounce, isArray, isEmpty, isEqual } from 'lodash';
-import React, { useCallback, useEffect, useState } from 'react';
+import { useQuery } from '@tanstack/react-query';
+import { debounce, isEmpty } from 'lodash';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useFormContext } from '../../../../../../theme/hooks';
 import { Skeleton } from '../../../../../core';
 import { retrieveCustomErrorMessage } from '../../../../Form/utils';
 import { getMiddleObject, getMiddleObjectFilter, getPrefixedUrl, transformToWhere } from '../../utils';
 import { DropdownRepeatableFieldInput } from './DropdownRepeatableFieldInput';
 const DropdownRepeatableField = (props) => {
-    const { id, fieldDefinition, criteria, readOnly, initialMiddleObjectInstances, middleObject, hasDescription, viewLayout, } = props;
-    const { fetchedOptions, setFetchedOptions, instance } = useFormContext();
+    const { id, fieldDefinition, criteria, readOnly, middleObject, hasDescription, viewLayout, initialMiddleObjectInstances, } = props;
+    const { instance } = useFormContext();
     const [layout, setLayout] = useState();
-    const [loading, setLoading] = useState(false);
     const [layoutLoaded, setLayoutLoaded] = useState(false);
     const [searchValue, setSearchValue] = useState('');
     const [middleObjectInstances, setMiddleObjectInstances] = useState(initialMiddleObjectInstances);
-    const [endObject, setEndObject] = useState(fetchedOptions[`${fieldDefinition.id}EndObject`]);
-    const [endObjectInstances, setEndObjectInstances] = useState(fetchedOptions[`${fieldDefinition.id}EndObjectInstances`] || []);
-    const [initialLoading, setInitialLoading] = useState(endObjectInstances ? false : true);
+    const [debouncedSearchValue, setDebouncedSearchValue] = useState();
     const [selectedOptions, setSelectedOptions] = useState([]);
-    const [hasFetched, setHasFetched] = useState(!!fetchedOptions[`${fieldDefinition.id}EndObjectInstancesHaveFetched`] || false);
     const [snackbarError, setSnackbarError] = useState({
         showAlert: false,
         isError: true,
@@ -41,6 +38,12 @@ const DropdownRepeatableField = (props) => {
         const newInstances = await getMiddleObjectInstances();
         setMiddleObjectInstances(newInstances);
     };
+    useEffect(() => {
+        instanceChanges?.subscribe(middleObject.rootObjectId, () => {
+            fetchMiddleObjectInstances();
+        });
+        return () => instanceChanges?.unsubscribe(middleObject.rootObjectId);
+    }, [instanceChanges, fetchMiddleObjectInstances, middleObject]);
     const setDropDownSelections = (instances) => {
         setSelectedOptions(instances
             .filter((currInstance) => fieldDefinition.manyToManyPropertyId in currInstance)
@@ -52,146 +55,86 @@ const DropdownRepeatableField = (props) => {
             .sort((instanceA, instanceB) => instanceA.label.localeCompare(instanceB.label)));
     };
     useEffect(() => {
-        const endObjectProperty = middleObject?.properties?.find((currProperty) => fieldDefinition.manyToManyPropertyId === currProperty.id);
-        if (endObjectProperty && endObjectProperty.objectId && !fetchedOptions[`${fieldDefinition.id}EndObject`]) {
-            setLayoutLoaded(false);
-            apiServices.get(getPrefixedUrl(`/objects/${endObjectProperty.objectId}/effective`), { params: { filter: { fields: ['id', 'name', 'properties', 'viewLayout'] } } }, (error, effectiveObject) => {
-                if (error) {
-                    console.error(error);
-                }
-                else {
-                    // If there's no error then the effective object is defined.
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    const endObject = effectiveObject;
-                    setEndObject(endObject);
-                    let defaultLayout;
-                    if (endObject.viewLayout?.dropdown) {
-                        defaultLayout = {
-                            id: 'default',
-                            name: 'Default',
-                            objectId: endObject.id,
-                            ...endObject.viewLayout.dropdown,
-                        };
-                    }
-                    if (viewLayout) {
-                        apiServices
-                            .get(getPrefixedUrl(`/objects/${viewLayout.objectId}/dropdownLayouts/${viewLayout.id}`))
-                            .then(setLayout)
-                            .catch(() => setLayout(defaultLayout))
-                            .finally(() => setLayoutLoaded(true));
-                    }
-                    else {
-                        setLayout(defaultLayout);
-                        setLayoutLoaded(true);
-                    }
-                }
-            });
-        }
-    }, [middleObject, viewLayout]);
-    useEffect(() => {
-        instanceChanges?.subscribe(middleObject.rootObjectId, () => {
-            fetchMiddleObjectInstances();
-        });
-        return () => instanceChanges?.unsubscribe(middleObject.rootObjectId);
-    }, [instanceChanges, fetchMiddleObjectInstances]);
-    const fetchEndObjectInstances = useCallback((searchedName) => {
-        if ((fieldDefinition.objectId &&
-            fieldDefinition.manyToManyPropertyId &&
-            endObjectInstances.length === 0 &&
-            !hasFetched) ||
-            (searchedName !== undefined && searchedName !== '')) {
-            setLoading(true);
-            const endObjectProperty = middleObject.properties?.find((currProperty) => fieldDefinition.manyToManyPropertyId === currProperty.id);
-            if (endObjectProperty?.objectId) {
-                const { propertyId, direction } = layout?.sort ?? {
-                    propertyId: 'name',
-                    direction: 'asc',
-                };
-                const filter = {
-                    limit: 100,
-                    order: `${propertyId} ${direction}`,
-                };
-                let searchCriteria = criteria && !isEmpty(criteria) ? transformToWhere(criteria) : {};
-                if (searchedName?.length) {
-                    const nameCriteria = transformToWhere({
-                        name: {
-                            like: searchedName,
-                            options: 'i',
-                        },
-                    });
-                    searchCriteria = !isEmpty(criteria)
-                        ? {
-                            and: [searchCriteria, nameCriteria],
-                        }
-                        : nameCriteria;
-                }
-                filter.where = searchCriteria;
-                apiServices.get(getPrefixedUrl(`/objects/${endObjectProperty.objectId}/instances`), { params: { filter: JSON.stringify(filter) } }, (error, instances) => {
-                    if (!error && instances) {
-                        setEndObjectInstances(instances);
-                        setHasFetched(true);
-                    }
-                    setInitialLoading(false);
-                    setLoading(false);
-                });
-            }
-        }
-        else if (endObjectInstances.length !== 0) {
-            setInitialLoading(false);
-        }
-    }, [fieldDefinition.objectId, fieldDefinition.manyToManyPropertyId, middleObject]);
-    const debouncedEndObjectSearch = useCallback(debounce(fetchEndObjectInstances, 500), [fetchEndObjectInstances]);
+        setDropDownSelections(middleObjectInstances);
+    }, [middleObjectInstances]);
+    const endObjectProperty = useMemo(() => middleObject.properties?.find((currProperty) => fieldDefinition.manyToManyPropertyId === currProperty.id), [middleObject.properties, fieldDefinition.manyToManyPropertyId]);
+    const { data: endObject } = useQuery({
+        queryKey: [endObjectProperty?.objectId, 'endObject', 'effective'],
+        queryFn: () => apiServices.get(getPrefixedUrl(`/objects/${endObjectProperty?.objectId}/effective`), {
+            params: { filter: { fields: ['id', 'name', 'properties', 'viewLayout'] } },
+        }),
+        staleTime: Infinity,
+        enabled: !!endObjectProperty?.objectId,
+    });
     useEffect(() => {
-        if (!fetchedOptions[`${fieldDefinition.id}EndObjectInstances`] ||
-            (isArray(fetchedOptions[`${fieldDefinition.id}EndObjectInstances`]) &&
-                fetchedOptions[`${fieldDefinition.id}EndObjectInstances`].length === 0)) {
-            setFetchedOptions({
-                [`${fieldDefinition.id}EndObjectInstances`]: endObjectInstances,
-                [`${fieldDefinition.id}EndObjectInstancesHaveFetched`]: hasFetched,
-            });
+        if (!endObject)
+            return;
+        let defaultLayout;
+        if (endObject.viewLayout?.dropdown) {
+            defaultLayout = {
+                id: 'default',
+                name: 'Default',
+                objectId: endObject.id,
+                ...endObject.viewLayout.dropdown,
+            };
         }
-        if (!fetchedOptions[`${fieldDefinition.id}EndObject`]) {
-            setFetchedOptions({
-                [`${fieldDefinition.id}EndObject`]: endObject,
-            });
+        if (viewLayout) {
+            apiServices
+                .get(getPrefixedUrl(`/objects/${viewLayout.objectId}/dropdownLayouts/${viewLayout.id}`))
+                .then(setLayout)
+                .catch(() => setLayout(defaultLayout))
+                .finally(() => setLayoutLoaded(true));
         }
-        if (!isEqual(middleObjectInstances, initialMiddleObjectInstances)) {
-            setFetchedOptions({
-                [`${fieldDefinition.id}MiddleObjectInstances`]: middleObjectInstances,
-            });
+        else {
+            setLayout(defaultLayout);
+            setLayoutLoaded(true);
         }
-    }, [endObjectInstances, endObject, middleObjectInstances]);
+    }, [endObject, viewLayout]);
+    const debouncedSetSearchValue = useMemo(() => debounce((value) => {
+        setDebouncedSearchValue(value);
+    }, 200), []);
     useEffect(() => {
-        const updateFetchedOptions = (key, value) => {
-            if (!fetchedOptions[key]) {
-                setFetchedOptions({ [key]: value });
-            }
+        debouncedSetSearchValue(searchValue);
+        return () => {
+            debouncedSetSearchValue.cancel();
         };
-        updateFetchedOptions(`${fieldDefinition.id}EndObjectInstances`, endObjectInstances);
-        updateFetchedOptions(`${fieldDefinition.id}EndObjectInstancesHaveFetched`, hasFetched);
-        updateFetchedOptions(`${fieldDefinition.id}EndObject`, endObject);
-        if (!isEqual(middleObjectInstances, initialMiddleObjectInstances)) {
-            setFetchedOptions({ [`${fieldDefinition.id}MiddleObjectInstances`]: middleObjectInstances });
-        }
-    }, [
-        endObjectInstances,
-        endObject,
-        middleObjectInstances,
-        fetchedOptions,
-        fieldDefinition.id,
-        hasFetched,
-        initialMiddleObjectInstances,
-        setFetchedOptions,
-    ]);
-    useEffect(() => {
-        debouncedEndObjectSearch(searchValue);
-        return () => debouncedEndObjectSearch.cancel();
-    }, [searchValue, debouncedEndObjectSearch]);
-    useEffect(() => {
-        if (layoutLoaded) {
-            fetchEndObjectInstances();
+    }, [searchValue, debouncedSetSearchValue, layoutLoaded]);
+    const searchCriteria = useMemo(() => {
+        let searchCriteria = criteria && !isEmpty(criteria) ? transformToWhere(criteria) : {};
+        if (debouncedSearchValue?.length) {
+            const nameCriteria = transformToWhere({
+                name: {
+                    like: debouncedSearchValue,
+                    options: 'i',
+                },
+            });
+            searchCriteria = !isEmpty(criteria) ? { and: [searchCriteria, nameCriteria] } : nameCriteria;
         }
-    }, [fetchEndObjectInstances, layoutLoaded]);
+        return searchCriteria;
+    }, [criteria, debouncedSearchValue]);
+    // Construct filter from debounced criteria
+    const updatedFilter = useMemo(() => {
+        const { propertyId, direction } = layout?.sort ?? {
+            propertyId: 'name',
+            direction: 'asc',
+        };
+        const filter = {
+            limit: 100,
+            order: `${propertyId} ${direction}`,
+            where: searchCriteria,
+        };
+        return filter;
+    }, [searchCriteria, layout]);
+    const { data: endObjectInstances = [], isLoading: initialLoading } = useQuery({
+        queryKey: ['endObjectInstances', endObjectProperty.objectId, updatedFilter],
+        queryFn: async () => {
+            return apiServices.get(getPrefixedUrl(`/objects/${endObjectProperty.objectId}/instances`), { params: { filter: JSON.stringify(updatedFilter) } });
+        },
+        enabled: !!fieldDefinition.objectId && !!fieldDefinition.manyToManyPropertyId && !!endObjectProperty?.objectId,
+        staleTime: Infinity,
+        // Keep old instances while filtering
+        placeholderData: (previousData) => previousData,
+    });
     const saveMiddleInstance = async (endObjectId, endObjectName) => {
         if (fieldDefinition.objectId) {
             const middleObject = getMiddleObject(fieldDefinition, endObjectId, endObjectName, instance);
@@ -228,6 +171,6 @@ const DropdownRepeatableField = (props) => {
             });
         }
     };
-    return initialLoading || !middleObject || !middleObjectInstances || !endObjectInstances || !endObject ? (React.createElement(Skeleton, null)) : (React.createElement(React.Fragment, null, middleObjectInstances && endObject && (React.createElement(DropdownRepeatableFieldInput, { id: id, fieldDefinition: fieldDefinition, readOnly: readOnly || !middleObject.actions?.some((action) => action.id === '_create'), layout: layout, middleObjectInstances: middleObjectInstances, endObjectInstances: endObjectInstances ?? [], endObject: endObject, searchValue: searchValue, loading: loading, handleSaveMiddleInstance: saveMiddleInstance, handleRemoveMiddleInstance: removeMiddleInstance, setSearchValue: setSearchValue, setSnackbarError: setSnackbarError, snackbarError: snackbarError, selectedOptions: selectedOptions, setSelectedOptions: setSelectedOptions, setDropdownSelections: setDropDownSelections, hasDescription: hasDescription }))));
+    return initialLoading || !middleObject || !middleObjectInstances || !endObjectInstances || !endObject ? (React.createElement(Skeleton, null)) : (React.createElement(React.Fragment, null, middleObjectInstances && endObject && (React.createElement(DropdownRepeatableFieldInput, { id: id, fieldDefinition: fieldDefinition, readOnly: readOnly || !middleObject.actions?.some((action) => action.id === '_create'), layout: layout, endObjectInstances: endObjectInstances ?? [], endObject: endObject, searchValue: searchValue, loading: initialLoading, handleSaveMiddleInstance: saveMiddleInstance, handleRemoveMiddleInstance: removeMiddleInstance, setSearchValue: setSearchValue, setSnackbarError: setSnackbarError, snackbarError: snackbarError, selectedOptions: selectedOptions, setSelectedOptions: setSelectedOptions, hasDescription: hasDescription }))));
 };
 export default DropdownRepeatableField;