From 8c89a5d460a22f5b989e642f222dd907b2c4a37f Mon Sep 17 00:00:00 2001 From: Stuart Date: Thu, 27 Apr 2023 20:02:04 +0100 Subject: [PATCH] Add a message to the changelog validation rules (#1201) --- frontend/src/components/MarkdownEditor.client.vue | 3 ++- frontend/src/components/MarkdownEditor.server.vue | 1 + .../src/pages/[user]/[project]/versions/[version]/index.vue | 2 ++ frontend/src/pages/[user]/[project]/versions/new.vue | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/MarkdownEditor.client.vue b/frontend/src/components/MarkdownEditor.client.vue index ccede755b..ac18151de 100644 --- a/frontend/src/components/MarkdownEditor.client.vue +++ b/frontend/src/components/MarkdownEditor.client.vue @@ -24,6 +24,7 @@ const props = withDefaults( rules?: ValidationRule[]; noPaddingTop?: boolean; maxHeight?: string; + label?: string; }>(), { maxlength: 30_000, @@ -52,7 +53,7 @@ const internalEditing = computed({ }); const errorMessages = computed(() => props.errorMessages); -const { v, errors } = useValidation(undefined, props.rules, rawEdited, errorMessages); +const { v, errors } = useValidation(props.label, props.rules, rawEdited, errorMessages); if (process.client && props.editing) { onMounted(startEditing); diff --git a/frontend/src/components/MarkdownEditor.server.vue b/frontend/src/components/MarkdownEditor.server.vue index 1f5f2a964..6aae3d4d9 100644 --- a/frontend/src/components/MarkdownEditor.server.vue +++ b/frontend/src/components/MarkdownEditor.server.vue @@ -15,6 +15,7 @@ const props = withDefaults( rules?: ValidationRule[]; noPaddingTop?: boolean; maxHeight?: string; + label?: string; }>(), { maxlength: 30_000, diff --git a/frontend/src/pages/[user]/[project]/versions/[version]/index.vue b/frontend/src/pages/[user]/[project]/versions/[version]/index.vue index 7d9e66e3c..1aa4d0610 100644 --- a/frontend/src/pages/[user]/[project]/versions/[version]/index.vue +++ b/frontend/src/pages/[user]/[project]/versions/[version]/index.vue @@ -15,6 +15,7 @@ import { useErrorRedirect } from "~/composables/useErrorRedirect"; import TagComponent from "~/components/Tag.vue"; import { hasPerms } from "~/composables/usePerm"; import Button from "~/components/design/Button.vue"; +import { required } from "~/composables/useValidationHelpers"; import { MarkdownEditor } from "#components"; import Markdown from "~/components/Markdown.vue"; @@ -184,6 +185,7 @@ async function restoreVersion() { :deletable="false" :cancellable="true" :saveable="true" + :rules="[required()]" @save="savePage" />