+ |
+
+ Status
+
+ |
|
+
+
+ |
new Date(b.created_at) - new Date(a.created_at))
}
diff --git a/client/composables/forms/pendingSubmission.js b/client/composables/forms/pendingSubmission.js
index 0a7ffc95..b4510327 100644
--- a/client/composables/forms/pendingSubmission.js
+++ b/client/composables/forms/pendingSubmission.js
@@ -31,6 +31,17 @@ export const pendingSubmission = (form) => {
return pendingSubmission ? JSON.parse(pendingSubmission) : defaultValue
}
+ const setSubmissionHash = (hash) => {
+ set({
+ ...get(),
+ submission_hash: hash
+ })
+ }
+
+ const getSubmissionHash = () => {
+ return get()?.submission_hash ?? null
+ }
+
const setTimer = (value) => {
if (import.meta.server) return
useStorage(formPendingSubmissionTimerKey.value).value = value
@@ -46,10 +57,13 @@ export const pendingSubmission = (form) => {
}
return {
+ formPendingSubmissionKey,
enabled,
set,
get,
remove,
+ setSubmissionHash,
+ getSubmissionHash,
setTimer,
removeTimer,
getTimer,
diff --git a/client/composables/forms/usePartialSubmission.js b/client/composables/forms/usePartialSubmission.js
new file mode 100644
index 00000000..2e36d596
--- /dev/null
+++ b/client/composables/forms/usePartialSubmission.js
@@ -0,0 +1,131 @@
+import { opnFetch } from "./../useOpnApi.js"
+import { pendingSubmission as pendingSubmissionFunction } from "./pendingSubmission.js"
+import { watch, onBeforeUnmount, ref } from 'vue'
+
+// Create a Map to store submission hashes for different forms
+const submissionHashes = ref(new Map())
+
+export const usePartialSubmission = (form, formData = {}) => {
+ const pendingSubmission = pendingSubmissionFunction(form)
+
+ let syncTimeout = null
+ let dataWatcher = null
+
+ const getSubmissionHash = () => {
+ return pendingSubmission.getSubmissionHash() ?? submissionHashes.value.get(pendingSubmission.formPendingSubmissionKey.value)
+ }
+
+ const setSubmissionHash = (hash) => {
+ submissionHashes.value.set(pendingSubmission.formPendingSubmissionKey.value, hash)
+ pendingSubmission.setSubmissionHash(hash)
+ }
+
+ const debouncedSync = () => {
+ if (syncTimeout) clearTimeout(syncTimeout)
+ syncTimeout = setTimeout(() => {
+ syncToServer()
+ }, 1000) // 1 second debounce
+ }
+
+ const syncToServer = async () => {
+ // Check if partial submissions are enabled and if we have data
+ if (!form?.enable_partial_submissions) return
+
+ // Get current form data - handle both function and direct object patterns
+ const currentData = typeof formData.value?.data === 'function'
+ ? formData.value.data()
+ : formData.value
+
+ // Skip if no data or empty data
+ if (!currentData || Object.keys(currentData).length === 0) return
+
+ try {
+ const response = await opnFetch(`/forms/${form.slug}/answer`, {
+ method: "POST",
+ body: {
+ ...currentData,
+ 'is_partial': true,
+ 'submission_hash': getSubmissionHash()
+ }
+ })
+ if (response.submission_hash) {
+ setSubmissionHash(response.submission_hash)
+ }
+ } catch (error) {
+ console.error('Failed to sync partial submission', error)
+ }
+ }
+
+ // Add these handlers as named functions so we can remove them later
+ const handleVisibilityChange = () => {
+ if (document.visibilityState === 'hidden') {
+ debouncedSync()
+ }
+ }
+
+ const handleBlur = () => {
+ debouncedSync()
+ }
+
+ const handleBeforeUnload = () => {
+ syncToServer()
+ }
+
+ const startSync = () => {
+ if (dataWatcher) return
+
+ // Initial sync
+ debouncedSync()
+
+ // Watch formData directly with Vue's reactivity
+ dataWatcher = watch(
+ formData,
+ () => {
+ debouncedSync()
+ },
+ { deep: true }
+ )
+
+ // Add event listeners for critical moments
+ document.addEventListener('visibilitychange', handleVisibilityChange)
+ window.addEventListener('blur', handleBlur)
+ window.addEventListener('beforeunload', handleBeforeUnload)
+ }
+
+ const stopSync = () => {
+ submissionHashes.value = new Map()
+
+ if (dataWatcher) {
+ dataWatcher()
+ dataWatcher = null
+ }
+
+ if (syncTimeout) {
+ clearTimeout(syncTimeout)
+ syncTimeout = null
+ }
+
+ // Remove event listeners
+ document.removeEventListener('visibilitychange', handleVisibilityChange)
+ window.removeEventListener('blur', handleBlur)
+ window.removeEventListener('beforeunload', handleBeforeUnload)
+ }
+
+ // Ensure cleanup when component is unmounted
+ onBeforeUnmount(() => {
+ stopSync()
+
+ // Final sync attempt before unmounting
+ if(getSubmissionHash()) {
+ syncToServer()
+ }
+ })
+
+ return {
+ startSync,
+ stopSync,
+ syncToServer,
+ getSubmissionHash,
+ setSubmissionHash
+ }
+}
\ No newline at end of file
diff --git a/client/pages/settings/connections/callback/[service].vue b/client/pages/settings/connections/callback/[service].vue
index da16868b..e92e3d40 100644
--- a/client/pages/settings/connections/callback/[service].vue
+++ b/client/pages/settings/connections/callback/[service].vue
@@ -63,16 +63,10 @@ async function handleCallback() {
// Get autoClose preference from the API response data
const shouldAutoClose = data?.autoClose === true
- console.log('[CallbackPage] Checking autoClose status from API data:', {
- apiValue: data?.autoClose,
- shouldAutoClose
- })
-
alert.success('Account connected successfully.')
// Close window if autoClose is set from API data, otherwise redirect
if (shouldAutoClose) {
- console.log('[CallbackPage] Attempting window.close() based on API data.')
window.close()
// Add a fallback check in case window.close is blocked
setTimeout(() => {
@@ -83,7 +77,6 @@ async function handleCallback() {
}
}, 500) // Check after 500ms
} else {
- console.log('[CallbackPage] autoClose is false or not detected in API data, redirecting.')
router.push('/settings/connections')
}
|