adminizer 4.1.0-build.3 → 4.1.0-build.30

package/assets/{user-info-DBYoAJYJ.js → user-info-qduQAMOl.js}

@@ -1,4 +1,4 @@
-import{d as F,r as g,j as c}from"./app.js";import{c as S}from"./compiler-runtime-tM4jBQ-T.js";import{c as U,a as M,u as w}from"./index-D5ir9iUV.js";import{P as y}from"./index-K81GbF6O.js";import{c as I}from"./utils-DjqsqOe8.js";import"./index-DrWfGwtf.js";var E={exports:{}},A={};/**
+import{b as F,r as g,j as c}from"./app.js";import{c as S}from"./compiler-runtime-CMDe02AS.js";import{c as U,a as M,u as w}from"./index-D5ir9iUV.js";import{P as y}from"./index-CsMwA9pu.js";import{c as I}from"./utils-DjqsqOe8.js";import"./index-HZzILD42.js";var E={exports:{}},A={};/**
  * @license React
  * use-sync-external-store-shim.production.js
  *
@@ -6,4 +6,4 @@ import{d as F,r as g,j as c}from"./app.js";import{c as S}from"./compiler-runtime
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- */var j;function P(){if(j)return A;j=1;var a=F();function e(o,i){return o===i&&(o!==0||1/o===1/i)||o!==o&&i!==i}var t=typeof Object.is=="function"?Object.is:e,r=a.useState,s=a.useEffect,n=a.useLayoutEffect,f=a.useDebugValue;function l(o,i){var m=i(),h=r({inst:{value:m,getSnapshot:i}}),p=h[0].inst,x=h[1];return n(function(){p.value=m,p.getSnapshot=i,u(p)&&x({inst:p})},[o,m,i]),s(function(){return u(p)&&x({inst:p}),o(function(){u(p)&&x({inst:p})})},[o]),f(m),m}function u(o){var i=o.getSnapshot;o=o.value;try{var m=i();return!t(o,m)}catch{return!0}}function d(o,i){return i()}var v=typeof window>"u"||typeof window.document>"u"||typeof window.document.createElement>"u"?d:l;return A.useSyncExternalStore=a.useSyncExternalStore!==void 0?a.useSyncExternalStore:v,A}var N;function z(){return N||(N=1,E.exports=P()),E.exports}var T=z();function V(){return T.useSyncExternalStore(D,()=>!0,()=>!1)}function D(){return()=>{}}var L="Avatar",[G,oe]=U(L),[H,R]=G(L),_=g.forwardRef((a,e)=>{const{__scopeAvatar:t,...r}=a,[s,n]=g.useState("idle");return c.jsx(H,{scope:t,imageLoadingStatus:s,onImageLoadingStatusChange:n,children:c.jsx(y.span,{...r,ref:e})})});_.displayName=L;var C="AvatarImage",k=g.forwardRef((a,e)=>{const{__scopeAvatar:t,src:r,onLoadingStatusChange:s=()=>{},...n}=a,f=R(C,t),l=B(r,n),u=M(d=>{s(d),f.onImageLoadingStatusChange(d)});return w(()=>{l!=="idle"&&u(l)},[l,u]),l==="loaded"?c.jsx(y.img,{...n,ref:e,src:r}):null});k.displayName=C;var $="AvatarFallback",q=g.forwardRef((a,e)=>{const{__scopeAvatar:t,delayMs:r,...s}=a,n=R($,t),[f,l]=g.useState(r===void 0);return g.useEffect(()=>{if(r!==void 0){const u=window.setTimeout(()=>l(!0),r);return()=>window.clearTimeout(u)}},[r]),f&&n.imageLoadingStatus!=="loaded"?c.jsx(y.span,{...s,ref:e}):null});q.displayName=$;function b(a,e){return a?e?(a.src!==e&&(a.src=e),a.complete&&a.naturalWidth>0?"loaded":"loading"):"error":"idle"}function B(a,{referrerPolicy:e,crossOrigin:t}){const r=V(),s=g.useRef(null),n=r?(s.current||(s.current=new window.Image),s.current):null,[f,l]=g.useState(()=>b(n,a));return w(()=>{l(b(n,a))},[n,a]),w(()=>{const u=o=>()=>{l(o)};if(!n)return;const d=u("loaded"),v=u("error");return n.addEventListener("load",d),n.addEventListener("error",v),e&&(n.referrerPolicy=e),typeof t=="string"&&(n.crossOrigin=t),()=>{n.removeEventListener("load",d),n.removeEventListener("error",v)}},[n,t,e]),f}var K=_,O=k,W=q;function J(a){const e=S.c(8);let t,r;e[0]!==a?({className:t,...r}=a,e[0]=a,e[1]=t,e[2]=r):(t=e[1],r=e[2]);let s;e[3]!==t?(s=I("relative flex size-8 shrink-0 overflow-hidden rounded-full",t),e[3]=t,e[4]=s):s=e[4];let n;return e[5]!==r||e[6]!==s?(n=c.jsx(K,{"data-slot":"avatar",className:s,...r}),e[5]=r,e[6]=s,e[7]=n):n=e[7],n}function Q(a){const e=S.c(8);let t,r;e[0]!==a?({className:t,...r}=a,e[0]=a,e[1]=t,e[2]=r):(t=e[1],r=e[2]);let s;e[3]!==t?(s=I("aspect-square size-full",t),e[3]=t,e[4]=s):s=e[4];let n;return e[5]!==r||e[6]!==s?(n=c.jsx(O,{"data-slot":"avatar-image",className:s,...r}),e[5]=r,e[6]=s,e[7]=n):n=e[7],n}function X(a){const e=S.c(8);let t,r;e[0]!==a?({className:t,...r}=a,e[0]=a,e[1]=t,e[2]=r):(t=e[1],r=e[2]);let s;e[3]!==t?(s=I("bg-muted flex size-full items-center justify-center rounded-full",t),e[3]=t,e[4]=s):s=e[4];let n;return e[5]!==r||e[6]!==s?(n=c.jsx(W,{"data-slot":"avatar-fallback",className:s,...r}),e[5]=r,e[6]=s,e[7]=n):n=e[7],n}function Y(){return Z}function Z(a){const e=a.trim().split(" ");if(e.length===0)return"";if(e.length===1)return e[0].charAt(0).toUpperCase();const t=e[0].charAt(0),r=e[e.length-1].charAt(0);return`${t}${r}`.toUpperCase()}function ie(a){const e=S.c(22),{user:t,showEmail:r}=a,s=r===void 0?!1:r,n=Y();let f;e[0]!==t.avatar||e[1]!==t.login?(f=c.jsx(Q,{src:t.avatar,alt:t.login}),e[0]=t.avatar,e[1]=t.login,e[2]=f):f=e[2];let l;e[3]!==n||e[4]!==t.login?(l=n(t.login),e[3]=n,e[4]=t.login,e[5]=l):l=e[5];let u;e[6]!==l?(u=c.jsx(X,{className:"rounded-lg bg-neutral-200 text-black dark:bg-neutral-700 dark:text-white",children:l}),e[6]=l,e[7]=u):u=e[7];let d;e[8]!==f||e[9]!==u?(d=c.jsxs(J,{className:"h-8 w-8 overflow-hidden rounded-full",children:[f,u]}),e[8]=f,e[9]=u,e[10]=d):d=e[10];let v;e[11]!==t.login?(v=c.jsx("span",{className:"truncate font-medium",children:t.login}),e[11]=t.login,e[12]=v):v=e[12];let o;e[13]!==s||e[14]!==t.email?(o=s&&c.jsx("span",{className:"text-muted-foreground truncate text-xs",children:t.email}),e[13]=s,e[14]=t.email,e[15]=o):o=e[15];let i;e[16]!==v||e[17]!==o?(i=c.jsxs("div",{className:"grid flex-1 text-left text-sm leading-tight",children:[v,o]}),e[16]=v,e[17]=o,e[18]=i):i=e[18];let m;return e[19]!==d||e[20]!==i?(m=c.jsxs(c.Fragment,{children:[d,i]}),e[19]=d,e[20]=i,e[21]=m):m=e[21],m}export{ie as UserInfo};
+ */var j;function P(){if(j)return A;j=1;var a=F();function e(o,i){return o===i&&(o!==0||1/o===1/i)||o!==o&&i!==i}var t=typeof Object.is=="function"?Object.is:e,r=a.useState,s=a.useEffect,n=a.useLayoutEffect,f=a.useDebugValue;function l(o,i){var m=i(),h=r({inst:{value:m,getSnapshot:i}}),p=h[0].inst,x=h[1];return n(function(){p.value=m,p.getSnapshot=i,u(p)&&x({inst:p})},[o,m,i]),s(function(){return u(p)&&x({inst:p}),o(function(){u(p)&&x({inst:p})})},[o]),f(m),m}function u(o){var i=o.getSnapshot;o=o.value;try{var m=i();return!t(o,m)}catch{return!0}}function d(o,i){return i()}var v=typeof window>"u"||typeof window.document>"u"||typeof window.document.createElement>"u"?d:l;return A.useSyncExternalStore=a.useSyncExternalStore!==void 0?a.useSyncExternalStore:v,A}var b;function z(){return b||(b=1,E.exports=P()),E.exports}var T=z();function V(){return T.useSyncExternalStore(D,()=>!0,()=>!1)}function D(){return()=>{}}var L="Avatar",[G,oe]=U(L),[H,R]=G(L),_=g.forwardRef((a,e)=>{const{__scopeAvatar:t,...r}=a,[s,n]=g.useState("idle");return c.jsx(H,{scope:t,imageLoadingStatus:s,onImageLoadingStatusChange:n,children:c.jsx(y.span,{...r,ref:e})})});_.displayName=L;var C="AvatarImage",k=g.forwardRef((a,e)=>{const{__scopeAvatar:t,src:r,onLoadingStatusChange:s=()=>{},...n}=a,f=R(C,t),l=B(r,n),u=M(d=>{s(d),f.onImageLoadingStatusChange(d)});return w(()=>{l!=="idle"&&u(l)},[l,u]),l==="loaded"?c.jsx(y.img,{...n,ref:e,src:r}):null});k.displayName=C;var $="AvatarFallback",q=g.forwardRef((a,e)=>{const{__scopeAvatar:t,delayMs:r,...s}=a,n=R($,t),[f,l]=g.useState(r===void 0);return g.useEffect(()=>{if(r!==void 0){const u=window.setTimeout(()=>l(!0),r);return()=>window.clearTimeout(u)}},[r]),f&&n.imageLoadingStatus!=="loaded"?c.jsx(y.span,{...s,ref:e}):null});q.displayName=$;function N(a,e){return a?e?(a.src!==e&&(a.src=e),a.complete&&a.naturalWidth>0?"loaded":"loading"):"error":"idle"}function B(a,{referrerPolicy:e,crossOrigin:t}){const r=V(),s=g.useRef(null),n=r?(s.current||(s.current=new window.Image),s.current):null,[f,l]=g.useState(()=>N(n,a));return w(()=>{l(N(n,a))},[n,a]),w(()=>{const u=o=>()=>{l(o)};if(!n)return;const d=u("loaded"),v=u("error");return n.addEventListener("load",d),n.addEventListener("error",v),e&&(n.referrerPolicy=e),typeof t=="string"&&(n.crossOrigin=t),()=>{n.removeEventListener("load",d),n.removeEventListener("error",v)}},[n,t,e]),f}var K=_,O=k,W=q;function J(a){const e=S.c(8);let t,r;e[0]!==a?({className:t,...r}=a,e[0]=a,e[1]=t,e[2]=r):(t=e[1],r=e[2]);let s;e[3]!==t?(s=I("relative flex size-8 shrink-0 overflow-hidden rounded-full",t),e[3]=t,e[4]=s):s=e[4];let n;return e[5]!==r||e[6]!==s?(n=c.jsx(K,{"data-slot":"avatar",className:s,...r}),e[5]=r,e[6]=s,e[7]=n):n=e[7],n}function Q(a){const e=S.c(8);let t,r;e[0]!==a?({className:t,...r}=a,e[0]=a,e[1]=t,e[2]=r):(t=e[1],r=e[2]);let s;e[3]!==t?(s=I("aspect-square size-full",t),e[3]=t,e[4]=s):s=e[4];let n;return e[5]!==r||e[6]!==s?(n=c.jsx(O,{"data-slot":"avatar-image",className:s,...r}),e[5]=r,e[6]=s,e[7]=n):n=e[7],n}function X(a){const e=S.c(8);let t,r;e[0]!==a?({className:t,...r}=a,e[0]=a,e[1]=t,e[2]=r):(t=e[1],r=e[2]);let s;e[3]!==t?(s=I("bg-muted flex size-full items-center justify-center rounded-full",t),e[3]=t,e[4]=s):s=e[4];let n;return e[5]!==r||e[6]!==s?(n=c.jsx(W,{"data-slot":"avatar-fallback",className:s,...r}),e[5]=r,e[6]=s,e[7]=n):n=e[7],n}function Y(){return Z}function Z(a){const e=a.trim().split(" ");if(e.length===0)return"";if(e.length===1)return e[0].charAt(0).toUpperCase();const t=e[0].charAt(0),r=e[e.length-1].charAt(0);return`${t}${r}`.toUpperCase()}function ie(a){const e=S.c(22),{user:t,showEmail:r}=a,s=r===void 0?!1:r,n=Y();let f;e[0]!==t.avatar||e[1]!==t.login?(f=c.jsx(Q,{src:t.avatar,alt:t.login}),e[0]=t.avatar,e[1]=t.login,e[2]=f):f=e[2];let l;e[3]!==n||e[4]!==t.login?(l=n(t.login),e[3]=n,e[4]=t.login,e[5]=l):l=e[5];let u;e[6]!==l?(u=c.jsx(X,{className:"rounded-lg bg-neutral-200 text-black dark:bg-neutral-700 dark:text-white",children:l}),e[6]=l,e[7]=u):u=e[7];let d;e[8]!==f||e[9]!==u?(d=c.jsxs(J,{className:"h-8 w-8 overflow-hidden rounded-full",children:[f,u]}),e[8]=f,e[9]=u,e[10]=d):d=e[10];let v;e[11]!==t.login?(v=c.jsx("span",{className:"truncate font-medium",children:t.login}),e[11]=t.login,e[12]=v):v=e[12];let o;e[13]!==s||e[14]!==t.email?(o=s&&c.jsx("span",{className:"text-muted-foreground truncate text-xs",children:t.email}),e[13]=s,e[14]=t.email,e[15]=o):o=e[15];let i;e[16]!==v||e[17]!==o?(i=c.jsxs("div",{className:"grid flex-1 text-left text-sm leading-tight",children:[v,o]}),e[16]=v,e[17]=o,e[18]=i):i=e[18];let m;return e[19]!==d||e[20]!==i?(m=c.jsxs(c.Fragment,{children:[d,i]}),e[19]=d,e[20]=i,e[21]=m):m=e[21],m}export{ie as UserInfo};

