Merge pull request #137 from RedisInsight/bugfix/RI-2212

#RI-2212 - update regex for getVisualizationsByCommand

Author: rsergeenko

redisinsight/ui/src/utils/plugins.ts

@@ -4,7 +4,7 @@ import { getBaseApiUrl } from 'uiSrc/utils/common'
 export const getVisualizationsByCommand = (query: string, visualizations: IPluginVisualization[]) =>
   visualizations.filter((visualization: IPluginVisualization) =>
     visualization.matchCommands.some((matchCommand) =>
-      query.startsWith(matchCommand) || (new RegExp(matchCommand.toLowerCase())).test(query.toLowerCase())))
+      query.startsWith(matchCommand) || (new RegExp(`^${matchCommand}`, 'i')).test(query)))
 
 export const urlForAsset = (basePluginUrl: string, path: string) => {
   const baseApiUrl = getBaseApiUrl()

redisinsight/ui/src/utils/tests/plugins.spec.ts

@@ -0,0 +1,27 @@
+import { getVisualizationsByCommand } from 'uiSrc/utils'
+import { IPluginVisualization } from 'uiSrc/slices/interfaces'
+
+describe('getVisualizationsByCommand', () => {
+  it('should return proper visualizations by query', () => {
+    const visualizations = [
+      { matchCommands: ['ft.search', 'ft.get'] },
+      { matchCommands: ['ft._list'] },
+      { matchCommands: ['ft.*'] },
+      { matchCommands: ['get'] }
+    ] as IPluginVisualization[]
+
+    const query1 = 'ft.search sa'
+    const query2 = 'ft.get zxc'
+    const query3 = 'command ft. zxc zxcz ft'
+    const query4 = 'command ft'
+    const query5 = 'any command'
+    const query6 = 'get key'
+
+    expect(getVisualizationsByCommand(query1, visualizations)).toHaveLength(2)
+    expect(getVisualizationsByCommand(query2, visualizations)).toHaveLength(2)
+    expect(getVisualizationsByCommand(query3, visualizations)).toHaveLength(0)
+    expect(getVisualizationsByCommand(query4, visualizations)).toHaveLength(0)
+    expect(getVisualizationsByCommand(query5, visualizations)).toHaveLength(0)
+    expect(getVisualizationsByCommand(query6, visualizations)).toHaveLength(1)
+  })
+})