Skip to content

refactor: match StatusIndicator component with the new designs #16458

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 8 commits into from
Feb 7, 2025
Merged

refactor: match StatusIndicator component with the new designs #16458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
170a731
Refactor status indicator
BrunoQuaresma Feb 5, 2025
dd31141
Replace StatusIndicator in old components
BrunoQuaresma Feb 5, 2025
1d78533
Apply fmt
BrunoQuaresma Feb 5, 2025
c114d37
Merge branch 'main' of https://github.com/coder/coder into bq/refacto…
BrunoQuaresma Feb 7, 2025
4cb0c64
Apply PR comments
BrunoQuaresma Feb 7, 2025
f3da2cc
Fix wrong variants
BrunoQuaresma Feb 7, 2025
38554ea
Fix status icons
BrunoQuaresma Feb 7, 2025
02618d5
Fix status
BrunoQuaresma Feb 7, 2025
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
Prev Previous commit
Next Next commit
Fix status icons
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Feb 7, 2025
commit 38554ea132704f7fee208e68018b38bfcc1ec862
5 changes: 1 addition & 4 deletions site/src/modules/provisioners/ProvisionerGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ import {
} from "components/HelpTooltip/HelpTooltip";
import { Pill } from "components/Pill/Pill";
import { Stack } from "components/Stack/Stack";
import {
StatusIndicator,
StatusIndicatorDot,
} from "components/StatusIndicator/StatusIndicator";
import { StatusIndicatorDot } from "components/StatusIndicator/StatusIndicator";
import {
Popover,
PopoverContent,
Expand Down
1 change: 1 addition & 0 deletions site/src/pages/CreateTokenPage/CreateTokenForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
</FormFields>
</FormSection>
<FormSection
data-chromatic="ignore"
title="Expiration"
description={
form.values.lifetime
Expand Down
6 changes: 0 additions & 6 deletions site/src/pages/CreateTokenPage/CreateTokenPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ const meta: Meta<typeof CreateTokenPage> = {
},
],
},
decorators: [
(Story) => {
Date.now = () => new Date("01/01/2014").getTime();
return <Story />;
},
],
};

export default meta;
Expand Down
11 changes: 7 additions & 4 deletions site/src/pages/UsersPage/UsersFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import {
type UseFilterMenuOptions,
useFilterMenu,
} from "components/Filter/menu";
import { StatusIndicator } from "components/StatusIndicator/StatusIndicator";
import {
StatusIndicator,
StatusIndicatorDot,
} from "components/StatusIndicator/StatusIndicator";
import type { FC } from "react";
import { docs } from "utils/docs";

Expand All @@ -24,17 +27,17 @@ export const useStatusFilterMenu = ({
{
value: "active",
label: "Active",
startIcon: <StatusIndicator variant="success" />,
startIcon: <StatusIndicatorDot variant="success" />,
},
{
value: "dormant",
label: "Dormant",
startIcon: <StatusIndicator variant="warning" />,
startIcon: <StatusIndicatorDot variant="warning" />,
},
{
value: "suspended",
label: "Suspended",
startIcon: <StatusIndicator variant="inactive" />,
startIcon: <StatusIndicatorDot variant="inactive" />,
},
];
return useFilterMenu({
Expand Down
12 changes: 6 additions & 6 deletions site/src/pages/WorkspacesPage/LastUsed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useTheme } from "@emotion/react";
import { Stack } from "components/Stack/Stack";
import { StatusIndicator } from "components/StatusIndicator/StatusIndicator";
import { StatusIndicatorDot } from "components/StatusIndicator/StatusIndicator";
import dayjs from "dayjs";
import relativeTime from "dayjs/plugin/relativeTime";
import { useTime } from "hooks/useTime";
Expand All @@ -18,19 +18,19 @@ export const LastUsed: FC<LastUsedProps> = ({ lastUsedAt }) => {
const t = dayjs(lastUsedAt);
const now = dayjs();
let message = t.fromNow();
let circle = <StatusIndicator variant="pending" />;
let circle = <StatusIndicatorDot variant="pending" />;

if (t.isAfter(now.subtract(1, "hour"))) {
circle = <StatusIndicator variant="success" />;
circle = <StatusIndicatorDot variant="success" />;
// Since the agent reports on a 10m interval,
// the last_used_at can be inaccurate when recent.
message = "Now";
} else if (t.isAfter(now.subtract(3, "day"))) {
circle = <StatusIndicator variant="pending" />;
circle = <StatusIndicatorDot variant="pending" />;
} else if (t.isAfter(now.subtract(1, "month"))) {
circle = <StatusIndicator variant="warning" />;
circle = <StatusIndicatorDot variant="warning" />;
} else if (t.isAfter(now.subtract(100, "year"))) {
circle = <StatusIndicator variant="failed" />;
circle = <StatusIndicatorDot variant="failed" />;
} else {
message = "Never";
}
Expand Down
9 changes: 3 additions & 6 deletions site/src/pages/WorkspacesPage/filter/menus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { API } from "api/api";
import type {
ProvisionerJob,
Template,
WorkspaceStatus,
} from "api/typesGenerated";
import type { Template, WorkspaceStatus } from "api/typesGenerated";
import { Avatar } from "components/Avatar/Avatar";
import {
SelectFilter,
Expand All @@ -16,6 +12,7 @@ import {
} from "components/Filter/menu";
import {
StatusIndicator,
StatusIndicatorDot,
type StatusIndicatorDotProps,
} from "components/StatusIndicator/StatusIndicator";
import type { FC } from "react";
Expand Down Expand Up @@ -117,7 +114,7 @@ export const useStatusFilterMenu = ({
label: display.text,
value: status,
startIcon: (
<StatusIndicator variant={getStatusIndicatorVariant(status)} />
<StatusIndicatorDot variant={getStatusIndicatorVariant(status)} />
),
};
});
Expand Down
Loading