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
added some unit tests
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed Mar 15, 2023
commit 9a5e6095d6d0883ed7944bd9ac684a30e0a47c1c
6 changes: 1 addition & 5 deletions site/src/pages/CreateTokenPage/CreateTokenForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
CreateTokenData,
determineDefaultLtValue,
filterByMaxTokenLifetime,
lifetimeDayPresets,
customLifetimeDay,
} from "./utils"
import { FormikContextType } from "formik"
Expand Down Expand Up @@ -108,10 +107,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
shrink: true,
}}
>
{filterByMaxTokenLifetime(
lifetimeDayPresets,
maxTokenLifetime,
).map((lt) => (
{filterByMaxTokenLifetime(maxTokenLifetime).map((lt) => (
<MenuItem key={lt.label} value={lt.value}>
{lt.label}
</MenuItem>
Expand Down
75 changes: 75 additions & 0 deletions site/src/pages/CreateTokenPage/utils.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import {
filterByMaxTokenLifetime,
determineDefaultLtValue,
lifetimeDayPresets,
LifetimeDay,
NANO_HOUR,
} from "./utils"

describe("unit/CreateTokenForm", () => {
describe("filterByMaxTokenLifetime", () => {
it.each<{
maxTokenLifetime: number
expected: LifetimeDay[]
}>([
{
maxTokenLifetime: 0,
expected: lifetimeDayPresets,
},
{ maxTokenLifetime: 6 * 24 * NANO_HOUR, expected: [] },
{
maxTokenLifetime: 20 * 24 * NANO_HOUR,
expected: [lifetimeDayPresets[0]],
},
{
maxTokenLifetime: 40 * 24 * NANO_HOUR,
expected: [lifetimeDayPresets[0], lifetimeDayPresets[1]],
},
{
maxTokenLifetime: 70 * 24 * NANO_HOUR,
expected: [
lifetimeDayPresets[0],
lifetimeDayPresets[1],
lifetimeDayPresets[2],
],
},
{
maxTokenLifetime: 100 * 24 * NANO_HOUR,
expected: lifetimeDayPresets,
},
])(
`filterByMaxTokenLifetime($maxTokenLifetime)`,
({ maxTokenLifetime, expected }) => {
expect(filterByMaxTokenLifetime(maxTokenLifetime)).toEqual(expected)
},
)
})
describe("determineDefaultLtValue", () => {
it.each<{
maxTokenLifetime: number
expected: string | number
}>([
{
maxTokenLifetime: 0,
expected: 30,
},
{
maxTokenLifetime: 60 * 24 * NANO_HOUR,
expected: 30,
},
{
maxTokenLifetime: 20 * 24 * NANO_HOUR,
expected: 7,
},
{
maxTokenLifetime: 2 * 24 * NANO_HOUR,
expected: "custom",
},
])(
`determineDefaultLtValue($maxTokenLifetime)`,
({ maxTokenLifetime, expected }) => {
expect(determineDefaultLtValue(maxTokenLifetime)).toEqual(expected)
},
)
})
})
16 changes: 7 additions & 9 deletions site/src/pages/CreateTokenPage/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface CreateTokenData {
lifetime: number
}

interface LifetimeDay {
export interface LifetimeDay {
label: string
value: number | string
}
Expand Down Expand Up @@ -37,25 +37,23 @@ export const customLifetimeDay: LifetimeDay = {
}

export const filterByMaxTokenLifetime = (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will write some unit tests for these helper functions

ltArr: LifetimeDay[],
maxTokenLifetime?: number,
): LifetimeDay[] => {
// if maxTokenLifetime hasn't been set, return the full array of options
if (!maxTokenLifetime) {
return ltArr
return lifetimeDayPresets
}

// otherwise only return options that are less than or equal to the max lifetime
return ltArr.filter(
return lifetimeDayPresets.filter(
(lifetime) => lifetime.value <= maxTokenLifetime / NANO_HOUR / 24,
)
}

export const determineDefaultLtValue = (maxTokenLifetime?: number) => {
const filteredArr = filterByMaxTokenLifetime(
lifetimeDayPresets,
maxTokenLifetime,
)
export const determineDefaultLtValue = (
maxTokenLifetime?: number,
): string | number => {
const filteredArr = filterByMaxTokenLifetime(maxTokenLifetime)

// default to a lifetime of 30 days if within the maxTokenLifetime
const thirtyDayDefault = filteredArr.find((lt) => lt.value === 30)
Expand Down