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

Commitb692b7e

Browse files
authored
fix: remove system user highlighting (#2973)
1 parent000bc50 commitb692b7e

File tree

5 files changed

+15
-43
lines changed

5 files changed

+15
-43
lines changed

‎site/src/components/WorkspaceBuildStats/WorkspaceBuildStats.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const WorkspaceBuildStats: FC<WorkspaceBuildStatsProps> = ({ build }) =>
1919
conststyles=useStyles()
2020
consttheme=useTheme()
2121
conststatus=getDisplayWorkspaceBuildStatus(theme,build)
22-
constinitiatedBy=getDisplayWorkspaceBuildInitiatedBy(theme,build)
22+
constinitiatedBy=getDisplayWorkspaceBuildInitiatedBy(build)
2323

2424
return(
2525
<divclassName={styles.stats}>
@@ -61,9 +61,7 @@ export const WorkspaceBuildStats: FC<WorkspaceBuildStatsProps> = ({ build }) =>
6161
<divclassName={styles.statsDivider}/>
6262
<divclassName={styles.statItem}>
6363
<spanclassName={styles.statsLabel}>Initiated by</span>
64-
<spanclassName={styles.statsValue}>
65-
<spanstyle={{color:initiatedBy.color}}>{initiatedBy.initiatedBy}</span>
66-
</span>
64+
<spanclassName={styles.statsValue}>{initiatedBy}</span>
6765
</div>
6866
</div>
6967
)

‎site/src/components/WorkspaceStats/WorkspaceStats.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({ workspace }) => {
2828
conststyles=useStyles()
2929
consttheme=useTheme()
3030
conststatus=getDisplayStatus(theme,workspace.latest_build)
31-
constinitiatedBy=getDisplayWorkspaceBuildInitiatedBy(theme,workspace.latest_build)
31+
constinitiatedBy=getDisplayWorkspaceBuildInitiatedBy(workspace.latest_build)
3232

3333
return(
3434
<WorkspaceSectiontitle={Language.workspaceDetails}contentsProps={{className:styles.stats}}>
@@ -63,9 +63,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({ workspace }) => {
6363
<divclassName={styles.statsDivider}/>
6464
<divclassName={styles.statItem}>
6565
<spanclassName={styles.statsLabel}>{Language.byLabel}</span>
66-
<spanclassName={styles.statsValue}>
67-
<spanstyle={{color:initiatedBy.color}}>{initiatedBy.initiatedBy}</span>
68-
</span>
66+
<spanclassName={styles.statsValue}>{initiatedBy}</span>
6967
</div>
7068
<divclassName={styles.statsDivider}/>
7169
<divclassName={styles.statItem}>

‎site/src/components/WorkspacesTable/WorkspacesRow.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const WorkspacesRow: FC<{ workspaceRef: WorkspaceItemMachineRef }> = ({ w
2727
const[workspaceState,send]=useActor(workspaceRef)
2828
const{data:workspace}=workspaceState.context
2929
conststatus=getDisplayStatus(theme,workspace.latest_build)
30-
constinitiatedBy=getDisplayWorkspaceBuildInitiatedBy(theme,workspace.latest_build)
30+
constinitiatedBy=getDisplayWorkspaceBuildInitiatedBy(workspace.latest_build)
3131
constworkspacePageLink=`/@${workspace.owner_name}/${workspace.name}`
3232

3333
return(
@@ -47,7 +47,7 @@ export const WorkspacesRow: FC<{ workspaceRef: WorkspaceItemMachineRef }> = ({ w
4747
</TableCellLink>
4848
<TableCellLinkto={workspacePageLink}>
4949
<AvatarData
50-
title={initiatedBy.initiatedBy}
50+
title={initiatedBy}
5151
subtitle={dayjs().to(dayjs(workspace.latest_build.created_at))}
5252
/>
5353
</TableCellLink>

‎site/src/util/workspace.test.ts

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
importdayjsfrom"dayjs"
22
import*asTypesGenfrom"../api/typesGenerated"
33
import*asMocksfrom"../testHelpers/entities"
4-
import{dark}from"../theme/theme"
54
import{
65
defaultWorkspaceExtension,
76
getDisplayWorkspaceBuildInitiatedBy,
@@ -109,32 +108,24 @@ describe("util > workspace", () => {
109108
})
110109

111110
describe("getDisplayWorkspaceBuildInitiatedBy",()=>{
112-
it.each<[TypesGen.WorkspaceBuild,string,string]>([
113-
[Mocks.MockWorkspaceBuild,"#C1C1C1","TestUser"],
111+
it.each<[TypesGen.WorkspaceBuild,string]>([
112+
[Mocks.MockWorkspaceBuild,"TestUser"],
114113
[
115114
{
116115
...Mocks.MockWorkspaceBuild,
117116
reason:"autostart",
118117
},
119-
"#7057FF",
120118
"system/autostart",
121119
],
122120
[
123121
{
124122
...Mocks.MockWorkspaceBuild,
125123
reason:"autostop",
126124
},
127-
"#7057FF",
128125
"system/autostop",
129126
],
130-
])(
131-
`getDisplayWorkspaceBuildInitiatedBy(%p) returns color: %p, initiatedBy: %p`,
132-
(build,color,initiatedBy)=>{
133-
expect(getDisplayWorkspaceBuildInitiatedBy(dark,build)).toEqual({
134-
color:color,
135-
initiatedBy:initiatedBy,
136-
})
137-
},
138-
)
127+
])(`getDisplayWorkspaceBuildInitiatedBy(%p) returns %p`,(build,initiatedBy)=>{
128+
expect(getDisplayWorkspaceBuildInitiatedBy(build)).toEqual(initiatedBy)
129+
})
139130
})
140131
})

‎site/src/util/workspace.ts

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -191,29 +191,14 @@ export const DisplayWorkspaceBuildInitiatedByLanguage = {
191191
autostop:"system/autostop",
192192
}
193193

194-
exportconstgetDisplayWorkspaceBuildInitiatedBy=(
195-
theme:Theme,
196-
build:TypesGen.WorkspaceBuild,
197-
):{
198-
color:string
199-
initiatedBy:string
200-
}=>{
194+
exportconstgetDisplayWorkspaceBuildInitiatedBy=(build:TypesGen.WorkspaceBuild):string=>{
201195
switch(build.reason){
202196
case"initiator":
203-
return{
204-
color:theme.palette.text.secondary,
205-
initiatedBy:build.initiator_name,
206-
}
197+
returnbuild.initiator_name
207198
case"autostart":
208-
return{
209-
color:theme.palette.secondary.dark,
210-
initiatedBy:DisplayWorkspaceBuildInitiatedByLanguage.autostart,
211-
}
199+
returnDisplayWorkspaceBuildInitiatedByLanguage.autostart
212200
case"autostop":
213-
return{
214-
color:theme.palette.secondary.dark,
215-
initiatedBy:DisplayWorkspaceBuildInitiatedByLanguage.autostop,
216-
}
201+
returnDisplayWorkspaceBuildInitiatedByLanguage.autostop
217202
}
218203
}
219204

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp