Merge pull request #3046 from RedisInsight/fe/bugfix/RI-5414

#RI-5414 - add hostname to redis parsing url

Author: rsergeenko

redisinsight/ui/src/pages/home/utils/form.tsx

@@ -226,7 +226,7 @@ export const autoFillFormDetails = (
 
         case InstanceType.Standalone: {
           return ({
-            name: details.host || initialValues.name || 'localhost:6379',
+            name: details.hostname || initialValues.name || 'localhost:6379',
             host: details.host || initialValues.host || 'localhost',
             port: `${details.port || initialValues.port || 9443}`,
             username: details.username || '',

redisinsight/ui/src/utils/parseRedisUrl.ts

@@ -14,6 +14,7 @@ interface ParsedRedisUrl {
   password: string
   host: string
   port: Maybe<number>
+  hostname: Maybe<string>
   dbNumber: Maybe<number>
 }
 
@@ -29,6 +30,7 @@ const parseRedisUrl = (urlString: string = ''): Nullable<ParsedRedisUrl> => {
       password: '',
       host,
       port: port ? parseInt(port, 10) : undefined,
+      hostname: port ? `${host}:${port}` : host,
       dbNumber: undefined
     }
   }
@@ -50,6 +52,7 @@ const parseRedisUrl = (urlString: string = ''): Nullable<ParsedRedisUrl> => {
     password: password || '',
     host,
     port: port ? parseInt(port, 10) : undefined,
+    hostname: port ? `${host}:${port}` : host,
     dbNumber: dbNumber ? parseInt(dbNumber, 10) : undefined
   }
 }

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

@@ -11,21 +11,21 @@ const defaultRedisParams = {
 const parseRedisUrlTests: Array<[string, any]> = [
   ['http://user:pass@localhost:6380', null],
   ['localhost', null],
-  ['localhost:6379', { ...defaultRedisParams, host: 'localhost', port: 6379 }],
-  ['redis://localhost', { ...defaultRedisParams, host: 'localhost' }],
-  ['redis://:@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380 }],
-  ['redis://user:pass/@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, username: 'user', password: 'pass/' }],
-  ['redis://user:pa@ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, username: 'user', password: 'pa@ss' }],
-  ['redis://us@er:pa@ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, username: 'us@er', password: 'pa@ss' }],
-  ['redis://us@er:pa@:ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, username: 'us@er', password: 'pa@:ss' }],
-  ['redis://localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380 }],
-  ['redis://@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380 }],
-  ['redis://user@localhost:6380', { ...defaultRedisParams, username: 'user', host: 'localhost', port: 6380 }],
-  ['redis://:pass@localhost:6380', { ...defaultRedisParams, password: 'pass', host: 'localhost', port: 6380 }],
-  ['redis://user:pass@localhost:6380', { ...defaultRedisParams, username: 'user', password: 'pass', host: 'localhost', port: 6380 }],
-  ['rediss://user:pa%712ss@localhost:6380', { ...defaultRedisParams, protocol: 'rediss', username: 'user', password: 'pa%712ss', host: 'localhost', port: 6380 }],
-  ['rediss://d&@&21^$:pa%@7:12:[email protected]:6380', { ...defaultRedisParams, protocol: 'rediss', username: 'd&@&21^$', password: 'pa%@7:12:ss', host: 'local-host-123.net.com', port: 6380 }],
-  ['rediss://user:pa%712ss@localhost:6380/2', { protocol: 'rediss', username: 'user', password: 'pa%712ss', host: 'localhost', port: 6380, dbNumber: 2 }],
+  ['localhost:6379', { ...defaultRedisParams, host: 'localhost', port: 6379, hostname: 'localhost:6379' }],
+  ['redis://localhost', { ...defaultRedisParams, host: 'localhost', hostname: 'localhost' }],
+  ['redis://:@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, hostname: 'localhost:6380' }],
+  ['redis://user:pass/@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, hostname: 'localhost:6380', username: 'user', password: 'pass/' }],
+  ['redis://user:pa@ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, hostname: 'localhost:6380', username: 'user', password: 'pa@ss' }],
+  ['redis://us@er:pa@ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, hostname: 'localhost:6380', username: 'us@er', password: 'pa@ss' }],
+  ['redis://us@er:pa@:ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, hostname: 'localhost:6380', username: 'us@er', password: 'pa@:ss' }],
+  ['redis://localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, hostname: 'localhost:6380', }],
+  ['redis://@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, hostname: 'localhost:6380', }],
+  ['redis://user@localhost:6380', { ...defaultRedisParams, username: 'user', host: 'localhost', port: 6380, hostname: 'localhost:6380', }],
+  ['redis://:pass@localhost:6380', { ...defaultRedisParams, password: 'pass', host: 'localhost', port: 6380, hostname: 'localhost:6380', }],
+  ['redis://user:pass@localhost:6380', { ...defaultRedisParams, username: 'user', password: 'pass', host: 'localhost', port: 6380, hostname: 'localhost:6380', }],
+  ['rediss://user:pa%712ss@localhost:6380', { ...defaultRedisParams, protocol: 'rediss', username: 'user', password: 'pa%712ss', host: 'localhost', port: 6380, hostname: 'localhost:6380', }],
+  ['rediss://d&@&21^$:pa%@7:12:[email protected]:6380', { ...defaultRedisParams, protocol: 'rediss', username: 'd&@&21^$', password: 'pa%@7:12:ss', host: 'local-host-123.net.com', port: 6380, hostname: 'local-host-123.net.com:6380', }],
+  ['rediss://user:pa%712ss@localhost:6380/2', { protocol: 'rediss', username: 'user', password: 'pa%712ss', host: 'localhost', port: 6380, hostname: 'localhost:6380', dbNumber: 2 }],
 ]
 
 describe('parseRedisUrl', () => {