Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #8252 from ToolJet/main

Browse source 
Merge main to develop
This commit is contained in:
Midhun G S 2023-12-07 11:31:58 +05:30 committed by GitHub
commit 10e798db84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
2.24.3
2.24.4

2
frontend/.version
View file

@ -1 +1 @@
2.24.3
2.24.4

6
frontend/src/_helpers/routes.js
View file

@ -120,8 +120,10 @@ export const getWorkspaceIdOrSlugFromURL = () => {
};
export const excludeWorkspaceIdFromURL = (pathname) => {
if (!['/integrations', '/applications/', '/switch-workspace'].find((path) => pathname.startsWith(path))) {
pathname = 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 !== '');
paths.shift();
const newPath = paths.join('/');

2
server/.version
View file

@ -1 +1 @@
2.24.3
2.24.4