The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix: update settings page for mobile viewport (#18991)
Harshit Singh34832815e656
diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsxindex d4ced55118d..8c720608a17 100644--- a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx@@ -17,9 +17,8 @@ const StyledText = styled.div`text-overflow: ellipsis;`;-const StyledCloseButtonContainer = styled.div`- color: ${themeCssVariables.grayScale.gray1};- display: flex;+const StyledInvertedIconButton = styled(IconButton)`+ color: ${themeCssVariables.font.color.inverted} !important;`;const StyledContent = styled.div<{ hasCloseButton: boolean }>`@@ -78,15 +77,13 @@ export const InformationBanner = ({)}</StyledContent>{onClose && (- <StyledCloseButtonContainer>- <IconButton- Icon={IconX}- size="small"- variant="tertiary"- onClick={onClose}- ariaLabel={t`Close banner`}- />- </StyledCloseButtonContainer>+ <StyledInvertedIconButton+ Icon={IconX}+ size="small"+ variant="tertiary"+ onClick={onClose}+ ariaLabel={t`Close banner`}+ />)}</Banner>)}diff --git a/packages/twenty-front/src/modules/navigation/components/NavigationDrawerOtherSection.tsx b/packages/twenty-front/src/modules/navigation/components/NavigationDrawerOtherSection.tsxindex 3f0169fc515..6ed5ca94020 100644--- a/packages/twenty-front/src/modules/navigation/components/NavigationDrawerOtherSection.tsx+++ b/packages/twenty-front/src/modules/navigation/components/NavigationDrawerOtherSection.tsx@@ -6,6 +6,7 @@ import { IconHelpCircle, IconSettings } from 'twenty-ui/display';import { AnimatedExpandableContainer } from 'twenty-ui/layout';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';+import { useOpenSettingsMenu } from '@/navigation/hooks/useOpenSettings';import { getDocumentationUrl } from '@/support/utils/getDocumentationUrl';import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';import { navigationDrawerExpandedMemorizedState } from '@/ui/navigation/states/navigationDrawerExpandedMemorizedState';@@ -36,6 +37,8 @@ export const NavigationDrawerOtherSection = () => {navigationMemorizedUrlState,);+ const { openSettingsMenu } = useOpenSettingsMenu();+const { toggleNavigationSection } = useNavigationSection('Other');const isNavigationSectionOpen = useAtomFamilyStateValue(isNavigationSectionOpenFamilyState,@@ -46,6 +49,7 @@ export const NavigationDrawerOtherSection = () => {setNavigationDrawerExpandedMemorized(isNavigationDrawerExpanded);setIsNavigationDrawerExpanded(true);setNavigationMemorizedUrl(location.pathname + location.search);+ openSettingsMenu();navigate(getSettingsPath(SettingsPath.ProfilePage));};diff --git a/packages/twenty-front/src/modules/object-record/components/MainContainerLayoutWithSidePanel.tsx b/packages/twenty-front/src/modules/object-record/components/MainContainerLayoutWithSidePanel.tsxindex 22724a092ba..53427ad1f9d 100644--- a/packages/twenty-front/src/modules/object-record/components/MainContainerLayoutWithSidePanel.tsx+++ b/packages/twenty-front/src/modules/object-record/components/MainContainerLayoutWithSidePanel.tsx@@ -41,9 +41,11 @@ const StyledMainContainerLayoutForMobile = styled.div`const StyledPageBodyForMobileContainer = styled.div`display: flex;- flex: 1;+ flex: 1 1 0;flex-direction: column;min-height: 0;+ min-width: 0;+ width: 0;> * {padding-bottom: 0;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsxindex 13452ffdd51..f1c89a7daa5 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx@@ -28,6 +28,7 @@ const StyledTableHeaderRowContainer = styled.div``;const TABLE_GRID = '1fr 1fr 100px 80px';+const TABLE_GRID_MOBILE = '3fr 3fr 1fr 70px';export const SettingsAdminApps = () => {const [searchQuery, setSearchQuery] = useState('');@@ -64,7 +65,10 @@ export const SettingsAdminApps = () => {<StyledTableContainer><Table><StyledTableHeaderRowContainer>- <TableRow gridTemplateColumns={TABLE_GRID}>+ <TableRow+ gridAutoColumns={TABLE_GRID}+ mobileGridAutoColumns={TABLE_GRID_MOBILE}+ ><TableHeader>{t`Name`}</TableHeader><TableHeader>{t`Source`}</TableHeader><TableHeader>{t`Listed`}</TableHeader>@@ -81,9 +85,13 @@ export const SettingsAdminApps = () => {)}fullWidth>- <TableRow gridTemplateColumns={TABLE_GRID} isClickable>+ <TableRow+ gridAutoColumns={TABLE_GRID}+ mobileGridAutoColumns={TABLE_GRID_MOBILE}+ isClickable+ ><TableCell>{registration.name}</TableCell>- <TableCell>+ <TableCell overflow="hidden">{registration.sourcePackage ?? registration.sourceType}</TableCell><TableCell>diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsxindex 28ffa956a59..fbcbdeeb4c1 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx@@ -11,6 +11,7 @@ import {SETTINGS_OBJECT_TABLE_ROW_GRID_TEMPLATE_COLUMNS,StyledActionTableCell,StyledNameTableCell,+ StyledStickyFirstCell,} from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';import { TableCell } from '@/ui/layout/table/components/TableCell';import { useIcons } from 'twenty-ui/display';@@ -70,25 +71,27 @@ export const SettingsObjectMetadataItemTableRow = ({key={objectMetadataItem.namePlural}to={link}>- <StyledNameTableCell>- {isDefined(Icon) && (- <Icon- style={{- minWidth: theme.icon.size.md,- }}- size={theme.icon.size.md}- stroke={theme.icon.stroke.sm}- />- )}- <StyledNameContainer>- <StyledNameLabel title={objectMetadataItem.labelPlural}>- {objectMetadataItem.labelPlural}- </StyledNameLabel>- {!objectMetadataItem.isActive && (- <StyledInactiveLabel>{t`Deactivated`}</StyledInactiveLabel>+ <StyledStickyFirstCell>+ <StyledNameTableCell>+ {isDefined(Icon) && (+ <Icon+ style={{+ minWidth: theme.icon.size.md,+ }}+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />)}- </StyledNameContainer>- </StyledNameTableCell>+ <StyledNameContainer>+ <StyledNameLabel title={objectMetadataItem.labelPlural}>+ {objectMetadataItem.labelPlural}+ </StyledNameLabel>+ {!objectMetadataItem.isActive && (+ <StyledInactiveLabel>{t`Deactivated`}</StyledInactiveLabel>+ )}+ </StyledNameContainer>+ </StyledNameTableCell>+ </StyledStickyFirstCell><TableCell><SettingsItemTypeTag item={objectMetadataItem} /></TableCell>diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents.tsxindex cdbae5b0ea7..56cb0acecf5 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents.tsx@@ -1,11 +1,23 @@import { TableCell } from '@/ui/layout/table/components/TableCell';-import { themeCssVariables } from 'twenty-ui/theme-constants';+import { styled } from '@linaria/react';+import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';import React from 'react';export const SETTINGS_OBJECT_TABLE_COLUMN_WIDTH = '98.7px';export const SETTINGS_OBJECT_TABLE_ROW_GRID_TEMPLATE_COLUMNS = `180px ${SETTINGS_OBJECT_TABLE_COLUMN_WIDTH} ${SETTINGS_OBJECT_TABLE_COLUMN_WIDTH} ${SETTINGS_OBJECT_TABLE_COLUMN_WIDTH} 36px`;+export const SETTINGS_OBJECT_TABLE_ROW_MOBILE_MIN_WIDTH = '520px';++export const StyledStickyFirstCell = styled.div`+ @media (max-width: ${MOBILE_VIEWPORT}px) {+ background: ${themeCssVariables.background.primary};+ left: 0;+ position: sticky;+ z-index: 1;+ }+`;+export const StyledNameTableCell = (props: React.ComponentProps<typeof TableCell>,) => (diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableHeader.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableHeader.tsxindex f7f7a6487ca..7b7f0ee2757 100644--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableHeader.tsx+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableHeader.tsx@@ -6,7 +6,10 @@ import { Trans } from '@lingui/react/macro';export const SettingsRolesTableHeader = () => {return (<Table>- <TableRow gridAutoColumns="332px 3fr 2fr 1fr">+ <TableRow+ mobileGridAutoColumns="5fr 1fr 1fr 35px"+ gridAutoColumns="332px 3fr 2fr 1fr"+ ><TableHeader><Trans>Name</Trans></TableHeader>@@ -14,6 +17,7 @@ export const SettingsRolesTableHeader = () => {<Trans>Assigned to</Trans></TableHeader><TableHeader></TableHeader>+ <TableHeader></TableHeader></TableRow></Table>);diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsxindex 2263cb3b965..93d7ec4e186 100644--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx@@ -83,6 +83,7 @@ export const SettingsRolesTableRow = ({ role }: SettingsRolesTableRowProps) => {<TableRowkey={role.id}gridAutoColumns="332px 3fr 2fr 1fr"+ mobileGridAutoColumns="5fr 1fr 1fr 35px"to={getSettingsPath(SettingsPath.RoleDetail, { roleId: role.id })}><TableCell>diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/MobileBreadcrumb.tsx b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/MobileBreadcrumb.tsxindex f3ef082c249..e68e0eef8d0 100644--- a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/MobileBreadcrumb.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/MobileBreadcrumb.tsx@@ -36,6 +36,7 @@ const StyledLinkContainer = styled.div`const StyledText = styled.span`color: inherit;+ cursor: pointer;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsxindex cdb1a51f11b..20a10907ad6 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx@@ -129,7 +129,7 @@ export const NavigationDrawer = ({isExpanded={isNavigationDrawerExpanded}>{isSettingsDrawer && title ? (- !isMobile && <NavigationDrawerBackButton title={title} />+ <NavigationDrawerBackButton title={title} />) : (<NavigationDrawerHeader showCollapseButton />)}diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsxindex 69da653341b..4fb9e3db6cc 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx@@ -1,5 +1,6 @@import { styled } from '@linaria/react';+import { currentMobileNavigationDrawerState } from '@/navigation/states/currentMobileNavigationDrawerState';import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';import { navigationDrawerExpandedMemorizedState } from '@/ui/navigation/states/navigationDrawerExpandedMemorizedState';import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';@@ -53,6 +54,9 @@ export const NavigationDrawerBackButton = ({const setIsNavigationDrawerExpanded = useSetAtomState(isNavigationDrawerExpandedState,);+ const setCurrentMobileNavigationDrawer = useSetAtomState(+ currentMobileNavigationDrawerState,+ );const navigationDrawerExpandedMemorized = useAtomStateValue(navigationDrawerExpandedMemorizedState,);@@ -70,9 +74,10 @@ export const NavigationDrawerBackButton = ({<UndecoratedLinkto={navigationMemorizedUrl}replace- onClick={() =>- setIsNavigationDrawerExpanded(navigationDrawerExpandedMemorized)- }+ onClick={() => {+ setIsNavigationDrawerExpanded(navigationDrawerExpandedMemorized);+ setCurrentMobileNavigationDrawer('main');+ }}><StyledIconAndButtonContainer><IconXdiff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsxindex 6207d27bc6b..0e0162892a6 100644--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectTable.tsx@@ -6,7 +6,11 @@ import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemFieldimport { useCombinedGetTotalCount } from '@/object-record/multiple-objects/hooks/useCombinedGetTotalCount';import { SettingsObjectMetadataItemTableRow } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRow';import { TableRow } from '@/ui/layout/table/components/TableRow';-import { SETTINGS_OBJECT_TABLE_ROW_GRID_TEMPLATE_COLUMNS } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';+import {+ SETTINGS_OBJECT_TABLE_ROW_GRID_TEMPLATE_COLUMNS,+ SETTINGS_OBJECT_TABLE_ROW_MOBILE_MIN_WIDTH,+ StyledStickyFirstCell,+} from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';import { SettingsObjectInactiveMenuDropDown } from '@/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown';import { getItemTagInfo } from '@/settings/data-model/utils/getItemTagInfo';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';@@ -26,7 +30,11 @@ import { getSettingsPath } from 'twenty-shared/utils';import { IconArchive, IconChevronRight, IconSettings } from 'twenty-ui/display';import { SearchInput } from 'twenty-ui/input';import { MenuItemToggle } from 'twenty-ui/navigation';-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';+import {+ MOBILE_VIEWPORT,+ ThemeContext,+ themeCssVariables,+} from 'twenty-ui/theme-constants';import { GET_SETTINGS_OBJECT_TABLE_METADATA } from '~/pages/settings/data-model/constants/SettingsObjectTableMetadata';import type { SettingsObjectTableItem } from '~/pages/settings/data-model/types/SettingsObjectTableItem';import { normalizeSearchText } from '~/utils/normalizeSearchText';@@ -39,6 +47,19 @@ const StyledSearchInputContainer = styled.div`padding-bottom: ${themeCssVariables.spacing[2]};`;+const StyledScrollWrapper = styled.div`+ @media (max-width: ${MOBILE_VIEWPORT}px) {+ overflow-x: auto;+ -webkit-overflow-scrolling: touch;+ }+`;++const StyledScrollableContent = styled.div`+ @media (max-width: ${MOBILE_VIEWPORT}px) {+ min-width: ${SETTINGS_OBJECT_TABLE_ROW_MOBILE_MIN_WIDTH};+ }+`;+export const SettingsObjectTable = ({objectMetadataItems,withSearchBar = true,@@ -170,74 +191,98 @@ export const SettingsObjectTable = ({</StyledSearchInputContainer>)}- <Table>- <TableRow- gridTemplateColumns={SETTINGS_OBJECT_TABLE_ROW_GRID_TEMPLATE_COLUMNS}- >- {GET_SETTINGS_OBJECT_TABLE_METADATA.fields.map(- (settingsObjectsTableMetadataField) => (- <SortableTableHeader- key={settingsObjectsTableMetadataField.fieldName}- fieldName={settingsObjectsTableMetadataField.fieldName}- label={t(settingsObjectsTableMetadataField.fieldLabel)}- tableId={GET_SETTINGS_OBJECT_TABLE_METADATA.tableId}- align={settingsObjectsTableMetadataField.align}- initialSort={GET_SETTINGS_OBJECT_TABLE_METADATA.initialSort}- />- ),- )}- <TableHeader></TableHeader>- </TableRow>- {filteredObjectSettingsItems.map((objectSettingsItem) => {- const isActive = objectSettingsItem.objectMetadataItem.isActive;-- return (- <SettingsObjectMetadataItemTableRow- key={objectSettingsItem.objectMetadataItem.namePlural}- objectMetadataItem={objectSettingsItem.objectMetadataItem}- totalObjectCount={objectSettingsItem.totalObjectCount}- action={- isActive ? (- <StyledIconChevronRightContainer>- <IconChevronRight- size={theme.icon.size.md}- stroke={theme.icon.stroke.sm}- />- </StyledIconChevronRightContainer>- ) : (- <SettingsObjectInactiveMenuDropDown- isCustomObject={- objectSettingsItem.objectMetadataItem.isCustom- }- objectMetadataItemNamePlural={- objectSettingsItem.objectMetadataItem.namePlural- }- onActivate={() =>- updateOneObjectMetadataItem({- idToUpdate: objectSettingsItem.objectMetadataItem.id,- updatePayload: { isActive: true },- })- }- onDelete={() =>- deleteOneObjectMetadataItem(- objectSettingsItem.objectMetadataItem.id,- )- }- />- )- }- link={- isActive- ? getSettingsPath(SettingsPath.ObjectDetail, {- objectNamePlural:- objectSettingsItem.objectMetadataItem.namePlural,- })- : undefined+ <StyledScrollWrapper>+ <StyledScrollableContent>+ <Table>+ <TableRow+ gridTemplateColumns={+ SETTINGS_OBJECT_TABLE_ROW_GRID_TEMPLATE_COLUMNS}- />- );- })}- </Table>+ >+ {GET_SETTINGS_OBJECT_TABLE_METADATA.fields.map(+ (settingsObjectsTableMetadataField, index) =>+ index === 0 ? (+ <StyledStickyFirstCell+ key={settingsObjectsTableMetadataField.fieldName}+ >+ <SortableTableHeader+ fieldName={settingsObjectsTableMetadataField.fieldName}+ label={t(settingsObjectsTableMetadataField.fieldLabel)}+ tableId={GET_SETTINGS_OBJECT_TABLE_METADATA.tableId}+ align={settingsObjectsTableMetadataField.align}+ initialSort={+ GET_SETTINGS_OBJECT_TABLE_METADATA.initialSort+ }+ />+ </StyledStickyFirstCell>+ ) : (+ <SortableTableHeader+ key={settingsObjectsTableMetadataField.fieldName}+ fieldName={settingsObjectsTableMetadataField.fieldName}+ label={t(settingsObjectsTableMetadataField.fieldLabel)}+ tableId={GET_SETTINGS_OBJECT_TABLE_METADATA.tableId}+ align={settingsObjectsTableMetadataField.align}+ initialSort={+ GET_SETTINGS_OBJECT_TABLE_METADATA.initialSort+ }+ />+ ),+ )}+ <TableHeader></TableHeader>+ </TableRow>+ {filteredObjectSettingsItems.map((objectSettingsItem) => {+ const isActive = objectSettingsItem.objectMetadataItem.isActive;++ return (+ <SettingsObjectMetadataItemTableRow+ key={objectSettingsItem.objectMetadataItem.namePlural}+ objectMetadataItem={objectSettingsItem.objectMetadataItem}+ totalObjectCount={objectSettingsItem.totalObjectCount}+ action={+ isActive ? (+ <StyledIconChevronRightContainer>+ <IconChevronRight+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />+ </StyledIconChevronRightContainer>+ ) : (+ <SettingsObjectInactiveMenuDropDown+ isCustomObject={+ objectSettingsItem.objectMetadataItem.isCustom+ }+ objectMetadataItemNamePlural={+ objectSettingsItem.objectMetadataItem.namePlural+ }+ onActivate={() =>+ updateOneObjectMetadataItem({+ idToUpdate:+ objectSettingsItem.objectMetadataItem.id,+ updatePayload: { isActive: true },+ })+ }+ onDelete={() =>+ deleteOneObjectMetadataItem(+ objectSettingsItem.objectMetadataItem.id,+ )+ }+ />+ )+ }+ link={+ isActive+ ? getSettingsPath(SettingsPath.ObjectDetail, {+ objectNamePlural:+ objectSettingsItem.objectMetadataItem.namePlural,+ })+ : undefined+ }+ />+ );+ })}+ </Table>+ </StyledScrollableContent>+ </StyledScrollWrapper></>);};diff --git a/packages/twenty-ui/src/display/banner/components/Banner.tsx b/packages/twenty-ui/src/display/banner/components/Banner.tsxindex 240e19d672d..28e1cba14cd 100644--- a/packages/twenty-ui/src/display/banner/components/Banner.tsx+++ b/packages/twenty-ui/src/display/banner/components/Banner.tsx@@ -10,7 +10,7 @@ const StyledBanner = styled.div<{ variant?: BannerVariant }>`: themeCssVariables.color.blue};display: flex;gap: ${themeCssVariables.spacing[3]};- height: 40px;+ min-height: 40px;justify-content: center;padding: ${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[3]};width: 100%;