The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Basic app logo fixes (#20919)
martmulla051490ec983
diff --git a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsxindex d5ffebfd962..8e9e224cd0a 100644--- a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx+++ b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx@@ -9,7 +9,6 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContainimport { type Dispatch, type SetStateAction, useState } from 'react';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { useModal } from '@/ui/layout/modal/hooks/useModal';-import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';const RESET_VARIABLE_MODAL_ID ='reset-application-registration-config-variable-modal';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsxindex 4e9cac70680..0520c895eab 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx@@ -6,7 +6,7 @@ import { useNavigationDrawerTooltip } from '@/ui/navigation/navigation-drawer/hoimport { type NavigationDrawerSubItemState } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerSubItemState';import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';@@ -261,8 +261,9 @@ export const NavigationDrawerItem = ({const { theme } = useContext(ThemeContext);const isMobile = useIsMobile();const isExpanded = useNavigationDrawerExpanded();- const [isNavigationDrawerExpanded, setIsNavigationDrawerExpanded] =- useAtomState(isNavigationDrawerExpandedState);+ const setIsNavigationDrawerExpanded = useSetAtomState(+ isNavigationDrawerExpandedState,+ );const { navigationItemId } = useNavigationDrawerTooltip(label, to);diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsxindex a043d0417b4..001df7de711 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx@@ -9,6 +9,7 @@ import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApoimport { APPLICATION_REGISTRATION_ADMIN_PATH } from '@/settings/admin-panel/apps/constants/ApplicationRegistrationAdminPath';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import {+ Avatar,IconInfoCircle,IconKey,IconSettings,@@ -21,10 +22,18 @@ import { SettingsApplicationRegistrationGeneralTab } from '~/pages/settings/applimport { TabList } from '@/ui/layout/tab-list/components/TabList';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';+import { themeCssVariables } from 'twenty-ui/theme-constants';+import { styled } from '@linaria/react';const REGISTRATION_DETAIL_TAB_LIST_ID ='admin-application-registration-detail-tab-list';+const StyledTitleContainer = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing[2]};+`;+export const SettingsAdminApplicationRegistrationDetail = () => {const { t } = useLingui();const apolloAdminClient = useApolloAdminClient();@@ -94,7 +103,18 @@ export const SettingsAdminApplicationRegistrationDetail = () => {return (<SubMenuTopBarContainer- title={registration.name}+ title={+ <StyledTitleContainer>+ <Avatar+ type="app"+ size="md"+ avatarUrl={registration.logoUrl ?? undefined}+ placeholder={registration.name}+ placeholderColorSeed={registration.name}+ />+ {registration.name}+ </StyledTitleContainer>+ }links={[{children: t`Other`,diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsxindex 57fcdb41aa6..5dfa07d6905 100644--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationRegistrationDetails.tsx@@ -9,6 +9,7 @@ import { Tag } from 'twenty-ui/components';import { TabList } from '@/ui/layout/tab-list/components/TabList';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import {+ Avatar,IconInfoCircle,IconKey,IconSettings,@@ -20,10 +21,18 @@ import { SettingsApplicationRegistrationDistributionTab } from '~/pages/settingsimport { SettingsApplicationRegistrationGeneralTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';const REGISTRATION_DETAIL_TAB_LIST_ID ='application-registration-detail-tab-list';+const StyledTitleContainer = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing[2]};+`;+export const SettingsApplicationRegistrationDetails = () => {const { t } = useLingui();@@ -86,7 +95,18 @@ export const SettingsApplicationRegistrationDetails = () => {return (<SubMenuTopBarContainer- title={registration.name}+ title={+ <StyledTitleContainer>+ <Avatar+ type="app"+ size="md"+ avatarUrl={registration.logoUrl ?? undefined}+ placeholder={registration.name}+ placeholderColorSeed={registration.name}+ />+ {registration.name}+ </StyledTitleContainer>+ }tag={<Tag text={t`Owner`} color={'gray'} />}links={[{diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsxindex 896a0c2f771..3184ca67a89 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx@@ -177,8 +177,8 @@ export const SettingsApplicationsDeveloperTab = () => {<TableRowgridTemplateColumns={APPLICATION_TABLE_ROW_GRID_TEMPLATE_COLUMNS}>- <TableHeader> {t`Name`}</TableHeader>- <TableHeader>{''}</TableHeader>+ <TableHeader>{t`Name`}</TableHeader>+ <TableHeader>{t`Type`}</TableHeader><TableHeader>{''}</TableHeader><TableHeader /></TableRow>@@ -188,6 +188,7 @@ export const SettingsApplicationsDeveloperTab = () => {<SettingsApplicationTableRowkey={registration.id}application={registration}+ sourceType={registration.sourceType}action={<IconChevronRightsize={theme.icon.size.md}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.tsindex 8d4110a1e1b..daddd479ba4 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts@@ -302,10 +302,11 @@ export class ApplicationDevelopmentResolver {`${serverUrl}/public-assets/${workspaceId}/${applicationId}/${filePath}`,);- await this.applicationRegistrationService.updateFromManifest(+ await this.applicationRegistrationService.updateFromManifest({applicationRegistrationId,- manifestWithResolvedUrls,- );+ manifest: manifestWithResolvedUrls,+ sourceType: ApplicationRegistrationSourceType.LOCAL,+ });if (manifest.application.serverVariables) {await this.applicationRegistrationVariableService.syncVariableSchemas(diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.tsindex 7c92c806be1..42640b1666f 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts@@ -211,10 +211,15 @@ export class ApplicationRegistrationService {return this.findOneById(id, ownerWorkspaceId);}- async updateFromManifest(- applicationRegistrationId: string,- manifest: Manifest,- ): Promise<void> {+ async updateFromManifest({+ applicationRegistrationId,+ manifest,+ sourceType,+ }: {+ applicationRegistrationId: string;+ manifest: Manifest;+ sourceType?: ApplicationRegistrationSourceType;+ }): Promise<void> {const existing = await this.applicationRegistrationRepository.findOneOrFail({ where: { id: applicationRegistrationId } },);@@ -223,6 +228,7 @@ export class ApplicationRegistrationService {...existing,name: manifest.application.displayName,manifest,+ ...(sourceType !== undefined && { sourceType }),});}