From 30993117633e84f2a65bfacaee2faa5844691837 Mon Sep 17 00:00:00 2001
From: Yury Saukou <yury_saukou@epam.com>
Date: Mon, 18 Nov 2024 18:01:14 +0400
Subject: [PATCH] UIORGS-355 update

---
 src/Organizations/OrganizationVersion/OrganizationVersion.js | 4 ++--
 src/Organizations/OrganizationsList/OrganizationsList.js     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Organizations/OrganizationVersion/OrganizationVersion.js b/src/Organizations/OrganizationVersion/OrganizationVersion.js
index d5856480..2f52d21f 100644
--- a/src/Organizations/OrganizationVersion/OrganizationVersion.js
+++ b/src/Organizations/OrganizationVersion/OrganizationVersion.js
@@ -48,10 +48,10 @@ const OrganizationVersion = ({
 
   const onSelectVersion = useCallback((_versionId) => {
     history.push({
-      pathname: `${ORGANIZATION_VERSIONS_VIEW_ROUTE}/${_versionId}`,
+      pathname: `${ORGANIZATION_VERSIONS_VIEW_ROUTE.replace(':id', organizationId)}/${_versionId}`,
       search: location.search,
     });
-  }, [history, location.search]);
+  }, [history, location.search, organizationId]);
 
   const {
     versions,
diff --git a/src/Organizations/OrganizationsList/OrganizationsList.js b/src/Organizations/OrganizationsList/OrganizationsList.js
index 2b4522f8..ce3135fa 100644
--- a/src/Organizations/OrganizationsList/OrganizationsList.js
+++ b/src/Organizations/OrganizationsList/OrganizationsList.js
@@ -260,7 +260,7 @@ const OrganizationsList = ({
 
         <Route
           exact
-          path={ORGANIZATION_VERSIONS_VIEW_ROUTE}
+          path={`${ORGANIZATION_VERSIONS_VIEW_ROUTE}/:versionId?`}
           component={OrganizationVersion}
         />
       </PersistedPaneset>