@evoke-platform/ui-components 1.5.0-testing.11 → 1.5.0-testing.12

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

@@ -1,8 +1,8 @@
 import { useNotification, } from '@evoke-platform/context';
-import { debounce, isEmpty, isObject } from 'lodash';
+import { debounce, isEmpty } from 'lodash';
 import React, { useCallback, useEffect, useState } from 'react';
 import { Skeleton } from '../../../../../core';
-import { getMiddleObject, getPrefixedUrl, transformToWhere } from '../../../utils';
+import { getMiddleObject, getPrefixedUrl, retrieveCustomErrorMessage, transformToWhere } from '../../../utils';
 import { DropdownRepeatableFieldInput } from './DropdownRepeatableFieldInput';
 export const DropdownRepeatableField = (props) => {
     const { id, property, criteria, instance, readOnly, apiServices, initialMiddleObjectInstances, middleObject, getMiddleObjectInstances, fieldHeight, viewLayout, } = props;
@@ -127,43 +127,41 @@ export const DropdownRepeatableField = (props) => {
             fetchEndObjectInstances();
         }
     }, [fetchEndObjectInstances, layoutLoaded]);
-    const saveMiddleInstance = (endObjectId, endObjectName) => {
+    const saveMiddleInstance = async (endObjectId, endObjectName) => {
         if (property.objectId) {
             const middleObject = getMiddleObject(instance, property, endObjectId, endObjectName);
-            apiServices.post(getPrefixedUrl(`/objects/${property.objectId}/instances/actions`), { actionId: `_create`, input: middleObject }, (error, newInstance) => {
-                if (!error && newInstance && isObject(newInstance)) {
-                    setMiddleObjectInstances((prevObjectInstances) => [
-                        ...prevObjectInstances,
-                        newInstance,
-                    ]);
-                }
-                else {
-                    if (error) {
-                        setSnackbarError({
-                            showAlert: true,
-                            message: 'An error occured while adding an instance',
-                            isError: true,
-                        });
-                        setDropDownSelections(middleObjectInstances);
-                    }
-                }
-            });
-        }
-    };
-    const removeMiddleInstance = (instanceId) => {
-        apiServices.post(getPrefixedUrl(`/objects/${property.objectId}/instances/${instanceId}/actions`), { actionId: '_delete' }, (error, res) => {
-            if (!error) {
-                setMiddleObjectInstances((prevInstances) => prevInstances.filter((curr) => curr.id !== instanceId));
+            try {
+                const newInstance = await apiServices.post(getPrefixedUrl(`/objects/${property.objectId}/instances/actions`), { actionId: `_create`, input: middleObject });
+                setMiddleObjectInstances((prevObjectInstances) => [
+                    ...prevObjectInstances,
+                    newInstance,
+                ]);
             }
-            else {
-                setDropDownSelections(middleObjectInstances);
+            catch (err) {
                 setSnackbarError({
                     showAlert: true,
-                    message: 'An error occurred while deleting the instance',
+                    message: retrieveCustomErrorMessage(err) ??
+                        'An error occured while adding an instance',
                     isError: true,
                 });
+                setDropDownSelections(middleObjectInstances);
             }
-        });
+        }
+    };
+    const removeMiddleInstance = async (instanceId) => {
+        try {
+            await apiServices.post(getPrefixedUrl(`/objects/${property.objectId}/instances/${instanceId}/actions`), { actionId: '_delete' });
+            setMiddleObjectInstances((prevInstances) => prevInstances.filter((curr) => curr.id !== instanceId));
+        }
+        catch (err) {
+            setDropDownSelections(middleObjectInstances);
+            setSnackbarError({
+                showAlert: true,
+                message: retrieveCustomErrorMessage(err) ??
+                    'An error occurred while deleting the instance',
+                isError: true,
+            });
+        }
     };
     return initialLoading ? (React.createElement(Skeleton, null)) : (React.createElement(React.Fragment, null, middleObjectInstances && endObject && (React.createElement(DropdownRepeatableFieldInput, { id: id, property: property, 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, fieldHeight: fieldHeight }))));
 };

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/RepeatableField.js

@@ -7,7 +7,7 @@ import sift from 'sift';
 import { Edit, TrashCan } from '../../../../../icons';
 import { Button, IconButton, Skeleton, Snackbar, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Tooltip, Typography, } from '../../../../core';
 import { Box } from '../../../../layout';
-import { getPrefixedUrl, normalizeDateTime } from '../../utils';
+import { getPrefixedUrl, normalizeDateTime, retrieveCustomErrorMessage } from '../../utils';
 import { ActionDialog } from './ActionDialog';
 import { DocumentViewerCell } from './DocumentViewerCell';
 const styles = {
@@ -251,11 +251,10 @@ const RepeatableField = (props) => {
                 isSuccessful = true;
             }
             catch (err) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                error = err.response?.data?.error;
                 setSnackbarError({
                     showAlert: true,
-                    message: error?.message ?? `An error occurred while creating an instance`,
+                    message: retrieveCustomErrorMessage(err) ??
+                        `An error occurred while creating an instance`,
                     isError: true,
                 });
                 setSubmitting && setSubmitting(false);
@@ -285,11 +284,9 @@ const RepeatableField = (props) => {
                 isSuccessful = true;
             }
             catch (err) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                error = err.response?.data?.error;
                 setSnackbarError({
                     showAlert: true,
-                    message: error?.message ??
+                    message: retrieveCustomErrorMessage(err) ??
                         `An error occurred while ${actionType === 'delete' ? ' deleting' : ' updating'} an instance`,
                     isError: true,
                 });

package/dist/published/components/custom/Form/utils.d.ts

@@ -1,4 +1,4 @@
-import { ActionInput, ActionInputType, ApiServices, FormEntry, InputParameter, InputParameterReference, Obj, ObjectInstance, Property, PropertyType, UserAccount } from '@evoke-platform/context';
+import { ActionInput, ActionInputType, ApiServices, AxiosError, FormEntry, InputParameter, InputParameterReference, Obj, ObjectInstance, Property, PropertyType, UserAccount } from '@evoke-platform/context';
 import { ReactComponent } from '@formio/react';
 import { LocalDateTime } from '@js-joda/core';
 import { AutocompleteOption } from '../../core';
@@ -50,3 +50,4 @@ export declare function isPropertyVisible(conditional: {
 }, formData: Record<string, unknown>): boolean;
 export declare function normalizeDateTime(dateTime: LocalDateTime): string;
 export declare function normalizeDates(instances: ObjectInstance[], object?: Obj): void;
+export declare function retrieveCustomErrorMessage(error: AxiosError<any>): string | undefined;

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

@@ -129,12 +129,12 @@ export function convertFormToComponents(entries, parameters, object) {
         }
         else if (entry.type === 'input') {
             const displayOptions = entry.display;
-            const parameter = parameters.find((parameter) => parameter.id === entry.parameterId);
+            const parameter = parameters.find((parameter) => entry.type === 'input' && parameter.id === entry.parameterId);
             if (!parameter) {
                 return;
             }
-            let property = object.properties?.find((p) => p.id === entry.parameterId) ?? {
-                id: entry.parameterId,
+            let property = object.properties?.find((p) => entry.type === 'input' && p.id === entry.parameterId) ?? {
+                id: entry.type === 'input' ? entry.parameterId : undefined,
             };
             if (property.id?.includes('.')) {
                 const topLevelProperty = object.properties?.find((p) => p.id === property.id?.split('.')[0] && (p.type === 'address' || p.type === 'user'));
@@ -163,7 +163,7 @@ export function convertFormToComponents(entries, parameters, object) {
                 type,
                 multiple: ['array', 'document'].includes(parameter.type),
                 data: {
-                    values: entry.enumWithLabels,
+                    values: entry.type === 'input' ? entry.enumWithLabels : undefined,
                 },
                 property: property,
                 defaultToCurrentTime: displayOptions?.defaultValue === 'currentTime' && parameter.type === 'time' ? true : false,
@@ -1286,6 +1286,9 @@ export function normalizeDates(instances, object) {
         });
     });
 }
+export function retrieveCustomErrorMessage(error) {
+    return error?.response?.data?.error?.statusCode !== 500 ? error?.response?.data?.error?.message : undefined;
+}
 /**
  * Given an object entry in a JsonLogic object, map it to the correct value.
  * @param entry An entry in a JsonLogic object.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.5.0-testing.11",
+    "version": "1.5.0-testing.12",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",