fix(designer): Fix issue where characters later in a token name would…

… carry less relevence in a search (#4736) * fix(designer): Fix issue where characters later in a token name would carry less relevence in a search * Add test for regression * name of test * Fix serialization test
Azure · Apr 30, 2024 · 2dfc193 · 2dfc193
1 parent 912f540
commit 2dfc193
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 12 deletions.
diff --git a/__mocks__/workflows/Panel.json b/__mocks__/workflows/Panel.json
@@ -50,12 +50,18 @@
                   "type": "string"
                 }
               },
-              "required": ["document", "min", "policy"]
+              "required": [
+                "document",
+                "min",
+                "policy"
+              ]
             }
           }
         },
         "runAfter": {
-          "Initialize_ArrayVariable": ["SUCCEEDED"]
+          "Initialize_ArrayVariable": [
+            "SUCCEEDED"
+          ]
         }
       },
       "Filter_array": {
@@ -65,7 +71,9 @@
           "where": "@not(contains(length(split(item(), '|')?[0]),length(split(item(), '|')?[0])))"
         },
         "runAfter": {
-          "Parse_JSON": ["SUCCEEDED"]
+          "Parse_JSON": [
+            "SUCCEEDED"
+          ]
         }
       },
       "HTTP": {
@@ -76,7 +84,9 @@
           "body": "@variables('ArrayVariable')"
         },
         "runAfter": {
-          "Filter_array": ["SUCCEEDED"]
+          "Filter_array": [
+            "SUCCEEDED"
+          ]
         },
         "runtimeConfiguration": {
           "contentTransfer": {
@@ -104,7 +114,9 @@
                       "type": "string"
                     }
                   },
-                  "required": ["item1"]
+                  "required": [
+                    "item1"
+                  ]
                 }
               },
               "string": {
@@ -120,5 +132,10 @@
     }
   },
   "connectionReferences": {},
