The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Link app owner workspace to admin workspace details (#28216)
martmull206194d23c35
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsxindex a76e3fa8ed5..85d6bfd6748 100644--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx@@ -5,6 +5,7 @@ import {type TableItem,} from '@/settings/components/SettingsTableCard';import { AvatarOrIcon } from '@/ui/field/display/components/internal/AvatarOrIcon/AvatarOrIcon';+import { LinkChip } from '@/ui/navigation/link/components/LinkChip/LinkChip';import { useQuery } from '@apollo/client/react';import { styled } from '@linaria/react';import { Trans, useLingui } from '@lingui/react/macro';@@ -54,8 +55,10 @@ const StyledGeneralContainer = styled.div`export const SettingsApplicationRegistrationGeneralInfo = ({registration,+ isAdminView = false,}: {registration: ApplicationRegistration;+ isAdminView?: boolean;}) => {const { t } = useLingui();@@ -107,7 +110,25 @@ export const SettingsApplicationRegistrationGeneralInfo = ({items.push({Icon: IconTag,label: t`Owner`,- value: isDefined(ownerWorkspace?.displayName) ? (+ value: !isDefined(ownerWorkspace?.displayName) ? (+ <Tag color="orange">{t`Unclaimed`}</Tag>+ ) : isAdminView && isDefined(registration.ownerWorkspaceId) ? (+ <LinkChip+ size="md"+ variant="soft"+ to={getSettingsPath(SettingsPath.AdminPanelWorkspaceDetail, {+ workspaceId: registration.ownerWorkspaceId,+ })}+ startElement={+ <AvatarOrIcon+ shape="circle"+ src={getAbsoluteImageUrl(ownerWorkspace?.logo ?? undefined)}+ />+ }+ >+ {getChipLabel(ownerWorkspace.displayName).content}+ </LinkChip>+ ) : (<Chipsize="md"variant="soft"@@ -120,8 +141,6 @@ export const SettingsApplicationRegistrationGeneralInfo = ({>{getChipLabel(ownerWorkspace.displayName).content}</Chip>- ) : (- <Tag color="orange">{t`Unclaimed`}</Tag>),});diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsxindex 9dc2686d959..c03ca7d7d9f 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx@@ -16,7 +16,10 @@ export const SettingsApplicationRegistrationGeneralTab = ({}) => {return (<>- <SettingsApplicationRegistrationGeneralInfo registration={registration} />+ <SettingsApplicationRegistrationGeneralInfo+ registration={registration}+ isAdminView={isAdminView}+ />{isAdminView && (<SettingsAdminApplicationRegistrationGeneralSwitchesregistration={registration}