Merge pull request #3077 from RedisInsight/fe/bugfix/RI-5448

#RI-5448 - fix resource url for docker

Author: mariasergeenko

redisinsight/ui/src/services/resourcesService.ts

@@ -16,9 +16,13 @@ export const getOriginUrl = () => (IS_ABSOLUTE_PATH.test(RESOURCES_BASE_URL)
   ? RESOURCES_BASE_URL
   : (window?.location?.origin || RESOURCES_BASE_URL))
 
-export const getPathToResource = (url: string = ''): string => (IS_ABSOLUTE_PATH.test(url)
-  ? url
-  : new URL(url, resourcesService.defaults.baseURL).toString())
+export const getPathToResource = (url: string = ''): string => {
+  try {
+    return IS_ABSOLUTE_PATH.test(url) ? url : new URL(url, getOriginUrl()).toString()
+  } catch {
+    return ''
+  }
+}
 
 export const checkResourse = async (url: string = '') => resourcesService.head(url)
 

redisinsight/ui/src/services/tests/resourcesService.spec.ts

@@ -0,0 +1,62 @@
+/*
+  eslint-disable global-require
+*/
+
+Object.defineProperty(window, 'location', {
+  value: {
+    origin: 'http://localhost'
+  },
+  writable: true
+})
+
+describe('getOriginUrl', () => {
+  const OLD_ENV = process.env
+
+  beforeEach(() => {
+    jest.resetModules()
+    process.env = { ...OLD_ENV }
+  })
+  afterAll(() => {
+    process.env = OLD_ENV
+  })
+
+  test('shoud return url with absolute path', () => {
+    const { getOriginUrl } = require('../resourcesService')
+
+    expect(getOriginUrl()).toEqual('http://localhost:5001/')
+  })
+
+  test('shoud return origin with not absolute path', () => {
+    process.env.RI_APP_TYPE = 'web'
+    process.env.NODE_ENV = 'production'
+
+    const { getOriginUrl } = require('../resourcesService')
+    expect(getOriginUrl()).toEqual('http://localhost')
+  })
+})
+
+describe('getPathToResource', () => {
+  const OLD_ENV = process.env
+
+  beforeEach(() => {
+    jest.resetModules()
+    process.env = { ...OLD_ENV }
+  })
+  afterAll(() => {
+    process.env = OLD_ENV
+  })
+
+  test('shoud return url with absolute path', () => {
+    const { getPathToResource } = require('../resourcesService')
+
+    expect(getPathToResource('data/file.txt')).toEqual('http://localhost:5001/data/file.txt')
+  })
+
+  test('shoud return origin with not absolute path', () => {
+    process.env.RI_APP_TYPE = 'web'
+    process.env.NODE_ENV = 'production'
+
+    const { getPathToResource } = require('../resourcesService')
+    expect(getPathToResource('data/file.txt')).toEqual('http://localhost/data/file.txt')
+  })
+})