Merge pull request #1659 from RedisInsight/main

Merge main into release/2.18.0

Author: vlad-dargel

redisinsight/api/src/constants/recommendations.ts

@@ -17,12 +17,10 @@ export const RECOMMENDATION_NAMES = Object.freeze({
   REDIS_VERSION: 'redisVersion',
   REDIS_SEARCH: 'redisSearch',
   SEARCH_INDEXES: 'searchIndexes',
-  DANGEROUS_COMMANDS: 'dangerousCommands',
 });
 
 export const ONE_NODE_RECOMMENDATIONS = [
   RECOMMENDATION_NAMES.LUA_SCRIPT,
-  RECOMMENDATION_NAMES.DANGEROUS_COMMANDS,
   RECOMMENDATION_NAMES.AVOID_LOGICAL_DATABASES,
   RECOMMENDATION_NAMES.RTS,
   RECOMMENDATION_NAMES.REDIS_VERSION,

redisinsight/api/src/modules/recommendation/providers/recommendation.provider.spec.ts

@@ -651,18 +651,4 @@ describe('RecommendationProvider', () => {
         expect(redisVersionRecommendation).toEqual(null);
       });
   });
-
-  describe('determineDangerousCommandsRecommendation', () => {
-    it('should not return dangerous commands recommendation when "command" command executed with error',
-      async () => {
-        resetAllWhenMocks();
-        when(nodeClient.sendCommand)
-          .calledWith(jasmine.objectContaining({ name: 'command' }))
-          .mockRejectedValue('some error');
-
-        const dangerousCommandsRecommendation = await service
-          .determineDangerousCommandsRecommendation(nodeClient);
-        expect(dangerousCommandsRecommendation).toEqual(null);
-      });
-  });
 });

redisinsight/api/src/modules/recommendation/providers/recommendation.provider.ts

@@ -438,39 +438,6 @@ export class RecommendationProvider {
     }
   }
 
