#RI-5376 - fix pr comments

Author: rsergeenko

redisinsight/ui/src/utils/parseRedisUrl.ts

@@ -1,7 +1,7 @@
 import { Maybe, Nullable } from 'uiSrc/utils/types'
 
 /*
-  redis[s]://               - Protocol (redis or rediss)
+  [redis[s]://]             - Optional Protocol (redis or rediss)
   [username][:password]@    - Optional username and password
   host                      - Hostname or IP address
   [:port]                   - Optional port
@@ -17,7 +17,22 @@ interface ParsedRedisUrl {
   dbNumber: Maybe<number>
 }
 
-const parseRedisUrl = (urlString: string): Nullable<ParsedRedisUrl> => {
+const parseRedisUrl = (urlString: string = ''): Nullable<ParsedRedisUrl> => {
+  const pureUrlPattern = /^([^:]+):(\d+)$/
+  const pureMatch = urlString.match(pureUrlPattern)
+
+  if (pureMatch) {
+    const [, host, port] = pureMatch
+    return {
+      protocol: 'redis',
+      username: '',
+      password: '',
+      host,
+      port: port ? parseInt(port, 10) : undefined,
+      dbNumber: undefined
+    }
+  }
+
   // eslint-disable-next-line no-useless-escape
   const redisUrlPattern = /^(redis[s]?):\/\/(?:([^:@]+)?(?::([^@]+))?@)?([^:\/]+)(?::(\d+))?(?:\/(\d+))?$/
   const match = urlString.match(redisUrlPattern)
@@ -29,7 +44,7 @@ const parseRedisUrl = (urlString: string): Nullable<ParsedRedisUrl> => {
   const [, protocol, username, password, host, port, dbNumber] = match
 
   return {
-    protocol,
+    protocol: protocol || 'redis',
     username: username || '',
     password: password || '',
     host,

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

@@ -1,6 +1,7 @@
 import { parseRedisUrl } from 'uiSrc/utils/parseRedisUrl'
 
 const defaultRedisParams = {
+  protocol: 'redis',
   username: '',
   password: '',
   port: undefined,
@@ -20,29 +21,37 @@ const parseRedisUrlTests: Array<[string, any]> = [
     'redis://us@er:pass@localhost:6380',
     null
   ],
+  [
+    'localhost',
+    null
+  ],
+  [
+    'localhost:6379',
+    { ...defaultRedisParams, host: 'localhost', port: 6379 }
+  ],
   [
     'redis://localhost',
-    { ...defaultRedisParams, protocol: 'redis', host: 'localhost' }
+    { ...defaultRedisParams, host: 'localhost' }
   ],
   [
     'redis://localhost:6380',
-    { ...defaultRedisParams, protocol: 'redis', host: 'localhost', port: 6380 }
+    { ...defaultRedisParams, host: 'localhost', port: 6380 }
   ],
   [
     'redis://@localhost:6380',
-    { ...defaultRedisParams, protocol: 'redis', host: 'localhost', port: 6380 }
+    { ...defaultRedisParams, host: 'localhost', port: 6380 }
   ],
   [
     'redis://user@localhost:6380',
-    { ...defaultRedisParams, username: 'user', protocol: 'redis', host: 'localhost', port: 6380 }
+    { ...defaultRedisParams, username: 'user', host: 'localhost', port: 6380 }
   ],
   [
     'redis://:pass@localhost:6380',
-    { ...defaultRedisParams, protocol: 'redis', password: 'pass', host: 'localhost', port: 6380 }
+    { ...defaultRedisParams, password: 'pass', host: 'localhost', port: 6380 }
   ],
   [
     'redis://user:pass@localhost:6380',
-    { ...defaultRedisParams, protocol: 'redis', username: 'user', password: 'pass', host: 'localhost', port: 6380 }
+    { ...defaultRedisParams, username: 'user', password: 'pass', host: 'localhost', port: 6380 }
   ],
   [
     'rediss://user:pa%712ss@localhost:6380',