@evoke-platform/ui-components 1.11.1-dev.6 → 1.12.0-dev.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/published/components/custom/FormV2/components/RecursiveEntryRenderer.js +8 -4
  2. package/dist/published/components/custom/FormV2/components/utils.d.ts +1 -1
  3. package/dist/published/components/custom/FormV2/components/utils.js +2 -1
  4. package/package.json +2 -2
package/dist/published/components/custom/FormV2/components/RecursiveEntryRenderer.js CHANGED
@@ -85,8 +85,8 @@ export function RecursiveEntryRenderer(props) {
85
85
  }
86
86
  else if (fieldDefinition.type === 'object') {
87
87
  return (React.createElement(FieldWrapper, { ...getFieldWrapperProps(fieldDefinition, entry, entryId, fieldValue, display, errors) },
88
- React.createElement(ObjectPropertyInput, { relatedObjectId: !fieldDefinition.objectId ? display?.relatedObjectId : fieldDefinition.objectId, fieldDefinition: fieldDefinition, id: entryId, mode: display?.mode || 'default', error: !!errors?.[entryId], displayOption: display?.relatedObjectDisplay || 'dialogBox', initialValue: fieldValue, readOnly: entry.type === 'readonlyField', filter: validation?.criteria
89
- ? updateCriteriaInputs(validation.criteria, getValues(), userAccount)
88
+ React.createElement(ObjectPropertyInput, { relatedObjectId: !fieldDefinition.objectId ? display?.relatedObjectId : fieldDefinition.objectId, fieldDefinition: fieldDefinition, id: entryId, mode: display?.mode || 'default', error: !!errors?.[entryId], displayOption: display?.relatedObjectDisplay || 'dialogBox', initialValue: fieldValue, readOnly: entry.type === 'readonlyField', filter: 'criteria' in validation && validation.criteria
89
+ ? updateCriteriaInputs(validation.criteria, getValues(), userAccount, instance)
90
90
  : undefined, sortBy: typeof display?.defaultValue === 'object' && 'sortBy' in display.defaultValue
91
91
  ? display?.defaultValue.sortBy
92
92
  : undefined, orderBy: typeof display?.defaultValue === 'object' && 'orderBy' in display.defaultValue
@@ -104,7 +104,9 @@ export function RecursiveEntryRenderer(props) {
104
104
  if (middleObject && !isEmpty(middleObject)) {
105
105
  return (initialMiddleObjectInstances && (React.createElement(FieldWrapper, { ...getFieldWrapperProps(fieldDefinition, entry, entryId, fieldValue, display, errors) },
106
106
  React.createElement(DropdownRepeatableField, { initialMiddleObjectInstances: fetchedOptions[`${entryId}MiddleObjectInstances`] ||
107
- initialMiddleObjectInstances, fieldDefinition: fieldDefinition, id: entryId, middleObject: middleObject, readOnly: entry.type === 'readonlyField', criteria: validation?.criteria, hasDescription: !!display?.description }))));
107
+ initialMiddleObjectInstances, fieldDefinition: fieldDefinition, id: entryId, middleObject: middleObject, readOnly: entry.type === 'readonlyField', criteria: 'criteria' in validation && validation.criteria
108
+ ? updateCriteriaInputs(validation.criteria, getValues(), userAccount, instance)
109
+ : undefined, hasDescription: !!display?.description }))));
108
110
  }
109
111
  else {
110
112
  // when in the builder preview, the middle object won't be fetched so instead show an empty field
@@ -116,7 +118,9 @@ export function RecursiveEntryRenderer(props) {
116
118
  }
117
119
  else {
118
120
  return (React.createElement(FieldWrapper, { ...getFieldWrapperProps(fieldDefinition, entry, entryId, fieldValue, display, errors) },
119
- React.createElement(RepeatableField, { fieldDefinition: fieldDefinition, canUpdateProperty: entry.type !== 'readonlyField', criteria: validation?.criteria, viewLayout: display?.viewLayout, entry: entry })));
121
+ React.createElement(RepeatableField, { fieldDefinition: fieldDefinition, canUpdateProperty: entry.type !== 'readonlyField', criteria: 'criteria' in validation && validation.criteria
122
+ ? updateCriteriaInputs(validation.criteria, getValues(), userAccount, instance)
123
+ : undefined, viewLayout: display?.viewLayout, entry: entry })));
120
124
  }
121
125
  }
122
126
  else if (fieldDefinition.type === 'richText') {
package/dist/published/components/custom/FormV2/components/utils.d.ts CHANGED
@@ -40,7 +40,7 @@ export declare const encodePageSlug: (slug: string) => string;
40
40
  export declare function getDefaultPages(parameters: InputParameter[], defaultPages: Record<string, string> | undefined, findDefaultPageSlugFor: (objectId: string) => Promise<string | undefined>): Promise<{
41
41
  [x: string]: string;
42
42
  }>;
43
- export declare function updateCriteriaInputs(criteria: Record<string, unknown>, data: Record<string, unknown>, user?: UserAccount): Record<string, unknown>;
43
+ export declare function updateCriteriaInputs(criteria: Record<string, unknown>, data: Record<string, unknown>, user?: UserAccount, instance?: Record<string, unknown>): Record<string, unknown>;
44
44
  export declare function fetchCollectionData(apiServices: ApiServices, fieldDefinition: InputParameter | Property, setFetchedOptions: (newData: FieldValues) => void, instanceId?: string, fetchedOptions?: Record<string, unknown>, initialMiddleObjectInstances?: ObjectInstance[]): Promise<void>;
45
45
  export declare const getErrorCountForSection: (section: Section | Column, errors?: FieldErrors) => number;
46
46
  export declare const propertyToParameter: (property: Property) => InputParameter;
package/dist/published/components/custom/FormV2/components/utils.js CHANGED
@@ -307,12 +307,13 @@ function compileQueryValues(query, data) {
307
307
  return query;
308
308
  }
309
309
  }
310
- export function updateCriteriaInputs(criteria, data, user) {
310
+ export function updateCriteriaInputs(criteria, data, user, instance) {
311
311
  const dataSet = {
312
312
  input: {
313
313
  ...data,
314
314
  },
315
315
  user: user,
316
+ instance,
316
317
  };
317
318
  const compiledQuery = compileQueryValues(parseMongoDB(criteria), dataSet);
318
319
  // The "compiledQueryValues" function filters out rules that have a value of "undefined".
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@evoke-platform/ui-components",
3
- "version": "1.11.1-dev.6",
3
+ "version": "1.12.0-dev.1",
4
4
  "description": "",
5
5
  "main": "dist/published/index.js",
6
6
  "module": "dist/published/index.js",
@@ -96,7 +96,7 @@
96
96
  "yalc": "^1.0.0-pre.53"
97
97
  },
98
98
  "peerDependencies": {
99
- "@evoke-platform/context": "^1.6.0",
99
+ "@evoke-platform/context": "^1.7.0-0",
100
100
  "react": "^18.1.0",
101
101
  "react-dom": "^18.1.0"
102
102
  },