Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Developers page dropdown not optimised for mobile viewport #8392

Merged
merged 4 commits into from
Nov 9, 2024
Merged

fix: Developers page dropdown not optimised for mobile viewport #8392

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fc8fbb
fixed dropdown for mobile width
harshit078 Nov 7, 2024
836cb25
Merge branch 'main' into webhook-setting
harshit078 Nov 7, 2024
cbf33ea
fixed casing
harshit078 Nov 8, 2024
4a29424
Merge branch 'main' into webhook-setting
harshit078 Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions ...ont/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
Section,
useIcons,
} from 'twenty-ui';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';

import { AnalyticsActivityGraph } from '@/analytics/components/AnalyticsActivityGraph';
import { AnalyticsGraphEffect } from '@/analytics/components/AnalyticsGraphEffect';
Expand Down Expand Up @@ -41,10 +42,15 @@ import { WebhookOperationType } from '~/pages/settings/developers/webhooks/types

const OBJECT_DROPDOWN_WIDTH = 340;
const ACTION_DROPDOWN_WIDTH = 140;
const OBJECT_MOBILE_WIDTH = 150;
const ACTION_MOBILE_WIDTH = 140;

const StyledFilterRow = styled.div`
const StyledFilterRow = styled.div<{ isMobile: boolean }>`
display: grid;
grid-template-columns: ${OBJECT_DROPDOWN_WIDTH}px ${ACTION_DROPDOWN_WIDTH}px auto;
grid-template-columns: ${({ isMobile }) =>
isMobile
? `${OBJECT_MOBILE_WIDTH}px ${ACTION_MOBILE_WIDTH}px auto`
: `${OBJECT_DROPDOWN_WIDTH}px ${ACTION_DROPDOWN_WIDTH}px auto`};
harshit078 marked this conversation as resolved.
Show resolved Hide resolved
gap: ${({ theme }) => theme.spacing(2)};
margin-bottom: ${({ theme }) => theme.spacing(2)};
align-items: center;
Expand All @@ -58,7 +64,7 @@ const StyledPlaceholder = styled.div`
export const SettingsDevelopersWebhooksDetail = () => {
const { objectMetadataItems } = useObjectMetadataItems();
const isAnalyticsEnabled = useRecoilValue(isAnalyticsEnabledState);

const isMobile = useIsMobile();
const navigate = useNavigate();
const { webhookId = '' } = useParams();

Expand Down Expand Up @@ -245,10 +251,12 @@ export const SettingsDevelopersWebhooksDetail = () => {
description="Select the events you wish to send to this endpoint"
/>
{operations.map((operation, index) => (
<StyledFilterRow key={index}>
<StyledFilterRow isMobile={isMobile} key={index}>
<Select
withSearchInput
dropdownWidth={OBJECT_DROPDOWN_WIDTH}
dropdownWidth={
isMobile ? OBJECT_MOBILE_WIDTH : OBJECT_DROPDOWN_WIDTH
}
dropdownId={`object-webhook-type-select-${index}`}
value={operation.object}
onChange={(object) => updateOperation(index, 'object', object)}
Expand All @@ -261,7 +269,9 @@ export const SettingsDevelopersWebhooksDetail = () => {
/>

<Select
dropdownWidth={ACTION_DROPDOWN_WIDTH}
dropdownWidth={
isMobile ? ACTION_MOBILE_WIDTH : ACTION_DROPDOWN_WIDTH
}
dropdownId={`operation-webhook-type-select-${index}`}
value={operation.action}
onChange={(action) => updateOperation(index, 'action', action)}
Expand Down
Loading