package/assets/{user-menu-content-qkvdkUVd.js → user-menu-content-Cjq658jE.js}

@@ -1,6 +1,6 @@
-import{j as t,J as u}from"./app.js";import{c as f}from"./compiler-runtime-tM4jBQ-T.js";import{g as d,e as x,d as h}from"./dropdown-menu-SEBnEIiL.js";import{UserInfo as y}from"./user-info-DBYoAJYJ.js";import{c as g}from"./createLucideIcon-BFG25zNo.js";import"./index-Cdb9ACvz.js";import"./index-D5ir9iUV.js";import"./index-K81GbF6O.js";import"./index-DrWfGwtf.js";import"./index-DEk3sC8d.js";import"./index-BbXEMx9n.js";import"./index-C0SL3SHw.js";import"./index-BC0yfOHo.js";import"./utils-DjqsqOe8.js";/**
+import{j as t,J as u}from"./app.js";import{c as f}from"./compiler-runtime-CMDe02AS.js";import{c as d,d as x,e as h}from"./dropdown-menu-D3vlxbLx.js";import{UserInfo as y}from"./user-info-qduQAMOl.js";import{c as j}from"./createLucideIcon-BFG25zNo.js";import"./index-C8anOJBB.js";import"./index-D5ir9iUV.js";import"./index-CsMwA9pu.js";import"./index-HZzILD42.js";import"./index-CS5ssiKu.js";import"./index-Bz0y23v2.js";import"./index-BZZx7KCI.js";import"./index-kzaPFHKt.js";import"./utils-DjqsqOe8.js";/**
  * @license lucide-react v0.485.0 - ISC
  *
  * This source code is licensed under the ISC license.
  * See the LICENSE file in the root directory of this source tree.
- */const j=[["path",{d:"M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4",key:"1uf3rs"}],["polyline",{points:"16 17 21 12 16 7",key:"1gabdz"}],["line",{x1:"21",x2:"9",y1:"12",y2:"12",key:"1uyos4"}]],b=g("log-out",j);function _(){return M}function M(){document.body.style.removeProperty("pointer-events")}function B(p){const e=f.c(11),{user:l,logout:m,logoutBtn:c}=p,a=_();let o;e[0]!==l?(o=t.jsx(d,{className:"p-0 font-normal",children:t.jsx("div",{className:"flex items-center gap-2 px-1 py-1.5 text-left text-sm",children:t.jsx(y,{user:l,showEmail:!0})})}),e[0]=l,e[1]=o):o=e[1];let s;e[2]===Symbol.for("react.memo_cache_sentinel")?(s=t.jsx(x,{}),e[2]=s):s=e[2];let n;e[3]===Symbol.for("react.memo_cache_sentinel")?(n=t.jsx(b,{className:"mr-2"}),e[3]=n):n=e[3];let r;e[4]!==a||e[5]!==m||e[6]!==c?(r=t.jsx(h,{asChild:!0,children:t.jsxs(u,{className:"block w-full cursor-pointer",method:"get",href:m,as:"button",onClick:a,children:[n,c]})}),e[4]=a,e[5]=m,e[6]=c,e[7]=r):r=e[7];let i;return e[8]!==o||e[9]!==r?(i=t.jsxs(t.Fragment,{children:[o,s,r]}),e[8]=o,e[9]=r,e[10]=i):i=e[10],i}export{B as UserMenuContent};
+ */const g=[["path",{d:"M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4",key:"1uf3rs"}],["polyline",{points:"16 17 21 12 16 7",key:"1gabdz"}],["line",{x1:"21",x2:"9",y1:"12",y2:"12",key:"1uyos4"}]],b=j("log-out",g);function _(){return M}function M(){document.body.style.removeProperty("pointer-events")}function B(p){const e=f.c(11),{user:l,logout:m,logoutBtn:c}=p,a=_();let o;e[0]!==l?(o=t.jsx(d,{className:"p-0 font-normal",children:t.jsx("div",{className:"flex items-center gap-2 px-1 py-1.5 text-left text-sm",children:t.jsx(y,{user:l,showEmail:!0})})}),e[0]=l,e[1]=o):o=e[1];let s;e[2]===Symbol.for("react.memo_cache_sentinel")?(s=t.jsx(x,{}),e[2]=s):s=e[2];let n;e[3]===Symbol.for("react.memo_cache_sentinel")?(n=t.jsx(b,{className:"mr-2"}),e[3]=n):n=e[3];let r;e[4]!==a||e[5]!==m||e[6]!==c?(r=t.jsx(h,{asChild:!0,children:t.jsxs(u,{className:"block w-full cursor-pointer",method:"get",href:m,as:"button",onClick:a,children:[n,c]})}),e[4]=a,e[5]=m,e[6]=c,e[7]=r):r=e[7];let i;return e[8]!==o||e[9]!==r?(i=t.jsxs(t.Fragment,{children:[o,s,r]}),e[8]=o,e[9]=r,e[10]=i):i=e[10],i}export{B as UserMenuContent};

