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

Small UI bugs #5886

Merged
merged 5 commits into from
Sep 20, 2022
Merged

Small UI bugs #5886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d4957c
Converted the number with comma
Ankit-Keshari-Vituity Sep 9, 2022
cb362fc
Rename the Column header from terms to Glossary Terms
Ankit-Keshari-Vituity Sep 9, 2022
be49b21
Used formatNumber function instead of numberWithCommas to add comma i…
Ankit-Keshari-Vituity Sep 19, 2022
64a5cd6
Removed Space
Ankit-Keshari-Vituity Sep 19, 2022
04f2f2d
Merge branch 'master' into small-ui-bugs
chriscollins3456 Sep 20, 2022
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
2 changes: 1 addition & 1 deletion datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default function SchemaTable({

const termColumn = {
width: 125,
title: 'Terms',
title: 'Glossary Terms',
dataIndex: 'globalTags',
key: 'tag',
render: termRenderer,
Expand Down
24 changes: 13 additions & 11 deletions datahub-web-react/src/app/search/SearchFilterLabel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { BookOutlined } from '@ant-design/icons';
import { Tag, Tooltip } from 'antd';
import * as React from 'react';
import styled from 'styled-components';
import {
AggregationMetadata,
Expand All @@ -21,6 +21,7 @@ import { useEntityRegistry } from '../useEntityRegistry';
import { ENTITY_FILTER_NAME } from './utils/constants';
import CustomAvatar from '../shared/avatar/CustomAvatar';
import { IconStyleType } from '../entity/Entity';
import { formatNumber } from '../shared/formatNumber';

type Props = {
aggregation: AggregationMetadata;
Expand All @@ -46,7 +47,8 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
const entityType = aggregation.value.toUpperCase() as EntityType;
return (
<span>
{entityType ? entityRegistry.getCollectionName(entityType) : aggregation.value} ({countText})
{entityType ? entityRegistry.getCollectionName(entityType) : aggregation.value} (
{formatNumber(countText)})
</span>
);
}
Expand All @@ -60,7 +62,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
<StyledTag $colorHash={tag?.urn} $color={tag?.properties?.colorHex}>
{truncatedDisplayName}
</StyledTag>
({countText})
({formatNumber(countText)})
</Tooltip>
);
}
Expand Down Expand Up @@ -94,7 +96,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
<span style={{ marginRight: 8 }}>
{entityRegistry.getIcon(EntityType.CorpGroup, 16, IconStyleType.ACCENT)}
</span>
{truncatedDisplayName} ({countText})
{truncatedDisplayName} ({formatNumber(countText)})
</Tooltip>
);
}
Expand All @@ -109,7 +111,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
<BookOutlined style={{ marginRight: '3%' }} />
{truncatedDisplayName}
</Tag>
({countText})
({formatNumber(countText)})
</Tooltip>
);
}
Expand All @@ -124,7 +126,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
<PreviewImage src={platform.properties?.logoUrl} alt={platform.name} />
)}
<span>
{truncatedDisplayName} ({countText})
{truncatedDisplayName} ({formatNumber(countText)})
</span>
</Tooltip>
);
Expand All @@ -136,7 +138,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
return (
<Tooltip title={displayName}>
{truncatedDisplayName} ({countText})
{truncatedDisplayName} ({formatNumber(countText)})
</Tooltip>
);
}
Expand All @@ -151,7 +153,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
<PreviewImage src={container.platform?.properties?.logoUrl} alt={container.properties?.name} />
)}
<span>
{truncatedDisplayName} ({countText})
{truncatedDisplayName} ({formatNumber(countText)})
</span>
</Tooltip>
);
Expand All @@ -163,7 +165,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
const truncatedDomainName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
return (
<Tooltip title={displayName}>
<DomainLink domain={domain} name={truncatedDomainName} />({countText})
<DomainLink domain={domain} name={truncatedDomainName} />({formatNumber(countText)})
</Tooltip>
);
}
Expand All @@ -175,7 +177,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
return (
<Tooltip title={displayName}>
<span>
{truncatedDomainName} ({countText})
{truncatedDomainName} ({formatNumber(countText)})
</span>
</Tooltip>
);
Expand All @@ -186,7 +188,7 @@ export const SearchFilterLabel = ({ aggregation, field }: Props) => {
}
return (
<>
{aggregation.value} ({countText})
{aggregation.value} ({formatNumber(countText)})
</>
);
};