@evoke-platform/ui-components 1.0.0-dev.232 → 1.0.0-dev.233

package/dist/published/components/custom/CriteriaBuilder/CriteriaBuilder.d.ts

@@ -22,7 +22,6 @@ export declare type CriteriaInputProps = {
     disabled?: boolean;
     hideBorder?: boolean;
     presetGroupLabel?: string;
-    freeSolo?: boolean;
 };
 export declare const valueEditor: (props: ValueEditorProps) => JSX.Element;
 declare const CriteriaBuilder: (props: CriteriaInputProps) => JSX.Element;

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

@@ -84,9 +84,8 @@ const customSelector = (props) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const rule = props.rule;
     let width = '90px';
-    let displayedValue = value;
+    let val = value;
     let opts = options;
-    const isFreeSoloEnabled = context.freeSolo && title === 'Fields';
     let readOnly = false;
     if (context.disabledCriteria) {
         readOnly =
@@ -103,32 +102,23 @@ const customSelector = (props) => {
                 opts = options
                     .filter((option) => ['null', 'notNull', 'in', 'notIn'].includes(option.name))
                     .map((option) => ({ name: option.name, label: option.label }));
-                displayedValue =
-                    value === '='
-                        ? ''
-                        : options.find((option) => option.name === displayedValue).name;
+                val = val === '=' ? '' : options.find((option) => option.name === val).name;
             }
             else if (props.fieldData?.inputType === 'document') {
                 opts = options
                     .filter((option) => ['null', 'notNull'].includes(option.name))
                     .map((option) => ({ name: option.name, label: option.label }));
-                displayedValue =
-                    value === '='
-                        ? ''
-                        : options.find((option) => option.name === displayedValue).name;
+                val = val === '=' ? '' : options.find((option) => option.name === val).name;
             }
             break;
         case 'Fields':
             width = '33%';
-            displayedValue = options.find((option) => option.name === displayedValue)?.label;
-            if (isFreeSoloEnabled && !displayedValue) {
-                displayedValue = value;
-            }
+            val = options.find((option) => option.name === val)?.name;
             break;
     }
