#RI-5766 - fix pathname

Author: rsergeenko

redisinsight/ui/src/components/markdown/RedisInsightLink/RedisInsightLink.spec.tsx

@@ -10,8 +10,7 @@ jest.mock('uiSrc/utils/routing', () => ({
 
 Object.defineProperty(window, 'location', {
   value: {
-    origin: 'http://localhost',
-    pathname: 'instanceId/workbench'
+    origin: 'http://localhost'
   },
   writable: true
 })

redisinsight/ui/src/components/markdown/RedisInsightLink/RedisInsightLink.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import { EuiLink, EuiPopover } from '@elastic/eui'
-import { useHistory, useParams } from 'react-router-dom'
+import { useHistory, useLocation, useParams } from 'react-router-dom'
 import cx from 'classnames'
 import { isNull } from 'lodash'
 import { getRedirectionPage } from 'uiSrc/utils/routing'
@@ -19,11 +19,12 @@ const RedisInsightLink = (props: Props) => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false)
   const { instanceId } = useParams<{ instanceId: string }>()
   const history = useHistory()
+  const location = useLocation()
 
   const handleLinkClick = (e: React.MouseEvent) => {
     e.preventDefault()
 
-    const href = getRedirectionPage(url, instanceId)
+    const href = getRedirectionPage(url, instanceId, location.pathname)
     if (href) {
       history.push(href)
       return

redisinsight/ui/src/services/resourcesService.ts

@@ -18,6 +18,9 @@ const resourcesService = axios.create({
   baseURL: RESOURCES_BASE_URL,
 })
 
+// TODO: it seems it's shoudn't be location.origin
+// TODO: check all cases and rename this to getResourcesUrl
+// TODO: also might be helpful create function which returns origin url
 export const getOriginUrl = () => (IS_ABSOLUTE_PATH.test(RESOURCES_BASE_URL)
   ? RESOURCES_BASE_URL
   : (window?.location?.origin || RESOURCES_BASE_URL))

redisinsight/ui/src/utils/routing.ts

@@ -26,14 +26,17 @@ export const findRouteByPathname = (routes: IRoute[], pathname: string): Maybe<I
 
 // undefined - route was not found
 // null - route found but private
-export const getRedirectionPage = (pageInput: string, databaseId?: string): Nullable<Maybe<string>> => {
+export const getRedirectionPage = (
+  pageInput: string,
+  databaseId?: string,
+  currentPathname?: string
+): Nullable<Maybe<string>> => {
   let page = pageInput.replace(/^\//, '')
   try {
-    const pageUrl = new URL(page, window.location.origin)
-    const { pathname, searchParams } = pageUrl
+    const { pathname, searchParams } = new URL(page, window.location.origin)
 
-    if (pathname === CURRENT_PAGE_URL_SYNTAX) {
-      return `${window.location.pathname}?${searchParams.toString()}`
+    if (currentPathname && pathname === CURRENT_PAGE_URL_SYNTAX) {
+      return `${currentPathname}?${searchParams.toString()}`
     }
 
     if (searchParams.has('guidePath') || searchParams.has('tutorialId')) {

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

@@ -6,8 +6,7 @@ jest.mock('uiSrc/utils/routing', () => ({
 
 Object.defineProperty(window, 'location', {
   value: {
-    origin: 'http://localhost',
-    pathname: 'instanceId/workbench'
+    origin: 'http://localhost'
   },
   writable: true
 })
@@ -24,7 +23,8 @@ const getRedirectionPageTests = [
   { input: ['/analytics'], expected: null },
   { input: ['some-page'], expected: undefined },
   { input: ['/workbench?guidePath=introduction.md', databaseId], expected: '/1/workbench?guidePath=introduction.md&insights=open' },
-  { input: ['/_?tutorialId=tutorial'], expected: 'instanceId/workbench?tutorialId=tutorial' },
+  { input: ['/_?tutorialId=tutorial'], expected: undefined },
+  { input: ['/_?tutorialId=tutorial', databaseId, `/${databaseId}/workbench`], expected: '/1/workbench?tutorialId=tutorial' },
 ]
 
 describe('getRedirectionPage', () => {