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: update Badge usage #478

Merged
merged 3 commits into from
Aug 12, 2024
Merged

fix: update Badge usage #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f68319
fix: update Badge usage
CataldoMazzilli Aug 5, 2024
4765878
fix: apply sonar suggestions
CataldoMazzilli Aug 5, 2024
7564d0b
Merge branch 'devel' into SHELL-233-Fix-badge-on-shell-after-DS-update
CataldoMazzilli Aug 9, 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
66 changes: 28 additions & 38 deletions src/settings/components/general-settings/module-version-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import {
Divider,
FormSubSection,
Text,
Tooltip,
useTheme
Tooltip
} from '@zextras/carbonio-design-system';
import { map } from 'lodash';

Expand All @@ -27,7 +26,6 @@ import { versionsSubSection } from '../../general-settings-sub-sections';
const ModuleVersionSettings = (): React.JSX.Element => {
const apps = useAppList();
const t = getT();
const theme = useTheme();

const copyToClipboard = useCallback<NonNullable<TextProps['onClick']>>((e) => {
e.preventDefault();
Expand All @@ -43,42 +41,34 @@ const ModuleVersionSettings = (): React.JSX.Element => {
const sectionTitle = useMemo(() => versionsSubSection(t), [t]);

return (
<>
<FormSubSection
label={sectionTitle.label}
minWidth="calc(min(100%, 32rem))"
width="50%"
id={sectionTitle.id}
>
{map(filteredList, (app: CarbonioModule) => (
<Container key={app.name} padding={{ horizontal: 'large', vertical: 'small' }}>
<Container orientation="horizontal" mainAlignment="space-between">
<Text>{app.display}</Text>
<Tooltip placement="top" label={t('label.click_to_copy', 'Click to copy')}>
<Text style={{ cursor: 'pointer' }} onClick={copyToClipboard}>
Version: {app.version}
</Text>
</Tooltip>
</Container>
<Container
orientation="horizontal"
mainAlignment="space-between"
padding={{ top: 'extrasmall', bottom: 'medium' }}
>
<Text color="secondary">{app.description}</Text>
<Badge
value="Active"
style={{
backgroundColor: theme.palette.success.regular,
color: theme.palette.gray6.regular
}}
/>
</Container>
<Divider color="gray2" />
<FormSubSection
label={sectionTitle.label}
minWidth="calc(min(100%, 32rem))"
width="50%"
id={sectionTitle.id}
>
{map(filteredList, (app: CarbonioModule) => (
<Container key={app.name} padding={{ horizontal: 'large', vertical: 'small' }}>
<Container orientation="horizontal" mainAlignment="space-between">
<Text>{app.display}</Text>
<Tooltip placement="top" label={t('label.click_to_copy', 'Click to copy')}>
<Text style={{ cursor: 'pointer' }} onClick={copyToClipboard}>
Version: {app.version}
</Text>
</Tooltip>
</Container>
))}
</FormSubSection>
</>
<Container
orientation="horizontal"
mainAlignment="space-between"
padding={{ top: 'extrasmall', bottom: 'medium' }}
>
<Text color="secondary">{app.description}</Text>
<Badge value="Active" color={'gray6'} backgroundColor={'success'} />
CataldoMazzilli marked this conversation as resolved.
Show resolved Hide resolved
</Container>
<Divider color="gray2" />
</Container>
))}
</FormSubSection>
);
};

Expand Down
17 changes: 10 additions & 7 deletions src/shell/badge-wrap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,25 @@ import type { FC } from 'react';
import React, { forwardRef } from 'react';

import { Container, Badge } from '@zextras/carbonio-design-system';
import type { DefaultTheme } from 'styled-components';
import styled from 'styled-components';

import type { BadgeInfo } from '../types/apps';

const MiniBadge = styled(Badge)<{ $color?: keyof DefaultTheme['palette'] }>`
const MiniBadge = styled(Badge)`
position: absolute;
bottom: 25%;
right: 25%;
transform: translate(30%, 30%);
min-width: 0.75rem;
min-height: 0.75rem;
min-width: 1rem;
min-height: 1rem;
pointer-events: none;
z-index: 99;
font-size: 0.625rem;
background: ${({ $color, theme }): string => theme.palette[$color ?? 'primary'].regular};
padding: 0.125rem;
color: ${({ theme }): string => theme.palette.gray6.regular};

& > div {
font-size: 0.625rem;
line-height: normal;
}
`;

const BadgeWrap: FC<{ badge: BadgeInfo }> = forwardRef<HTMLDivElement, { badge: BadgeInfo }>(
Expand All @@ -33,6 +34,8 @@ const BadgeWrap: FC<{ badge: BadgeInfo }> = forwardRef<HTMLDivElement, { badge:
<Container width={'3rem'} height={'3rem'} style={{ position: 'relative' }} ref={ref}>
{badge.show && (
<MiniBadge
color={'gray6'}
backgroundColor={badge.color ?? 'primary'}
data-testid={'badge-counter'}
value={badge.showCount ? badge.count ?? 0 : ''}
/>
Expand Down
21 changes: 12 additions & 9 deletions src/shell/shell-primary-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import React, { useEffect, useMemo, useRef } from 'react';

import { Container, IconButton, Row, Tooltip } from '@zextras/carbonio-design-system';
import { map, isEmpty, trim, filter, sortBy, noop } from 'lodash';
import { Button, Container, Row, Tooltip } from '@zextras/carbonio-design-system';
import { map, isEmpty, trim, filter, sortBy } from 'lodash';
import { useHistory, useLocation } from 'react-router-dom';
import styled from 'styled-components';

Expand All @@ -20,6 +20,10 @@ import { minimizeBoards, reopenBoards, useBoardStore } from '../store/boards';
import type { PrimaryAccessoryView, PrimaryBarView } from '../types/apps';
import { checkRoute } from '../utility-bar/utils';

function noop(): void {
return undefined;
}

const PrimaryBarContainer = styled(Container)`
border-right: 0.0625rem solid ${({ theme }): string => theme.palette.gray3.regular};
z-index: ${BOARD_CONTAINER_ZINDEX + 1};
Expand All @@ -30,8 +34,8 @@ const ToggleBoardIcon = (): React.JSX.Element | null => {

return isEmpty(boards) ? null : (
<Container width={'3rem'} height={'3rem'}>
<IconButton
iconColor="primary"
<Button
labelColor="primary"
icon={minimized ? 'BoardOpen' : 'BoardCollapse'}
onClick={minimized ? reopenBoards : minimizeBoards}
size="large"
Expand All @@ -54,13 +58,12 @@ const PrimaryBarElement = ({ view, active, onClick }: PrimaryBarItemProps): Reac
<Tooltip label={view.label} placement="right" key={view.id}>
<BadgeWrap badge={view.badge}>
{typeof view.component === 'string' ? (
<IconButton
<Button
icon={view.component}
backgroundColor={active ? 'gray4' : 'gray6'}
iconColor={active ? 'primary' : 'text'}
labelColor={active ? 'primary' : 'text'}
onClick={onClick}
size="large"
data-isselected={active}
/>
) : (
<view.component active={active} />
Expand All @@ -73,10 +76,10 @@ const PrimaryBarAccessoryElement = ({ view }: PrimaryBarAccessoryItemProps): Rea
<Tooltip label={view.label} placement="right" key={view.id}>
<AppContextProvider key={view.id} pkg={view.app}>
{typeof view.component === 'string' ? (
<IconButton
<Button
icon={view.component}
backgroundColor="gray6"
iconColor="text"
labelColor="text"
onClick={view.onClick ?? noop}
size="large"
/>
Expand Down