-  "parameters": {}
-}
+  "parameters": {
+    "EILCO Admin Nominations-OCSA List (cr773_EILCOAdminNominations_OCSA_L2)": {
+      "type": "String",
+      "value": "test"
+    }
+  }
+}
diff --git a/apps/Standalone/src/designer/app/LocalDesigner/localDesigner.tsx b/apps/Standalone/src/designer/app/LocalDesigner/localDesigner.tsx
@@ -154,6 +154,7 @@ const connectionParameterEditorService = new CustomConnectionParameterEditorServ
 export const LocalDesigner = () => {
   const {
     workflowDefinition,
+    parameters,
     isReadOnly,
     isMonitoringView,
     isDarkMode,
@@ -201,7 +202,7 @@ export const LocalDesigner = () => {
           workflow={{
             definition: workflowDefinition,
             connectionReferences: connections,
-            parameters: workflowDefinition.parameters,
+            parameters: parameters,
             kind: workflowKind,
           }}
           runInstance={runInstance}

diff --git a/apps/Standalone/src/designer/state/workflowLoadingSlice.ts b/apps/Standalone/src/designer/state/workflowLoadingSlice.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import { getStateHistory, setStateHistory } from './historyHelpers';
 import type { RootState } from './store';
-import type { ConnectionReferences } from '@microsoft/logic-apps-designer';
+import type { ConnectionReferences, WorkflowParameter } from '@microsoft/logic-apps-designer';
 import type { LogicAppsV2 } from '@microsoft/logic-apps-shared';
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
@@ -20,6 +20,7 @@ export interface WorkflowLoadingState {
   isConsumption: boolean;
   isLocal: boolean;
   showChatBot?: boolean;
+  parameters: Record<string, WorkflowParameter>;
   showConnectionsPanel?: boolean;
   workflowKind?: string;
   language: string;
@@ -35,6 +36,7 @@ export interface WorkflowLoadingState {
 const initialState: WorkflowLoadingState = {
   appId: undefined,
   workflowDefinition: null,
+  parameters: {},
   runInstance: null,
   connections: {},
   resourcePath: '',
@@ -58,6 +60,7 @@ const initialState: WorkflowLoadingState = {
 type WorkflowPayload = {
   workflowDefinition: LogicAppsV2.WorkflowDefinition;
   connectionReferences: ConnectionReferences;
+  parameters: Record<string, WorkflowParameter>;
 };
 
 type RunPayload = {
@@ -70,7 +73,8 @@ export const loadWorkflow = createAsyncThunk('workflowLoadingState/loadWorkflow'
   const wf = await import(`../../../../../__mocks__/workflows/${currentState.workflowLoader.resourcePath?.split('.')[0]}.json`);
   return {
     workflowDefinition: wf.definition as LogicAppsV2.WorkflowDefinition,
-    connectionReferences: {},
+    connectionReferences: wf.connections as ConnectionReferences,
+    parameters: wf.parameters ?? {},
   } as WorkflowPayload;
 });
 
@@ -182,9 +186,11 @@ export const workflowLoadingSlice = createSlice({
       }
       state.workflowDefinition = action.payload?.workflowDefinition;
       state.connections = action.payload?.connectionReferences ?? {};
+      state.parameters = action.payload?.parameters ?? {};
     });
     builder.addCase(loadWorkflow.rejected, (state) => {
       state.workflowDefinition = null;
+      state.parameters = {};
     });
     builder.addCase(loadRun.fulfilled, (state, action: PayloadAction<RunPayload | null>) => {
       if (!action.payload) {

diff --git a/e2e/designer/TokenPicker.spec.ts b/e2e/designer/TokenPicker.spec.ts
@@ -0,0 +1,29 @@
+import test, { expect } from '@playwright/test';
+import { GoToMockWorkflow } from './utils/GoToWorkflow';
+
+test.describe(
+  'Token Picker Tests',
+  {
+    tag: '@mock',
+  },
+  async () => {
+    test('Token picker search should have robust name matching', async ({ page }) => {
+      await page.goto('/');
+
+      await GoToMockWorkflow(page, 'Panel');
+      await page.getByLabel('Parse JSON operation, Data').click();
+      await page.getByLabel('Content').click();
+      await page.locator('button').filter({ hasText: '' }).click();
+      await expect(page.getByRole('button', { name: 'EILCO Admin Nominations-OCSA' })).toBeVisible();
+      await page.getByPlaceholder('Search').click();
+      await page.getByPlaceholder('Search').fill('OCSA');
+      await expect(page.getByRole('button', { name: 'EILCO Admin Nominations-OCSA' })).toBeVisible();
+      await page.getByPlaceholder('Search').click();
+      await page.getByPlaceholder('Search').fill('_L2');
+      await expect(page.getByRole('button', { name: 'EILCO Admin Nominations-OCSA' })).toBeVisible();
+      await page.getByPlaceholder('Search').click();
+      await page.getByPlaceholder('Search').fill('OCSR');
+      await expect(page.getByRole('button', { name: 'EILCO Admin Nominations-OCSA' })).toBeVisible();
+    });
+  }
+);
diff --git a/e2e/designer/serialization.spec.ts b/e2e/designer/serialization.spec.ts
@@ -18,7 +18,7 @@ test.describe(
         assert: { type: 'json' },
       });
 
-      expect({ connectionReferences: {}, parameters: {}, definition: mock.default.definition }).toEqual(serialized as any);
+      expect({ connectionReferences: mock.default.connectionReferences, parameters: mock.default.parameters, definition: mock.default.definition }).toEqual(serialized as any);
     });
 
     test('Should serialize the workflow after deserializing it and match with a switch statement', async ({ page }) => {

diff --git a/libs/data-mapper/src/lib/components/functionList/FunctionList.tsx b/libs/data-mapper/src/lib/components/functionList/FunctionList.tsx
@@ -30,6 +30,7 @@ const fuseFunctionSearchOptions: Fuse.IFuseOptions<FunctionData> = {
   minMatchCharLength: 2,
   includeMatches: true,
   threshold: 0.4,
+  ignoreLocation: true,
   keys: ['key', 'functionName', 'displayName', 'category'],
 };
 

diff --git a/libs/data-mapper/src/lib/utils/Schema.Utils.ts b/libs/data-mapper/src/lib/utils/Schema.Utils.ts
@@ -194,6 +194,7 @@ export const searchSchemaTreeFromRoot = (
     includeScore: true,
     minMatchCharLength: 2,
     includeMatches: true,
+    ignoreLocation: true,
     threshold: 0.4,
     keys: ['qName'],
   };

diff --git a/libs/designer-ui/src/lib/azureResourcePicker/index.tsx b/libs/designer-ui/src/lib/azureResourcePicker/index.tsx
@@ -30,6 +30,7 @@ const fuseOptions: Fuse.IFuseOptions<{ id: string; text: string }> = {
   includeScore: true,
   minMatchCharLength: 2,
   includeMatches: true,
+  ignoreLocation: true,
   threshold: 0.4,
   keys: ['text'],
 };

diff --git a/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickeroption.tsx b/libs/designer-ui/src/lib/tokenpicker/tokenpickersection/tokenpickeroption.tsx
@@ -54,7 +54,7 @@ export const TokenPickerOptions = ({
     let tokens: Token[];
     if (searchQuery) {
       const query = searchQuery.trim();
-      const fuse = new Fuse(section.tokens, { keys: ['description', 'title'], threshold: 0.2 });
+      const fuse = new Fuse(section.tokens, { keys: ['description', 'title'], threshold: 0.4, ignoreLocation: true });
       tokens = fuse.search(query).map((token) => token.item);
       setFilteredTokens(tokens);
     }

diff --git a/libs/designer/src/lib/ui/panel/nodeSearchPanel/nodeSearchPanel.tsx b/libs/designer/src/lib/ui/panel/nodeSearchPanel/nodeSearchPanel.tsx
@@ -20,6 +20,7 @@ const fuseOptions: Fuse.IFuseOptions<{ id: string; text: string }> = {
   includeScore: true,
   minMatchCharLength: 2,
   includeMatches: true,
+  ignoreLocation: true,
   threshold: 0.4,
   keys: ['text'],
 };

diff --git a/libs/designer/src/lib/ui/panel/recommendation/searchView.tsx b/libs/designer/src/lib/ui/panel/recommendation/searchView.tsx
@@ -114,6 +114,7 @@ class DefaultSearchOperationsService implements Pick<ISearchService, 'searchOper
     return {
       includeScore: true,
       threshold: 0.4,
+      ignoreLocation: true,
       keys: [
         {
           name: 'properties.summary', // Operation 'name'