@evoke-platform/ui-components 1.1.0-testing.3 → 1.1.0-testing.4

package/dist/published/components/custom/Form/FormComponents/ObjectComponent/ObjectPropertyInput.js

@@ -78,7 +78,11 @@ export const ObjectPropertyInput = (props) => {
             updatedFilter = {};
         }
         updatedFilter.limit = 100;
-        updatedFilter.order = 'name ASC';
+        const { propertyId, direction } = layout?.sort ?? {
+            propertyId: 'name',
+            direction: 'asc',
+        };
+        updatedFilter.order = `${propertyId} ${direction}`;
         const where = name
             ? transformToWhere({
                 name: {
@@ -103,7 +107,7 @@ export const ObjectPropertyInput = (props) => {
                 setLoadingOptions(false);
             }
         });
-    }, [relatedObject, setLoadingOptions, setOptions, property, filter]);
+    }, [relatedObject, setLoadingOptions, setOptions, property, filter, layout]);
     useEffect(() => {
         if (displayOption === 'dropdown') {
             getDropdownOptions();
@@ -281,7 +285,7 @@ export const ObjectPropertyInput = (props) => {
                                 caretColor: 'white',
                             }
                             : {}),
-                    } })), readOnly: !loadingOptions && !canUpdateProperty, error: error }))) : (React.createElement(Box, { sx: {
+                    } })), readOnly: !loadingOptions && !canUpdateProperty, error: error, sortBy: "NONE" }))) : (React.createElement(Box, { sx: {
                 padding: (instance?.[property.id]?.name ?? selectedInstance?.name)
                     ? '16.5px 14px'
                     : '10.5px 0',

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/ManyToMany/DropdownRepeatableField.js

@@ -78,9 +78,13 @@ export const DropdownRepeatableField = (props) => {
             setLoading(true);
             const endObjectProperty = middleObject.properties?.find((currProperty) => property.manyToManyPropertyId === currProperty.id);
             if (endObjectProperty?.objectId) {
+                const { propertyId, direction } = layout?.sort ?? {
+                    propertyId: 'name',
+                    direction: 'asc',
+                };
                 const filter = {
                     limit: 100,
-                    order: 'name ASC',
+                    order: `${propertyId} ${direction}`,
                 };
                 let searchCriteria = criteria && !isEmpty(criteria) ? transformToWhere(criteria) : {};
                 if (searchedName?.length) {
@@ -106,7 +110,7 @@ export const DropdownRepeatableField = (props) => {
                 });
             }
         }
-    }, [property.objectId, property.manyToManyPropertyId, apiServices, middleObject]);
+    }, [property.objectId, property.manyToManyPropertyId, apiServices, middleObject, layout]);
     const debouncedEndObjectSearch = useCallback(debounce(fetchEndObjectInstances, 500), [fetchEndObjectInstances]);
     useEffect(() => {
         debouncedEndObjectSearch(searchValue);

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/ManyToMany/DropdownRepeatableFieldInput.js

@@ -86,6 +86,7 @@ export const DropdownRepeatableFieldInput = (props) => {
                         setSearchValue(event.target.value);
                     } })),
                 loading: loading,
+                sortBy: 'NONE',
             } }),
         React.createElement(Snackbar, { open: snackbarError.showAlert, handleClose: () => setSnackbarError({ isError: snackbarError.isError, showAlert: false }), message: snackbarError.message, error: snackbarError.isError })))) : (React.createElement(Typography, null, selectedOptions && selectedOptions.map((option) => option.label).join(', ')))));
 };

package/dist/published/components/custom/Form/utils.js

@@ -384,7 +384,7 @@ export function convertComponentsToForm(components) {
                                             ...(component.orderBy ? { sortBy: component.orderBy } : {}),
                                         }
                                         : isArray(component.initialValue)
-                                            ? component.initialValue.map((c) => c.value)
+                                            ? component.initialValue.map((c) => typeof c === 'string' ? c : c.value)
                                             : component.initialValue?.value
                                                 ? component.initialValue?.value
                                                 : component.initialValue,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.1.0-testing.3",
+    "version": "1.1.0-testing.4",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",
@@ -94,7 +94,7 @@
         "@dnd-kit/sortable": "^7.0.1",
         "@emotion/react": "^11.13.5",
         "@emotion/styled": "^11.8.1",
-        "@evoke-platform/context": "^1.0.0-dev.118",
+        "@evoke-platform/context": "^1.0.0-dev.126",
         "@formio/react": "^5.2.4-rc.1",
         "@js-joda/core": "^3.2.0",
         "@js-joda/locale_en-us": "^3.2.2",