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 array and links display #8671

Merged
merged 4 commits into from
Nov 22, 2024
Merged

Fix array and links display #8671

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15c46dd
Simplify Links display
martmull Nov 22, 2024
a9ddfcd
Simplify and fix Array display
martmull Nov 22, 2024
6f9a351
Remove useless stuff
martmull Nov 22, 2024
bd110a5
Fix test
martmull Nov 22, 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
24 changes: 1 addition & 23 deletions ...rc/modules/object-record/record-field/meta-types/display/components/ArrayFieldDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,12 @@
import { THEME_COMMON } from 'twenty-ui';

import { useFieldFocus } from '@/object-record/record-field/hooks/useFieldFocus';
import { useArrayFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useArrayFieldDisplay';
import { ArrayDisplay } from '@/ui/field/display/components/ArrayDisplay';
import styled from '@emotion/styled';

const spacing1 = THEME_COMMON.spacing(1);

const StyledContainer = styled.div`
align-items: center;
display: flex;
flex-wrap: wrap;
gap: ${spacing1};
justify-content: flex-start;
max-width: 100%;
overflow: hidden;
`;

export const ArrayFieldDisplay = () => {
const { fieldValue } = useArrayFieldDisplay();

const { isFocused } = useFieldFocus();

if (!Array.isArray(fieldValue)) {
return <></>;
}

return (
<StyledContainer>
<ArrayDisplay value={fieldValue} isFocused={isFocused} />
</StyledContainer>
);
return <ArrayDisplay value={fieldValue} />;
};
5 changes: 1 addition & 4 deletions ...rc/modules/object-record/record-field/meta-types/display/components/LinksFieldDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { useFieldFocus } from '@/object-record/record-field/hooks/useFieldFocus';
import { useLinksFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useLinksFieldDisplay';
import { LinksDisplay } from '@/ui/field/display/components/LinksDisplay';

export const LinksFieldDisplay = () => {
const { fieldValue } = useLinksFieldDisplay();

const { isFocused } = useFieldFocus();

return <LinksDisplay value={fieldValue} isFocused={isFocused} />;
return <LinksDisplay value={fieldValue} />;
};
2 changes: 1 addition & 1 deletion ...src/modules/object-record/record-field/meta-types/input/components/ArrayFieldMenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const ArrayFieldMenuItem = ({
value={value}
onEdit={onEdit}
onDelete={onDelete}
DisplayComponent={() => <ArrayDisplay value={[value]} isInputDisplay />}
DisplayComponent={() => <ArrayDisplay value={[value]} />}
hasPrimaryButton={false}
/>
);
Expand Down
53 changes: 9 additions & 44 deletions packages/twenty-front/src/modules/ui/field/display/components/ArrayDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import {
BORDER_COMMON,
OverflowingTextWithTooltip,
THEME_COMMON,
} from 'twenty-ui';
import { BORDER_COMMON, Chip, ChipVariant } from 'twenty-ui';

import { FieldArrayValue } from '@/object-record/record-field/types/FieldMetadata';
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
Expand All @@ -14,49 +10,18 @@ type ArrayDisplayProps = {
isInputDisplay?: boolean;
};

const themeSpacing = THEME_COMMON.spacingMultiplicator;

const StyledContainer = styled.div`
align-items: center;
display: flex;
gap: ${themeSpacing * 1}px;
justify-content: flex-start;

max-width: 100%;

overflow: hidden;

width: 100%;
`;

const StyledTag = styled.div<{ isInputDisplay?: boolean }>`
background-color: ${({ theme, isInputDisplay }) =>
isInputDisplay ? 'transparent' : theme.background.tertiary};
padding: ${({ theme }) => theme.spacing(1)} ${({ theme }) => theme.spacing(2)};
const StyledTag = styled.div`
background-color: ${({ theme }) => theme.background.tertiary};
padding: 0 ${({ theme }) => theme.spacing(2)};
border-radius: ${BORDER_COMMON.radius.sm};
font-weight: ${({ theme }) => theme.font.weight.regular};
`;

export const ArrayDisplay = ({
value,
isFocused,
isInputDisplay = false,
}: ArrayDisplayProps) => {
return isFocused ? (
<ExpandableList isChipCountDisplayed>
{value?.map((item, index) => (
<StyledTag key={index}>
<OverflowingTextWithTooltip text={item} />
</StyledTag>
export const ArrayDisplay = ({ value }: ArrayDisplayProps) => {
return (
<ExpandableList>
{value?.map((item) => (
<Chip variant={ChipVariant.Highlighted} label={item} />
))}
</ExpandableList>
Comment on lines +13 to 15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: Missing key prop for mapped elements

) : (
<StyledContainer>
{value?.map((item, index) => (
<StyledTag key={index} isInputDisplay={isInputDisplay}>
<OverflowingTextWithTooltip text={item} />
</StyledTag>
))}
</StyledContainer>
);
};
34 changes: 4 additions & 30 deletions packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { styled } from '@linaria/react';
import { useMemo } from 'react';
import { LinkType, RoundedLink, SocialLink, THEME_COMMON } from 'twenty-ui';
import { LinkType, RoundedLink, SocialLink } from 'twenty-ui';

import { FieldLinksValue } from '@/object-record/record-field/types/FieldMetadata';
import { ExpandableList } from '@/ui/layout/expandable-list/components/ExpandableList';
Expand All @@ -14,22 +13,7 @@ type LinksDisplayProps = {
isFocused?: boolean;
};

const themeSpacing = THEME_COMMON.spacingMultiplicator;

const StyledContainer = styled.div`
align-items: center;
display: flex;
gap: ${themeSpacing * 1}px;
justify-content: flex-start;

max-width: 100%;

overflow: hidden;

width: 100%;
`;

export const LinksDisplay = ({ value, isFocused }: LinksDisplayProps) => {
export const LinksDisplay = ({ value }: LinksDisplayProps) => {
const links = useMemo(
() =>
[
Expand All @@ -53,8 +37,8 @@ export const LinksDisplay = ({ value, isFocused }: LinksDisplayProps) => {
[value?.primaryLinkLabel, value?.primaryLinkUrl, value?.secondaryLinks],
);

return isFocused ? (
<ExpandableList isChipCountDisplayed>
return (
<ExpandableList>
{links.map(({ url, label, type }, index) =>
type === LinkType.LinkedIn || type === LinkType.Twitter ? (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Using array index as key may cause issues with React reconciliation if links are reordered

<SocialLink key={index} href={url} type={type} label={label} />
Expand All @@ -63,15 +47,5 @@ export const LinksDisplay = ({ value, isFocused }: LinksDisplayProps) => {
),
)}
</ExpandableList>
) : (
<StyledContainer>
{links.map(({ url, label, type }, index) =>
type === LinkType.LinkedIn || type === LinkType.Twitter ? (
<SocialLink key={index} href={url} type={type} label={label} />
) : (
<RoundedLink key={index} href={url} label={label} />
),
)}
</StyledContainer>
);
};
11 changes: 2 additions & 9 deletions packages/twenty-front/src/utils/checkUrlType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
import { LinkType } from 'twenty-ui';
import { isDefined } from './isDefined';

export const checkUrlType = (url: string) => {
if (
/^(http|https):\/\/(?:www\.)?linkedin.com(\w+:{0,1}\w*@)?(\S+)(:([0-9])+)?(\/|\/([\w#!:.?+=&%@!\-/]))?/.test(
url,
)
) {
if (/^(https?:\/\/)?(www\.)?linkedin\.com(\/[\w\-\/?#:.%=&]*)?$/.test(url)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: The new regex pattern allows invalid LinkedIn URLs that end with .linkedin.com (e.g. fake.linkedin.com)

return LinkType.LinkedIn;
}
if (
isDefined(/^((http|https):\/\/)?(?:www\.)?twitter\.com\/(\w+)?/i.exec(url))
) {
if (/^(https?:\/\/)?(www\.)?twitter\.com(\/[\w\-\/?#:.%=&]*)?$/.test(url)) {
return LinkType.Twitter;
}

Expand Down
Loading