package/assets/welcome-CbHEVD33.js

@@ -0,0 +1 @@
+import{q as s,j as i}from"./app.js";import{c as l}from"./compiler-runtime-CMDe02AS.js";import{A as x}from"./app-layout-CQTlWDgg.js";import"./sidebar-DflSp1X1.js";import"./index-HZzILD42.js";import"./button-DleSKY4-.js";import"./utils-DjqsqOe8.js";import"./index-BpVWRzP4.js";import"./createLucideIcon-BFG25zNo.js";import"./index-C8anOJBB.js";import"./index-D5ir9iUV.js";import"./index-CsMwA9pu.js";import"./index-BZZx7KCI.js";import"./index-kzaPFHKt.js";import"./tooltip-BlR1mf2V.js";import"./index-BRQOFOzQ.js";import"./app-shell-B4pzTbiN.js";import"./app-sidebar-DX9Shcd3.js";import"./nav-main-CwwCPIYf.js";import"./material-icon-C9IuCi5R.js";import"./chevron-right-D5q8rF7h.js";import"./index-Bz0y23v2.js";import"./index-CS5ssiKu.js";import"./chevrons-up-down-kALltqHV.js";import"./app-sidebar-header-BcZ0JSSJ.js";import"./breadcrumbs-DIhfOCvh.js";import"./nav-user-K0xXPEmb.js";import"./dropdown-menu-D3vlxbLx.js";import"./user-info-qduQAMOl.js";import"./user-menu-content-Cjq658jE.js";import"./icon-DLHMhF_-.js";import"./use-appearance-CL1-5ZfQ.js";const a=[];function J(){const t=l.c(8),r=s();let o;t[0]!==r.props.title?(o=r.props.title&&i.jsx("div",{className:"text-3xl mb-8",children:r.props.title}),t[0]=r.props.title,t[1]=o):o=t[1];let e;t[2]===Symbol.for("react.memo_cache_sentinel")?(e=i.jsx("div",{className:"text-3xl mb-8",children:"Adminizer"}),t[2]=e):e=t[2];let p;t[3]!==r.props.text?(p=r.props.text&&i.jsx("div",{dangerouslySetInnerHTML:{__html:r.props.text}}),t[3]=r.props.text,t[4]=p):p=t[4];let m;return t[5]!==o||t[6]!==p?(m=i.jsx(x,{breadcrumbs:a,children:i.jsxs("div",{className:"flex h-full flex-1 flex-col gap-4 rounded-xl p-4",children:[o,e,p]})}),t[5]=o,t[6]=p,t[7]=m):m=t[7],m}export{J as default};

