isValidOptionalUrlを追加

traPtitech · Jan 8, 2024 · 8eda3f6 · 8eda3f6
1 parent 7820569
commit 8eda3f6
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/src/pages/ContestEdit.vue b/src/pages/ContestEdit.vue
@@ -12,7 +12,11 @@ import { computed, ref } from 'vue'
 import LabeledForm from '/@/components/Form/LabeledForm.vue'
 import DeleteForm from '/@/components/Form/DeleteForm.vue'
 import FormDuration from '/@/components/UI/FormDuration.vue'
-import { isValidDuration, isValidLength, isValidUrl } from '/@/use/validate'
+import {
+  isValidDuration,
+  isValidLength,
+  isValidOptionalUrl
+} from '/@/use/validate'
 import useModal from '/@/components/UI/composables/useModal'
 import ConfirmModal from '/@/components/UI/ConfirmModal.vue'
 import { useContestStore } from '/@/store/contest'
@@ -42,7 +46,7 @@ const canSubmit = computed(
     !isSending.value &&
     isValidLength(formValues.value.name, 1, 32) &&
     isValidDuration(formValues.value.duration) &&
-    (formValues.value.link !== '' ? isValidUrl(formValues.value.link) : true) &&
+    isValidOptionalUrl(formValues.value.link) &&
     isValidLength(formValues.value.description, 1, 256)
 )
 

diff --git a/src/pages/ContestNew.vue b/src/pages/ContestNew.vue
@@ -9,7 +9,7 @@ import LabeledForm from '/@/components/Form/LabeledForm.vue'
 import FormInput from '/@/components/UI/FormInput.vue'
 import FormTextArea from '/@/components/UI/FormTextArea.vue'
 import FormDuration from '/@/components/UI/FormDuration.vue'
-import { isValidDuration, isValidLength, isValidUrl } from '/@/use/validate'
+import { isValidDuration, isValidLength, isValidOptionalUrl} from '/@/use/validate'
 import { useToast } from 'vue-toastification'
 import { useContestStore } from '/@/store/contest'
 
@@ -31,7 +31,7 @@ const canSubmit = computed(
   () =>
     !isSending.value &&
     isValidLength(formValues.name, 1, 32) &&
-    (formValues.link !== '' ? isValidUrl(formValues.link) : true) &&
+    isValidOptionalUrl(formValues.link) &&
     isValidDuration(formValues.duration) &&
     isValidLength(formValues.description, 1, 256)
 )

diff --git a/src/pages/ContestTeamEdit.vue b/src/pages/ContestTeamEdit.vue
@@ -12,7 +12,7 @@ import FormInput from '/@/components/UI/FormInput.vue'
 import { computed, ref } from 'vue'
 import LabeledForm from '/@/components/Form/LabeledForm.vue'
 import DeleteForm from '/@/components/Form/DeleteForm.vue'
-import { isValidLength, isValidUrl } from '/@/use/validate'
+import { isValidLength, isValidOptionalUrl } from '/@/use/validate'
 import useModal from '/@/components/UI/composables/useModal'
 import ConfirmModal from '/@/components/UI/ConfirmModal.vue'
 import { useToast } from 'vue-toastification'
@@ -42,7 +42,7 @@ const canSubmit = computed(
     !isSending.value &&
     isValidLength(formValues.value.name, 1, 32) &&
     isValidLength(formValues.value.result, 0, 32) &&
-    (formValues.value.link !== '' ? isValidUrl(formValues.value.link) : true) &&
+    isValidOptionalUrl(formValues.value.link) &&
     isValidLength(formValues.value.description, 1, 256) &&
     members.value.length > 0
 )

diff --git a/src/pages/ContestTeamNew.vue b/src/pages/ContestTeamNew.vue
@@ -11,7 +11,7 @@ import FormTextArea from '/@/components/UI/FormTextArea.vue'
 import FormInput from '/@/components/UI/FormInput.vue'
 import { computed, ref } from 'vue'
 import LabeledForm from '/@/components/Form/LabeledForm.vue'
-import { isValidLength, isValidUrl } from '/@/use/validate'
+import { isValidLength, isValidOptionalUrl } from '/@/use/validate'
 import { useToast } from 'vue-toastification'
 import { useUserStore } from '/@/store/user'
 
@@ -38,7 +38,7 @@ const canSubmit = computed(
     !isSending.value &&
     isValidLength(formValues.value.name, 1, 32) &&
     isValidLength(formValues.value.result, 0, 32) &&
-    (formValues.value.link !== '' ? isValidUrl(formValues.value.link) : true) &&
+    isValidOptionalUrl(formValues.value.link) &&
     isValidLength(formValues.value.description, 1, 256) &&
     members.value.length > 0
 )

diff --git a/src/pages/Project.vue b/src/pages/Project.vue
@@ -13,7 +13,7 @@ import LabeledForm from '/@/components/Form/LabeledForm.vue'
 import DeleteForm from '/@/components/Form/DeleteForm.vue'
 import {
   isValidLength,
-  isValidUrl,
+  isValidOptionalUrl,
   isValidYearWithSemesterDuration
 } from '/@/use/validate'
 import { useToast } from 'vue-toastification'
@@ -47,7 +47,7 @@ const canSubmit = computed(
     !isSending.value &&
     isValidLength(formValues.value.name, 1, 32) &&
     isValidYearWithSemesterDuration(formValues.value.duration) &&
-    (formValues.value.link !== '' ? isValidUrl(formValues.value.link) : true) &&
+    isValidOptionalUrl(formValues.value.link) &&
     isValidLength(formValues.value.description, 1, 256) &&
     members.value.every(member =>
       isValidYearWithSemesterDuration(member.duration)

diff --git a/src/pages/ProjectNew.vue b/src/pages/ProjectNew.vue
@@ -18,7 +18,7 @@ import ProjectMember from '/@/components/Projects/ProjectMember.vue'
 import { useUserStore } from '/@/store/user'
 import {
   isValidLength,
-  isValidUrl,
+  isValidOptionalUrl,
   isValidYearWithSemesterDuration
 } from '/@/use/validate'
 import { useProjectStore } from '/@/store/project'
@@ -69,7 +69,7 @@ const canSubmit = computed(
   () =>
     !isSending.value &&
     isValidLength(formValues.name, 1, 32) &&
-    (formValues.link !== '' ? isValidUrl(formValues.link) : true) &&
+    isValidOptionalUrl(formValues.link) &&
     isValidYearWithSemesterDuration(formValues.duration) &&
     isValidLength(formValues.description, 1, 256) &&
     isValidYearWithSemesterDuration(formValues.duration) &&

diff --git a/src/use/validate.ts b/src/use/validate.ts
@@ -16,6 +16,11 @@ export const isValidUrl = (link: string) => {
   return url.protocol === 'http:' || url.protocol === 'https:'
 }
 
+export const isValidOptionalUrl = (link: string) => {
+  if (link === '') return true
+  return isValidUrl(link)
+}
+
 export const isValidDuration = (duration: Duration) => {
   if (duration.since && duration.until) {
     return duration.since <= duration.until