Updated QueryBuilder issue 4346

shesha-reactjs/eslint.config.mjs

@@ -194,6 +194,8 @@ const baseTsConfig = {
     ignores: [
         "src/apis/*",
         "**/__tests__/**/*",
+        "**/*.test.ts",
+        "**/*.test.tsx",
     ],
     plugins: {
         "memory-monitor": memoryTracePlugin,
@@ -418,6 +420,12 @@ const makeStrictConfig = (path) => {
 }
 
 export default [
+    {
+        ignores: [
+            "dist/**",
+            ".next/**",
+        ],
+    },
     {
         ...baseTsConfig,
         files: [
@@ -455,4 +463,4 @@ export default [
             '@typescript-eslint/no-var-requires': 'off', // Allow require() in JS files
         }
     },
-];
+];

shesha-reactjs/jest.config.js

@@ -16,25 +16,24 @@ module.exports = {
   // extended assertions to Jest
   setupFilesAfterEnv: [
     //"@testing-library/jest-dom/extend-expect"
-    "@testing-library/jest-dom"
+    "@testing-library/jest-dom",
+    "<rootDir>/src/testSetup.ts",
   ],
 
   // Test spec file resolution pattern
   // Matches parent folder `__tests__` and filename
   // should contain `test` or `spec`.
   //testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.ts$",
   testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(ts|tsx)$',
-  // other Jest configuration options...
-  /*
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1',
   },
-  */
+  // other Jest configuration options...
   // Module file extensions for importing
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
   globals: {
     'ts-jest': {
       tsconfig: 'tsconfig.test.json'
     }
   }
-};
+};

shesha-reactjs/src/components/autocomplete/index.tsx

@@ -314,8 +314,11 @@ const AutocompleteInner: FC<IAutocompleteBaseProps> = (props: IAutocompleteBaseP
   }, [selected.current, source?.tableData, props.grouping]);
 
   const title = useMemo(() => {
-    return selected.current.length === 1 ? displayValueFunc(selected.current[0], allData) : null;
-  }, [selected.current]);
+    if (selected.current.length === 1)
+      return displayValueFunc(selected.current[0], allData);
+
+    return props.placeholder ?? null;
+  }, [allData, displayValueFunc, props.placeholder, selected.current]);
 
   // Show loading when actively fetching data
   const shouldShowLoading = (loadingIndicator || (!props.readOnly && loadingValues));
@@ -527,4 +530,3 @@ export {
   AutocompleteInterface as Autocomplete, type AutocompleteDataSourceType, type IAutocompleteProps,
   type ISelectOption,
 };
-

shesha-reactjs/src/components/expressionEditor/contextMetadata.test.ts

@@ -0,0 +1,64 @@
+import { DataTypes } from '@/interfaces';
+import { IObjectMetadata } from '@/interfaces/metadata';
+import { buildExpressionContextFromMetadata } from './contextMetadata';
+
+describe('buildExpressionContextFromMetadata', () => {
+  it('merges nested properties with type-definition members for context suggestions', async () => {
+    const metadata: IObjectMetadata = {
+      dataType: DataTypes.object,
+      properties: [
+        {
+          path: 'contexts',
+          dataType: DataTypes.object,
+          properties: [
+            {
+              path: 'canvasContext',
+              dataType: DataTypes.object,
+              properties: [
+                { path: 'zoom', dataType: DataTypes.number },
+                { path: 'details.themeName', dataType: DataTypes.string },
+              ],
+              typeDefinitionLoader: async () => ({
+                typeName: 'ICanvasContextApi',
+                files: [{
+                  fileName: 'apis/canvasContext.ts',
+                  content: `
+                    export interface ICanvasActions {
+                      setDesignerDevice(deviceType: string): void;
+                      setCanvasWidth(width: number | string): void;
+                    }
+
+                    export interface ICanvasState {
+                      activeDevice?: string;
+                    }
+
+                    export interface ICanvasContextApi extends ICanvasState {
+                      zoom?: number;
+                      api: ICanvasActions;
+                    }
+                  `,
+                }],
+              }),
+            },
+          ],
+        },
+      ],
+    };
+
+    await expect(buildExpressionContextFromMetadata(metadata)).resolves.toEqual({
+      contexts: {
+        canvasContext: {
+          zoom: null,
+          details: {
+            themeName: null,
+          },
+          activeDevice: null,
+          api: {
+            setDesignerDevice: null,
+            setCanvasWidth: null,
+          },
+        },
+      },
+    });
+  });
+});