@@ -21,6 +21,7 @@ import {
21
21
import { FormikContextType } from "formik"
22
22
import dayjs from "dayjs"
23
23
import { useNavigate } from "react-router-dom"
24
+ import { Stack } from "components/Stack/Stack"
24
25
25
26
interface CreateTokenFormProps {
26
27
form : FormikContextType < CreateTokenData >
@@ -64,6 +65,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
64
65
< FormSection
65
66
title = { t ( "createToken.nameSection.title" ) }
66
67
description = { t ( "createToken.nameSection.description" ) }
68
+ classes = { { sectionInfo : styles . formSectionInfo } }
67
69
>
68
70
< FormFields >
69
71
< TextField
@@ -72,6 +74,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
72
74
required
73
75
onChange = { onChangeTrimmed ( form , ( ) => setFormError ( undefined ) ) }
74
76
autoFocus
77
+ fullWidth
75
78
variant = "outlined"
76
79
/>
77
80
</ FormFields >
@@ -88,63 +91,67 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
88
91
} )
89
92
: t ( "createToken.lifetimeSection.emptyDescription" )
90
93
}
94
+ classes = { { sectionInfo : styles . formSectionInfo } }
91
95
>
92
96
< FormFields >
93
- < TextField
94
- select
95
- label = { t ( "createToken.fields.lifetime" ) }
96
- required
97
- defaultValue = { determineDefaultLtValue ( maxTokenLifetime ) }
98
- onChange = { ( event ) => {
99
- void setLifetimeDays ( event . target . value )
100
- } }
101
- InputLabelProps = { {
102
- shrink : true ,
103
- } }
104
- >
105
- { filterByMaxTokenLifetime ( lifetimeDayPresets , maxTokenLifetime ) . map (
106
- ( lt ) => (
107
- < MenuItem key = { lt . label } value = { lt . value } >
108
- { lt . label }
109
- </ MenuItem >
110
- ) ,
111
- ) }
112
- < MenuItem
113
- key = { customLifetimeDay . label }
114
- value = { customLifetimeDay . value }
115
- >
116
- { customLifetimeDay . label }
117
- </ MenuItem >
118
- </ TextField >
119
- </ FormFields >
120
- < FormFields >
121
- { lifetimeDays === "custom" && (
97
+ < Stack direction = "row" >
122
98
< TextField
123
- type = "date"
124
- label = { t ( "createToken.lifetimeSection.expiresOn" ) }
125
- defaultValue = { dayjs ( ) . add ( expDays , "day" ) . format ( "YYYY-MM-DD" ) }
99
+ select
100
+ label = { t ( "createToken.fields.lifetime" ) }
101
+ required
102
+ defaultValue = { determineDefaultLtValue ( maxTokenLifetime ) }
126
103
onChange = { ( event ) => {
127
- const lt = Math . ceil (
128
- dayjs ( event . target . value ) . diff ( dayjs ( ) , "day" , true ) ,
129
- )
130
- setExpDays ( lt )
131
- } }
132
- inputProps = { {
133
- min : dayjs ( ) . add ( 1 , "day" ) . format ( "YYYY-MM-DD" ) ,
134
- max : maxTokenLifetime
135
- ? dayjs ( )
136
- . add ( maxTokenLifetime / NANO_HOUR / 24 , "day" )
137
- . format ( "YYYY-MM-DD" )
138
- : undefined ,
139
- required : true ,
104
+ void setLifetimeDays ( event . target . value )
140
105
} }
106
+ fullWidth
141
107
InputLabelProps = { {
142
108
shrink : true ,
143
- required : true ,
144
109
} }
145
- className = { styles . expField }
146
- />
147
- ) }
110
+ >
111
+ { filterByMaxTokenLifetime (
112
+ lifetimeDayPresets ,
113
+ maxTokenLifetime ,
114
+ ) . map ( ( lt ) => (
115
+ < MenuItem key = { lt . label } value = { lt . value } >
116
+ { lt . label }
117
+ </ MenuItem >
118
+ ) ) }
119
+ < MenuItem
120
+ key = { customLifetimeDay . label }
121
+ value = { customLifetimeDay . value }
122
+ >
123
+ { customLifetimeDay . label }
124
+ </ MenuItem >
125
+ </ TextField >
126
+
127
+ { lifetimeDays === "custom" && (
128
+ < TextField
129
+ type = "date"
130
+ label = { t ( "createToken.lifetimeSection.expiresOn" ) }
131
+ defaultValue = { dayjs ( ) . add ( expDays , "day" ) . format ( "YYYY-MM-DD" ) }
132
+ onChange = { ( event ) => {
133
+ const lt = Math . ceil (
134
+ dayjs ( event . target . value ) . diff ( dayjs ( ) , "day" , true ) ,
135
+ )
136
+ setExpDays ( lt )
137
+ } }
138
+ inputProps = { {
139
+ min : dayjs ( ) . add ( 1 , "day" ) . format ( "YYYY-MM-DD" ) ,
140
+ max : maxTokenLifetime
141
+ ? dayjs ( )
142
+ . add ( maxTokenLifetime / NANO_HOUR / 24 , "day" )
143
+ . format ( "YYYY-MM-DD" )
144
+ : undefined ,
145
+ required : true ,
146
+ } }
147
+ fullWidth
148
+ InputLabelProps = { {
149
+ shrink : true ,
150
+ required : true ,
151
+ } }
152
+ />
153
+ ) }
154
+ </ Stack >
148
155
</ FormFields >
149
156
</ FormSection >
150
157
< FormFooter
@@ -160,8 +167,8 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
160
167
)
161
168
}
162
169
163
- const useStyles = makeStyles ( ( theme ) => ( {
164
- expField : {
165
- marginLeft : theme . spacing ( 2 ) ,
170
+ const useStyles = makeStyles ( ( ) => ( {
171
+ formSectionInfo : {
172
+ minWidth : "300px" ,
166
173
} ,
167
174
} ) )
0 commit comments