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.

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

Web: Add MarkInverse and ResourceLabelTooltip contents #50532

Merged
merged 6 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
12 changes: 11 additions & 1 deletion web/packages/design/src/Mark/Mark.story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
*/

import Box from 'design/Box';
import { IconTooltip } from 'design/Tooltip';

import { Mark as M } from './Mark';
import { Mark as M, MarkInverse } from './Mark';

export default {
title: 'Design/Mark',
Expand All @@ -41,3 +42,12 @@ export const SampleText = () => {
</Box>
);
};

export const MarkInsideTooltip = () => {
return (
<IconTooltip>
Example of <MarkInverse>MarkForToolTip</MarkInverse>. Note the{' '}
<MarkInverse>inversed</MarkInverse> background and text color.
</IconTooltip>
);
};
5 changes: 5 additions & 0 deletions web/packages/design/src/Mark/Mark.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ export const Mark = styled.mark`
background-color: ${p => p.theme.colors.interactive.tonal.neutral[2]};
color: inherit;
`;

export const MarkInverse = styled(Mark)`
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: JSdoc on exported function/var/types/styles etc.

background-color: ${p => p.theme.colors.tooltip.inverseBackground};
color: ${p => p.theme.colors.text.main};
`;
2 changes: 1 addition & 1 deletion web/packages/design/src/Mark/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

export { Mark } from './Mark';
export { Mark, MarkInverse } from './Mark';
1 change: 1 addition & 0 deletions web/packages/design/src/theme/themes/bblpTheme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ const colors: ThemeColors = {

tooltip: {
background: 'rgba(255, 255, 255, 0.8)',
inverseBackground: 'rgba(0, 0, 0, 0.5)',
},

progressBarColor: '#00BFA5',
Expand Down
1 change: 1 addition & 0 deletions web/packages/design/src/theme/themes/darkTheme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ const colors: ThemeColors = {

tooltip: {
background: 'rgba(255, 255, 255, 0.8)',
inverseBackground: 'rgba(0, 0, 0, 0.5)',
},

progressBarColor: '#00BFA5',
Expand Down
1 change: 1 addition & 0 deletions web/packages/design/src/theme/themes/lightTheme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ const colors: ThemeColors = {

tooltip: {
background: 'rgba(0, 0, 0, 0.80)',
inverseBackground: 'rgba(255, 255, 255, 0.5)',
},

progressBarColor: '#007D6B',
Expand Down
1 change: 1 addition & 0 deletions web/packages/design/src/theme/themes/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ export type ThemeColors = {

tooltip: {
background: string;
inverseBackground: string;
};

progressBarColor: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const ButtonTextWithAddIcon = ({
iconSize?: IconSize;
}) => {
return (
<ButtonText onClick={onClick} disabled={disabled} compact>
<ButtonText onClick={onClick} disabled={disabled} compact pr={2}>
<AddIcon
className="icon-add"
size={iconSize}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
* Teleport
* Copyright (C) 2024 Gravitational, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import { ResourceLabelTooltip } from './ResourceLabelTooltip';

export default {
title: 'Teleport/Discover/Shared/ResourceLabelTooltip',
};

export const RDS = () => <ResourceLabelTooltip resourceKind="rds" />;
export const EKS = () => <ResourceLabelTooltip resourceKind="eks" />;
export const Server = () => <ResourceLabelTooltip resourceKind="server" />;
export const Database = () => <ResourceLabelTooltip resourceKind="db" />;
export const Kube = () => <ResourceLabelTooltip resourceKind="kube" />;
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
/**
* Teleport
* Copyright (C) 2024 Gravitational, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import Link from 'design/Link';
import { MarkInverse } from 'design/Mark';
import { Position } from 'design/Popover/Popover';
import { IconTooltip } from 'design/Tooltip';
import styled from 'styled-components';

export function ResourceLabelTooltip({
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: JSDoc

resourceKind,
toolTipPosition,
}: {
resourceKind: 'server' | 'eks' | 'rds' | 'kube' | 'db';
toolTipPosition?: Position;
}) {
let tip;

switch (resourceKind) {
case 'server': {
tip = (
<>
Labels allow you to do the following:
<Ul>
<li>
Filter servers by labels when using tsh, tctl, or the web UI
</li>
<li>
Restrict access to this server with{' '}
<Link
target="_blank"
href="https://goteleport.com/docs/enroll-resources/server-access/rbac/"
>
Teleport RBAC
</Link>
. Only roles with <MarkInverse>node_labels</MarkInverse> that
match these labels will be allowed to access this server.
</li>
</Ul>
</>
);
break;
}
case 'kube':
case 'eks': {
tip = (
<>
Labels allow you to do the following:
<Ul>
<li>
Filter Kubernetes clusters by labels when using tsh, tctl, or the
web UI
</li>
<li>
Restrict access to this Kubernetes cluster with{' '}
<Link
target="_blank"
href="https://goteleport.com/docs/enroll-resources/kubernetes-access/controls/"
>
Teleport RBAC
</Link>
. Only roles with <MarkInverse>kubernetes_labels</MarkInverse>{' '}
that match these labels will be allowed to access this Kubernetes
cluster.
</li>
{resourceKind === 'eks' && (
<li>
All the AWS tags from the selected EKS will be included upon
enrollment.
</li>
)}
</Ul>
</>
);
break;
}
case 'rds':
case 'db': {
tip = (
<>
Labels allow you to do the following:
<Ul>
<li>
Filter databases by labels when using tsh, tctl, or the web UI
</li>
<li>
Restrict access to this database with{' '}
<Link
target="_blank"
href="https://goteleport.com/docs/enroll-resources/database-access/rbac/"
>
Teleport RBAC
</Link>
. Only roles with <MarkInverse>db_labels</MarkInverse> that match
these labels will be allowed to access this database.
</li>
{resourceKind === 'rds' && (
<li>
All the AWS tags from the selected RDS will be included upon
enrollment.
</li>
)}
</Ul>
</>
);
break;
}
default:
resourceKind satisfies never;
}

return (
<IconTooltip sticky={true} position={toolTipPosition}>
{tip}
</IconTooltip>
);
}

const Ul = styled.ul`
margin: 0;
padding-left: ${p => p.theme.space[4]}px;
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* Teleport
* Copyright (C) 2024 Gravitational, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

export { ResourceLabelTooltip } from './ResourceLabelTooltip';
Loading