Skip to content

feat(site): add ability to create tokens from account tokens page #6608

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 16, 2023
Merged

feat(site): add ability to create tokens from account tokens page #6608

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
379210f
add token actions
Kira-Pilot Mar 8, 2023
ac26fd4
added basic token form
Kira-Pilot Mar 9, 2023
482f230
removed token switch
Kira-Pilot Mar 10, 2023
a11b252
refined date field
Kira-Pilot Mar 14, 2023
f0620fe
limiting lifetime days to maxTokenLifetime
Kira-Pilot Mar 14, 2023
c3c03bf
broke apart files
Kira-Pilot Mar 14, 2023
6f204f9
added loader and error
Kira-Pilot Mar 14, 2023
a3dad5a
Merge remote-tracking branch 'origin/main' into create-token-ui/kira-…
Kira-Pilot Mar 15, 2023
0bd2c2c
fixed form layout
Kira-Pilot Mar 15, 2023
9a5e609
added some unit tests
Kira-Pilot Mar 15, 2023
7f049cc
fixed be tests
Kira-Pilot Mar 15, 2023
2811d66
no authorize check
Kira-Pilot Mar 15, 2023
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
Prev Previous commit
Next Next commit
fixed form layout
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed Mar 15, 2023
commit 0bd2c2c716481870d996f26a94121b6119f61e09
8 changes: 7 additions & 1 deletion site/src/components/Form/Form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export const FormSection: FC<
description: string | JSX.Element
classes?: {
root?: string
sectionInfo?: string
infoTitle?: string
}
}
Expand All @@ -73,7 +74,12 @@ export const FormSection: FC<

return (
<div className={combineClasses([styles.formSection, classes.root])}>
<div className={styles.formSectionInfo}>
<div
className={combineClasses([
classes.sectionInfo,
styles.formSectionInfo,
])}
>
<h2
className={combineClasses([
styles.formSectionInfoTitle,
Expand Down
111 changes: 59 additions & 52 deletions site/src/pages/CreateTokenPage/CreateTokenForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
import { FormikContextType } from "formik"
import dayjs from "dayjs"
import { useNavigate } from "react-router-dom"
import { Stack } from "components/Stack/Stack"

interface CreateTokenFormProps {
form: FormikContextType<CreateTokenData>
Expand Down Expand Up @@ -64,6 +65,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
<FormSection
title={t("createToken.nameSection.title")}
description={t("createToken.nameSection.description")}
classes={{ sectionInfo: styles.formSectionInfo }}
>
<FormFields>
<TextField
Expand All @@ -72,6 +74,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
required
onChange={onChangeTrimmed(form, () => setFormError(undefined))}
autoFocus
fullWidth
variant="outlined"
/>
</FormFields>
Expand All @@ -88,63 +91,67 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
})
: t("createToken.lifetimeSection.emptyDescription")
}
classes={{ sectionInfo: styles.formSectionInfo }}
>
<FormFields>
<TextField
select
label={t("createToken.fields.lifetime")}
required
defaultValue={determineDefaultLtValue(maxTokenLifetime)}
onChange={(event) => {
void setLifetimeDays(event.target.value)
}}
InputLabelProps={{
shrink: true,
}}
>
{filterByMaxTokenLifetime(lifetimeDayPresets, maxTokenLifetime).map(
(lt) => (
<MenuItem key={lt.label} value={lt.value}>
{lt.label}
</MenuItem>
),
)}
<MenuItem
key={customLifetimeDay.label}
value={customLifetimeDay.value}
>
{customLifetimeDay.label}
</MenuItem>
</TextField>
</FormFields>
<FormFields>
{lifetimeDays === "custom" && (
<Stack direction="row">
<TextField
type="date"
label={t("createToken.lifetimeSection.expiresOn")}
defaultValue={dayjs().add(expDays, "day").format("YYYY-MM-DD")}
select
label={t("createToken.fields.lifetime")}
required
defaultValue={determineDefaultLtValue(maxTokenLifetime)}
onChange={(event) => {
const lt = Math.ceil(
dayjs(event.target.value).diff(dayjs(), "day", true),
)
setExpDays(lt)
}}
inputProps={{
min: dayjs().add(1, "day").format("YYYY-MM-DD"),
max: maxTokenLifetime
? dayjs()
.add(maxTokenLifetime / NANO_HOUR / 24, "day")
.format("YYYY-MM-DD")
: undefined,
required: true,
void setLifetimeDays(event.target.value)
}}
fullWidth
InputLabelProps={{
shrink: true,
required: true,
}}
className={styles.expField}
/>
)}
>
{filterByMaxTokenLifetime(
lifetimeDayPresets,
maxTokenLifetime,
).map((lt) => (
<MenuItem key={lt.label} value={lt.value}>
{lt.label}
</MenuItem>
))}
<MenuItem
key={customLifetimeDay.label}
value={customLifetimeDay.value}
>
{customLifetimeDay.label}
</MenuItem>
</TextField>

{lifetimeDays === "custom" && (
<TextField
type="date"
label={t("createToken.lifetimeSection.expiresOn")}
defaultValue={dayjs().add(expDays, "day").format("YYYY-MM-DD")}
onChange={(event) => {
const lt = Math.ceil(
dayjs(event.target.value).diff(dayjs(), "day", true),
)
setExpDays(lt)
}}
inputProps={{
min: dayjs().add(1, "day").format("YYYY-MM-DD"),
max: maxTokenLifetime
? dayjs()
.add(maxTokenLifetime / NANO_HOUR / 24, "day")
.format("YYYY-MM-DD")
: undefined,
required: true,
}}
fullWidth
InputLabelProps={{
shrink: true,
required: true,
}}
/>
)}
</Stack>
</FormFields>
</FormSection>
<FormFooter
Expand All @@ -160,8 +167,8 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
)
}

const useStyles = makeStyles((theme) => ({
expField: {
marginLeft: theme.spacing(2),
const useStyles = makeStyles(() => ({
formSectionInfo: {
minWidth: "300px",
},
}))