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

Commit00ebe2e

Browse files
committed
Fix template version editor overflow
1 parent9fe9d4c commit00ebe2e

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

‎site/src/components/DeploymentBanner/DeploymentBannerView.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import dayjs from "dayjs"
2020
importCollectedIconfrom"@material-ui/icons/Compare"
2121
importRefreshIconfrom"@material-ui/icons/Refresh"
2222

23+
exportconstbannerHeight=36
24+
2325
exportinterfaceDeploymentBannerViewProps{
2426
fetchStats?:()=>void
2527
stats?:DeploymentStats
@@ -250,6 +252,7 @@ const useStyles = makeStyles((theme) => ({
250252
},
251253
container:{
252254
position:"sticky",
255+
height:bannerHeight,
253256
bottom:0,
254257
zIndex:1,
255258
padding:theme.spacing(1,2),

‎site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
}from"api/typesGenerated"
1414
import{Avatar}from"components/Avatar/Avatar"
1515
import{AvatarData}from"components/AvatarData/AvatarData"
16+
import{bannerHeight}from"components/DeploymentBanner/DeploymentBannerView"
1617
import{TemplateResourcesTable}from"components/TemplateResourcesTable/TemplateResourcesTable"
1718
import{WorkspaceBuildLogs}from"components/WorkspaceBuildLogs/WorkspaceBuildLogs"
1819
import{FC,useCallback,useEffect,useRef,useState}from"react"
@@ -44,6 +45,7 @@ export interface TemplateVersionEditorProps {
4445
defaultFileTree:FileTree
4546
buildLogs?:ProvisionerJobLog[]
4647
resources?:WorkspaceResource[]
48+
deploymentBannerVisible?:boolean
4749
disablePreview:boolean
4850
disableUpdate:boolean
4951
onPreview:(files:FileTree)=>void
@@ -68,6 +70,7 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
6870
disablePreview,
6971
disableUpdate,
7072
template,
73+
deploymentBannerVisible,
7174
templateVersion,
7275
defaultFileTree,
7376
onPreview,
@@ -146,6 +149,7 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
146149
conststyles=useStyles({
147150
templateVersionSucceeded,
148151
showBuildLogs,
152+
deploymentBannerVisible,
149153
})
150154

151155
return(
@@ -385,10 +389,14 @@ const useStyles = makeStyles<
385389
{
386390
templateVersionSucceeded:boolean
387391
showBuildLogs:boolean
392+
deploymentBannerVisible:boolean
388393
}
389394
>((theme)=>({
390395
root:{
391-
height:`calc(100vh -${navHeight}px)`,
396+
height:(props)=>
397+
`calc(100vh -${
398+
navHeight+(props.deploymentBannerVisible ?bannerHeight :0)
399+
}px)`,
392400
background:theme.palette.background.default,
393401
flex:1,
394402
display:"flex",

‎site/src/pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import{useMachine}from"@xstate/react"
22
import{TemplateVersionEditor}from"components/TemplateVersionEditor/TemplateVersionEditor"
33
import{useOrganizationId}from"hooks/useOrganizationId"
4+
import{usePermissions}from"hooks/usePermissions"
45
import{FC}from"react"
56
import{Helmet}from"react-helmet-async"
67
import{useParams}from"react-router-dom"
@@ -19,6 +20,7 @@ export const TemplateVersionEditorPage: FC = () => {
1920
const[editorState,sendEvent]=useMachine(templateVersionEditorMachine,{
2021
context:{ orgId},
2122
})
23+
constpermissions=usePermissions()
2224
const{ isSuccess, data}=useTemplateVersionData(
2325
{
2426
orgId,
@@ -41,6 +43,7 @@ export const TemplateVersionEditorPage: FC = () => {
4143
{isSuccess&&(
4244
<TemplateVersionEditor
4345
template={data.template}
46+
deploymentBannerVisible={permissions.viewDeploymentStats}
4447
templateVersion={editorState.context.version||data.version}
4548
defaultFileTree={data.fileTree}
4649
onPreview={(fileTree)=>{

0 commit comments

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