Skip to content
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

fix: アプリケーション登録画面で、登録処理中にボタンを押せないように #935

Merged
merged 4 commits into from
Jul 15, 2024
Merged

fix: アプリケーション登録画面で、登録処理中にボタンを押せないように #935

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6c6cd2
fix: アプリケーション登録画面で、登録処理中にボタンを押せないように
cp-20 Jul 8, 2024
97a9cd7
chore: 拡張性のためにエラーハンドリングを追加
cp-20 Jul 8, 2024
b2a233d
fmt
cp-20 Jul 8, 2024
870050c
Merge branch 'main' into fix/application-creation-submitting-disabled
cp-20 Jul 15, 2024
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
16 changes: 12 additions & 4 deletions dashboard/src/pages/apps/new.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ const WebsiteStep: Component<{
backToGeneralStep: () => void
submit: () => Promise<void>
}> = (props) => {
const [isSubmitting, setIsSubmitting] = createSignal(false)
const addWebsiteForm = () => {
const form = createFormStore<WebsiteFormStatus>({
initialValues: {
Expand All @@ -437,9 +438,16 @@ const WebsiteStep: Component<{
}

const handleSubmit = async () => {
const isValid = (await Promise.all(props.websiteForms().map((form) => validate(form)))).every((v) => v)
if (!isValid) return
await props.submit()
try {
const isValid = (await Promise.all(props.websiteForms().map((form) => validate(form)))).every((v) => v)
if (!isValid) return
setIsSubmitting(true)
await props.submit()
} catch (err) {
console.error(err)
} finally {
setIsSubmitting(false)
}
}

return (
Expand Down Expand Up @@ -500,6 +508,7 @@ const WebsiteStep: Component<{
size="medium"
variants="primary"
onClick={handleSubmit}
disabled={isSubmitting()}
// TODO: hostが空の状態でsubmitして一度requiredエラーが出たあとhostを入力してもエラーが消えない
// disabled={props.websiteForms().some((form) => form.invalid)}
>
Expand Down Expand Up @@ -589,7 +598,6 @@ export default () => {
setCurrentStep(formStep.repository)
// 選択していたリポジトリをリセットする
setParam({ repositoryID: undefined })
mutateRepo(undefined)
Copy link
Contributor

Choose a reason for hiding this comment

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

確かにこの部分いらなかったですね、削除感謝です 🙏

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(何もしてない気がするので、Linterが消した気がする……w)

}
const GoToGeneralStep = () => {
setCurrentStep(formStep.general)
Expand Down
Loading