-    return (React.createElement(Autocomplete, { options: opts, value: displayedValue ?? null, getOptionLabel: (option) => {
+    return (React.createElement(Autocomplete, { options: opts, value: val ?? null, getOptionLabel: (option) => {
             if (typeof option === 'string') {
-                return option;
+                return opts.find((o) => option === o.name)?.label || '';
             }
             return option.label;
         }, isOptionEqualToValue: (option, value) => {
@@ -137,11 +127,7 @@ const customSelector = (props) => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         onChange: (event, newValue) => {
             handleOnChange(newValue?.value.name);
-        }, onInputChange: (event, value) => {
-            if (isFreeSoloEnabled) {
-                handleOnChange(value);
-            }
-        }, renderInput: (params) => React.createElement(TextField, { ...params, size: "small", name: title }), sx: { width: width, maxWidth: title === 'Operators' ? '200px' : 'none' }, disableClearable: true, readOnly: readOnly }));
+        }, renderInput: (params) => React.createElement(TextField, { ...params, size: "small" }), sx: { width: width, maxWidth: title === 'Operators' ? '200px' : 'none' }, disableClearable: true, readOnly: readOnly }));
 };
 const customCombinator = (props) => {
     const { options, value, handleOnChange, context, level } = props;
@@ -188,7 +174,7 @@ export const valueEditor = (props) => {
     return ValueEditor(props);
 };
 const CriteriaBuilder = (props) => {
-    const { properties, criteria, setCriteria, originalCriteria, enablePresetValues, presetValues, operators, dynamicContentInput, disabled, disabledCriteria, hideBorder, presetGroupLabel, freeSolo, } = props;
+    const { properties, criteria, setCriteria, originalCriteria, enablePresetValues, presetValues, operators, dynamicContentInput, disabled, disabledCriteria, hideBorder, presetGroupLabel, } = props;
     const [query, setQuery] = useState(undefined);
     useEffect(() => {
         if (criteria || originalCriteria) {
@@ -293,7 +279,6 @@ const CriteriaBuilder = (props) => {
                         enablePresetValues,
                         presetGroupLabel,
                         disabledCriteria,
-                        freeSolo,
                     }, controlClassnames: {
                         queryBuilder: 'queryBuilder-branches',
                         ruleGroup: 'container',

package/dist/published/stories/CriteriaBuilder.stories.d.ts

@@ -4,6 +4,5 @@ import { CriteriaInputProps } from '../components/custom/CriteriaBuilder/Criteri
 declare const _default: ComponentMeta<(props: CriteriaInputProps) => JSX.Element>;
 export default _default;
 export declare const CriteriaBuilder: ComponentStory<(props: CriteriaInputProps) => JSX.Element>;
-export declare const FreeSolo: ComponentStory<(props: CriteriaInputProps) => JSX.Element>;
 export declare const CriteriaBuilderPresetUserID: ComponentStory<(props: CriteriaInputProps) => JSX.Element>;
 export declare const CriteriaBuilderGroupedPresetValues: ComponentStory<(props: CriteriaInputProps) => JSX.Element>;

package/dist/published/stories/CriteriaBuilder.stories.js

@@ -109,27 +109,6 @@ CriteriaBuilder.args = {
     },
     enablePresetValues: false,
 };
-export const FreeSolo = CriteriaBuilderTemplate.bind({});
-FreeSolo.args = {
-    ...CriteriaBuilder.args,
-    criteria: {
-        $or: [
-            {
-                'person.license.name': 'bert',
-            },
-            {
-                licensedFor: { $in: ['hot dogs', 'amusements', 'entertainment'] },
-            },
-            {
-                licenseNumber: '123456',
-            },
-            {
-                issueDate: '2023-03-16',
-            },
-        ],
-    },
-    freeSolo: true,
-};
 export const CriteriaBuilderPresetUserID = CriteriaBuilderTemplate.bind({});
 CriteriaBuilderPresetUserID.args = {
     properties: [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.0.0-dev.232",
+    "version": "1.0.0-dev.233",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",
@@ -72,7 +72,6 @@
         "eslint-plugin-prettier": "^5.1.2",
         "eslint-plugin-testing-library": "^6.2.0",
         "husky": "^8.0.3",
-        "identity-obj-proxy": "^3.0.0",
         "is-ci": "^3.0.1",
         "jest": "^28.1.2",
         "jest-environment-jsdom": "^28.1.2",
@@ -144,9 +143,6 @@
     "jest": {
         "verbose": true,
         "testEnvironment": "jsdom",
-        "moduleNameMapper": {
-            "\\.(css|less|scss|sass)$": "identity-obj-proxy"
-        },
         "testPathIgnorePatterns": [
             "/node_modules/",
             "<rootDir>/dist/"

package/dist/published/components/custom/CriteriaBuilder/CriteriaBuilder.test.d.ts

@@ -1 +0,0 @@
-import '@testing-library/jest-dom/extend-expect';

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

@@ -1,44 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import '@testing-library/jest-dom/extend-expect';
-import CriteriaBuilder from './CriteriaBuilder';
-const mockProperties = [
-    { id: 'name', name: 'name', type: 'string', required: true },
-    { id: 'licenseNumber', name: 'license number', type: 'string', required: true },
-    { id: 'issueDate', name: 'issue date', type: 'date', required: false },
-];
-describe('CriteriaBuilder', () => {
-    test('allows selection of a property and clears value input when selected', async () => {
-        const user = userEvent.setup();
-        render(React.createElement(CriteriaBuilder, { properties: mockProperties, criteria: {
-                $or: [
-                    {
-                        name: 'test value',
-                    },
-                ],
-            }, setCriteria: jest.fn(), freeSolo: true }));
-        const field = await screen.findByDisplayValue(/name/);
-        const value = await screen.findByDisplayValue(/test value/);
-        await user.click(field);
-        const option = await screen.findByRole('option', { name: /license number/ });
-        await user.click(option);
-        expect(field).toHaveValue('license number');
-        expect(value).toHaveValue('');
-    });
-    test('allows free solo input when freeSolo is true, clears value input when entered', async () => {
-        const user = userEvent.setup();
-        render(React.createElement(CriteriaBuilder, { properties: mockProperties, criteria: {
-                $or: [
-                    {
-                        name: 'test value',
-                    },
-                ],
-            }, setCriteria: jest.fn(), freeSolo: true }));
-        const field = await screen.findByDisplayValue(/name/);
-        const value = await screen.findByDisplayValue(/test value/);
-        await user.type(field, 'person.license.name');
-        expect(field).toHaveValue('person.license.name');
-        expect(value).toHaveValue('');
-    });
-});