diff --git a/ProcessMaker/Http/Controllers/Process/ScreenBuilderController.php b/ProcessMaker/Http/Controllers/Process/ScreenBuilderController.php
index c356f4c27b..76727289ef 100644
--- a/ProcessMaker/Http/Controllers/Process/ScreenBuilderController.php
+++ b/ProcessMaker/Http/Controllers/Process/ScreenBuilderController.php
@@ -43,6 +43,7 @@ public function edit(ScreenBuilderManager $manager, Screen $screen, $processId =
return view('processes.screen-builder.screen', [
'screen' => $screen,
+ 'type' => strtoupper($screen->type ?? 'FORM'),
'manager' => $manager,
'autoSaveDelay' => config('versions.delay.process', 5000),
'isVersionsInstalled' => PackageHelper::isPmPackageVersionsInstalled(),
diff --git a/ProcessMaker/Managers/ModelerManager.php b/ProcessMaker/Managers/ModelerManager.php
index e762e3ef23..efd296f7e0 100644
--- a/ProcessMaker/Managers/ModelerManager.php
+++ b/ProcessMaker/Managers/ModelerManager.php
@@ -16,7 +16,7 @@ public function __construct()
{
$this->javascriptRegistry = [];
// Include our default javascript for our core controls
- $this->addScript(mix('js/processes/modeler/initialLoad.js'));
+ // $this->addScript(mix('js/processes/modeler/initialLoad.js'));
}
/**
diff --git a/resources/js/admin/auth-clients/index.js b/resources/js/admin/auth-clients/index.js
index aaf7f83cf1..118b786fa0 100644
--- a/resources/js/admin/auth-clients/index.js
+++ b/resources/js/admin/auth-clients/index.js
@@ -1,4 +1,113 @@
import Vue from "vue";
-import AuthClientsListing from "./components/AuthClientsListing";
+import AuthClientsListing from "./components/AuthClientsListing.vue";
Vue.component("AuthClientsListing", AuthClientsListing);
+
+new Vue({
+ el: "#authClients",
+ data: {
+ authClient: {
+ id: null,
+ name: "",
+ types: [],
+ redirect: "",
+ secret: "",
+ },
+ filter: "",
+ errors: null,
+ disabled: false,
+ title: "",
+ secretTitle: "",
+ customModalButtons: [],
+ secret: "",
+ },
+ beforeMount() {
+ this.initCustomModalButtons();
+ this.resetValues();
+ },
+ methods: {
+ onClose() {
+ this.resetValues();
+ },
+ onSave() {
+ if (this.disabled) {
+ return;
+ }
+ this.disabled = true;
+
+ this.loading = true;
+ let method = "POST";
+ let url = "/oauth/clients";
+ let verb = "created";
+ if (this.authClient.id) {
+ method = "PUT";
+ url = `${url}/${this.authClient.id}`;
+ verb = "saved";
+ }
+ ProcessMaker.apiClient({
+ method,
+ url,
+ baseURL: "/",
+ data: this.authClient,
+ }).then((response) => {
+ this.$refs.createEditAuthClient.hide();
+ this.loading = false;
+ if (response.data.secret) {
+ this.secret = response.data.secret;
+ this.$refs.secretModal.show();
+ } else {
+ this.$refs.authClientList.fetch();
+ }
+ ProcessMaker.alert(`${this.$t("The auth client was ")}${verb}.`, this.$t("success"));
+ }).catch((error) => {
+ this.disabled = false;
+ this.errors = error.response.data.errors;
+ });
+ },
+ resetValues() {
+ this.title = this.$t("Create Auth-Client");
+ this.secretTitle = this.$t("Copy Secret To Clipboard");
+ this.authClient = {
+ id: null,
+ name: "",
+ types: [],
+ redirect: "",
+ secret: "",
+ };
+ this.errors = {
+ name: null,
+ redirect: null,
+ types: null,
+ };
+ this.disabled = false;
+ this.initCustomModalButtons();
+ },
+ edit(item) {
+ this.title = this.$t("Edit Auth Client");
+ this.authClient = item;
+ this.$refs.createEditAuthClient.show();
+ },
+ initCustomModalButtons() {
+ this.customModalButtons = [
+ {
+ content: "Close",
+ action: "close",
+ variant: "secondary",
+ disabled: false,
+ hidden: false,
+ },
+ ];
+ },
+ hideSecretModal() {
+ this.$refs.secretModal.hide();
+ this.$refs.authClientList.fetch();
+ },
+ copySecret(secret) {
+ navigator.clipboard.writeText(secret).then(() => {
+ ProcessMaker.alert(this.$t("Secret copied to clipboard."), "success");
+ }, () => {
+ ProcessMaker.alert(this.$t("Secret not copied to clipboard."), "danger");
+ });
+ },
+ },
+});
diff --git a/resources/js/admin/auth-clients/loaderAuthClients.js b/resources/js/admin/auth-clients/loaderAuthClients.js
new file mode 100644
index 0000000000..f860598640
--- /dev/null
+++ b/resources/js/admin/auth-clients/loaderAuthClients.js
@@ -0,0 +1,6 @@
+import { setupMain } from "../../next/setupMain";
+
+setupMain();
+
+window.ProcessMaker.packages = window.temporal?.packages || [];
+window.packages = window.ProcessMaker.packages;
diff --git a/resources/js/admin/cssOverride/components/ColorPicker.vue b/resources/js/admin/cssOverride/components/ColorPicker.vue
index e316dedcc9..5914743858 100644
--- a/resources/js/admin/cssOverride/components/ColorPicker.vue
+++ b/resources/js/admin/cssOverride/components/ColorPicker.vue
@@ -10,8 +10,8 @@
import {Sketch} from 'vue-color';
import { createUniqIdsMixin } from "vue-uniq-ids";
+ import tinycolor from 'tinycolor2';
const uniqIdsMixin = createUniqIdsMixin();
- const tinycolor = require("tinycolor2");
export default {
components: {
diff --git a/resources/js/admin/cssOverride/components/SiteDesign.vue b/resources/js/admin/cssOverride/components/SiteDesign.vue
index 4357c79cf8..a67dcf62ab 100644
--- a/resources/js/admin/cssOverride/components/SiteDesign.vue
+++ b/resources/js/admin/cssOverride/components/SiteDesign.vue
@@ -193,6 +193,9 @@
-
+ @vite(['resources/js/admin/auth-clients/loaderAuthClients.js'])
+ @vite(['resources/js/admin/auth-clients/index.js'])
@endsection
diff --git a/resources/views/admin/cases-retention/index.blade.php b/resources/views/admin/cases-retention/index.blade.php
index cea7ad691d..c3539bcb43 100644
--- a/resources/views/admin/cases-retention/index.blade.php
+++ b/resources/views/admin/cases-retention/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Cases Retention')}}
@@ -15,6 +15,7 @@
]])
@endsection
@section('content')
+ @vite(['resources/js/admin/loaderAdmin.js'])
@@ -61,7 +62,12 @@ class="btn btn-primary download-retention-logs text-nowrap"
@section('js')
-
+
+ @vite(['resources/js/admin/cases-retention/index.js'])
@endsection
@section('css')
diff --git a/resources/views/admin/cssOverride/edit.blade.php b/resources/views/admin/cssOverride/edit.blade.php
index 77d1bef50e..1305f9321a 100644
--- a/resources/views/admin/cssOverride/edit.blade.php
+++ b/resources/views/admin/cssOverride/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{ __('Customize UI') }}
@@ -35,79 +35,88 @@
@endsection
@section('js')
-
+ @vite(['resources/js/admin/cssOverride/loaderCssOverride.js'])
+ @vite(['resources/js/admin/cssOverride/edit.js'])
+
@@ -134,4 +143,3 @@
}
@endsection
-
diff --git a/resources/views/admin/devlink/index.blade.php b/resources/views/admin/devlink/index.blade.php
index 8f428119c3..66e4b6c18e 100644
--- a/resources/views/admin/devlink/index.blade.php
+++ b/resources/views/admin/devlink/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('DevLink')}}
@@ -15,6 +15,7 @@
]])
@endsection
@section('content')
+ @vite(['resources/js/admin/loaderAdmin.js'])
@@ -22,5 +23,10 @@
@section('js')
-
+
+ @vite(['resources/js/admin/devlink/index.js'])
@endsection
diff --git a/resources/views/admin/groups/edit.blade.php b/resources/views/admin/groups/edit.blade.php
index 2bf2b9cecb..78e81928d9 100644
--- a/resources/views/admin/groups/edit.blade.php
+++ b/resources/views/admin/groups/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Edit Group')}}
@@ -230,11 +230,18 @@ class="multiselect__tag-icon">
@endsection
@section('js')
-
+ @vite(['resources/js/admin/groups/loaderGroups.js'])
+ @vite(['resources/js/admin/groups/edit.js'])
+
@endsection
diff --git a/resources/views/admin/groups/index.blade.php b/resources/views/admin/groups/index.blade.php
index 227a1b1741..9b38c95f4d 100644
--- a/resources/views/admin/groups/index.blade.php
+++ b/resources/views/admin/groups/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Groups')}}
@@ -63,76 +63,11 @@ class="form-text text-muted">{{__('Group name must be unique')}}
@endsection
@section('js')
-
+ @vite(['resources/js/admin/groups/loaderGroups.js'])
+ @vite(['resources/js/admin/groups/index.js'])
@endsection
diff --git a/resources/views/admin/logs/index.blade.php b/resources/views/admin/logs/index.blade.php
index 9a7ca90a61..8a00f2066e 100644
--- a/resources/views/admin/logs/index.blade.php
+++ b/resources/views/admin/logs/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Logs')}}
@@ -21,8 +21,12 @@
@section('js')
-
+ @vite(['resources/js/admin/loaderAdmin.js'])
+ @vite(['resources/js/admin/logs/index.js'])
@endsection
diff --git a/resources/views/admin/queues/index.blade.php b/resources/views/admin/queues/index.blade.php
index 6e64ff7df6..cef4184ac6 100644
--- a/resources/views/admin/queues/index.blade.php
+++ b/resources/views/admin/queues/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Queue Management')}}
@@ -16,6 +16,7 @@
@endsection
@section('content')
+ @vite(['resources/js/admin/users/loaderUsers.js'])
@endsection
diff --git a/resources/views/admin/script-executors/index.blade.php b/resources/views/admin/script-executors/index.blade.php
index cb3146fabe..2cf21ad947 100644
--- a/resources/views/admin/script-executors/index.blade.php
+++ b/resources/views/admin/script-executors/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{ __('Script Executors') }}
@@ -15,6 +15,7 @@
]])
@endsection
@section('content')
+ @vite(['resources/js/admin/loaderAdmin.js'])
+
+ @vite(['resources/js/admin/script-executors/index.js'])
@endsection
diff --git a/resources/views/admin/settings/index.blade.php b/resources/views/admin/settings/index.blade.php
index d224fe9634..8bc5cd57a6 100644
--- a/resources/views/admin/settings/index.blade.php
+++ b/resources/views/admin/settings/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Settings')}}
@@ -26,20 +26,31 @@
@endsection
@section('js')
+
+ @vite(['resources/js/admin/settings/loaderSettings.js'])
+
@if (hasPackage('package-email-start-event'))
@endif
-
+ @vite(['resources/js/admin/settings/index.js'])
@if($errors->has('error'))
@endif
@if($errors->has('message'))
@endif
@endsection
diff --git a/resources/views/admin/settings/ldap-logs.blade.php b/resources/views/admin/settings/ldap-logs.blade.php
index 3efd5dd5d1..d3b446b499 100644
--- a/resources/views/admin/settings/ldap-logs.blade.php
+++ b/resources/views/admin/settings/ldap-logs.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Ldap Logs')}}
@@ -16,6 +16,7 @@
]])
@endsection
@section('content')
+ @vite(['resources/js/admin/users/loaderUsers.js'])
@@ -42,5 +43,5 @@
@endsection
@section('js')
-
+ @vite(['resources/js/admin/settings/ldaplogs.js'])
@endsection
diff --git a/resources/views/admin/tenant-queues/index.blade.php b/resources/views/admin/tenant-queues/index.blade.php
index 6c5967ffaf..6c3af26a72 100644
--- a/resources/views/admin/tenant-queues/index.blade.php
+++ b/resources/views/admin/tenant-queues/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Jobs Dashboard')}}
@@ -16,11 +16,17 @@
@endsection
@section('content')
+ @vite(['resources/js/admin/loaderAdmin.js'])
@endsection
@section('js')
-
+
+ @vite(['resources/js/admin/tenant-queues/index.js'])
@endsection
diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php
index 180739726b..0d8181f814 100644
--- a/resources/views/admin/users/edit.blade.php
+++ b/resources/views/admin/users/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Edit Users')}}
@@ -171,12 +171,18 @@
@endsection
@section('js')
-
-
+ @vite(['resources/js/admin/users/loaderUsers.js'])
+ @vite(['resources/js/admin/users/edit.js'])
+
-
-
@endsection
diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php
index 2697745d22..8a9e9f5063 100644
--- a/resources/views/admin/users/index.blade.php
+++ b/resources/views/admin/users/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Users')}}
@@ -24,7 +24,7 @@
-
{{ __('Deleted Users') }}
@@ -49,15 +49,12 @@
@endsection
-
-
@section('js')
-
+
+ @vite(['resources/js/admin/users/loaderUsers.js'])
+ @vite(['resources/js/admin/users/index.js'])
@endsection
diff --git a/resources/views/auth/2fa/auth_app_qr.blade.php b/resources/views/auth/2fa/auth_app_qr.blade.php
index cd370d4557..e645de68ed 100644
--- a/resources/views/auth/2fa/auth_app_qr.blade.php
+++ b/resources/views/auth/2fa/auth_app_qr.blade.php
@@ -8,7 +8,7 @@
{{ __('Configure the authenticator app') }}
-
+ @vite('resources/sass/app.scss')
diff --git a/resources/views/auth/2fa/otp.blade.php b/resources/views/auth/2fa/otp.blade.php
index b08295a3c0..c88eb3d8b9 100644
--- a/resources/views/auth/2fa/otp.blade.php
+++ b/resources/views/auth/2fa/otp.blade.php
@@ -8,7 +8,7 @@
{{ __('Enter Security Code') }}
-
+ @vite('resources/sass/app.scss')
diff --git a/resources/views/auth/layouts/auth.blade.php b/resources/views/auth/layouts/auth.blade.php
index 2503fb1203..cbbb23f668 100644
--- a/resources/views/auth/layouts/auth.blade.php
+++ b/resources/views/auth/layouts/auth.blade.php
@@ -9,7 +9,7 @@
@yield('title') - {{ __('ProcessMaker') }}
-
+ @vite('resources/sass/app.scss')
@include('auth.partials.login-critical-styles')
@include('auth.partials.auth-styles')
diff --git a/resources/views/cases/casesMain.blade.php b/resources/views/cases/casesMain.blade.php
index 4ae4b57d77..c76bdc9ce7 100644
--- a/resources/views/cases/casesMain.blade.php
+++ b/resources/views/cases/casesMain.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layoutnext',['content_margin' => '', 'overflow-auto' => ''])
+@extends('layouts.layoutnextvite',['content_margin' => '', 'overflow-auto' => ''])
@section('title')
{{ __('Cases') }}
@@ -13,24 +13,20 @@
@endsection
@section('js')
-
-
-
-
-
+ {{-- temporal must exist before loaderCases (Vite modules run after deferred classic scripts) --}}
-
-
-
+ @vite(['resources/jscomposition/cases/casesMain/loaderCasesMain.js'])
@foreach(GlobalScripts::getScripts() as $script)
-
+
@endforeach
-
-
+ @foreach($manager->getScripts() as $script)
+
+ @endforeach
+ @vite(['resources/jscomposition/cases/casesMain/casesMain.js'])
@endsection
@section('css')
diff --git a/resources/views/cases/edit.blade.php b/resources/views/cases/edit.blade.php
index d340a35dd8..6c07c811bd 100644
--- a/resources/views/cases/edit.blade.php
+++ b/resources/views/cases/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layoutnext',['content_margin' => '', 'overflow-auto' => ''])
+@extends('layouts.layoutnextvite',['content_margin' => '', 'overflow-auto' => ''])
@section('title')
{{ __('Case Detail') }}
@@ -140,17 +140,12 @@ class="tw-grow tw-overflow-hidden"
@endsection
@section('js')
-
-
-
-
-
+ {{-- temporal must exist before loader (Vite modules run after deferred classic scripts) --}}
-
-
-
-
+ @vite(['resources/jscomposition/cases/casesDetail/loaderCasesDetail.js'])
+ @vite(['resources/js/initialLoad.js'])
-
@foreach(GlobalScripts::getScripts() as $script)
-
+
@endforeach
-
-
+
@foreach($managerModelerScripts as $params)
-
+
@endif
-
+ @vite(['resources/jscomposition/cases/casesDetail/casesDetail.js'])
@endsection
@section('css')
diff --git a/resources/views/categories/list.blade.php b/resources/views/categories/list.blade.php
index 2ab4811da2..6a510f25a3 100644
--- a/resources/views/categories/list.blade.php
+++ b/resources/views/categories/list.blade.php
@@ -71,90 +71,11 @@ class="btn btn-secondary"
@section('js')
-
+ @vite(['resources/js/processes/categories/index.js'])
@append
@endif
@section('css')
diff --git a/resources/views/designer/index.blade.php b/resources/views/designer/index.blade.php
index d3a6b3b18f..e32db4f59b 100644
--- a/resources/views/designer/index.blade.php
+++ b/resources/views/designer/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Designer')}}
@@ -14,7 +14,6 @@
]])
@endsection
@section('content')
-
@@ -56,10 +55,12 @@
@endsection
@section('js')
-
-
+@vite(['resources/js/processes/loaderProcesses.js'])
+@vite(['resources/js/processes/newDesigner.js'])
@endsection
-
diff --git a/resources/views/inbox-rules/index.blade.php b/resources/views/inbox-rules/index.blade.php
index f4e1ca16bf..eb913f5efe 100644
--- a/resources/views/inbox-rules/index.blade.php
+++ b/resources/views/inbox-rules/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Inbox Rules')}}
@@ -20,11 +20,11 @@
@endsection
@section('js')
+ @vite('resources/js/tasks/loaderTasks.js')
-
-
+ @vite('resources/js/inbox-rules/index.js')
@endsection
@section('css')
diff --git a/resources/views/layouts/layoutnextvite.blade.php b/resources/views/layouts/layoutnextvite.blade.php
index 1e5984ecb0..71117f54ac 100644
--- a/resources/views/layouts/layoutnextvite.blade.php
+++ b/resources/views/layouts/layoutnextvite.blade.php
@@ -27,7 +27,7 @@
@yield('meta')
@endif
-
+
@if(Session::has('_alert'))
@@ -136,6 +136,12 @@ class="main flex-grow-1 h-100
@endif
+
+
@yield('js')
@stack('scripts')
@foreach(GlobalScripts::getScripts() as $script)
@@ -144,7 +150,7 @@ class="main flex-grow-1 h-100
@isset($addons)
@foreach ($addons as $addon)
@if (!empty($addon['script_mix']))
-
+
@endif
@if (!empty($addon['script_mix_module']))
diff --git a/resources/views/layouts/minimal.blade.php b/resources/views/layouts/minimal.blade.php
index 4b6483b74a..40620a520b 100644
--- a/resources/views/layouts/minimal.blade.php
+++ b/resources/views/layouts/minimal.blade.php
@@ -10,7 +10,7 @@
@include('layouts.common-meta')
@yield('title',__('Welcome')) - {{ __('ProcessMaker') }}
-
+ @vite('resources/sass/app.scss')
@if (hasPackage('package-accessibility'))
@include('package-accessibility::userway')
diff --git a/resources/views/notifications/index.blade.php b/resources/views/notifications/index.blade.php
index 03f20c4f60..17f1fb0933 100644
--- a/resources/views/notifications/index.blade.php
+++ b/resources/views/notifications/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Notifications Inbox')}}
@@ -52,5 +52,6 @@
@endsection
@section('js')
-
+@vite('resources/js/notifications/loaderNotifications.js')
+@vite('resources/js/notifications/index.js')
@endsection
diff --git a/resources/views/processes-catalogue/index.blade.php b/resources/views/processes-catalogue/index.blade.php
index ca34bff986..4f9707ff78 100644
--- a/resources/views/processes-catalogue/index.blade.php
+++ b/resources/views/processes-catalogue/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite', ['content_margin' => '', 'overflow-auto' => ''])
@section('title')
{{__('Processes Catalogue')}}
@@ -25,22 +25,26 @@
@endsection
@section('js')
+ {{-- temporal must exist before loader (Vite modules run after deferred classic scripts) --}}
+ @vite(['resources/js/processes-catalogue/loaderProcessesCatalogue.js'])
@foreach($manager->getScripts() as $script)
-
+
@endforeach
-
-
+ @vite(['resources/js/processes-catalogue/processesCatalogue.js'])
@endsection
diff --git a/resources/views/processes/archivedList.blade.php b/resources/views/processes/archivedList.blade.php
index 822354704d..302886252d 100644
--- a/resources/views/processes/archivedList.blade.php
+++ b/resources/views/processes/archivedList.blade.php
@@ -30,5 +30,5 @@
@section('js')
-
+ @vite(['resources/js/processes/archived.js'])
@append
diff --git a/resources/views/processes/edit.blade.php b/resources/views/processes/edit.blade.php
index 1161508184..f0ef66dd20 100644
--- a/resources/views/processes/edit.blade.php
+++ b/resources/views/processes/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout', ['title' => __('Processes Management')])
+@extends('layouts.layoutnextvite', ['title' => __('Processes Management')])
@section('title')
{{__('Configure Process')}}
@@ -240,7 +240,7 @@ class="invalid-feedback"
label="title"
>
- @{{ __(noElementsFoundMsg) }}
+ @{{ noElementsFoundMsg }}
{{ __('No Data Available') }}
@@ -269,9 +269,7 @@ class="invalid-feedback"
label="title"
>
- @{{
- __(noElementsFoundMsg)
- }}
+ @{{ noElementsFoundMsg }}
{{ __('No Data Available') }}
@@ -301,9 +299,7 @@ class="invalid-feedback"
group-label="label"
>
- @{{
- noElementsFoundMsg
- }}
+ @{{ noElementsFoundMsg }}
{{ __('No Data Available') }}
@@ -325,9 +321,7 @@ class="invalid-feedback"
group-label="label"
>
- @{{
- __(noElementsFoundMsg)
- }}
+ @{{ noElementsFoundMsg }}
{{ __('No Data Available') }}
@@ -625,7 +619,7 @@ class="custom-control-input">
@isset($addons)
@foreach ($addons as $addon)
+ aria-labelledby="{{$addon['id']}}-tab">
{!! $addon['content'] !!}
@endforeach
@@ -640,12 +634,18 @@ class="custom-control-input">
@endsection
@section('js')
-
+ @vite(['resources/js/processes/loaderProcesses.js'])
+ @vite(['resources/js/processes/edit.js'])
+
-
+ @vite(['resources/js/processes/environment-variables/loaderEnvironment.js'])
+ @vite(['resources/js/processes/environment-variables/edit.js'])
@endsection
diff --git a/resources/views/processes/environment-variables/index.blade.php b/resources/views/processes/environment-variables/index.blade.php
index 73a8184975..6c80025a8d 100644
--- a/resources/views/processes/environment-variables/index.blade.php
+++ b/resources/views/processes/environment-variables/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Environment Variables')}}
@@ -40,5 +40,12 @@
@endsection
@section('js')
-
+
+
+ @vite(['resources/js/processes/environment-variables/loaderEnvironment.js'])
+ @vite(['resources/js/processes/environment-variables/index.js'])
@endsection
diff --git a/resources/views/processes/export.blade.php b/resources/views/processes/export.blade.php
index a1e484c179..92cdb1d55b 100644
--- a/resources/views/processes/export.blade.php
+++ b/resources/views/processes/export.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Export Process')}}
@@ -7,8 +7,7 @@
@section('meta')
-
@endsection
@section('sidebar')
@@ -31,5 +30,11 @@
@endsection
@section('js')
-
+
+ @vite(['resources/js/processes/loaderProcesses.js'])
+ @vite(['resources/js/processes/export/index.js'])
@endsection
diff --git a/resources/views/processes/import.blade.php b/resources/views/processes/import.blade.php
index d89d051bc2..fb266b2a19 100644
--- a/resources/views/processes/import.blade.php
+++ b/resources/views/processes/import.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Import Process')}}
@@ -23,8 +23,12 @@
@section('js')
-
+ @vite(['resources/js/processes/loaderProcesses.js'])
+ @vite(['resources/js/processes/import/index.js'])
@endsection
diff --git a/resources/views/processes/index.blade.php b/resources/views/processes/index.blade.php
index 81b2299c1b..b58869cfa0 100644
--- a/resources/views/processes/index.blade.php
+++ b/resources/views/processes/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
@php
@@ -24,6 +24,7 @@
]])
@endsection
@section('content')
+@vite(['resources/js/processes/loaderProcesses.js'])
@component('components.categorized_resource', [
'tabs' => [
__('Processes'),
diff --git a/resources/views/processes/list.blade.php b/resources/views/processes/list.blade.php
index 7569f901b1..f1468dc5c9 100644
--- a/resources/views/processes/list.blade.php
+++ b/resources/views/processes/list.blade.php
@@ -25,15 +25,15 @@
@endcan
@can('create-processes')
@endcan
@@ -67,6 +67,5 @@
@section('js')
-
-
+ @vite(['resources/js/processes/processes.js'])
@append
diff --git a/resources/views/processes/modeler/index.blade.php b/resources/views/processes/modeler/index.blade.php
index a9d4980dc3..3e0312b975 100644
--- a/resources/views/processes/modeler/index.blade.php
+++ b/resources/views/processes/modeler/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout', ['content_margin'=>''])
+@extends('layouts.layoutnextvite', ['content_margin'=>''])
@section('title')
{{__('Edit Process')}}
@@ -40,9 +40,10 @@
@endsection
@section('js')
-
+ @include('shared.monaco')
+ @vite(['resources/js/processes/modeler/loaderModeler.js'])
+ @vite(['resources/js/leave-warning.js'])
+ @vite(['resources/js/processes/modeler/initialLoad.js'])
@foreach($manager->getScriptWithParams() as $params)
-
@endforeach
-
+ @vite(['resources/js/processes/modeler/index.js'])
@yield('extra_js')
@endsection
diff --git a/resources/views/processes/screen-builder/screen.blade.php b/resources/views/processes/screen-builder/screen.blade.php
index d9c831d3d2..042d1bae15 100644
--- a/resources/views/processes/screen-builder/screen.blade.php
+++ b/resources/views/processes/screen-builder/screen.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout', ['content_margin'=>''])
+@extends('layouts.layoutnextvite', ['content_margin'=>''])
@section('title')
{{__('Edit Screen')}}
@@ -25,7 +25,6 @@ class="border-0 bg-white p-0"
/>
@endsection
-
@section('content')
{{ __('A mouse and keyboard are required to use screen builder.') }}
@@ -41,106 +40,110 @@ class="border-0 bg-white p-0"
@endsection
@section('js')
+
+ {{-- Load Monaco AMD loader before any Vue component that uses vue-monaco --}}
+ @include('shared.monaco')
+ {{-- Register FORM controls before loaderScreen dispatches app-bootstrapped --}}
+ @vite(['resources/js/processes/screen-builder/loaderScreen.js'])
-
@foreach($manager->getScripts() as $script)
-
+
+
@endforeach
-
+
+ @if ($type === 'FORM')
+ @vite(['resources/js/processes/screen-builder/typeForm.js'])
+ @elseif ($type === 'DISPLAY')
+ @vite(['resources/js/processes/screen-builder/typeDisplay.js'])
+ @endif
+
+ @vite(['resources/js/leave-warning.js'])
+ @vite(['resources/js/processes/screen-builder/main.js'])
@endsection
diff --git a/resources/views/processes/screens/edit.blade.php b/resources/views/processes/screens/edit.blade.php
index b4fccc9f96..72fc53e3de 100644
--- a/resources/views/processes/screens/edit.blade.php
+++ b/resources/views/processes/screens/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Configure Screen')}}
@@ -81,77 +81,14 @@
@endsection
@section('js')
-
-
+
+ @vite(['resources/js/processes/screens/loaderScreens.js'])
+ @vite(['resources/js/processes/screens/edit.js'])
@endsection
diff --git a/resources/views/processes/screens/export.blade.php b/resources/views/processes/screens/export.blade.php
index 7e7741a924..38ba848810 100644
--- a/resources/views/processes/screens/export.blade.php
+++ b/resources/views/processes/screens/export.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Export Screen')}}
@@ -44,26 +44,34 @@
@section('js')
+ @vite(['resources/js/processes/screens/loaderScreens.js'])
+
@endsection
diff --git a/resources/views/processes/screens/import.blade.php b/resources/views/processes/screens/import.blade.php
index 6e0e925bdb..be7976aa02 100644
--- a/resources/views/processes/screens/import.blade.php
+++ b/resources/views/processes/screens/import.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Import Screen')}}
@@ -91,70 +91,77 @@ class="btn btn-secondary ml-2"
@section('js')
+ @vite(['resources/js/processes/screens/loaderScreens.js'])
+
@endsection
diff --git a/resources/views/processes/screens/index.blade.php b/resources/views/processes/screens/index.blade.php
index 50cd01da7c..f7037d23b8 100644
--- a/resources/views/processes/screens/index.blade.php
+++ b/resources/views/processes/screens/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Screens')}}
@@ -16,6 +16,12 @@
@endsection
@section('content')
+
+ @vite(['resources/js/processes/screens/loaderScreens.js'])
@component('components.categorized_resource', [
'tabs' => [
__('Screens'),
diff --git a/resources/views/processes/screens/list.blade.php b/resources/views/processes/screens/list.blade.php
index 9ee623db0e..1eeef45835 100644
--- a/resources/views/processes/screens/list.blade.php
+++ b/resources/views/processes/screens/list.blade.php
@@ -42,6 +42,5 @@
@section('js')
-
-
+ @vite(['resources/js/processes/screens/index.js'])
@append
diff --git a/resources/views/processes/screens/myTemplates.blade.php b/resources/views/processes/screens/myTemplates.blade.php
index bfa6d5a59b..95ef8913d1 100644
--- a/resources/views/processes/screens/myTemplates.blade.php
+++ b/resources/views/processes/screens/myTemplates.blade.php
@@ -46,6 +46,5 @@ class="btn btn-outline-secondary w-100"
@section('js')
-
-
+ @vite(['resources/js/processes/screen-templates/myTemplates.js'])
@append
diff --git a/resources/views/processes/screens/publicTemplates.blade.php b/resources/views/processes/screens/publicTemplates.blade.php
index 56516bdb7d..743f987cf8 100644
--- a/resources/views/processes/screens/publicTemplates.blade.php
+++ b/resources/views/processes/screens/publicTemplates.blade.php
@@ -44,6 +44,5 @@ class="btn btn-outline-secondary w-100"
@section('js')
-
-
+ @vite(['resources/js/processes/screen-templates/publicTemplates.js'])
@append
diff --git a/resources/views/processes/scripts/builder.blade.php b/resources/views/processes/scripts/builder.blade.php
index faa4df2de0..3e9387304d 100644
--- a/resources/views/processes/scripts/builder.blade.php
+++ b/resources/views/processes/scripts/builder.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout', ['content_margin' => ''])
+@extends('layouts.layoutnextvite', ['content_margin' => ''])
@section('title')
{{ __('Edit Script') }}
@@ -53,9 +53,11 @@
@endsection
@section('js')
-
+ @include('shared.monaco')
+ @vite(['resources/js/processes/scripts/loaderScripts.js'])
@foreach ($manager->getScripts() as $script)
-
+
@endforeach
-
+ @vite(['resources/js/leave-warning.js'])
+ @vite(['resources/js/processes/scripts/edit.js'])
@endsection
diff --git a/resources/views/processes/scripts/edit.blade.php b/resources/views/processes/scripts/edit.blade.php
index 61fd6737b3..ad6977092c 100644
--- a/resources/views/processes/scripts/edit.blade.php
+++ b/resources/views/processes/scripts/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Configure Script')}}
@@ -141,84 +141,93 @@
@endsection
@section('js')
-
+ @vite(['resources/js/processes/scripts/loaderScripts.js'])
+ @vite(['resources/js/processes/scripts/editConfig.js'])
+
@endsection
diff --git a/resources/views/processes/scripts/index.blade.php b/resources/views/processes/scripts/index.blade.php
index 4e10ac6ccb..a578a345e3 100644
--- a/resources/views/processes/scripts/index.blade.php
+++ b/resources/views/processes/scripts/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Scripts')}}
@endsection
@@ -15,6 +15,12 @@
@endsection
@section('content')
+
+ @vite(['resources/js/processes/scripts/loaderScripts.js'])
@component('components.categorized_resource', [
'tabs' => [
__('Scripts'),
@@ -39,4 +45,3 @@
@section('js')
@endsection
-
diff --git a/resources/views/processes/scripts/list.blade.php b/resources/views/processes/scripts/list.blade.php
index 459bfd1c14..28616952de 100644
--- a/resources/views/processes/scripts/list.blade.php
+++ b/resources/views/processes/scripts/list.blade.php
@@ -33,6 +33,5 @@
@section('js')
-
-
+ @vite(['resources/js/processes/scripts/index.js'])
@append
diff --git a/resources/views/processes/signals/edit.blade.php b/resources/views/processes/signals/edit.blade.php
index 7091b608a1..1c68e42553 100644
--- a/resources/views/processes/signals/edit.blade.php
+++ b/resources/views/processes/signals/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Edit Signal')}}
@@ -76,50 +76,56 @@
@endsection
@section('js')
-
-
+@vite(['resources/js/processes/signals/loaderSignals.js'])
+@vite(['resources/js/processes/signals/edit.js'])
+
@endsection
diff --git a/resources/views/processes/signals/index.blade.php b/resources/views/processes/signals/index.blade.php
index 9abf84211c..3e1fb62c1b 100644
--- a/resources/views/processes/signals/index.blade.php
+++ b/resources/views/processes/signals/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Signals')}}
@@ -68,74 +68,11 @@
@endsection
@section('js')
-
+ @vite(['resources/js/processes/signals/loaderSignals.js'])
+ @vite(['resources/js/processes/signals/index.js'])
@endsection
diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php
index d7d24757a2..9fdbe7a76a 100644
--- a/resources/views/profile/edit.blade.php
+++ b/resources/views/profile/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.layout')
+@extends('layouts.layoutnextvite')
@section('title')
{{__('Edit Profile')}}
@@ -111,662 +111,662 @@
@endsection
@section('js')
-
+ @vite('resources/js/admin/profile/loaderProfile.js')
+ @vite('resources/js/admin/profile/edit.js')
-
-
+ }
+ });
+
-
+ },
+ methods: {
+ hideModal() {
+ accountsModalInstance.$refs.editConnectionModal.hide();
+ },
+ onCloseModal() {
+ this.hideModal();
+ this.resetFormData();
+ this.resetModalErrors();
+ },
+ resetFormData() {
+ this.formData = Object.assign({}, {
+ url: null,
+ user: null,
+ accessKey: null
+ });
+ },
+ resetModalErrors() {
+ this.errors = Object.assign({}, {
+ url: null,
+ user: null,
+ accessKey: null
+ });
+ },
+ onSubmit() {
+ this.resetModalErrors();
+ //single click
+ if (this.disabled) {
+ return
+ }
+ this.disabled = true;
+
+ //TODO: HANDLE CONNECTION UPDATE
+ this.onCloseModal;
+ },
+ }
+ });
+ });
+