Skip to content

[Improvement-17874][ApiServer] Remove the default value of expireTime and let the user choose the time #17907

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

Open
njnu-seafish wants to merge 3 commits into
base: dev
Choose a base branch
from
+7 −7
Open

[Improvement-17874][ApiServer] Remove the default value of expireTime and let the user choose the time #17907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ae8863
remove expireTime default value
Jan 27, 2026
942910a
update expireTime type
Jan 28, 2026
8bfdb4d
set expireTime default value = null
Jan 28, 2026
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
4 changes: 2 additions & 2 deletions dolphinscheduler-ui/src/views/security/token-manage/components/token-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const TokenModal = defineComponent({
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
: null
variables.model.expireTime = Date.now()
variables.model.expireTime = null
variables.model.token = ''
} else {
variables.model.userId = props.row.userId
Expand Down Expand Up @@ -110,7 +110,7 @@ const TokenModal = defineComponent({
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
: null
variables.model.expireTime = Date.now()
variables.model.expireTime = null
variables.model.token = ''
} else {
variables.model.id = props.row.id
Expand Down
10 changes: 5 additions & 5 deletions dolphinscheduler-ui/src/views/security/token-manage/components/use-modal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function useModal(
? (userStore.getUserInfo as UserInfoRes).id
: null
),
expireTime: ref(Date.now()),
expireTime: null as number | Date | null,
Copy link
Member

@SbloodyS SbloodyS Jan 29, 2026

Choose a reason for hiding this comment

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

expireTime should not be number

Copy link
Contributor Author

@njnu-seafish njnu-seafish Jan 29, 2026

Choose a reason for hiding this comment

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

expireTime should not be number
dolphinscheduler-ui/src/views/security/token-manage/components/token-modal.tsx
variables.model.expireTime = new Date(props.row.expireTime).getTime()

token: ref(''),
generalOptions: []
},
Expand Down Expand Up @@ -101,7 +101,7 @@ export function useModal(
const getToken = () => {
const data = {
userId: (userStore.getUserInfo as UserInfoRes).id,
expireTime: format(variables.model.expireTime, 'yyyy-MM-dd HH:mm:ss')
expireTime: format(variables.model.expireTime!, 'yyyy-MM-dd HH:mm:ss')
}

useAsyncState(
Expand Down Expand Up @@ -129,7 +129,7 @@ export function useModal(
const submitTokenModal = () => {
const data = {
userId: Number(variables.model.userId),
expireTime: format(variables.model.expireTime, 'yyyy-MM-dd HH:mm:ss'),
expireTime: format(variables.model.expireTime!, 'yyyy-MM-dd HH:mm:ss'),
token: variables.model.token
}

Expand All @@ -138,7 +138,7 @@ export function useModal(
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
: null
variables.model.expireTime = Date.now()
variables.model.expireTime = null
variables.model.token = ''
ctx.emit('confirmModal', props.showModalRef)
})
Expand All @@ -148,7 +148,7 @@ export function useModal(
const data = {
id: variables.model.id,
userId: Number(variables.model.userId),
expireTime: format(variables.model.expireTime, 'yyyy-MM-dd HH:mm:ss'),
expireTime: format(variables.model.expireTime!, 'yyyy-MM-dd HH:mm:ss'),
token: variables.model.token
}

Expand Down