@evoke-platform/ui-components 1.0.0-dev.238 → 1.0.0-dev.240

package/dist/published/components/custom/CriteriaBuilder/CriteriaBuilder.js

@@ -9,22 +9,22 @@ import { Box } from '../../layout';
 import { difference } from '../util';
 import ValueEditor from './ValueEditor';
 const ALL_OPERATORS = [
-    { name: '=', label: '=' },
-    { name: '!=', label: '!=' },
-    { name: '<', label: '<' },
-    { name: '>', label: '>' },
-    { name: '<=', label: '<=' },
-    { name: '>=', label: '>=' },
-    { name: 'contains', label: 'contains' },
-    { name: 'beginsWith', label: 'begins with' },
-    { name: 'endsWith', label: 'ends with' },
-    { name: 'doesNotContain', label: 'does not contain' },
-    { name: 'doesNotBeginWith', label: 'does not begin with' },
-    { name: 'doesNotEndWith', label: 'does not end with' },
-    { name: 'null', label: 'is null' },
-    { name: 'notNull', label: 'is not null' },
-    { name: 'in', label: 'in' },
-    { name: 'notIn', label: 'not in' },
+    { name: '=', label: 'Is' },
+    { name: '!=', label: 'Is not' },
+    { name: '<', label: 'Less than' },
+    { name: '>', label: 'Greater than' },
+    { name: '<=', label: 'Less than or equal to' },
+    { name: '>=', label: 'Greater than or equal to' },
+    { name: 'contains', label: 'Contains' },
+    { name: 'beginsWith', label: 'Starts with' },
+    { name: 'endsWith', label: 'Ends with' },
+    { name: 'doesNotContain', label: 'Does not contain' },
+    { name: 'doesNotBeginWith', label: 'Does not start with' },
+    { name: 'doesNotEndWith', label: 'Does not end with' },
+    { name: 'null', label: 'Is empty' },
+    { name: 'notNull', label: 'Is not empty' },
+    { name: 'in', label: 'In' },
+    { name: 'notIn', label: 'Not in' },
 ];
 const CustomRuleGroup = (props) => {
     const rg = { ...props, ...useRuleGroup(props) };
@@ -86,6 +86,7 @@ const customSelector = (props) => {
     let width = '90px';
     let val = value;
     let opts = options;
+    const inputType = props.fieldData?.inputType;
     let readOnly = false;
     if (context.disabledCriteria) {
         readOnly =
@@ -98,18 +99,42 @@ const customSelector = (props) => {
     switch (title) {
         case 'Operators':
             width = '20%';
-            if (props.fieldData?.inputType === 'array') {
+            if (inputType === 'array') {
                 opts = options
                     .filter((option) => ['null', 'notNull', 'in', 'notIn'].includes(option.name))
                     .map((option) => ({ name: option.name, label: option.label }));
                 val = val === '=' ? '' : options.find((option) => option.name === val).name;
             }
-            else if (props.fieldData?.inputType === 'document') {
+            else if (inputType === 'document') {
                 opts = options
                     .filter((option) => ['null', 'notNull'].includes(option.name))
                     .map((option) => ({ name: option.name, label: option.label }));
                 val = val === '=' ? '' : options.find((option) => option.name === val).name;
             }
+            else if (inputType === 'date' || inputType === 'date-time' || inputType === 'time') {
+                opts = options
+                    .filter((option) => ['=', '!=', '<', '>', '<=', '>=', 'null', 'notNull'].includes(option.name))
+                    .map((option) => ({
+                    ...option,
+                    label: option.name === '>'
+                        ? inputType === 'time'
+                            ? 'Later than'
+                            : 'After'
+                        : option.name === '>='
+                            ? inputType === 'time'
+                                ? 'Later than or at'
+                                : 'After or on'
+                            : option.name === '<'
+                                ? inputType === 'time'
+                                    ? 'Earlier than'
+                                    : 'Before'
+                                : option.name === '<='
+                                    ? inputType === 'time'
+                                        ? 'Earlier than or at'
+                                        : 'Before or on'
+                                    : option.label,
+                }));
+            }
             break;
         case 'Fields':
             width = '33%';

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

@@ -4,7 +4,7 @@ import { cloneDeep, isEmpty, pick } from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { FormComponentWrapper } from '../../Common';
-import { getAllCriteriaInputs, getPrefixedUrl, isPropertyVisible, transformToWhere, updateCriteriaInputs, } from '../../utils';
+import { getAllCriteriaInputs, getPrefixedUrl, transformToWhere, updateCriteriaInputs } from '../../utils';
 import { ObjectPropertyInput } from './ObjectPropertyInput';
 export class ObjectComponent extends ReactComponent {
     constructor(component, options, data) {
@@ -130,7 +130,7 @@ export class ObjectComponent extends ReactComponent {
         this.root.customErrors = this.root.customErrors.filter((error) => error.formattedKeyOrPath !== this.component.key);
     }
     handleValidation() {
-        if (!isPropertyVisible(this.component.conditional, this.root.data)) {
+        if (!this.visible) {
             return;
         }
         //check for out-of-the-box formio errors which store on this.root.errors

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

@@ -228,6 +228,7 @@ export const ObjectPropertyInput = (props) => {
                         setDropdownInput(undefined); // refresh search options
                         setSelectedInstance(undefined);
                         handleChangeObjectProperty(property.id, null);
+                        instance[property.id] = null;
                     }
                     else {
                         const selectedInstance = options.find((o) => o.id === value?.value);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.0.0-dev.238",
+    "version": "1.0.0-dev.240",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",