From 839bca2c25a370f5ecd3f28944a6fa74a35fdf2f Mon Sep 17 00:00:00 2001 From: gsmithun4 Date: Wed, 6 Dec 2023 17:28:18 +0530 Subject: [PATCH 1/3] bump version --- .version | 2 +- frontend/.version | 2 +- server/.version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.version b/.version index 29690d10f0..b71a29b1f9 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.24.3 +2.24.4 diff --git a/frontend/.version b/frontend/.version index 29690d10f0..b71a29b1f9 100644 --- a/frontend/.version +++ b/frontend/.version @@ -1 +1 @@ -2.24.3 +2.24.4 diff --git a/server/.version b/server/.version index 29690d10f0..b71a29b1f9 100644 --- a/server/.version +++ b/server/.version @@ -1 +1 @@ -2.24.3 +2.24.4 From 3734e6fc00c3b8f25dec201540d25812d4e2b060 Mon Sep 17 00:00:00 2001 From: Muhsin Shah C P Date: Wed, 6 Dec 2023 17:29:38 +0530 Subject: [PATCH 2/3] fix: public apps are not loading (#8247) --- frontend/src/_helpers/routes.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/_helpers/routes.js b/frontend/src/_helpers/routes.js index 183f83a51b..e8611d46ea 100644 --- a/frontend/src/_helpers/routes.js +++ b/frontend/src/_helpers/routes.js @@ -120,8 +120,9 @@ export const getWorkspaceIdOrSlugFromURL = () => { }; export const excludeWorkspaceIdFromURL = (pathname) => { - if (!['/integrations', '/applications/', '/switch-workspace'].find((path) => pathname.startsWith(path))) { - pathname = getSubpath() ? pathname.replace(getSubpath(), '') : pathname; + const tempPathname = getSubpath() ? pathname.replace(getSubpath(), '') : pathname; + if (!['/integrations', '/applications/', '/switch-workspace'].find((path) => tempPathname.startsWith(path))) { + pathname = tempPathname; const paths = pathname?.split('/').filter((path) => path !== ''); paths.shift(); const newPath = paths.join('/'); From 8bb26f27a1c7a1edf1e5cbbf5baa3a695da40a73 Mon Sep 17 00:00:00 2001 From: Muhsin Shah Date: Wed, 6 Dec 2023 18:57:46 +0530 Subject: [PATCH 3/3] PR change: refactored --- frontend/src/_helpers/routes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/_helpers/routes.js b/frontend/src/_helpers/routes.js index e8611d46ea..3c4de8c2ea 100644 --- a/frontend/src/_helpers/routes.js +++ b/frontend/src/_helpers/routes.js @@ -120,7 +120,8 @@ export const getWorkspaceIdOrSlugFromURL = () => { }; export const excludeWorkspaceIdFromURL = (pathname) => { - const tempPathname = getSubpath() ? pathname.replace(getSubpath(), '') : pathname; + const subPath = getSubpath(); + const tempPathname = subPath ? pathname.replace(subPath, '') : pathname; if (!['/integrations', '/applications/', '/switch-workspace'].find((path) => tempPathname.startsWith(path))) { pathname = tempPathname; const paths = pathname?.split('/').filter((path) => path !== '');