Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

refactor: minor task page design adjustments#18187

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
BrunoQuaresma merged 4 commits intomainfrombq/refactor-task-page-layout
Jun 2, 2025
Merged
Show file tree
Hide file tree
Changes fromall 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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type {WorkspaceAppStatus } from "api/typesGenerated";
import type {WorkspaceAppStatusState } from "api/typesGenerated";
import { Spinner } from "components/Spinner/Spinner";
import {
BanIcon,
CircleAlertIcon,
CircleCheckIcon,
HourglassIcon,
Expand All@@ -9,20 +10,22 @@ import {
import type { FC } from "react";
import { cn } from "utils/cn";

typeAppStatusIconProps = {
status: WorkspaceAppStatus;
typeAppStatusStateIconProps = {
state: WorkspaceAppStatusState;
latest: boolean;
disabled?: boolean;
className?: string;
};

export const AppStatusIcon: FC<AppStatusIconProps> = ({
status,
export const AppStatusStateIcon: FC<AppStatusStateIconProps> = ({
state,
disabled,
latest,
className: customClassName,
}) => {
const className = cn(["size-4 shrink-0", customClassName]);

switch (status.state) {
switch (state) {
case "complete":
return (
<CircleCheckIcon className={cn(["text-content-success", className])} />
Expand All@@ -32,10 +35,12 @@ export const AppStatusIcon: FC<AppStatusIconProps> = ({
<CircleAlertIcon className={cn(["text-content-warning", className])} />
);
case "working":
return latest ? (
return disabled ? (
<BanIcon className={cn(["text-content-disabled", className])} />
) : latest ? (
<Spinner size="sm" className="shrink-0" loading />
) : (
<HourglassIcon className={cn(["text-highlight-sky", className])} />
<HourglassIcon className={cn(["text-content-secondary", className])} />
);
default:
return (
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import {
TooltipProvider,
TooltipTrigger,
} from "components/Tooltip/Tooltip";
import {AppStatusIcon } from "modules/apps/AppStatusIcon";
import {AppStatusStateIcon } from "modules/apps/AppStatusStateIcon";
import { cn } from "utils/cn";

type WorkspaceAppStatusProps = {
Expand All@@ -31,9 +31,10 @@ export const WorkspaceAppStatus = ({
<Tooltip>
<TooltipTrigger asChild>
<div className="flex items-center gap-2">
<AppStatusIcon
status={status}
<AppStatusStateIcon
latest
disabled={disabled}
state={status.state}
className={cn({
"text-content-disabled": disabled,
})}
Expand Down
Loading
Loading

[8]ページ先頭

©2009-2025 Movatter.jp