-  /*
- * Check dangerous commands recommendation
- * @param redisClient
- */
-
-  async determineDangerousCommandsRecommendation(
-    redisClient: Redis | Cluster,
-  ): Promise<Recommendation> {
-    try {
-      const dangerousCommands = await redisClient.sendCommand(
-        new Command('ACL', ['CAT', 'dangerous'], { replyEncoding: 'utf8' }),
-      ) as string[];
-
-      const filteredDangerousCommands = dangerousCommands.filter((command) => {
-        const commandName = command.split('|')[0];
-        return !redisInsightCommands.includes(commandName);
-      });
-
-      const activeDangerousCommands = await Promise.all(
-        filteredDangerousCommands.map(async (command) => await this.checkCommandInfo(redisClient, command)),
-      );
-      const commands = activeDangerousCommands
-        .filter((command) => !isNull(command))
-        .join('\r\n').toUpperCase();
-      return activeDangerousCommands.length
-        ? { name: RECOMMENDATION_NAMES.DANGEROUS_COMMANDS, params: { commands } }
-        : null;
-    } catch (err) {
-      this.logger.error('Can not determine dangerous commands recommendation', err);
-      return null;
-    }
-  }
-
   private async checkAuth(redisClient: Redis | Cluster): Promise<boolean> {
     try {
       await redisClient.sendCommand(
@@ -484,20 +451,6 @@ export class RecommendationProvider {
     return false;
   }
 
-  private async checkCommandInfo(redisClient: Redis | Cluster, command: string): Promise<string> {
-    try {
-      const result = await redisClient.sendCommand(
-        new Command('command', ['info', command]),
-      );
-      if (isNull(result[0])) {
-        return null;
-      }
-    } catch (err) {
-      return null;
-    }
-    return command;
-  }
-
   private checkTimestamp(value: string): boolean {
     try {
       if (!IS_NUMBER_REGEX.test(value) && isValid(new Date(value))) {

redisinsight/api/src/modules/recommendation/recommendation.service.ts

@@ -108,10 +108,6 @@ export class RecommendationService {
         RECOMMENDATION_NAMES.SEARCH_INDEXES,
         async () => await this.recommendationProvider.determineSearchIndexesRecommendation(client, keys, globalClient),
       ],
-      [
-        RECOMMENDATION_NAMES.DANGEROUS_COMMANDS,
-        async () => await this.recommendationProvider.determineDangerousCommandsRecommendation(client),
-      ],
       [
         RECOMMENDATION_NAMES.SET_PASSWORD,
         async () => await this.recommendationProvider.determineSetPasswordRecommendation(client),

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -109,6 +109,7 @@ const QueryCardHeader = (props: Props) => {
     setSelectedValue,
     onQueryDelete,
     onQueryReRun,
+    onQueryProfile,
     db,
   } = props
 

redisinsight/ui/src/constants/dbAnalysisRecommendations.json

@@ -687,36 +687,5 @@
       }
     ],
     "badges": ["upgrade"]
-  },
-  "dangerousCommands": {
-    "id": "dangerousCommands",
-    "title": "Rename or disable dangerous commands",
-    "content": [
-      {
-        "id": "1",
-        "type": "paragraph",
-        "value": "The following commands are currently not renamed or disabled for your Instance. These commands are powerful and dangerous if not managed properly. Rename or disable them, especially for the production environment"
-      },
-      {
-        "id": "2",
-        "type": "pre",
-        "parameter": ["commands"],
-        "value": "${0} "
-      },
-      {
-        "id": "3",
-        "type": "spacer",
-        "value": "s"
-      },
-      {
-        "id": "4",
-        "type": "link",
-        "value": {
-          "href": "https://redis.io/download/",
-          "name": "Read more"
-        }
-      }
-    ],
-    "badges": ["code_changes"]
   }
 }

redisinsight/ui/src/packages/ri-explain/README.md

@@ -0,0 +1 @@
+# RI-Explain plugin

redisinsight/ui/src/packages/ri-explain/package.json

@@ -0,0 +1,71 @@
+{
+  "author": {
+    "name": "Redis Ltd.",
+    "email": "support@redis.com",
+    "url": "https://redis.com/redis-enterprise/redis-insight"
+  },
+  "bugs": {
+    "url": "https://github.com/"
+  },
+  "description": "Show Profile/Explain Visualization",
+  "source": "./src/main.tsx",
+  "styles": "./dist/styles.css",
+  "main": "./dist/index.js",
+  "name": "explain-plugin",
+  "version": "0.0.1",
+  "scripts": {
+    "start": "cross-env NODE_ENV=development parcel serve src/index.html",
+    "build": "rimraf dist && cross-env NODE_ENV=production concurrently \"yarn build:js && yarn minify:js\" \"yarn build:css\" \"yarn build:assets\"",
+    "build-lite": "rm dist/*.js && cross-env NODE_ENV=production concurrently \"yarn build:js && yarn minify:js\"",
+    "build:js": "parcel build src/main.tsx --dist-dir dist",
+    "build:css": "parcel build src/styles/styles.less --dist-dir dist",
+    "build:assets": "parcel build src/assets/**/* --dist-dir dist",
+    "minify:js": "terser -- dist/main.js > dist/index.js && rimraf dist/main.js"
+  },
+  "targets": {
+    "main": false,
+    "module": {
+      "includeNodeModules": true
+    }
+  },
+  "visualizations": [
+    {
+      "id": "profile-explain-viz",
+      "name": "Visualization",
+      "activationMethod": "renderCore",
+      "matchCommands": [
+        "FT.EXPLAIN",
+        "FT.EXPLAINCLI",
+        "FT.PROFILE",
+        "GRAPH.EXPLAIN",
+        "GRAPH.PROFILE"
+      ],
+      "iconDark": "./dist/profile_icon_dark.svg",
+      "iconLight": "./dist/profile_icon_light.svg",
+      "description": "Profile/Explain plugin Visualization",
+      "default": true
+    }
+  ],
+  "devDependencies": {
+    "@parcel/compressor-brotli": "^2.0.0",
+    "@parcel/compressor-gzip": "^2.0.0",
+    "@parcel/transformer-less": "^2.3.2",
+    "concurrently": "^6.3.0",
+    "cross-env": "^7.0.3",
+    "parcel": "^2.0.0",
+    "rimraf": "^3.0.2",
+    "terser": "^5.9.0"
+  },
+  "dependencies": {
+    "@antv/hierarchy": "^0.6.8",
+    "@antv/x6": "^2.1.3",
+    "@antv/x6-react-shape": "^2.1.0",
+    "@elastic/eui": "34.6.0",
+    "@emotion/react": "^11.7.1",
+    "classnames": "^2.3.1",
+    "prop-types": "^15.8.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "uuid": "^9.0.0"
+  }
+}

redisinsight/ui/src/packages/ri-explain/src/App.tsx

@@ -0,0 +1,27 @@
+import React from 'react'
+import Explain from './Explain'
+
+const isDarkTheme = document.body.classList.contains('theme_DARK')
+
+export function App(props: { command?: string, data: any }) {
+
+  const ErrorResponse = HandleError(props)
+
+  if (ErrorResponse !== null) return ErrorResponse
+
+  return (
+    <div id="mainApp" style={{ height: "100%", width: '100%', overflowX: 'auto' }}>
+      <Explain command={props.command || ''} data={props.data}/>
+    </div>
+  )
+}
+
+function HandleError(props: { command?: string, data: any }): JSX.Element  | null {
+  const { data: [{ response = '', status = '' } = {}] = [] } = props
+
+  if (status === 'fail') {
+    return <div className="responseFail">{JSON.stringify(response)}</div>
+  }
+
+  return null
+}