Merge remote-tracking branch 'origin/develop' into develop

ems-core/src/main/java/it/integry/ems/migration/service/MigrationSetupService.java

@@ -1,5 +1,6 @@
 package it.integry.ems.migration.service;
 
+import com.annimon.stream.Stream;
 import it.integry.ems.javabeans.RequestDataDTO;
 import it.integry.ems.migration.MigrationService;
 import it.integry.ems.migration.dto.MigrationStatusDTO;
@@ -128,7 +129,10 @@ public class MigrationSetupService {
 
     public void executeAll() throws Exception {
         for (AvailableConnectionsModel availableConnectionsModel : settingsModel.getAvailableConnections()) {
-            multiDBTransactionManager.addConnection(availableConnectionsModel);
+            if (!Stream.of(multiDBTransactionManager.getActiveConnections())
+                    .anyMatch(advancedDataSource -> advancedDataSource.getDataSource().getDbName().equalsIgnoreCase(availableConnectionsModel.getDbName()))) {
+                multiDBTransactionManager.addConnection(availableConnectionsModel);
+            }
         }
 
         migrationService.startMigrationsGlobally(multiDBTransactionManager);

ems-engine/src/main/webapp/assets/Create.d773546a.js

@@ -1 +1 @@
-import{_ as b,d as C,q as v,X as w,u as k,c as n,w as L,b as h,e as s,g as y,h as g,A as _,r as d,o as l,B as f,a as S,i as B}from"./index.d37591b5.js";import{D}from"./DynamicForm.0ae62a02.js";const N=C({name:"SchedulerCreate",components:{DynamicForm:D},setup(){const e=v(),m=w(),t=k(),o=n(()=>e.params.type);L(o,()=>r());function r(){t.dispatch("scheduler/setCurrentCategory",o.value)}r();const p=n(()=>t.getters["scheduler/getCurrentCategory"]),i=n(()=>t.getters["main/isLoading"]),a=n(()=>t.getters["scheduler/getError"]);async function c(u){await t.dispatch("scheduler/saveAutomation",{category:o.value,...u}),a.value||await m.push({name:"scheduler.show",params:{type:o.value}})}return{type:o,currentCategory:p,onSubmit:c,isLoading:i,error:a}}}),R={class:"intro-y flex items-center mt-8"},V={class:"text-lg font-medium mr-auto"},$={key:0,class:"alert alert-danger show my-2",role:"alert"},A={class:"text-right mt-5"},F=["disabled","onClick"],E=["disabled"],I=B(" Salva ");function q(e,m,t,o,r,p){const i=d("RouterLink"),a=d("LoadingIcon"),c=d("DynamicForm");return l(),h("div",null,[s("div",R,[s("h2",V," Nuova Pianificata "+y(e.type),1)]),g(c,{fields:e.currentCategory,onSubmit:e.onSubmit,class:"intro-y"},{default:_(()=>[e.error?(l(),h("div",$,y(e.error.message),1)):f("",!0),s("div",A,[g(i,{to:{name:"scheduler.show",params:{type:e.type}},custom:""},{default:_(({navigate:u})=>[s("button",{type:"button",class:"btn btn-outline-secondary w-24 mr-1",disabled:e.isLoading,onClick:u}," Annulla ",8,F)]),_:1},8,["to"]),s("button",{type:"submit",class:"btn btn-primary w-24",disabled:e.isLoading},[I,e.isLoading?(l(),S(a,{key:0,icon:"oval",color:"white",class:"w-4 h-4 ml-2"})):f("",!0)],8,E)])]),_:1},8,["fields","onSubmit"])])}const X=b(N,[["render",q]]);export{X as default};
+import{_ as b,d as C,q as v,X as w,u as k,c as n,w as L,b as h,e as s,g as y,h as g,A as _,r as d,o as l,B as f,a as S,i as B}from"./index.74704084.js";import{D}from"./DynamicForm.793486e1.js";const N=C({name:"SchedulerCreate",components:{DynamicForm:D},setup(){const e=v(),m=w(),t=k(),o=n(()=>e.params.type);L(o,()=>r());function r(){t.dispatch("scheduler/setCurrentCategory",o.value)}r();const p=n(()=>t.getters["scheduler/getCurrentCategory"]),i=n(()=>t.getters["main/isLoading"]),a=n(()=>t.getters["scheduler/getError"]);async function c(u){await t.dispatch("scheduler/saveAutomation",{category:o.value,...u}),a.value||await m.push({name:"scheduler.show",params:{type:o.value}})}return{type:o,currentCategory:p,onSubmit:c,isLoading:i,error:a}}}),R={class:"intro-y flex items-center mt-8"},V={class:"text-lg font-medium mr-auto"},$={key:0,class:"alert alert-danger show my-2",role:"alert"},A={class:"text-right mt-5"},F=["disabled","onClick"],E=["disabled"],I=B(" Salva ");function q(e,m,t,o,r,p){const i=d("RouterLink"),a=d("LoadingIcon"),c=d("DynamicForm");return l(),h("div",null,[s("div",R,[s("h2",V," Nuova Pianificata "+y(e.type),1)]),g(c,{fields:e.currentCategory,onSubmit:e.onSubmit,class:"intro-y"},{default:_(()=>[e.error?(l(),h("div",$,y(e.error.message),1)):f("",!0),s("div",A,[g(i,{to:{name:"scheduler.show",params:{type:e.type}},custom:""},{default:_(({navigate:u})=>[s("button",{type:"button",class:"btn btn-outline-secondary w-24 mr-1",disabled:e.isLoading,onClick:u}," Annulla ",8,F)]),_:1},8,["to"]),s("button",{type:"submit",class:"btn btn-primary w-24",disabled:e.isLoading},[I,e.isLoading?(l(),S(a,{key:0,icon:"oval",color:"white",class:"w-4 h-4 ml-2"})):f("",!0)],8,E)])]),_:1},8,["fields","onSubmit"])])}const X=b(N,[["render",q]]);export{X as default};

ems-engine/src/main/webapp/assets/Edit.d4f8d531.js

@@ -1 +1 @@
-import{_ as S,d as B,q as D,X as N,u as E,c as a,w as g,v as R,b as y,e as n,g as v,h as _,A as b,r as l,o as m,B as C,a as V,i as $}from"./index.d37591b5.js";import{D as F}from"./DynamicForm.0ae62a02.js";const I=B({name:"SchedulerEdit",components:{DynamicForm:F},setup(){const e=D(),h=N(),t=E(),o=a(()=>e.params.type);g(o,()=>i()),i();async function p(){await t.dispatch("scheduler/fetchAutomations",o.value)}p();function i(){t.dispatch("scheduler/setCurrentCategory",o.value)}const c=a(()=>t.getters["scheduler/getCurrentCategory"]),s=a(()=>e.params.id);g(s,()=>r());const u=a(()=>e.name);function r(){t.dispatch("scheduler/setCurrentAutomation",s.value)}r();const w=a(()=>t.getters["scheduler/getCurrentAutomation"]),d=R(w.value);d.value&&u.value==="scheduler.duplicate"&&(d.value.id=void 0);const A=a(()=>t.getters["main/isLoading"]),f=a(()=>t.getters["scheduler/getError"]);async function k(L){await t.dispatch("scheduler/saveAutomation",{category:o.value,...L}),f.value||await h.push({name:"scheduler.show",params:{type:o.value}})}return{type:o,id:s,currentCategory:c,currentAutomation:d,onSubmit:k,isLoading:A,error:f}}}),q={class:"intro-y flex items-center mt-8"},M={class:"text-lg font-medium mr-auto"},P={key:0,class:"alert alert-danger show my-2",role:"alert"},T={class:"text-right mt-5"},X=["disabled","onClick"],j=["disabled"],z=$(" Salva ");function G(e,h,t,o,p,i){const c=l("RouterLink"),s=l("LoadingIcon"),u=l("DynamicForm");return m(),y("div",null,[n("div",q,[n("h2",M," Modifica Pianificata "+v(e.currentAutomation.name),1)]),_(u,{fields:e.currentCategory,"initial-values":e.currentAutomation,onSubmit:e.onSubmit,class:"intro-y"},{default:b(()=>[e.error?(m(),y("div",P,v(e.error.message),1)):C("",!0),n("div",T,[_(c,{to:{name:"scheduler.show",params:{type:e.type}},custom:""},{default:b(({navigate:r})=>[n("button",{type:"button",class:"btn btn-outline-secondary w-24 mr-1",disabled:e.isLoading,onClick:r}," Annulla ",8,X)]),_:1},8,["to"]),n("button",{type:"submit",class:"btn btn-primary w-24",disabled:e.isLoading},[z,e.isLoading?(m(),V(s,{key:0,icon:"oval",color:"white",class:"w-4 h-4 ml-2"})):C("",!0)],8,j)])]),_:1},8,["fields","initial-values","onSubmit"])])}const K=S(I,[["render",G]]);export{K as default};
+import{_ as S,d as B,q as D,X as N,u as E,c as a,w as g,v as R,b as y,e as n,g as v,h as _,A as b,r as l,o as m,B as C,a as V,i as $}from"./index.74704084.js";import{D as F}from"./DynamicForm.793486e1.js";const I=B({name:"SchedulerEdit",components:{DynamicForm:F},setup(){const e=D(),h=N(),t=E(),o=a(()=>e.params.type);g(o,()=>i()),i();async function p(){await t.dispatch("scheduler/fetchAutomations",o.value)}p();function i(){t.dispatch("scheduler/setCurrentCategory",o.value)}const c=a(()=>t.getters["scheduler/getCurrentCategory"]),s=a(()=>e.params.id);g(s,()=>r());const u=a(()=>e.name);function r(){t.dispatch("scheduler/setCurrentAutomation",s.value)}r();const w=a(()=>t.getters["scheduler/getCurrentAutomation"]),d=R(w.value);d.value&&u.value==="scheduler.duplicate"&&(d.value.id=void 0);const A=a(()=>t.getters["main/isLoading"]),f=a(()=>t.getters["scheduler/getError"]);async function k(L){await t.dispatch("scheduler/saveAutomation",{category:o.value,...L}),f.value||await h.push({name:"scheduler.show",params:{type:o.value}})}return{type:o,id:s,currentCategory:c,currentAutomation:d,onSubmit:k,isLoading:A,error:f}}}),q={class:"intro-y flex items-center mt-8"},M={class:"text-lg font-medium mr-auto"},P={key:0,class:"alert alert-danger show my-2",role:"alert"},T={class:"text-right mt-5"},X=["disabled","onClick"],j=["disabled"],z=$(" Salva ");function G(e,h,t,o,p,i){const c=l("RouterLink"),s=l("LoadingIcon"),u=l("DynamicForm");return m(),y("div",null,[n("div",q,[n("h2",M," Modifica Pianificata "+v(e.currentAutomation.name),1)]),_(u,{fields:e.currentCategory,"initial-values":e.currentAutomation,onSubmit:e.onSubmit,class:"intro-y"},{default:b(()=>[e.error?(m(),y("div",P,v(e.error.message),1)):C("",!0),n("div",T,[_(c,{to:{name:"scheduler.show",params:{type:e.type}},custom:""},{default:b(({navigate:r})=>[n("button",{type:"button",class:"btn btn-outline-secondary w-24 mr-1",disabled:e.isLoading,onClick:r}," Annulla ",8,X)]),_:1},8,["to"]),n("button",{type:"submit",class:"btn btn-primary w-24",disabled:e.isLoading},[z,e.isLoading?(m(),V(s,{key:0,icon:"oval",color:"white",class:"w-4 h-4 ml-2"})):C("",!0)],8,j)])]),_:1},8,["fields","initial-values","onSubmit"])])}const K=S(I,[["render",G]]);export{K as default};

ems-engine/src/main/webapp/assets/Index.5320d20b.js

@@ -1 +1 @@
-import{_ as s,d as n,u as r,c as i,w as u,a as d,o as p,r as l}from"./index.d37591b5.js";const h=n({name:"SchedulerIndex",setup(){const e=r(),o=i(()=>e.getters["scheduler/getAutomationCategories"]);e.dispatch("scheduler/initStore"),u(()=>o.value,()=>{e.dispatch("main/clearMenuButton",{button:"Pianificate",child:!0}),Object.keys(o.value).forEach(t=>{e.dispatch("main/addMenuButton",{child:"Pianificate",button:{title:t,icon:"ActivityIcon",routeName:"scheduler.show",params:{type:t},child:[{routeName:"scheduler.create",params:{type:t}}]}})})})}});function m(e,o,a,t,_,f){const c=l("router-view");return p(),d(c)}const w=s(h,[["render",m]]);export{w as default};
+import{_ as s,d as n,u as r,c as i,w as u,a as d,o as p,r as l}from"./index.74704084.js";const h=n({name:"SchedulerIndex",setup(){const e=r(),o=i(()=>e.getters["scheduler/getAutomationCategories"]);e.dispatch("scheduler/initStore"),u(()=>o.value,()=>{e.dispatch("main/clearMenuButton",{button:"Pianificate",child:!0}),Object.keys(o.value).forEach(t=>{e.dispatch("main/addMenuButton",{child:"Pianificate",button:{title:t,icon:"ActivityIcon",routeName:"scheduler.show",params:{type:t},child:[{routeName:"scheduler.create",params:{type:t}}]}})})})}});function m(e,o,a,t,_,f){const c=l("router-view");return p(),d(c)}const w=s(h,[["render",m]]);export{w as default};

ems-engine/src/main/webapp/assets/auto.6d937f4c.js

@@ -0,0 +1 @@
+import{a8 as a,a9 as r}from"./index.74704084.js";import{a8 as o}from"./index.74704084.js";a.register(...r);export{o as default};

ems-engine/src/main/webapp/assets/auto.9780fd88.js

@@ -1 +0,0 @@
-import{a8 as a,a9 as r}from"./index.d37591b5.js";import{a8 as o}from"./index.d37591b5.js";a.register(...r);export{o as default};

ems-engine/src/main/webapp/index.html

@@ -17,8 +17,8 @@
     />
     <!-- <link rel="preload" href="/font/Inter-italic.var.woff2" as="font" type="font/woff2" crossorigin="anonymous"> -->
     <link rel="stylesheet" href="./font/inter.css"/>
-  <script type="module" crossorigin src="./assets/index.d37591b5.js"></script>
-  <link rel="stylesheet" href="./assets/index.5d943bfb.css">
+  <script type="module" crossorigin src="./assets/index.74704084.js"></script>
+  <link rel="stylesheet" href="./assets/index.58ae021f.css">
 </head>
 
 <body>