Skip to content

Beautiful Open-Source Form Builder

Enhance Form Visibility Logic and UI Components

JhumanJ1ba7805e3572
diff --git a/api/app/Models/Forms/Form.php b/api/app/Models/Forms/Form.php
index 42b6f2ec4..afecd4b20 100644
--- a/api/app/Models/Forms/Form.php
+++ b/api/app/Models/Forms/Form.php
@@ -223,7 +223,7 @@ class Form extends Model implements CachableAttributes
public function getIsClosedAttribute()
{
- return $this->closes_at && now()->gt($this->closes_at);
+ return $this->visibility === 'closed' || ($this->closes_at && now()->gt($this->closes_at));
}
public function getFormPendingSubmissionKeyAttribute()
diff --git a/client/components/forms/components/QuillyEditor.vue b/client/components/forms/components/QuillyEditor.vue
index 94978277f..1d0a43f75 100644
--- a/client/components/forms/components/QuillyEditor.vue
+++ b/client/components/forms/components/QuillyEditor.vue
@@ -8,6 +8,7 @@
<script setup>
import Quill from 'quill'
import 'quill/dist/quill.snow.css'
+import '../../../lib/quill/quillPatches'
import { onMounted, onBeforeUnmount, ref, watch } from 'vue'
const props = defineProps({
diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue
index 701bc16b6..cca884ea9 100644
--- a/client/components/open/forms/OpenCompleteForm.vue
+++ b/client/components/open/forms/OpenCompleteForm.vue
@@ -55,7 +55,7 @@
class="m-2 my-4">
<UAlert
:close-button="{ icon: 'i-heroicons-x-mark-20-solid', color: 'gray', variant: 'link', padded: false }"
- color="yellow"
+ color="amber"
variant="subtle"
icon="i-material-symbols-info-outline"
@close="hidePasswordDisabledMsg = true"
@@ -64,29 +64,35 @@
</div>
- <div
+ <UAlert
v-if="isPublicFormPage && (form.is_closed || form.visibility=='closed')"
- class="border shadow-sm p-2 my-4 flex items-center rounded-md bg-yellow-100 dark:bg-yellow-600/20 border-yellow-500 dark:border-yellow-500/20"
+ icon="i-heroicons-lock-closed-20-solid"
+ color="amber"
+ variant="subtle"
+ class="m-2 my-4"
>
- <div class="flex-grow">
+ <template #description>
<div
- class="mb-0 py-2 px-4 text-yellow-600"
+ class="py-2"
v-html="form.closed_text"
/>
- </div>
- </div>
+ </template>
+ </UAlert>
- <div
+ <UAlert
v-else-if="isPublicFormPage && form.max_number_of_submissions_reached"
- class="border shadow-sm p-2 my-4 flex items-center rounded-md bg-yellow-100 dark:bg-yellow-600/20 border-yellow-500 dark:border-yellow-500/20"
+ icon="i-heroicons-lock-closed-20-solid"
+ color="amber"
+ variant="subtle"
+ class="m-2 my-4"
>
- <div class="flex-grow">
+ <template #description>
<div
- class="mb-0 py-2 px-4 text-yellow-600 dark:text-yellow-600"
+ class="py-2"
v-html="form.max_submissions_reached_text"
/>
- </div>
- </div>
+ </template>
+ </UAlert>
<form-cleanings
v-if="showFormCleanings"
diff --git a/client/components/open/forms/components/FormEditorNavbar.vue b/client/components/open/forms/components/FormEditorNavbar.vue
index f7beb47e4..be50554fc 100644
--- a/client/components/open/forms/components/FormEditorNavbar.vue
+++ b/client/components/open/forms/components/FormEditorNavbar.vue
@@ -23,7 +23,7 @@
]"
/>
- <div class="flex-grow flex justify-center">
+ <div class="flex-grow flex justify-center gap-2">
<EditableTag
id="form-editor-title"
v-model="form.title"
@@ -34,12 +34,14 @@
v-if="form.visibility == 'draft'"
color="yellow"
variant="soft"
+ icon="i-heroicons-pencil-square"
label="Draft"
/>
<UBadge
v-else-if="form.visibility == 'closed'"
color="gray"
variant="soft"
+ icon="i-heroicons-lock-closed-20-solid"
label="Closed"
/>
</div>
diff --git a/client/components/open/forms/components/FormStatusBadges.vue b/client/components/open/forms/components/FormStatusBadges.vue
new file mode 100644
index 000000000..d8475192d
--- /dev/null
+++ b/client/components/open/forms/components/FormStatusBadges.vue
@@ -0,0 +1,110 @@
+<template>
+ <div
+ v-if="shouldDisplayBadges"
+ class="flex items-center flex-wrap gap-1"
+ >
+ <!-- Draft Badge -->
+ <UTooltip v-if="form.visibility === 'draft'" text="Not publicly accessible">
+ <UBadge
+ color="amber"
+ variant="subtle"
+ icon="i-heroicons-exclamation-triangle"
+ :size="size"
+ >
+ Draft
+ </UBadge>
+ </UTooltip>
+
+ <!-- Closed Badge -->
+ <UTooltip v-else-if="form.visibility === 'closed'" text="Won't accept new submissions">
+ <UBadge
+ color="gray"
+ variant="subtle"
+ icon="i-heroicons-lock-closed"
+ :size="size"
+ >
+ Closed
+ </UBadge>
+ </UTooltip>
+
+ <!-- Time Limited Badge -->
+ <UTooltip v-if="form.closes_at && !form.is_closed" :text="`Will close on ${closesDate}`">
+ <UBadge
+ color="amber"
+ variant="subtle"
+ icon="i-heroicons-clock"
+ :size="size"
+ >
+ Time limited
+ </UBadge>
+ </UTooltip>
+
+ <!-- Submission Limited Badge -->
+ <UTooltip
+ v-if="form.max_submissions_count > 0 && !form.max_number_of_submissions_reached"
+ :text="`Limited to ${form.max_submissions_count} submissions`"
+ >
+ <UBadge
+ color="amber"
+ variant="subtle"
+ icon="i-heroicons-chart-bar"
+ :size="size"
+ >
+ Submission limited
+ </UBadge>
+ </UTooltip>
+
+ <!-- Tags Badges -->
+ <UBadge
+ v-for="tag in form.tags"
+ :key="tag"
+ color="white"
+ variant="solid"
+ class="capitalize"
+ :size="size"
+ >
+ {{ tag }}
+ </UBadge>
+ </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+ form: {
+ type: Object,
+ required: true
+ },
+ size: {
+ type: String,
+ default: 'sm',
+ validator: (value) => ['xs', 'sm', 'md', 'lg'].includes(value)
+ }
+})
+
+const closesDate = computed(() => {
+ if (props.form && props.form.closes_at) {
+ try {
+ const dateObj = new Date(props.form.closes_at)
+ return dateObj.getFullYear() + '-' +
+ String(dateObj.getMonth() + 1).padStart(2, '0') + '-' +
+ String(dateObj.getDate()).padStart(2, '0') + ' ' +
+ String(dateObj.getHours()).padStart(2, '0') + ':' +
+ String(dateObj.getMinutes()).padStart(2, '0')
+ } catch (e) {
+ console.error(e)
+ return null
+ }
+ }
+ return null
+})
+
+// Conditional to determine if badges should be displayed
+const shouldDisplayBadges = computed(() => {
+ return ['draft', 'closed'].includes(props.form.visibility) ||
+ (props.form.tags && props.form.tags.length > 0) ||
+ props.form.closes_at ||
+ (props.form.max_submissions_count > 0)
+})
+</script>
\ No newline at end of file
diff --git a/client/lib/quill/quillPatches.js b/client/lib/quill/quillPatches.js
new file mode 100644
index 000000000..3811237b0
--- /dev/null
+++ b/client/lib/quill/quillPatches.js
@@ -0,0 +1,22 @@
+import Quill from 'quill'
+
+// Self-executing function to patch Quill's prototype
+;(function installQuillFixes() {
+ // Store the original method
+ const originalGetSemanticHTML = Quill.prototype.getSemanticHTML
+
+ // Override the getSemanticHTML method
+ Quill.prototype.getSemanticHTML = function(index = 0, length) {
+ // Call the original method
+ const html = originalGetSemanticHTML.call(this, index, length || this.getLength())
+
+ // Apply fixes:
+ return html
+ // 1. Replace &nbsp; with regular spaces
+ .replace(/&nbsp;/g, ' ')
+ // 2. Fix line breaks by replacing empty paragraphs with paragraphs containing <br/>
+ .replace(/<p><\/p>/g, '<p><br/></p>')
+ }
+})()
+
+export default {}
\ No newline at end of file
diff --git a/client/pages/forms/[slug]/show.vue b/client/pages/forms/[slug]/show.vue
index 3d4d6c24d..fc44bdf99 100644
--- a/client/pages/forms/[slug]/show.vue
+++ b/client/pages/forms/[slug]/show.vue
@@ -78,60 +78,11 @@
</span>
<span>- Edited {{ form.last_edited_human }}</span>
</p>
- <div
- v-if="
- ['draft', 'closed'].includes(form.visibility) ||
- (form.tags && form.tags.length > 0)
- "
- class="mt-2 flex items-center flex-wrap gap-3"
- >
- <span
- v-if="form.visibility == 'draft'"
- class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700"
- >
- Draft - not publicly accessible
- </span>
- <span
- v-else-if="form.visibility == 'closed'"
- class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700"
- >
- Closed - won't accept new submissions
- </span>
- <span
- v-for="(tag) in form.tags"
- :key="tag"
- class="inline-flex items-center rounded-full bg-gray-50 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700"
- >
- {{ tag }}
- </span>
- </div>
-
- <p
- v-if="form.closes_at"
- class="text-yellow-500"
- >
- <span v-if="form.is_closed">
- This form stopped accepting submissions on the
- {{ displayClosesDate }}
- </span>
- <span v-else>
- This form will stop accepting submissions on the
- {{ displayClosesDate }}
- </span>
- </p>
- <p
- v-if="form.max_submissions_count > 0"
- class="text-yellow-500"
- >
- <span v-if="form.max_number_of_submissions_reached">
- The form is now closed because it reached its limit of
- {{ form.max_submissions_count }} submissions.
- </span>
- <span v-else>
- This form will stop accepting submissions after
- {{ form.max_submissions_count }} submissions.
- </span>
- </p>
+
+ <FormStatusBadges
+ :form="form"
+ class="mt-2"
+ />
<form-cleanings
class="mt-4"
@@ -181,6 +132,7 @@
import { computed } from "vue"
import ExtraMenu from "../../../components/pages/forms/show/ExtraMenu.vue"
import FormCleanings from "../../../components/pages/forms/show/FormCleanings.vue"
+import FormStatusBadges from "../../../components/open/forms/components/FormStatusBadges.vue"
definePageMeta({
middleware: "auth",
@@ -201,23 +153,6 @@ const form = computed(() => formsStore.getByKey(slug))
const workspace = computed(() => workspacesStore.getCurrent)
const loading = computed(() => formsStore.loading || workspacesStore.loading)
-const displayClosesDate = computed(() => {
- if (form.value && form.value.closes_at) {
- const dateObj = new Date(form.value.closes_at)
- return (
- dateObj.getFullYear() +
- "-" +
- String(dateObj.getMonth() + 1).padStart(2, "0") +
- "-" +
- String(dateObj.getDate()).padStart(2, "0") +
- " " +
- String(dateObj.getHours()).padStart(2, "0") +
- ":" +
- String(dateObj.getMinutes()).padStart(2, "0")
- )
- }
- return ""
-})
const tabsList = [
{
diff --git a/client/pages/home.vue b/client/pages/home.vue
index 5d155aae4..d3e148f9b 100644
--- a/client/pages/home.vue
+++ b/client/pages/home.vue
@@ -153,30 +153,13 @@
{{ form?.creator?.name }}
</li>
</ul>
- <div
- v-if="['draft','closed'].includes(form.visibility) || (form.tags && form.tags.length > 0)"
- class="mt-1 flex items-center flex-wrap gap-3"
- >
- <span
- v-if="form.visibility=='draft'"
- class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700"
- >
- Draft
- </span>
- <span
- v-else-if="form.visibility=='closed'"
- class="inline-flex items-center rounded-full bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700"
- >
- Closed
- </span>
- <span
- v-for="(tag) in form.tags"
- :key="tag"
- class="inline-flex items-center rounded-full bg-gray-50 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/10 dark:text-white dark:bg-gray-700"
- >
- {{ tag }}
- </span>
- </div>
+
+ <FormStatusBadges
+ :form="form"
+ class="mt-1"
+ size="xs"
+ />
+
</div>
<extra-menu
:form="form"
@@ -238,6 +221,7 @@ import {useWorkspacesStore} from "../stores/workspaces"
import Fuse from "fuse.js"
import TextInput from "../components/forms/TextInput.vue"
import ExtraMenu from "../components/pages/forms/show/ExtraMenu.vue"
+import FormStatusBadges from "../components/open/forms/components/FormStatusBadges.vue"
import {refDebounced} from "@vueuse/core"
definePageMeta({