From 549c1b5a16be0fc5e21ec483fe121ab148dd35ff Mon Sep 17 00:00:00 2001
From: illia prokopchuk <illia.prokopchuk@globallogic.com>
Date: Fri, 6 Oct 2023 13:23:53 +0300
Subject: [PATCH] Fix [Jobs] Go back to list redirects to Overview page

---
 .../ModelsPage/RealTimePipelines/RealTimePipelinesView.js       | 2 ++
 src/reducers/artifactsReducer.js                                | 1 +
 src/utils/getCloseDetailsLink.js                                | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/ModelsPage/RealTimePipelines/RealTimePipelinesView.js b/src/components/ModelsPage/RealTimePipelines/RealTimePipelinesView.js
index 7ed077087..13df7da1c 100644
--- a/src/components/ModelsPage/RealTimePipelines/RealTimePipelinesView.js
+++ b/src/components/ModelsPage/RealTimePipelines/RealTimePipelinesView.js
@@ -26,6 +26,7 @@ import FunctionsTableRow from '../../../elements/FunctionsTableRow/FunctionsTabl
 import ModelsPageTabs from '../ModelsPageTabs/ModelsPageTabs'
 import Pipeline from '../../Pipeline/Pipeline'
 import Table from '../../Table/Table'
+import Loader from '../../../common/Loader/Loader'
 
 import { filters } from './realTimePipelines.util'
 import { MODELS_PAGE, REAL_TIME_PIPELINES_TAB } from '../../../constants'
@@ -57,6 +58,7 @@ const RealTimePipelinesView = React.forwardRef(
 
     return (
       <>
+        {artifactsStore.loading && <Loader />}
         <div className="models" ref={ref}>
           <div className="table-container">
             <div className={filterMenuClassNames}>
diff --git a/src/reducers/artifactsReducer.js b/src/reducers/artifactsReducer.js
index 5d54bf060..8fc0f03e3 100644
--- a/src/reducers/artifactsReducer.js
+++ b/src/reducers/artifactsReducer.js
@@ -264,6 +264,7 @@ const artifactsSlice = createSlice({
       state.loading = false
     })
     builder.addCase(fetchFiles.rejected, defaultRejectedHandler)
+    builder.addCase(fetchArtifactsFunctions.pending, defaultPendingHandler)
     builder.addCase(fetchArtifactsFunctions.fulfilled, (state, action) => {
       state.error = null
       state.pipelines = action.payload
diff --git a/src/utils/getCloseDetailsLink.js b/src/utils/getCloseDetailsLink.js
index d80c0029f..ebd51ae1e 100644
--- a/src/utils/getCloseDetailsLink.js
+++ b/src/utils/getCloseDetailsLink.js
@@ -20,6 +20,6 @@ such restriction.
 export const getCloseDetailsLink = (location, paramName) => {
   return location.pathname
     .split('/')
-    .splice(0, location.pathname.split('/').indexOf(paramName) + 1)
+    .splice(0, location.pathname.split('/').lastIndexOf(paramName) + 1)
     .join('/')
 }