#RI-3572 - resolve comments

Author: AmirAllayarovSofteq

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

@@ -428,55 +428,54 @@ export class RecommendationProvider {
     keys: Key[],
     client: any,
   ): Promise<Recommendation> {
-    if (client.isCluster) {
-      let processedKeysNumber = 0;
-      let isJSONOrHash = false;
-      let sortedSetNumber = 0;
-      while (
-        processedKeysNumber < keys.length
-        && !isJSONOrHash
-        && sortedSetNumber <= sortedSetCountForCheck
-      ) {
-        if (keys[processedKeysNumber].type !== RedisDataType.ZSet) {
-          processedKeysNumber += 1;
-        } else {
-          let keyType: string;
-          const sortedSetMember = await redisClient.sendCommand(
-            new Command('zrange', [keys[processedKeysNumber].name, 0, 0], { replyEncoding: 'utf8' }),
-          ) as string[];
-
-          try {
-            keyType = await redisClient.sendCommand(
-              new Command('type', [sortedSetMember[0]], { replyEncoding: 'utf8' }),
-            ) as string;
-          } catch (err) {
-            if (err && checkRedirectionError(err)) {
-              const { address } = parseRedirectionError(err);
-              const nodes = client.nodes('master');
-
-              const node: any = nodes.find(({ options: { host, port } }: Redis) => `${host}:${port}` === address);
-              if (!node) {
-                throw new ClusterNodeNotFoundError(
-                  ERROR_MESSAGES.CLUSTER_NODE_NOT_FOUND(node),
-                );
-              }
-
-              keyType = await node.sendCommand(
+    try {
+      if (client.isCluster) {
+        let processedKeysNumber = 0;
+        let isJSONOrHash = false;
+        let sortedSetNumber = 0;
+        while (
+          processedKeysNumber < keys.length
+          && !isJSONOrHash
+          && sortedSetNumber <= sortedSetCountForCheck
+        ) {
+          if (keys[processedKeysNumber].type !== RedisDataType.ZSet) {
+            processedKeysNumber += 1;
+          } else {
+            let keyType: string;
+            const sortedSetMember = await redisClient.sendCommand(
+              new Command('zrange', [keys[processedKeysNumber].name, 0, 0], { replyEncoding: 'utf8' }),
+            ) as string[];
+            try {
+              keyType = await redisClient.sendCommand(
                 new Command('type', [sortedSetMember[0]], { replyEncoding: 'utf8' }),
               ) as string;
+            } catch (err) {
+              if (err && checkRedirectionError(err)) {
+                const { address } = parseRedirectionError(err);
+                const nodes = client.nodes('master');
+
+                const node: any = nodes.find(({ options: { host, port } }: Redis) => `${host}:${port}` === address);
+                if (!node) {
+                  throw new ClusterNodeNotFoundError(
+                    ERROR_MESSAGES.CLUSTER_NODE_NOT_FOUND(node),
+                  );
+                }
+
+                keyType = await node.sendCommand(
+                  new Command('type', [sortedSetMember[0]], { replyEncoding: 'utf8' }),
+                ) as string;
+              }
             }
+            if (keyType === RedisDataType.JSON || keyType === RedisDataType.Hash) {
+              isJSONOrHash = true;
+            }
+            processedKeysNumber += 1;
+            sortedSetNumber += 1;
           }
-          if (keyType === RedisDataType.JSON || keyType === RedisDataType.Hash) {
-            isJSONOrHash = true;
-          }
-          processedKeysNumber += 1;
-          sortedSetNumber += 1;
         }
-      }
 
-      return isJSONOrHash ? { name: RECOMMENDATION_NAMES.SEARCH_INDEXES } : null;
-    }
-    try {
+        return isJSONOrHash ? { name: RECOMMENDATION_NAMES.SEARCH_INDEXES } : null;
+      }
       const sortedSets = keys
         .filter(({ type }) => type === RedisDataType.ZSet)
         .slice(0, 100);

redisinsight/ui/src/constants/dbAnalysisRecommendations.json

@@ -673,32 +673,22 @@
     "content": [
       {
         "id": "1",
-        "type": "pre",
-        "parameter": ["commands"],
-        "value": "${0} "
+        "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": "span",
-        "value": " are currently not renamed or disabled for your Instance."
+        "type": "pre",
+        "parameter": ["commands"],
+        "value": "${0} "
       },
       {
         "id": "3",
-        "type": "paragraph",
-        "value": "These commands are powerful and dangerous if not managed properly."
-      },
-      {
-        "id": "4",
         "type": "spacer",
-        "value": "l"
+        "value": "s"
       },
       {
-        "id": "5",
-        "type": "span",
-        "value": "Rename or disable them, especially for the production environment. "
-      },
-      {
-        "id": "6",
+        "id": "4",
         "type": "link",
         "value": {
           "href": "https://redis.io/download/",