Merge pull request #8752 from ProcessMaker/feature/FOUR-29961

FOUR-29961: APPLICANT >> Improve Draft behavior

Author: nolanpro

config/app.php

@@ -246,6 +246,7 @@
         'cache_enabled' => env('SCREEN_CACHE_ENABLED', false),
         'cache_timeout' => env('SCREEN_CACHE_TIMEOUT', 5000), // timeout in milliseconds
         'show_secure_handler_toggle' => filter_var(env('SCREEN_SECURE_HANDLER_TOGGLE_VISIBLE', false), FILTER_VALIDATE_BOOLEAN),
+        'merge_draft_on_restore' => filter_var(env('SCREEN_MERGE_DRAFT_ON_RESTORE', true), FILTER_VALIDATE_BOOLEAN),
     ],
 
     'queue_imports' => env('QUEUE_IMPORTS', true),

resources/js/next/screenBuilder.js

@@ -32,10 +32,12 @@ export default () => {
         const screenCacheEnabled = document.head.querySelector("meta[name=\"screen-cache-enabled\"]")?.content ?? "false";
         const screenCacheTimeout = document.head.querySelector("meta[name=\"screen-cache-timeout\"]")?.content ?? "5000";
         const screenSecureHandlerToggleVisible = document.head.querySelector("meta[name='screen-secure-handler-toggle-visible']");
+        const screenMergeDraftOnRestore = document.head.querySelector("meta[name='screen-merge-draft-on-restore']")?.content ?? "true";
         const screen = {
           cacheEnabled: screenCacheEnabled === "true",
           cacheTimeout: Number(screenCacheTimeout),
           secureHandlerToggleVisible: !!Number(screenSecureHandlerToggleVisible?.content),
+          mergeDraftOnRestore: screenMergeDraftOnRestore === "true",
         };
 
         setGlobalVariable("ScreenBuilder", ScreenBuilder);

resources/views/layouts/layoutnext.blade.php

@@ -16,6 +16,7 @@
     <meta name="screen-cache-enabled" content="{{ config('app.screen.cache_enabled') ? 'true' : 'false' }}">
     <meta name="screen-cache-timeout" content="{{ config('app.screen.cache_timeout') }}">
     <meta name="screen-secure-handler-toggle-visible" content="{{ config('app.screen.show_secure_handler_toggle') }}">
+    <meta name="screen-merge-draft-on-restore" content="{{ config('app.screen.merge_draft_on_restore') ? 'true' : 'false' }}">
     <meta name="settings-translations-enabled" content="{{ config('translations.enabled') ? 'true' : 'false' }}">
     @include('layouts.common-meta')
     @if(Auth::user())