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 6

open in new tab fix workspace modal (#2595)

Browse source
This commit is contained in:
Rohan Lahori 2024-11-11 11:27:33 +05:30 committed by johnsoncherian
parent 5d6c7e0b89
commit fce61d8db9
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frontend/src/_components/OrganizationManager/List.jsx
View file

@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useEffect, useState, useRef } from 'react';
import { authenticationService } from '@/_services';
import { CustomSelect } from './CustomSelect';
import { getAvatar, decodeEntities } from '@/_helpers/utils';
@ -29,14 +29,21 @@ export const OrganizationList = function () {
fetchOrganizations();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
const switchOrganization = (id) => {
const newTabRef = useRef(false);
const switchOrganization = (id, newTab = false) => {
newTabRef.current = newTab;
const organization = organizationList.find((org) => org.id === id);
if (![id, organization.slug].includes(getWorkspaceIdOrSlugFromURL())) {
const newPath = appendWorkspaceId(organization.slug || id, location.pathname, true);
window.open(newPath, '_blank');
newTab ? window.open(newPath, '_blank') : (window.location = newPath);
}
};
const handleOnChange = (id) => {
if (!newTabRef.current) {
switchOrganization(id, false);
}
newTabRef.current = false;
};
const options = organizationList
.map((org) => ({
@ -81,7 +88,7 @@ export const OrganizationList = function () {
<div
className="current-org-indicator"
data-cy="current-org-indicator"
onClick={() => switchOrganization(org.id)}
onClick={() => switchOrganization(org.id, true)}
>
<SolidIcon name="newtab" fill="var(--icon-strong)" width="16" className="add-new-workspace-icon" />
</div>
@ -103,7 +110,7 @@ export const OrganizationList = function () {
isLoading={isGettingOrganizations}
options={options}
value={current_organization_id}
onChange={(id) => switchOrganization(id)}
onChange={handleOnChange}
className={`tj-org-select ${darkMode && 'dark-theme'}`}
/>
</div>