Skip to content

chore: add inactive role to experimental theme #11967

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

Merged
merged 2 commits into from
Jan 31, 2024
Merged

chore: add inactive role to experimental theme #11967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50d4f24
chore: add `inactive` role to experimental theme
aslilac Jan 31, 2024
27d19f6
`PillType` -> `ThemeRole`
aslilac Jan 31, 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
110 changes: 49 additions & 61 deletions site/src/components/Pill/Pill.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
import CircularProgress, {
type CircularProgressProps,
} from "@mui/material/CircularProgress";
import { type Interpolation, type Theme } from "@emotion/react";
import {
type FC,
forwardRef,
type HTMLAttributes,
type ReactNode,
useMemo,
forwardRef,
HTMLAttributes,
} from "react";
import { useTheme, type Interpolation, type Theme } from "@emotion/react";
import type { ThemeRole } from "theme/experimental";
import CircularProgress, {
CircularProgressProps,
} from "@mui/material/CircularProgress";

export type PillType = ThemeRole | keyof typeof themeOverrides;

export type PillProps = HTMLAttributes<HTMLDivElement> & {
icon?: ReactNode;
type?: PillType;
type?: ThemeRole;
};

const themeOverrides = {
neutral: (theme) => ({
backgroundColor: theme.experimental.l1.background,
borderColor: theme.experimental.l1.outline,
}),
} satisfies Record<string, Interpolation<Theme>>;