package/controllers/add.js

@@ -7,6 +7,7 @@ import { Adminizer } from "../lib/Adminizer";
 import inertiaAddHelper from "../helpers/inertiaAddHelper";
 export default async function add(req, res) {
     let entity = ControllerHelper.findEntityObject(req);
+    console.log(entity);
     if (!entity.model) {
         return res.status(404).send({ error: 'Model not Found' });
     }
@@ -14,14 +15,14 @@ export default async function add(req, res) {
         return req.Inertia.redirect(`${req.adminizer.config.routePrefix}/${entity.uri}`);
     }
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return req.Inertia.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }
-    let dataAccessor = new DataAccessor(req, entity, "add");
+    let dataAccessor = new DataAccessor(req.adminizer, req.user, entity, "add");
     let fields = dataAccessor.getFieldsConfig();
     // add deprecated 'records' to config
     fields = await FieldsHelper.loadAssociations(req, fields, "add");
@@ -91,6 +92,7 @@ export default async function add(req, res) {
             await saveRelationsMediaManager(fields, rawReqData, entity.model.identity, record.id);
             Adminizer.log.debug(`A new record was created: `, record);
             if (req.body.jsonPopupCatalog) {
+                // await new Promise(resolve => setTimeout(resolve, 2000));
                 return res.json({ record: record });
             }
             else {
@@ -104,16 +106,13 @@ export default async function add(req, res) {
             data = reqData;
         }
     }
+    const props = inertiaAddHelper(req, entity, fields);
     if (req.query?.without_layout) {
-        // return res.viewAdmin("./../ejs/partials/content/addPopup.ejs", {
-        //     entity: entity,
-        //     fields: fields,
-        //     data: data
-        // });
-        return null;
+        return res.json({
+            props: props
+        });
     }
     else {
-        const props = inertiaAddHelper(req, entity, fields);
         return req.Inertia.render({
             component: 'add',
             props: props

package/controllers/addGroup.js

@@ -4,10 +4,10 @@ import { inertiaGroupHelper } from "../helpers/inertiaGroupHelper";
 export default async function addGroup(req, res) {
     let entity = ControllerHelper.findEntityObject(req);
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }
@@ -25,7 +25,6 @@ export default async function addGroup(req, res) {
         groupedTokens[department] = req.adminizer.accessRightsHelper.getTokensByDepartment(department);
     }
     if (req.method.toUpperCase() === 'POST') {
-        // console.log(req.body);
         let allTokens = req.adminizer.accessRightsHelper.getTokens();
         let usersInThisGroup = [];
         let tokensOfThisGroup = [];
@@ -60,7 +59,6 @@ export default async function addGroup(req, res) {
             Adminizer.log.error(e);
             req.session.messages.adminError.push(e.message || 'Something went wrong...');
         }
-        // console.log(group)
     }
     const props = inertiaGroupHelper(entity, req, users, groupedTokens);
     return req.Inertia.render({

package/controllers/addUser.js

@@ -5,10 +5,10 @@ import { inertiaUserHelper } from "../helpers/inertiaUserHelper";
 export default async function (req, res) {
     let entity = ControllerHelper.findEntityObject(req);
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.user)) {
             return res.sendStatus(403);
         }
     }
@@ -22,7 +22,6 @@ export default async function (req, res) {
     }
     let user;
     if (req.method.toUpperCase() === 'POST') {
-        // console.log(req.body);
         let userGroups = [];
         for (let key in req.body) {
             if (key.startsWith("group-checkbox-") && req.body[key] === true) {
@@ -40,12 +39,12 @@ export default async function (req, res) {
             locale = req.body.locale === 'default' ? req.adminizer.config.translation.defaultLocale : req.body.locale;
         }
         try {
-            let passwordHashed = generate(req.body.login + req.body.userPassword);
+            let passwordHashed = generate(req.body.login + req.body.userPassword + process.env.AP_PASSWORD_SALT);
             let password = 'masked';
             // TODO refactor CRUD functions for DataAccessor usage
             user = await req.adminizer.modelHandler.model.get("UserAP")["_create"]({
                 login: req.body.login, fullName: req.body.fullName, email: req.body.email,
-                password: password, passwordHashed: passwordHashed, timezone: req.body.timezone, expires: req.body.date,
+                passwordHashed: passwordHashed, timezone: req.body.timezone, expires: req.body.date,
                 locale: locale, isAdministrator: isAdministrator, isConfirmed: isConfirmed, groups: userGroups
             });
             Adminizer.log.debug(`A new user was created: `, user);
@@ -56,7 +55,6 @@ export default async function (req, res) {
             Adminizer.log.error(e);
             req.session.messages.adminError.push(e.message || 'Something went wrong...');
         }
-        // console.log(user)
     }
     const props = inertiaUserHelper(entity, req, groups);
     return req.Inertia.render({

package/controllers/catalog/Catalog.d.ts

@@ -1 +1 @@
-export declare function catalogController(req: ReqType, res: ResType): Promise<void | ResType>;
+export declare function catalogController(req: ReqType, res: ResType): Promise<void | import("express").Response<any, Record<string, any>>>;

package/controllers/catalog/Catalog.js

@@ -1,4 +1,4 @@
-import { CatalogHandler } from "../../lib/catalog/CatalogHandler";
+import { CatalogHandler } from "../../lib/v4/catalog/CatalogHandler";
 import { VueCatalog } from "./FrontentCatalogAdapter";
 import { Adminizer } from "../../lib/Adminizer";
 export async function catalogController(req, res) {
@@ -6,10 +6,10 @@ export async function catalogController(req, res) {
     let id = req.params.id ? req.params.id : '';
     const postfix = id ? `${slug}-${id}` : `${slug}`;
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             return res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
         }
-        else if (!req.adminizer.accessRightsHelper.hasPermission(`catalog-${postfix}`, req.session.UserAP)) {
+        else if (!req.adminizer.accessRightsHelper.hasPermission(`catalog-${postfix}`, req.user)) {
             return res.sendStatus(403);
         }
     }
@@ -28,64 +28,72 @@ export async function catalogController(req, res) {
     }
     const method = req.method.toUpperCase();
     if (method === 'GET') {
-        return res.viewAdmin('catalog', { entity: "entity", slug: slug, id: id });
+        return req.Inertia.render({
+            component: 'catalog',
+            props: null
+        });
     }
     if (method === 'POST' || method === 'PUT' || method === 'DELETE') {
         const data = req.body;
-        const vueCatalog = new VueCatalog(_catalog);
-        if (!vueCatalog)
+        const frontendCatalog = new VueCatalog(_catalog);
+        if (!frontendCatalog)
             return res.status(404);
-        vueCatalog.setId(id);
-        const item = vueCatalog.getItemType(data.type);
+        frontendCatalog.setId(id);
+        const item = frontendCatalog.getItemType(data.type);
         switch (method) {
             case 'POST':
                 switch (data._method) {
+                    // TODO: deprecated, passing react module instead html
                     case 'getAddHTML':
-                        return res.json(await vueCatalog.getAddHTML(item, req));
+                        return res.json(await frontendCatalog.getAddHTML(item, req));
+                    // TODO: deprecated, passing react module instead html
                     case 'getEditHTML':
-                        return res.json(await vueCatalog.getEditHTML(item, data.id, req, data.modelId));
+                        return res.json(await frontendCatalog.getEditHTML(item, data.id, req, data.modelId));
                     case 'getCatalog':
-                        const __catalog = await vueCatalog.getCatalog();
-                        return res.json({
-                            'items': vueCatalog.getitemTypes(),
-                            'catalog': {
-                                nodes: __catalog,
-                                movingGroupsRootOnly: _catalog.movingGroupsRootOnly ?? false,
-                                catalogName: _catalog.name,
-                                catalogId: _catalog.id,
-                                catalogSlug: _catalog.slug,
-                                idList: idList
-                            },
-                            'toolsActions': await vueCatalog.getActions([], 'tools')
-                        });
+                        {
+                            const __catalog = await frontendCatalog.getCatalog();
+                            return res.json({
+                                items: frontendCatalog.getitemTypes(),
+                                catalog: {
+                                    nodes: __catalog,
+                                    movingGroupsRootOnly: _catalog.movingGroupsRootOnly ?? false,
+                                    catalogName: _catalog.name,
+                                    catalogId: _catalog.id,
+                                    catalogSlug: _catalog.slug,
+                                    idList: idList
+                                },
+                                toolsActions: await frontendCatalog.getActions([], 'tools')
+                            });
+                        }
                     case 'createItem':
-                        return res.json({ 'data': await vueCatalog.createItem(data.data) });
+                        return res.json({ 'data': await frontendCatalog.createItem(data.data, req) });
                     case 'getChilds':
-                        return res.json({ data: await vueCatalog.getChilds(data.data) });
+                        return res.json({ data: await frontendCatalog.getChilds(data.data, req) });
                     case 'getActions':
-                        return res.json({ data: await vueCatalog.getActions(data.items, data.type) });
+                        return res.json({ data: await frontendCatalog.getActions(data.items, data.type) });
                     case 'search':
-                        return res.json({ data: await vueCatalog.search(data.s) });
+                        return res.json({ data: await frontendCatalog.search(data.s, req) });
                     case "getLocales":
-                        return res.json({ data: vueCatalog.getLocales(req) });
+                        return res.json({ data: frontendCatalog.getLocales(req) });
                 }
                 break;
             case 'PUT':
                 switch (data._method) {
                     case 'updateTree':
-                        return res.json({ data: await vueCatalog.updateTree(data.data) });
+                        return res.json({ data: await frontendCatalog.updateTree(data.data, req) });
                     case 'getLink':
-                        return res.json({ data: await vueCatalog.getLink(data.actionId) });
+                        return res.json({ data: await frontendCatalog.getLink(data.actionId) });
                     case 'handleAction':
-                        return res.json({ data: await vueCatalog.handleAction(data.data.actionID, data.data.items, data.data.config) });
+                        return res.json({ data: await frontendCatalog.handleAction(data.data.actionID, data.data.items, data.data.config, req) });
                     case 'getPopUpHTML':
-                        return res.json({ data: await vueCatalog.getPopUpHTML(data.actionId) });
+                        // TODO: deprecated, passing react module instead html
+                        return res.json({ data: await frontendCatalog.getPopUpHTML(data.actionId) });
                     case 'updateItem':
-                        return res.json({ data: await vueCatalog.updateItem(item, data.modelId, data.data) });
+                        return res.json({ data: await frontendCatalog.updateItem(item, data.modelId, data.data, req) });
                 }
                 break;
             case 'DELETE':
-                return res.json({ data: await vueCatalog.deleteItem(data.data) });
+                return res.json({ data: await frontendCatalog.deleteItem(data.data, req) });
         }
     }
 }

package/controllers/catalog/FrontentCatalogAdapter.d.ts

@@ -1,9 +1,9 @@
-import { AbstractCatalog, Item } from "../../lib/catalog/AbstractCatalog";
+import { AbstractCatalog, Item } from "../../lib/v4/catalog/AbstractCatalog";
 interface NodeModel<TDataType> {
-    title: string;
-    isLeaf: boolean;
-    isExpanded: boolean;
-    ind: number;
+    text: string;
+    droppable: boolean;
+    id: number;
+    parent: number;
     data?: TDataType;
     children?: NodeModel<TDataType>[];
     isSelected?: boolean;
@@ -18,40 +18,62 @@ interface NodeModel<TDataType> {
 }
 interface NodeData extends Item {
 }
-interface obj {
-    [key: string]: string;
-}
 interface RequestData {
     reqNode: NodeModel<NodeData>[];
     reqParent: NodeModel<NodeData>;
     _method: string;
 }
+/**
+ * @deprecated Now is React
+ * // TODO: refactor for react name
+ */
 export declare class VueCatalog {
     catalog: AbstractCatalog;
     constructor(_catalog: AbstractCatalog);
     setId(id: string): void;
-    getItemType(type: string): import("../../lib/catalog/AbstractCatalog").BaseItem<Item>;
+    getItemType(type: string): import("../../lib/v4/catalog/AbstractCatalog").BaseItem<Item>;
+    /**
+     * @deprecated reason: migration for intertia
+     * // TODO: need passing custom React module
+     */
     getAddHTML(item: any, req: ReqType): Promise<{
-        type: "link" | "html" | "jsonForm";
-        data: string;
+        type: "component" | "model" | string;
+        data: any;
     }>;
+    /**
+     * @deprecated reason: migration for intertia
+     * TODO need passing custom React module
+     */
     getEditHTML(item: any, id: string | number, req: ReqType, modelId: string | number): Promise<{
         type: "link" | "html" | "jsonForm";
         data: string;
     }>;
-    getitemTypes(): import("../../lib/catalog/AbstractCatalog").BaseItem<Item>[];
-    getLocales(req: ReqType): obj;
-    getActions(items: NodeModel<any>[], type: string): Promise<import("../../lib/catalog/AbstractCatalog").ActionHandler[]>;
-    handleAction(actionId: string, items: any[], config: any): Promise<void>;
+    getitemTypes(): {
+        type: string;
+        name: string;
+        isGroup: boolean;
+        allowedRoot: boolean;
+        icon: string;
+        actionHandlers: import("../../lib/v4/catalog/AbstractCatalog").ActionHandler[];
+    }[];
+    getLocales(req: ReqType): {
+        [key: string]: string;
+    };
+    getActions(items: NodeModel<any>[], type: string): Promise<import("../../lib/v4/catalog/AbstractCatalog").ActionHandler[]>;
+    handleAction(actionId: string, items: any[], config: any, req: ReqType): Promise<void>;
+    /**
+     * @deprecated reason: migration for intertia
+     * // TODO: need passing custom React module
+     */
     getPopUpHTML(actionId: string): Promise<string>;
     getLink(actionId: string): Promise<string>;
     getCatalog(): Promise<NodeModel<Item>[]>;
-    createItem(data: any): Promise<any>;
-    getChilds(data: any): Promise<NodeModel<Item>[]>;
-    search(s: string): Promise<NodeModel<Item>[]>;
-    updateTree(data: RequestData): Promise<any>;
-    updateItem(item: any, modelId: string, data: any): Promise<any>;
-    deleteItem(items: NodeModel<any>[]): Promise<{
+    createItem(data: any, req: ReqType): Promise<any>;
+    getChilds(data: any, req: ReqType): Promise<NodeModel<Item>[]>;
+    search(s: string, req: ReqType): Promise<NodeModel<Item>[]>;
+    updateTree(data: RequestData, req: ReqType): Promise<any>;
+    updateItem(item: any, modelId: string, data: any, req: ReqType): Promise<any>;
+    deleteItem(items: NodeModel<any>[], req: ReqType): Promise<{
         ok: boolean;
     }>;
 }

package/controllers/catalog/FrontentCatalogAdapter.js

@@ -1,4 +1,8 @@
-import { AbstractCatalog } from "../../lib/catalog/AbstractCatalog";
+import { AbstractCatalog } from "../../lib/v4/catalog/AbstractCatalog";
+/**
+ * @deprecated Now is React
+ * // TODO: refactor for react name
+ */
 export class VueCatalog {
     catalog;
     constructor(_catalog) {
@@ -10,9 +14,17 @@ export class VueCatalog {
     getItemType(type) {
         return this.catalog.getItemType(type);
     }
+    /**
+     * @deprecated reason: migration for intertia
+     * // TODO: need passing custom React module
+     */
     getAddHTML(item, req) {
         return this.catalog.getAddHTML(item, req);
     }
+    /**
+     * @deprecated reason: migration for intertia
+     * TODO need passing custom React module
+     */
     getEditHTML(item, id, req, modelId) {
         return this.catalog.getEditHTML(item, id, req, modelId);
     }
@@ -31,19 +43,21 @@ export class VueCatalog {
             "No, cancel": "",
             "Are you sure?": "",
             "Yes, I'm sure": "",
-            "Select Ids": ""
+            "Select Ids": "",
+            "OR": "",
         };
         obj[this.catalog.name] = "";
         for (const actionHandler of this.catalog.actionHandlers) {
             obj[actionHandler.name] = "";
         }
         let messages = obj;
-        req.i18n.setLocale(req.session.UserAP.locale);
         let outMessages = {};
         for (const mess of Object.keys(messages)) {
             outMessages[mess] = req.i18n.__(mess);
         }
-        return outMessages;
+        return {
+            ...outMessages,
+        };
     }
     async getActions(items, type) {
         let arrItems = [];
@@ -57,13 +71,17 @@ export class VueCatalog {
             return (await this.catalog.getActions(arrItems))?.filter(e => e.displayContext);
         }
     }
-    async handleAction(actionId, items, config) {
+    async handleAction(actionId, items, config, req) {
         let arrItems = [];
         for (const item of items) {
             arrItems.push(await this.catalog.find(item.data));
         }
-        return this.catalog.handleAction(actionId, arrItems, config);
+        return this.catalog.handleAction(actionId, arrItems, config, req);
     }
+    /**
+     * @deprecated reason: migration for intertia
+     * // TODO: need passing custom React module
+     */
     async getPopUpHTML(actionId) {
         return this.catalog.getPopUpHTML(actionId);
     }
@@ -72,35 +90,35 @@ export class VueCatalog {
     }
     //Below are the methods that require action
     async getCatalog() {
-        let rootItems = await this.catalog.getChilds(null);
+        let rootItems = await this.catalog.getChilds(0);
         return VueCatalogUtils.arrayToNode(rootItems, this.catalog.getGroupType().type);
     }
-    createItem(data) {
+    async createItem(data, req) {
         //data = VueCatalogUtils.refinement(data);
         if (this.catalog.slug !== "navigation") {
             let item = data.record;
             item.parenId = data.parenId;
-            return this.catalog.createItem(item);
+            return await this.catalog.createItem(item, req);
         }
         else {
-            return this.catalog.createItem(data);
+            return await this.catalog.createItem(data, req);
         }
     }
-    async getChilds(data) {
+    async getChilds(data, req) {
         data = VueCatalogUtils.refinement(data);
-        return VueCatalogUtils.arrayToNode(await this.catalog.getChilds(data.id), this.catalog.getGroupType().type);
+        return VueCatalogUtils.arrayToNode(await this.catalog.getChilds(data.id, undefined, req), this.catalog.getGroupType().type);
     }
     // Moved into actions
     // getCreatedItems(data: any) {
     //   data = VueCatalogUtils.refinement(data);
     //   return this.catalog.getChilds(data.id);
     // }
-    async search(s) {
-        let searchResult = await this.catalog.search(s);
+    async search(s, req) {
+        let searchResult = await this.catalog.search(s, undefined, req);
         let itemsTree = AbstractCatalog.buildTree(searchResult);
         return VueCatalogUtils.treeToNode(itemsTree, this.catalog.getGroupType().type);
     }
-    async updateTree(data) {
+    async updateTree(data, req) {
         let reqNodes = data.reqNode;
         if (!Array.isArray(data.reqNode)) {
             reqNodes = [data.reqNode];
@@ -114,8 +132,7 @@ export class VueCatalog {
         }
         // It’s unclear why he’s coming reqNodes
         for (const reqNode of reqNodes) {
-            // console.log(">>>>>>>>>", "this.catalog.find", reqNode)
-            const item = await this.catalog.find(reqNode.data);
+            const item = await this.catalog.find(reqNode.data, req);
             if (!item) {
                 throw `reqNode Item not found`;
             }
@@ -125,26 +142,26 @@ export class VueCatalog {
         for (const childNode of reqParent.children) {
             childNode.data.sortOrder = sortCount;
             childNode.data.parentId = reqParent.data.id;
-            await this.catalog.updateItem(childNode.data.id, childNode.data.type, childNode.data);
+            await this.catalog.updateItem(childNode.data.id, childNode.data.type, childNode.data, req);
             sortCount++;
         }
         return Promise.resolve('ok');
     }
-    async updateItem(item, modelId, data) {
+    async updateItem(item, modelId, data, req) {
         //data = VueCatalogUtils.refinement(data);
         if (this.catalog.slug !== "navigation") {
-            return await this.catalog.updateModelItems(data.modelId, data.type, data.record);
+            return await this.catalog.updateModelItems(data.modelId, data.type, data.record, req);
         }
         else {
-            return await this.catalog.updateModelItems(modelId, item.type, data);
+            return await this.catalog.updateModelItems(modelId, item.type, data, req);
         }
     }
-    async deleteItem(items) {
+    async deleteItem(items, req) {
         for (const item1 of items) {
             if (item1.children?.length) {
-                await this.deleteItem(item1.children);
+                await this.deleteItem(item1.children, req);
             }
-            this.catalog.deleteItem(item1.data.type, item1.data.id);
+            await this.catalog.deleteItem(item1.data.type, item1.data.id, req);
         }
         return { ok: true };
     }
@@ -162,16 +179,18 @@ export class VueCatalogUtils {
     static toNode(data, groupTypeName) {
         return {
             data: data,
-            isLeaf: data.type !== groupTypeName,
-            isExpanded: false,
-            ind: data.sortOrder,
-            title: data.name
+            // droppable: data.type !== groupTypeName,
+            droppable: true,
+            // isExpanded: false,
+            id: data.sortOrder + 1,
+            text: data.name,
+            parent: 0
         };
     }
     static expandTo(vueCatalogData, theseItemIdsNeedToBeOpened) {
         function expand(node) {
             if (theseItemIdsNeedToBeOpened.includes(node.data.id)) {
-                node.isExpanded = true;
+                // node.isExpanded = true;
             }
             if (node.children) {
                 for (const child of node.children) {
@@ -192,7 +211,7 @@ export class VueCatalogUtils {
                     // Sort the children before building their nodes
                     item.childs.sort((a, b) => (a.sortOrder || 0) - (b.sortOrder || 0));
                     node.children = buildNodes(item.childs);
-                    node.isExpanded = !node.isLeaf;
+                    // node.isExpanded = !node.droppable;
                 }
                 return node;
             });

package/controllers/ckeditorUpload.js

@@ -2,10 +2,9 @@ import { ControllerHelper } from "../helpers/controllerHelper";
 import * as fs from "fs";
 import { Adminizer } from "../lib/Adminizer";
 export default function upload(req, res) {
-    //console.log('admin > CK-upload');
     let entity = ControllerHelper.findEntityObject(req);
     if (req.adminizer.config.auth.enable) {
-        if (!req.session.UserAP) {
+        if (!req.user) {
             res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
             return;
         }
@@ -14,7 +13,7 @@ export default function upload(req, res) {
             `create-${entity.name}-model`,
             `update-${entity.name}-form`,
             `create-${entity.name}-form`
-        ], req.session.UserAP)) {
+        ], req.user)) {
             res.sendStatus(403);
             return;
         }