The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Always create app connections at workspace level (#25598)
Félix Malfait8ffc38082cbf
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsxindex c66b6975912..d8054d2b92d 100644--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx@@ -7,7 +7,7 @@ import { useParams } from 'react-router-dom';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';import { Status, Tag } from 'twenty-ui/data-display';-import { IconRefresh, IconTrash, IconUser, IconUsers } from 'twenty-ui/icon';+import { IconRefresh, IconTrash, IconUsers } from 'twenty-ui/icon';import { H2Title } from 'twenty-ui/typography';import { Button } from 'twenty-ui/input';import { Section } from 'twenty-ui/layout';@@ -129,7 +129,7 @@ export const SettingsApplicationConnectionDetail = () => {? connection.name: (connection?.handle ?? t`Connection`);const deleteModalId = `delete-application-connection-modal-${connectedAccountId}`;- const changeVisibilityModalId = `change-application-connection-visibility-modal-${connectedAccountId}`;+ const shareWithWorkspaceModalId = `share-application-connection-with-workspace-modal-${connectedAccountId}`;const applicationSettingsPath = getSettingsPath(SettingsPath.ApplicationDetail,{ applicationId },@@ -155,7 +155,7 @@ export const SettingsApplicationConnectionDetail = () => {});};- const handleChangeVisibility = () => {+ const handleShareWithWorkspace = () => {if (connection === undefined || provider === undefined) {return;}@@ -163,7 +163,7 @@ export const SettingsApplicationConnectionDetail = () => {triggerAppOAuth({applicationId,providerName: provider.name,- visibility: connection.visibility === 'workspace' ? 'user' : 'workspace',+ visibility: 'workspace',reconnectingConnectedAccountId: connection.id,redirectLocation: detailPath,});@@ -330,19 +330,15 @@ export const SettingsApplicationConnectionDetail = () => {onClick={handleReconnect}/>)}- <Button- title={- connection.visibility === 'workspace'- ? t`Make private`- : t`Share with workspace`- }- Icon={- connection.visibility === 'workspace' ? IconUser : IconUsers- }- variant="secondary"- accent="default"- onClick={() => openModal(changeVisibilityModalId)}- />+ {connection.visibility !== 'workspace' && (+ <Button+ title={t`Share with workspace`}+ Icon={IconUsers}+ variant="secondary"+ accent="default"+ onClick={() => openModal(shareWithWorkspaceModalId)}+ />+ )}<Buttontitle={t`Disconnect`}Icon={IconTrash}@@ -392,16 +388,16 @@ export const SettingsApplicationConnectionDetail = () => {loading={isDeleting}/><ConfirmationModal- modalInstanceId={changeVisibilityModalId}- title={t`Change visibility?`}+ modalInstanceId={shareWithWorkspaceModalId}+ title={t`Share with workspace?`}subtitle={<Trans>- Changing visibility requires reconnecting this OAuth- connection. You will be redirected to authorize it again.+ Sharing this connection with the workspace requires+ reconnecting it. You will be redirected to authorize it again.</Trans>}- onConfirmClick={handleChangeVisibility}- confirmButtonText={t`Reconnect and change visibility`}+ onConfirmClick={handleShareWithWorkspace}+ confirmButtonText={t`Reconnect and share`}confirmButtonAccent="blue"/></>diff --git a/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx b/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsxindex 689f2043667..f6fc57d5464 100644--- a/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx+++ b/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx@@ -171,12 +171,12 @@ describe('SettingsApplicationConnectionDetail', () => {);expect(mockOpenModal).toHaveBeenCalledWith(- 'change-application-connection-visibility-modal-account-1',+ 'share-application-connection-with-workspace-modal-account-1',);fireEvent.click(screen.getByRole('button', {- name: 'Reconnect and change visibility',+ name: 'Reconnect and share',}),);diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsxindex 2b1eab4db81..94304b8a5a1 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx@@ -4,31 +4,20 @@ import { useContext } from 'react';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { Table } from '@/ui/layout/table/components/Table';import { TableCell } from '@/ui/layout/table/components/TableCell';import { TableHeader } from '@/ui/layout/table/components/TableHeader';import { TableRow } from '@/ui/layout/table/components/TableRow';import { Avatar, Status } from 'twenty-ui/data-display';import { Info } from 'twenty-ui/feedback';-import {- IconChevronRight,- IconPlus,- IconUser,- IconUsers,-} from 'twenty-ui/icon';+import { IconChevronRight, IconPlus } from 'twenty-ui/icon';import { H2Title } from 'twenty-ui/typography';import { Button } from 'twenty-ui/input';import { Section } from 'twenty-ui/layout';-import { MenuItem } from 'twenty-ui/navigation';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';import { useFindApplicationConnectionProviders } from '~/pages/settings/applications/hooks/useFindApplicationConnectionProviders';import { useMyAppConnectedAccounts } from '~/pages/settings/applications/hooks/useMyAppConnectedAccounts';import { useTriggerAppOAuth } from '~/pages/settings/applications/hooks/useTriggerAppOAuth';-import { type FrontendApplicationConnectionProvider } from '~/pages/settings/applications/types/FrontendApplicationConnectionProvider';import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';const CONNECTION_TABLE_ROW_GRID_TEMPLATE_COLUMNS =@@ -45,55 +34,6 @@ const StyledTableRowsContainer = styled.div`padding: ${themeCssVariables.spacing[2]} 0;`;-const AddConnectionDropdown = ({- provider,- onPick,-}: {- provider: FrontendApplicationConnectionProvider;- onPick: (visibility: 'user' | 'workspace') => void;-}) => {- const { t } = useLingui();- const dropdownId = `app-connection-add-${provider.id}`;- const { closeDropdown } = useCloseDropdown();-- const handleSelect = (visibility: 'user' | 'workspace') => {- closeDropdown(dropdownId);- onPick(visibility);- };-- return (- <Dropdown- dropdownId={dropdownId}- dropdownPlacement="bottom-start"- clickableComponent={- <Button- title={t`Add connection`}- Icon={IconPlus}- variant="secondary"- accent="default"- size="small"- />- }- dropdownComponents={- <DropdownContent>- <DropdownMenuItemsContainer>- <MenuItem- text={t`Just for me`}- LeftIcon={IconUser}- onClick={() => handleSelect('user')}- />- <MenuItem- text={t`Workspace shared`}- LeftIcon={IconUsers}- onClick={() => handleSelect('workspace')}- />- </DropdownMenuItemsContainer>- </DropdownContent>- }- />- );-};-export const SettingsApplicationConnectionsSection = ({applicationId,}: {@@ -215,13 +155,17 @@ export const SettingsApplicationConnectionsSection = ({)}{isClientCredentialsConfigured && (<StyledFooter>- <AddConnectionDropdown- provider={provider}- onPick={(visibility) =>+ <Button+ title={t`Add connection`}+ Icon={IconPlus}+ variant="secondary"+ accent="default"+ size="small"+ onClick={() =>triggerAppOAuth({applicationId,providerName: provider.name,- visibility,+ visibility: 'workspace',})}/>diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsxindex 2c4f6a6436c..56efe58a38a 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx@@ -1,6 +1,7 @@import { i18n } from '@lingui/core';import { I18nProvider } from '@lingui/react';import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';import { MemoryRouter } from 'react-router-dom';import { SettingsApplicationConnectionsSection } from '~/pages/settings/applications/tabs/SettingsApplicationConnectionsSection';@@ -112,4 +113,51 @@ describe('SettingsApplicationConnectionsSection', () => {screen.queryByRole('button', { name: 'Delete' }),).not.toBeInTheDocument();});++ it('adds a workspace shared connection without asking for a visibility', async () => {+ mockedUseFindApplicationConnectionProviders.mockReturnValue({+ connectionProviders: [+ {+ id: 'provider-1',+ applicationId: 'app-1',+ type: 'oauth',+ name: 'google-calendar',+ displayName: 'Google Calendar',+ logoUrl: null,+ oauth: {+ scopes: ['calendar.readonly'],+ isClientCredentialsConfigured: true,+ },+ },+ ],+ loading: false,+ refetch: jest.fn(),+ });++ mockedUseMyAppConnectedAccounts.mockReturnValue({+ accounts: [],+ loading: false,+ refetch: jest.fn(),+ });++ render(+ <I18nProvider i18n={i18n}>+ <MemoryRouter>+ <SettingsApplicationConnectionsSection applicationId="app-1" />+ </MemoryRouter>+ </I18nProvider>,+ );++ await userEvent.click(+ screen.getByRole('button', { name: /Add connection/i }),+ );++ expect(screen.queryByText('Just for me')).not.toBeInTheDocument();+ expect(mockTriggerAppOAuth).toHaveBeenCalledTimes(1);+ expect(mockTriggerAppOAuth).toHaveBeenCalledWith({+ applicationId: 'app-1',+ providerName: 'google-calendar',+ visibility: 'workspace',+ });+ });});