const themeStyles = (type: ThemeRole) => (theme: Theme) => {
const palette = theme.experimental.roles[type];
return {
Expand All @@ -39,43 +30,13 @@ const PILL_ICON_SPACING = (PILL_HEIGHT - PILL_ICON_SIZE) / 2;

export const Pill: FC<PillProps> = forwardRef<HTMLDivElement, PillProps>(
(props, ref) => {
const { icon, type = "neutral", children, ...divProps } = props;
const theme = useTheme();
const typeStyles = useMemo(() => {
if (type in themeOverrides) {
return themeOverrides[type as keyof typeof themeOverrides];
}
return themeStyles(type as ThemeRole);
}, [type]);
const { icon, type = "inactive", children, ...divProps } = props;
const typeStyles = useMemo(() => themeStyles(type), [type]);

return (
<div
ref={ref}
css={[
{
fontSize: 12,
color: theme.experimental.l1.text,
cursor: "default",
display: "inline-flex",
alignItems: "center",
whiteSpace: "nowrap",
fontWeight: 400,
borderWidth: 1,
borderStyle: "solid",
borderRadius: 99999,
lineHeight: 1,
height: PILL_HEIGHT,
gap: PILL_ICON_SPACING,
paddingRight: 12,
paddingLeft: icon ? PILL_ICON_SPACING : 12,

"& svg": {
width: PILL_ICON_SIZE,
height: PILL_ICON_SIZE,
},
},
typeStyles,
]}
css={[styles.pill, icon && styles.pillWithIcon, typeStyles]}
{...divProps}
>
{icon}
Expand All @@ -85,18 +46,45 @@ export const Pill: FC<PillProps> = forwardRef<HTMLDivElement, PillProps>(
},
);

export const PillSpinner = (props: CircularProgressProps) => {
export const PillSpinner: FC<CircularProgressProps> = (props) => {
return (
<CircularProgress
size={PILL_ICON_SIZE}
css={(theme) => ({
color: theme.experimental.l1.text,
// It is necessary to align it with the MUI Icons internal padding
"& svg": {
transform: "scale(.75)",
},
})}
{...props}
/>
<CircularProgress size={PILL_ICON_SIZE} css={styles.spinner} {...props} />
);
};

const styles = {
pill: (theme) => ({
fontSize: 12,
color: theme.experimental.l1.text,
cursor: "default",
display: "inline-flex",
alignItems: "center",
whiteSpace: "nowrap",
fontWeight: 400,
borderWidth: 1,
borderStyle: "solid",
borderRadius: 99999,
lineHeight: 1,
height: PILL_HEIGHT,
gap: PILL_ICON_SPACING,
paddingLeft: 12,
paddingRight: 12,

"& svg": {
width: PILL_ICON_SIZE,
height: PILL_ICON_SIZE,
},
}),

pillWithIcon: {
paddingLeft: PILL_ICON_SPACING,
},

spinner: (theme) => ({
color: theme.experimental.l1.text,
// It is necessary to align it with the MUI Icons internal padding
"& svg": {
transform: "scale(.75)",
},
}),
} satisfies Record<string, Interpolation<Theme>>;
23 changes: 11 additions & 12 deletions site/src/pages/AuditPage/AuditLogRow/AuditLogRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
import { type CSSObject, type Interpolation, type Theme } from "@emotion/react";
import Collapse from "@mui/material/Collapse";
import TableCell from "@mui/material/TableCell";
import { type FC, useState } from "react";
import userAgentParser from "ua-parser-js";
import type { AuditLog } from "api/typesGenerated";
import { type ThemeRole } from "theme/experimental";
import { DropdownArrow } from "components/DropdownArrow/DropdownArrow";
import { Pill, type PillType } from "components/Pill/Pill";
import { Pill } from "components/Pill/Pill";
import { Stack } from "components/Stack/Stack";
import { TimelineEntry } from "components/Timeline/TimelineEntry";
import { UserAvatar } from "components/UserAvatar/UserAvatar";
import { type FC, useState } from "react";
import userAgentParser from "ua-parser-js";
import { AuditLogDiff } from "./AuditLogDiff/AuditLogDiff";
import { AuditLogDescription } from "./AuditLogDescription/AuditLogDescription";
import { determineGroupDiff } from "./AuditLogDiff/auditUtils";

const httpStatusColor = (httpStatus: number): PillType => {
// redirects are successful
if (httpStatus === 307) {
return "success";
const httpStatusColor = (httpStatus: number): ThemeRole => {
// Treat server errors (500) as errors
if (httpStatus >= 500) {
return "error";
}

if (httpStatus >= 300 && httpStatus < 500) {
// Treat client errors (400) as warnings
if (httpStatus >= 400) {
return "warning";
}

if (httpStatus >= 500) {
return "error";
}

// OK (200) and redirects (300) are successful
return "success";
};

Expand Down
6 changes: 3 additions & 3 deletions site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,17 @@ export const VersionRow: FC<VersionRowProps> = ({
</Pill>
)}
{jobStatus === "pending" && (
<Pill role="status" type="warning">
<Pill role="status" type="inactive">
Pending&hellip;
</Pill>
)}
{jobStatus === "running" && (
<Pill role="status" type="warning">
<Pill role="status" type="active">
Building&hellip;
</Pill>
)}
{(jobStatus === "canceling" || jobStatus === "canceled") && (
<Pill role="status" type="neutral">
<Pill role="status" type="inactive">
Canceled
</Pill>
)}
Expand Down
7 changes: 4 additions & 3 deletions site/src/pages/TemplateVersionEditorPage/TemplateVersionStatusBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { type TemplateVersion } from "api/typesGenerated";
import { type FC, type ReactNode } from "react";
import ErrorIcon from "@mui/icons-material/ErrorOutline";
import CheckIcon from "@mui/icons-material/CheckOutlined";
import { Pill, PillSpinner, type PillType } from "components/Pill/Pill";
import type { TemplateVersion } from "api/typesGenerated";
import { type ThemeRole } from "theme/experimental";
import { Pill, PillSpinner } from "components/Pill/Pill";

interface TemplateVersionStatusBadgeProps {
version: TemplateVersion;
Expand All @@ -22,7 +23,7 @@ export const TemplateVersionStatusBadge: FC<
export const getStatus = (
version: TemplateVersion,
): {
type?: PillType;
type?: ThemeRole;
text: string;
icon: ReactNode;
} => {
Expand Down
10 changes: 10 additions & 0 deletions site/src/theme/dark/experimental.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@ export default {
},
},
},
inactive: {
background: colors.zinc[950],
outline: colors.zinc[500],
text: colors.zinc[50],
fill: {
solid: colors.zinc[400],
outline: colors.zinc[400],
text: colors.white,
},
},
preview: {
background: colors.violet[950],
outline: colors.violet[500],
Expand Down
10 changes: 10 additions & 0 deletions site/src/theme/darkBlue/experimental.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@ export default {
},
},
},
inactive: {
background: colors.zinc[950],
outline: colors.zinc[500],
text: colors.zinc[50],
fill: {
solid: colors.zinc[400],
outline: colors.zinc[400],
text: colors.white,
},
},
preview: {
background: colors.violet[950],
outline: colors.violet[500],
Expand Down
10 changes: 8 additions & 2 deletions site/src/theme/experimental.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,25 @@ export interface NewTheme {
/** Selected, in progress, of particular relevance right now. */
active: InteractiveRole;

/** For things that can be made "active", but are not currently so.
* Paused, stopped, off, etc.
*/
inactive: Role;

/** Actions that have long lasting or irreversible effects.
* Deletion, immutable parameters, etc.
*/
danger: InteractiveRole;

/** This isn't quite ready for prime-time, but you're welcome to look around!
* Preview features, experiments, unstable etc.
* Preview features, experiments, unstable, etc.
*/
preview: Role;
};
}

/** A set of colors which work together to fill a desirable "communication role"
/**
* A set of colors which work together to fill a desirable "communication role"
* ie. I wish to communicate an error, I wish to communicate that this is dangerous, etc.
*/
export interface Role {
Expand Down
10 changes: 10 additions & 0 deletions site/src/theme/light/experimental.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@ export default {
},
},
},
inactive: {
background: colors.gray[100],
outline: colors.gray[400],
text: colors.gray[950],
fill: {
solid: colors.gray[600],
outline: colors.gray[600],
text: colors.white,
},
},
preview: {
background: colors.violet[50],
outline: colors.violet[500],
Expand Down