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

fix: remove system user highlighting#2973

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
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
Expand Up@@ -19,7 +19,7 @@ export const WorkspaceBuildStats: FC<WorkspaceBuildStatsProps> = ({ build }) =>
const styles = useStyles()
const theme = useTheme()
const status = getDisplayWorkspaceBuildStatus(theme, build)
const initiatedBy = getDisplayWorkspaceBuildInitiatedBy(theme,build)
const initiatedBy = getDisplayWorkspaceBuildInitiatedBy(build)

return (
<div className={styles.stats}>
Expand DownExpand Up@@ -61,9 +61,7 @@ export const WorkspaceBuildStats: FC<WorkspaceBuildStatsProps> = ({ build }) =>
<div className={styles.statsDivider} />
<div className={styles.statItem}>
<span className={styles.statsLabel}>Initiated by</span>
<span className={styles.statsValue}>
<span style={{ color: initiatedBy.color }}>{initiatedBy.initiatedBy}</span>
</span>
<span className={styles.statsValue}>{initiatedBy}</span>
</div>
</div>
)
Expand Down
6 changes: 2 additions & 4 deletionssite/src/components/WorkspaceStats/WorkspaceStats.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({ workspace }) => {
const styles = useStyles()
const theme = useTheme()
const status = getDisplayStatus(theme, workspace.latest_build)
const initiatedBy = getDisplayWorkspaceBuildInitiatedBy(theme,workspace.latest_build)
const initiatedBy = getDisplayWorkspaceBuildInitiatedBy(workspace.latest_build)

return (
<WorkspaceSection title={Language.workspaceDetails} contentsProps={{ className: styles.stats }}>
Expand DownExpand Up@@ -63,9 +63,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({ workspace }) => {
<div className={styles.statsDivider} />
<div className={styles.statItem}>
<span className={styles.statsLabel}>{Language.byLabel}</span>
<span className={styles.statsValue}>
<span style={{ color: initiatedBy.color }}>{initiatedBy.initiatedBy}</span>
</span>
<span className={styles.statsValue}>{initiatedBy}</span>
</div>
<div className={styles.statsDivider} />
<div className={styles.statItem}>
Expand Down
4 changes: 2 additions & 2 deletionssite/src/components/WorkspacesTable/WorkspacesRow.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ export const WorkspacesRow: FC<{ workspaceRef: WorkspaceItemMachineRef }> = ({ w
const [workspaceState, send] = useActor(workspaceRef)
const { data: workspace } = workspaceState.context
const status = getDisplayStatus(theme, workspace.latest_build)
const initiatedBy = getDisplayWorkspaceBuildInitiatedBy(theme,workspace.latest_build)
const initiatedBy = getDisplayWorkspaceBuildInitiatedBy(workspace.latest_build)
const workspacePageLink = `/@${workspace.owner_name}/${workspace.name}`

return (
Expand All@@ -47,7 +47,7 @@ export const WorkspacesRow: FC<{ workspaceRef: WorkspaceItemMachineRef }> = ({ w
</TableCellLink>
<TableCellLink to={workspacePageLink}>
<AvatarData
title={initiatedBy.initiatedBy}
title={initiatedBy}
subtitle={dayjs().to(dayjs(workspace.latest_build.created_at))}
/>
</TableCellLink>
Expand Down
19 changes: 5 additions & 14 deletionssite/src/util/workspace.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import dayjs from "dayjs"
import * as TypesGen from "../api/typesGenerated"
import * as Mocks from "../testHelpers/entities"
import { dark } from "../theme/theme"
import {
defaultWorkspaceExtension,
getDisplayWorkspaceBuildInitiatedBy,
Expand DownExpand Up@@ -109,32 +108,24 @@ describe("util > workspace", () => {
})

describe("getDisplayWorkspaceBuildInitiatedBy", () => {
it.each<[TypesGen.WorkspaceBuild, string, string]>([
[Mocks.MockWorkspaceBuild, "#C1C1C1", "TestUser"],
it.each<[TypesGen.WorkspaceBuild, string]>([
[Mocks.MockWorkspaceBuild, "TestUser"],
[
{
...Mocks.MockWorkspaceBuild,
reason: "autostart",
},
"#7057FF",
"system/autostart",
],
[
{
...Mocks.MockWorkspaceBuild,
reason: "autostop",
},
"#7057FF",
"system/autostop",
],
])(
`getDisplayWorkspaceBuildInitiatedBy(%p) returns color: %p, initiatedBy: %p`,
(build, color, initiatedBy) => {
expect(getDisplayWorkspaceBuildInitiatedBy(dark, build)).toEqual({
color: color,
initiatedBy: initiatedBy,
})
},
)
])(`getDisplayWorkspaceBuildInitiatedBy(%p) returns %p`, (build, initiatedBy) => {
expect(getDisplayWorkspaceBuildInitiatedBy(build)).toEqual(initiatedBy)
})
})
})
23 changes: 4 additions & 19 deletionssite/src/util/workspace.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,29 +191,14 @@ export const DisplayWorkspaceBuildInitiatedByLanguage = {
autostop: "system/autostop",
}

export const getDisplayWorkspaceBuildInitiatedBy = (
theme: Theme,
build: TypesGen.WorkspaceBuild,
): {
color: string
initiatedBy: string
} => {
export const getDisplayWorkspaceBuildInitiatedBy = (build: TypesGen.WorkspaceBuild): string => {
switch (build.reason) {
case "initiator":
return {
color: theme.palette.text.secondary,
initiatedBy: build.initiator_name,
}
return build.initiator_name
case "autostart":
return {
color: theme.palette.secondary.dark,
initiatedBy: DisplayWorkspaceBuildInitiatedByLanguage.autostart,
}
return DisplayWorkspaceBuildInitiatedByLanguage.autostart
case "autostop":
return {
color: theme.palette.secondary.dark,
initiatedBy: DisplayWorkspaceBuildInitiatedByLanguage.autostop,
}
return DisplayWorkspaceBuildInitiatedByLanguage.autostop
}
}

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp