Skip to content

Commit 3f036c7

Browse files
committed
feat: add secure handler toggle visibility configuration to screen settings
1 parent 3ff7d99 commit 3f036c7

9 files changed

Lines changed: 11 additions & 0 deletions

File tree

config/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@
242242
'screen' => [
243243
'cache_enabled' => env('SCREEN_CACHE_ENABLED', false),
244244
'cache_timeout' => env('SCREEN_CACHE_TIMEOUT', 5000), // timeout in milliseconds
245+
'show_secure_handler_toggle' => filter_var(env('SCREEN_SECURE_HANDLER_TOGGLE_VISIBLE', false), FILTER_VALIDATE_BOOLEAN),
245246
],
246247

247248
'queue_imports' => env('QUEUE_IMPORTS', true),

resources/js/bootstrap.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,11 @@ if (userID) {
448448
// @link https://processmaker.atlassian.net/browse/FOUR-6833 Cache configuration
449449
const screenCacheEnabled = document.head.querySelector("meta[name=\"screen-cache-enabled\"]")?.content ?? "false";
450450
const screenCacheTimeout = document.head.querySelector("meta[name=\"screen-cache-timeout\"]")?.content ?? "5000";
451+
const screenSecureHandlerToggleVisible = document.head.querySelector("meta[name='screen-secure-handler-toggle-visible']");
451452
window.ProcessMaker.screen = {
452453
cacheEnabled: screenCacheEnabled === "true",
453454
cacheTimeout: Number(screenCacheTimeout),
455+
secureHandlerToggleVisible: !!Number(screenSecureHandlerToggleVisible?.content),
454456
};
455457
// Initialize screen-builder cache
456458
initializeScreenCache(window.ProcessMaker.apiClient, window.ProcessMaker.screen);

resources/js/next/screenBuilder.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ export default () => {
3131
// @link https://processmaker.atlassian.net/browse/FOUR-6833 Cache configuration
3232
const screenCacheEnabled = document.head.querySelector("meta[name=\"screen-cache-enabled\"]")?.content ?? "false";
3333
const screenCacheTimeout = document.head.querySelector("meta[name=\"screen-cache-timeout\"]")?.content ?? "5000";
34+
const screenSecureHandlerToggleVisible = document.head.querySelector("meta[name='screen-secure-handler-toggle-visible']");
3435
const screen = {
3536
cacheEnabled: screenCacheEnabled === "true",
3637
cacheTimeout: Number(screenCacheTimeout),
38+
secureHandlerToggleVisible: !!Number(screenSecureHandlerToggleVisible?.content),
3739
};
3840

3941
setGlobalVariable("ScreenBuilder", ScreenBuilder);

resources/views/layouts/ai-qr-mobile.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<meta name="i18n-mdate" content='{!! json_encode(ProcessMaker\i18nHelper::mdates()) !!}'>
1414
<meta name="screen-cache-enabled" content="{{ config('app.screen.cache_enabled') ? 'true' : 'false' }}">
1515
<meta name="screen-cache-timeout" content="{{ config('app.screen.cache_timeout') }}">
16+
<meta name="screen-secure-handler-toggle-visible" content="{{ config('app.screen.show_secure_handler_toggle') }}">
1617
<meta name="settings-translations-enabled" content="{{ config('translations.enabled') ? 'true' : 'false' }}">
1718
@include('layouts.common-meta')
1819
@if(Auth::user())

resources/views/layouts/layout.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<meta name="i18n-mdate" content='{!! json_encode(ProcessMaker\i18nHelper::mdates()) !!}'>
1616
<meta name="screen-cache-enabled" content="{{ config('app.screen.cache_enabled') ? 'true' : 'false' }}">
1717
<meta name="screen-cache-timeout" content="{{ config('app.screen.cache_timeout') }}">
18+
<meta name="screen-secure-handler-toggle-visible" content="{{ config('app.screen.show_secure_handler_toggle') }}">
1819
<meta name="settings-translations-enabled" content="{{ config('translations.enabled') ? 'true' : 'false' }}">
1920
@if(Auth::user())
2021
<meta name="user-id" content="{{ Auth::user()->id }}">

resources/views/layouts/layoutnext.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<meta name="i18n-mdate" content='{!! json_encode(ProcessMaker\i18nHelper::mdates()) !!}'>
1616
<meta name="screen-cache-enabled" content="{{ config('app.screen.cache_enabled') ? 'true' : 'false' }}">
1717
<meta name="screen-cache-timeout" content="{{ config('app.screen.cache_timeout') }}">
18+
<meta name="screen-secure-handler-toggle-visible" content="{{ config('app.screen.show_secure_handler_toggle') }}">
1819
<meta name="settings-translations-enabled" content="{{ config('translations.enabled') ? 'true' : 'false' }}">
1920
@include('layouts.common-meta')
2021
@if(Auth::user())

resources/views/layouts/preview.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<meta name="i18n-mdate" content='{!! json_encode(ProcessMaker\i18nHelper::mdates()) !!}'>
1616
<meta name="screen-cache-enabled" content="{{ config('app.screen.cache_enabled') ? 'true' : 'false' }}">
1717
<meta name="screen-cache-timeout" content="{{ config('app.screen.cache_timeout') }}">
18+
<meta name="screen-secure-handler-toggle-visible" content="{{ config('app.screen.show_secure_handler_toggle') }}">
1819
@include('layouts.common-meta')
1920
@if(Auth::user())
2021
<meta name="user-id" content="{{ Auth::user()->id }}">

resources/views/layouts/print.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<meta name="i18n-mdate" content='{!! json_encode(ProcessMaker\i18nHelper::mdates()) !!}'>
1616
<meta name="screen-cache-enabled" content="{{ config('app.screen.cache_enabled') ? 'true' : 'false' }}">
1717
<meta name="screen-cache-timeout" content="{{ config('app.screen.cache_timeout') }}">
18+
<meta name="screen-secure-handler-toggle-visible" content="{{ config('app.screen.show_secure_handler_toggle') }}">
1819
<meta name="settings-translations-enabled" content="{{ config('translations.enabled') ? 'true' : 'false' }}">
1920
@if(Auth::user())
2021
<meta name="user-id" content="{{ Auth::user()->id }}">

resources/views/tasks/preview.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<meta name="i18n-mdate" content='{!! json_encode(ProcessMaker\i18nHelper::mdates()) !!}'>
1515
<meta name="screen-cache-enabled" content="{{ config('app.screen.cache_enabled') ? 'true' : 'false' }}">
1616
<meta name="screen-cache-timeout" content="{{ config('app.screen.cache_timeout') }}">
17+
<meta name="screen-secure-handler-toggle-visible" content="{{ config('app.screen.show_secure_handler_toggle') }}">
1718
@if(Auth::user())
1819
<meta name="user-id" content="{{ Auth::user()->id }}">
1920
<meta name="datetime-format" content="{{ Auth::user()->datetime_format ?: config('app.dateformat') }}">

0 commit comments

Comments
 (0)