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

Commitae20df4

Browse files
refactor(site): remove version and last built from workspace header (#10495)
1 parentd2b8a93 commitae20df4

File tree

4 files changed

+16
-41
lines changed

4 files changed

+16
-41
lines changed

‎site/src/components/Stats/Stats.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{typeCSSObject,typeInterpolation,typeTheme}from"@emotion/react";
22
importBoxfrom"@mui/material/Box";
3-
import{typeComponentProps,typeFC}from"react";
3+
import{ReactNode,typeComponentProps,typeFC}from"react";
44

55
exportconstStats:FC<ComponentProps<typeofBox>>=(props)=>{
66
return<Box{...props}css={styles.stats}/>;
@@ -9,7 +9,7 @@ export const Stats: FC<ComponentProps<typeof Box>> = (props) => {
99
exportconstStatsItem:FC<
1010
{
1111
label:string;
12-
value:string|number|JSX.Element;
12+
value:ReactNode;
1313
}&ComponentProps<typeofBox>
1414
>=({ label, value, ...divProps})=>{
1515
return(

‎site/src/components/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const Language = {
2020
outdatedLabel:"Outdated",
2121
versionTooltipText:
2222
"This workspace version is outdated and a newer version is available.",
23-
updateVersionLabel:"Update version",
23+
updateVersionLabel:"Update",
2424
};
2525

2626
interfaceTooltipProps{

‎site/src/pages/WorkspacePage/BuildRow.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ export const BuildRow: React.FC<BuildRowProps> = ({ build }) => {
5858
</span>
5959
</Stack>
6060

61-
<Stackdirection="row"spacing={1}>
61+
<Stack
62+
direction="row"
63+
spacing={1}
64+
css={{"& strong":{fontWeight:600}}}
65+
>
6266
<spancss={styles.buildInfo}>
6367
Reason:<strong>{build.reason}</strong>
6468
</span>
@@ -94,6 +98,9 @@ const styles = {
9498
buildSummary:(theme)=>({
9599
...(theme.typography.body1asCSSObject),
96100
fontFamily:"inherit",
101+
"& strong":{
102+
fontWeight:600,
103+
},
97104
}),
98105

99106
buildInfo:(theme)=>({

‎site/src/pages/WorkspacePage/WorkspaceStats.tsx

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import Link from "@mui/material/Link";
44
import{WorkspaceOutdatedTooltip}from"components/WorkspaceOutdatedTooltip/WorkspaceOutdatedTooltip";
55
import{typeFC}from"react";
66
import{LinkasRouterLink}from"react-router-dom";
7-
import{createDayString}from"utils/createDayString";
87
import{
9-
getDisplayWorkspaceBuildInitiatedBy,
108
getDisplayWorkspaceTemplateName,
119
isWorkspaceOn,
1210
workspaceUpdatePolicy,
@@ -38,12 +36,6 @@ import { Stack } from "components/Stack/Stack";
3836
constLanguage={
3937
workspaceDetails:"Workspace Details",
4038
templateLabel:"Template",
41-
statusLabel:"Workspace Status",
42-
versionLabel:"Version",
43-
lastBuiltLabel:"Last built",
44-
outdated:"Outdated",
45-
upToDate:"Up to date",
46-
byLabel:"Last built by",
4739
costLabel:"Daily cost",
4840
updatePolicy:"Update policy",
4941
};
@@ -72,9 +64,6 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
7264
onDeadlinePlus,
7365
})=>{
7466
consttheme=useTheme();
75-
constinitiatedBy=getDisplayWorkspaceBuildInitiatedBy(
76-
workspace.latest_build,
77-
);
7867
constdisplayTemplateName=getDisplayWorkspaceTemplateName(workspace);
7968
constdeadlinePlusEnabled=maxDeadlineIncrease>=1;
8069
constdeadlineMinusEnabled=maxDeadlineDecrease>=1;
@@ -103,24 +92,12 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
10392
css={styles.statsItem}
10493
label={Language.templateLabel}
10594
value={
106-
<Link
107-
component={RouterLink}
108-
to={`/templates/${workspace.template_name}`}
109-
>
110-
{displayTemplateName}
111-
</Link>
112-
}
113-
/>
114-
<StatsItem
115-
css={styles.statsItem}
116-
label={Language.versionLabel}
117-
value={
118-
<>
95+
<divcss={{display:"flex",alignItems:"center",gap:2}}>
11996
<Link
12097
component={RouterLink}
121-
to={`/templates/${workspace.template_name}/versions/${workspace.latest_build.template_version_name}`}
98+
to={`/templates/${workspace.template_name}`}
12299
>
123-
{workspace.latest_build.template_version_name}
100+
{displayTemplateName}
124101
</Link>
125102

126103
{workspace.outdated&&(
@@ -131,19 +108,10 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
131108
ariaLabel="update version"
132109
/>
133110
)}
134-
</>
135-
}
136-
/>
137-
<StatsItem
138-
css={styles.statsItem}
139-
label={Language.lastBuiltLabel}
140-
value={
141-
<>
142-
{upperFirst(createDayString(workspace.latest_build.created_at))}{" "}
143-
by{initiatedBy}
144-
</>
111+
</div>
145112
}
146113
/>
114+
147115
{shouldDisplayScheduleLabel(workspace)&&(
148116
<StatsItem
149117
css={styles.statsItem}

0 commit comments

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