@strapi/admin 4.11.0-alpha.0 → 4.11.0-beta.1

package/build/webhook-edit-page.ddd5963d.chunk.js

@@ -0,0 +1,128 @@
+"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[5162],{55734:function(G,b,t){t.d(b,{Z:function(){return ge}});var e=t(32735),o=t(24989),A=t(27649),M=t(20108),p=t(53038),j=t(70166),me=t(60216),i=t.n(me),ne=t(2438),re=t(66456),Ee=t(29439),pe=t(82055),m=t(87933),S=t(41415),fe=t(17e3),k=t(72850),J=t(15335),D=t(5803),Y=t(10369),I=t(92802),$=t(67879),se=t(28847),O=t(49372),le=t(8471),ve=t(8284),Ce=t(82884),be=t(23940),Me=t.n(be);const W=({disabledEvents:n,name:r,events:s,inputValue:l,handleChange:c,handleChangeAll:f})=>{const d=s.filter(h=>!n.includes(h)),u=l.length===d.length,E=l.length>0,x=({target:{name:h}})=>{f({target:{name:h,value:!u}})};return e.createElement("tr",null,e.createElement("td",null,e.createElement(ve.X,{indeterminate:E&&!u,"aria-label":"Select all entries",name:r,onChange:x,value:u},Me()(r))),s.map(h=>e.createElement("td",{key:h},e.createElement(Ce.C,{disabled:n.includes(h),"aria-label":h,name:h,value:l.includes(h),onValueChange:v=>c({target:{name:h,value:v}})}))))};W.defaultProps={disabledEvents:[],events:[],inputValue:[],handleChange(){},handleChangeAll(){}},W.propTypes={disabledEvents:i().array,events:i().array,inputValue:i().array,handleChange:i().func,handleChangeAll:i().func,name:i().string.isRequired};var a=W;const y=n=>n.reduce((r,s)=>{const l=s.split(".")[0];return r[l]||(r[l]=[]),r[l].push(s),r},{}),U=le.ZP.table`
+  td {
+    height: ${52/16}rem;
+    width: 10%;
+    vertical-align: middle;
+    text-align: center;
+  }
+
+  tbody tr:nth-child(odd) {
+    background: ${({theme:n})=>n.colors.neutral100};
+  }
+
+  tbody tr td:first-child {
+    padding-left: ${({theme:n})=>n.spaces[7]};
+  }
+`,Z={headers:{default:[{id:"Settings.webhooks.events.create",defaultMessage:"Create"},{id:"Settings.webhooks.events.update",defaultMessage:"Update"},{id:"app.utils.delete",defaultMessage:"Delete"}],draftAndPublish:[{id:"Settings.webhooks.events.create",defaultMessage:"Create"},{id:"Settings.webhooks.events.update",defaultMessage:"Update"},{id:"app.utils.delete",defaultMessage:"Delete"},{id:"app.utils.publish",defaultMessage:"Publish"},{id:"app.utils.unpublish",defaultMessage:"Unpublish"}]},events:{default:{entry:["entry.create","entry.update","entry.delete"],media:["media.create","media.update","media.delete"]},draftAndPublish:{entry:["entry.create","entry.update","entry.delete","entry.publish","entry.unpublish"],media:["media.create","media.update","media.delete"]}}},K=({isDraftAndPublish:n})=>{const r=n?Z.headers.draftAndPublish:Z.headers.default,s=n?Z.events.draftAndPublish:Z.events.default,{formatMessage:l}=(0,$.Z)(),{values:c,handleChange:f}=(0,I.u6)(),d="events",u=c.events,E=[],x=y(u),h=({target:{name:g,value:B}})=>{let R=new Set(u);B?R.add(g):R.delete(g),f({target:{name:d,value:Array.from(R)}})},v=({target:{name:g,value:B}})=>{let R=new Set(u);B?s[g].forEach(L=>{E.includes(L)||R.add(L)}):s[g].forEach(L=>R.delete(L)),f({target:{name:d,value:Array.from(R)}})};return e.createElement(m.k,{direction:"column",alignItems:"stretch",gap:1},e.createElement(se.Q,null,l({id:"Settings.webhooks.form.events",defaultMessage:"Events"})),e.createElement(U,null,e.createElement("thead",null,e.createElement("tr",null,e.createElement("td",null),r.map(g=>g==="app.utils.publish"||g==="app.utils.unpublish"?e.createElement("td",{key:g.id,title:l({id:"Settings.webhooks.event.publish-tooltip",defaultMessage:"This event only exists for content with draft & publish enabled"})},e.createElement(O.Z,{variant:"sigma",textColor:"neutral600"},l(g))):e.createElement("td",{key:g.id},e.createElement(O.Z,{variant:"sigma",textColor:"neutral600"},l(g)))))),e.createElement("tbody",null,Object.keys(s).map(g=>e.createElement(a,{disabledEvents:E,key:g,name:g,events:s[g],inputValue:x[g],handleChange:h,handleChangeAll:v})))))};K.propTypes={isDraftAndPublish:i().bool.isRequired};var q=K,ye=t(19406),Pe=t(7563),xe=t(21428),ee=t(90333),ie=["A-IM","Accept","Accept-Charset","Accept-Encoding","Accept-Language","Accept-Datetime","Access-Control-Request-Method","Access-Control-Request-Headers","Authorization","Cache-Control","Connection","Content-Length","Content-Type","Cookie","Date","Expect","Forwarded","From","Host","If-Match","If-Modified-Since","If-None-Match","If-Range","If-Unmodified-Since","Max-Forwards","Origin","Pragma","Proxy-Authorization","Range","Referer","TE","User-Agent","Upgrade","Via","Warning"];const te=({name:n,onChange:r,value:s,...l})=>{const[c,f]=(0,e.useState)(s?[...ie,s]:ie),d=E=>{r({target:{name:n,value:E}})},u=E=>{f(x=>[...x,E]),r({target:{name:n,value:E}})};return e.createElement(xe.XU,{...l,onChange:d,onCreateOption:u,placeholder:"",value:s},c.map(E=>e.createElement(ee.O,{value:E,key:E},E)))};te.defaultProps={value:void 0},te.propTypes={name:i().string.isRequired,onChange:i().func.isRequired,value:i().string};var Ie=te,Oe=()=>{const{formatMessage:n}=(0,$.Z)(),{values:r,errors:s}=(0,I.u6)();return e.createElement(m.k,{direction:"column",alignItems:"stretch",gap:1},e.createElement(se.Q,null,n({id:"Settings.webhooks.form.headers",defaultMessage:"Headers"})),e.createElement(k.x,{padding:8,background:"neutral100",hasRadius:!0},e.createElement(I.F2,{validateOnChange:!1,name:"headers",render:({push:l,remove:c})=>e.createElement(J.r,{gap:4},r.headers?.map((f,d)=>e.createElement(e.Fragment,{key:d},e.createElement(D.P,{col:6},e.createElement(I.gN,{as:Ie,name:`headers.${d}.key`,"aria-label":`row ${d+1} key`,label:n({id:"Settings.webhooks.key",defaultMessage:"Key"}),error:s.headers?.[d]?.key&&n({id:s.headers[d]?.key,defaultMessage:s.headers[d]?.key})})),e.createElement(D.P,{col:6},e.createElement(m.k,{alignItems:"flex-end"},e.createElement(k.x,{style:{flex:1}},e.createElement(I.gN,{as:Y.o,"aria-label":`row ${d+1} value`,label:n({id:"Settings.webhooks.value",defaultMessage:"Value"}),name:`headers.${d}.value`,error:s.headers?.[d]?.value&&n({id:s.headers[d]?.value,defaultMessage:s.headers[d]?.value})})),e.createElement(m.k,{paddingLeft:2,style:{alignSelf:"center"},paddingTop:s.headers?.[d]?.value?0:5},e.createElement(o.fG,{onClick:()=>r.headers.length!==1&&c(d),label:n({id:"Settings.webhooks.headers.remove",defaultMessage:"Remove header row {number}"},{number:d+1})})))))),e.createElement(D.P,{col:12},e.createElement(Pe.A,{type:"button",onClick:()=>{l({key:"",value:""})},startIcon:e.createElement(ye.Z,null)},n({id:"Settings.webhooks.create.header",defaultMessage:"Create new header"}))))})))},Re=t(27169),F=t(35331);const Q=le.ZP.svg(({theme:n,color:r})=>`
+  width: ${12/16}rem;
+  height: ${12/16}rem;
+
+  path {
+    fill: ${n.colors[r]};
+  }
+`),ae=({isPending:n,statusCode:r})=>{const{formatMessage:s}=(0,$.Z)();return n?e.createElement(m.k,{gap:2,alignItems:"center"},e.createElement(Q,{as:Re.Z}),e.createElement(O.Z,null,s({id:"Settings.webhooks.trigger.pending",defaultMessage:"pending"}))):r>=200&&r<300?e.createElement(m.k,{gap:2,alignItems:"center"},e.createElement(Q,{as:re.Z,color:"success700"}),e.createElement(O.Z,null,s({id:"Settings.webhooks.trigger.success",defaultMessage:"success"}))):r>=300?e.createElement(m.k,{gap:2,alignItems:"center"},e.createElement(Q,{as:F.Z,color:"danger700"}),e.createElement(O.Z,null,s({id:"Settings.error",defaultMessage:"error"})," ",r)):null};ae.propTypes={isPending:i().bool.isRequired,statusCode:i().number},ae.defaultProps={statusCode:void 0};const H=({statusCode:n,message:r})=>{const{formatMessage:s}=(0,$.Z)();return n>=200&&n<300?e.createElement(m.k,{justifyContent:"flex-end"},e.createElement(O.Z,{textColor:"neutral600",ellipsis:!0},s({id:"Settings.webhooks.trigger.success.label",defaultMessage:"Trigger succeeded"}))):n>=300?e.createElement(m.k,{justifyContent:"flex-end"},e.createElement(m.k,{maxWidth:(0,o.Q1)(250),justifyContent:"flex-end",title:r},e.createElement(O.Z,{ellipsis:!0,textColor:"neutral600"},r))):null};H.propTypes={statusCode:i().number,message:i().string},H.defaultProps={statusCode:void 0,message:void 0};const N=({onCancel:n})=>{const{formatMessage:r}=(0,$.Z)();return e.createElement(m.k,{justifyContent:"flex-end"},e.createElement("button",{onClick:n,type:"button"},e.createElement(m.k,{gap:2,alignItems:"center"},e.createElement(O.Z,{textColor:"neutral400"},r({id:"Settings.webhooks.trigger.cancel",defaultMessage:"cancel"})),e.createElement(Q,{as:F.Z,color:"neutral400"}))))};N.propTypes={onCancel:i().func.isRequired};const z=({isPending:n,onCancel:r,response:s})=>{const{statusCode:l,message:c}=s,{formatMessage:f}=(0,$.Z)();return e.createElement(k.x,{background:"neutral0",padding:5,shadow:"filterShadow",hasRadius:!0},e.createElement(J.r,{gap:4,style:{alignItems:"center"}},e.createElement(D.P,{col:3},e.createElement(O.Z,null,f({id:"Settings.webhooks.trigger.test",defaultMessage:"Test-trigger"}))),e.createElement(D.P,{col:3},e.createElement(ae,{isPending:n,statusCode:l})),e.createElement(D.P,{col:6},n?e.createElement(N,{onCancel:r}):e.createElement(H,{statusCode:l,message:c}))))};z.defaultProps={isPending:!1,onCancel(){},response:{}},z.propTypes={isPending:i().bool,onCancel:i().func,response:i().object};var Te=z,P=t(24346);const De=/(^$)|(^[A-Za-z][_0-9A-Za-z ]*$)/,de=/(^$)|((https?:\/\/.*)(d*)\/?(.*))/;var ce=P.Ry().shape({name:P.Z_(o.I0.string).required(o.I0.required).matches(De,o.I0.regex),url:P.Z_(o.I0.string).required(o.I0.required).matches(de,o.I0.regex),headers:P.Vo(n=>{let r=P.IX();if(n.length===1){const{key:s,value:l}=n[0];if(!s&&!l)return r}return r.of(P.Ry().shape({key:P.Z_().required(o.I0.required),value:P.Z_().required(o.I0.required)}))}),events:P.IX()});const _=({handleSubmit:n,data:r,triggerWebhook:s,isCreating:l,isTriggering:c,triggerResponse:f,isDraftAndPublishEvents:d})=>{const{formatMessage:u}=(0,$.Z)(),[E,x]=(0,e.useState)(!1);return e.createElement(I.J9,{onSubmit:n,initialValues:{name:r?.name||"",url:r?.url||"",headers:Object.keys(r?.headers||[]).length?Object.entries(r.headers).map(([h,v])=>({key:h,value:v})):[{key:"",value:""}],events:r?.events||[]},validationSchema:ce,validateOnChange:!1,validateOnBlur:!1},({handleSubmit:h,errors:v})=>e.createElement(o.l0,{noValidate:!0},e.createElement(pe.T,{primaryAction:e.createElement(m.k,{gap:2},e.createElement(S.z,{onClick:()=>{s(),x(!0)},variant:"tertiary",startIcon:e.createElement(ne.Z,null),disabled:l||c,size:"L"},u({id:"Settings.webhooks.trigger",defaultMessage:"Trigger"})),e.createElement(S.z,{startIcon:e.createElement(re.Z,null),onClick:h,type:"submit",size:"L"},u({id:"global.save",defaultMessage:"Save"}))),title:l?u({id:"Settings.webhooks.create",defaultMessage:"Create a webhook"}):r?.name,navigationAction:e.createElement(o.rU,{startIcon:e.createElement(Ee.Z,null),to:"/settings/webhooks"},u({id:"global.back",defaultMessage:"Back"}))}),e.createElement(fe.D,null,e.createElement(m.k,{direction:"column",alignItems:"stretch",gap:4},E&&e.createElement("div",{className:"trigger-wrapper"},e.createElement(Te,{isPending:c,response:f,onCancel:()=>x(!1)})),e.createElement(k.x,{background:"neutral0",padding:8,shadow:"filterShadow",hasRadius:!0},e.createElement(m.k,{direction:"column",alignItems:"stretch",gap:6},e.createElement(J.r,{gap:6},e.createElement(D.P,{col:6},e.createElement(I.gN,{as:Y.o,name:"name",error:v.name&&u({id:v.name}),label:u({id:"global.name",defaultMessage:"Name"}),required:!0})),e.createElement(D.P,{col:12},e.createElement(I.gN,{as:Y.o,name:"url",error:v.url&&u({id:v.url}),label:u({id:"Settings.roles.form.input.url",defaultMessage:"Url"}),required:!0}))),e.createElement(Oe,null),e.createElement(q,{isDraftAndPublish:d})))))))};_.propTypes={data:i().object,handleSubmit:i().func.isRequired,triggerWebhook:i().func.isRequired,isCreating:i().bool.isRequired,isDraftAndPublishEvents:i().bool.isRequired,isTriggering:i().bool.isRequired,triggerResponse:i().object},_.defaultProps={data:void 0,triggerResponse:void 0};var Ae=_;const ue=n=>({...n,headers:X(n.headers)}),X=n=>n.reduce((r,s)=>{const{key:l,value:c}=s;return l!==""?{...r,[l]:c}:r},{});var he=ue,ge=()=>{const{params:{id:n}}=(0,p.$B)("/settings/webhooks/:id"),{replace:r}=(0,p.k6)(),{lockApp:s,unlockApp:l}=(0,o.o1)(),c=(0,o.lm)(),f=(0,M.useQueryClient)(),{isLoading:d,collectionTypes:u}=(0,j.G)(),{put:E,get:x,post:h}=(0,o.kY)(),v=n==="create",{isLoading:g,data:B}=(0,M.useQuery)(["get-webhook",n],async()=>{try{const{data:{data:T}}=await x(`/admin/webhooks/${n}`);return T}catch{return c({type:"warning",message:{id:"notification.error"}}),null}},{enabled:!v}),{isLoading:R,data:L,isIdle:je,mutate:ke}=(0,M.useMutation)(()=>h(`/admin/webhooks/${n}/trigger`)),C=()=>ke(null,{onError(){c({type:"warning",message:{id:"notification.error"}})}}),Se=(0,M.useMutation)(T=>h("/admin/webhooks",T)),Ze=(0,M.useMutation)(({id:T,body:V})=>E(`/admin/webhooks/${T}`,V)),Be=async T=>{v?(s(),Se.mutate(he(T),{onSuccess({data:V}){c({type:"success",message:{id:"Settings.webhooks.created"}}),r(`/settings/webhooks/${V.data.id}`),l()},onError(V){c({type:"warning",message:{id:"notification.error"}}),console.log(V),l()}})):(s(),Ze.mutate({id:n,body:he(T)},{onSuccess(){f.invalidateQueries(["get-webhook",n]),c({type:"success",message:{id:"notification.form.success.fields"}}),l()},onError(V){c({type:"warning",message:{id:"notification.error"}}),console.log(V),l()}}))},We=e.useMemo(()=>u.some(T=>T.options.draftAndPublish===!0),[u]);return g||d?e.createElement(o.dO,null):e.createElement(A.o,null,e.createElement(o.SL,{name:"Webhooks"}),e.createElement(Ae,{handleSubmit:Be,data:B,triggerWebhook:C,isCreating:v,isTriggering:R,isTriggerIdle:je,triggerResponse:L?.data.data,isDraftAndPublishEvents:We}))}},33238:function(G,b,t){t.r(b);var e=t(32735),o=t(24989),A=t(83983),M=t(55734);const p=()=>e.createElement(o.O4,{permissions:A.Z.settings.webhooks.create},e.createElement(M.Z,null));b.default=p},59021:function(G,b,t){t.r(b);var e=t(32735),o=t(24989),A=t(83983),M=t(55734);const p=()=>e.createElement(o.O4,{permissions:A.Z.settings.webhooks.update},e.createElement(M.Z,null));b.default=p},21428:function(G,b,t){t.d(b,{Wx:function(){return Me},XU:function(){return $},hQ:function(){return I}});var e=t(74512),o=t(32735),A=t(35331),M=t(16899),p=t(42345),j=t(8471),me=t(14268),i=t(95976),ne=t(74971),re=t(36971),Ee=t(30350),pe=t(23866),m=t(72850),S=t(49372),fe=t(87107),k=t(87933),J=t(28847),D=t(67014),Y=t(47851);const I=({children:a,clearLabel:y="clear",creatable:U=!1,createMessage:Z=X=>`Create "${X}"`,defaultFilterValue:K,defaultTextValue:q,defaultOpen:ye=!1,open:Pe,onOpenChange:xe,disabled:ee=!1,error:oe,filterValue:ie,hasMoreItems:te=!1,hint:Ie,id:$e,label:Oe,labelAction:Re,loading:F=!1,loadingMessage:Q="Loading content...",noOptionsMessage:ae=()=>"No results found",onChange:H,onClear:N,onCreateOption:z,onFilterValueChange:Te,onInputChange:P,onTextValueChange:De,onLoadMore:de,placeholder:Le="Select or enter a value",required:ce=!1,startIcon:_,textValue:Ae,value:ue})=>{const[X,he]=(0,i.T)({prop:Pe,defaultProp:ye,onChange:xe}),[w,ge]=(0,i.T)({prop:Ae,defaultProp:q,onChange:De}),[n,r]=(0,i.T)({prop:ie,defaultProp:K,onChange:Te}),s=o.useRef(null),l=o.useRef(null),c=o.useRef(null),f=(0,ne.M)($e),d=C=>{N&&!ee&&(ge(""),r(""),N(C),l.current.focus())},u=C=>{he(C)},E=C=>{ge(C)},x=C=>{r(C)},h=C=>{P&&P(C)},v=C=>{H&&H(C)},g=(0,ne.M)(),B=`intersection-${(0,me.B)(g)}`,R=C=>{de&&te&&!F&&de(C)},L=()=>{z&&w&&z(w)};(0,re.s)(s,R,{selectorToWatch:`#${B}`,skipWhen:!X});const je=`${f}-hint`,ke=`${f}-error`;return(0,e.jsx)(fe.g,{hint:Ie,error:oe,id:f,required:ce,children:(0,e.jsxs)(k.k,{direction:"column",alignItems:"stretch",gap:1,children:[(0,e.jsx)(J.Q,{action:Re,children:Oe}),(0,e.jsxs)(p.hQ.Root,{autocomplete:U?"list":"both",open:X,onOpenChange:u,onTextValueChange:E,textValue:w,allowCustomValue:!0,disabled:ee,required:ce,value:ue===null?void 0:ue,onValueChange:v,filterValue:n,onFilterValueChange:x,children:[(0,e.jsxs)(O,{$hasError:!!oe,children:[(0,e.jsxs)(k.k,{flex:"1",as:"span",gap:3,children:[_?(0,e.jsx)(m.x,{as:"span","aria-hidden":!0,children:_}):null,(0,e.jsx)(le,{placeholder:Le,id:f,"aria-invalid":!!oe,"aria-labelledby":`${je} ${ke}`,onChange:h,ref:l})]}),(0,e.jsxs)(k.k,{as:"span",gap:3,children:[w&&N?(0,e.jsx)(se,{as:"button",hasRadius:!0,background:"transparent",type:"button",onClick:d,"aria-disabled":ee,"aria-label":y,title:y,ref:c,children:(0,e.jsx)(A.Z,{})}):null,(0,e.jsx)(ve,{children:(0,e.jsx)(M.Z,{})})]})]}),(0,e.jsx)(p.hQ.Portal,{children:(0,e.jsx)(Ce,{sideOffset:4,children:(0,e.jsxs)(be,{ref:s,children:[a,U?(0,e.jsx)(p.hQ.CreateItem,{onPointerUp:L,onClick:L,asChild:!0,children:(0,e.jsx)(W,{children:(0,e.jsx)(S.Z,{children:Z(w??"")})})}):null,!U&&!F?(0,e.jsx)(p.hQ.NoValueFound,{asChild:!0,children:(0,e.jsx)(W,{$hasHover:!1,children:(0,e.jsx)(S.Z,{children:ae(w??"")})})}):null,F?(0,e.jsx)(k.k,{justifyContent:"center",alignItems:"center",paddingTop:2,paddingBottom:2,children:(0,e.jsx)(pe.a,{small:!0,children:Q})}):null,(0,e.jsx)(m.x,{id:B,width:"100%",height:"1px"})]})})})]}),(0,e.jsx)(D.J,{}),(0,e.jsx)(Y.c,{})]})})},$=a=>(0,e.jsx)(I,{...a,creatable:!0}),se=(0,j.ZP)(m.x)`
+  border: none;
+
+  svg {
+    height: ${11/16}rem;
+    width: ${11/16}rem;
+  }
+
+  svg path {
+    fill: ${({theme:a})=>a.colors.neutral600};
+  }
+`,O=(0,j.ZP)(p.hQ.Trigger)`
+  position: relative;
+  border: 1px solid ${({theme:a,$hasError:y})=>y?a.colors.danger600:a.colors.neutral200};
+  padding-right: ${({theme:a})=>a.spaces[3]};
+  padding-left: ${({theme:a})=>a.spaces[3]};
+  border-radius: ${({theme:a})=>a.borderRadius};
+  background: ${({theme:a})=>a.colors.neutral0};
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: ${({theme:a})=>a.spaces[4]};
+
+  &[data-disabled] {
+    color: ${({theme:a})=>a.colors.neutral600};
+    background: ${({theme:a})=>a.colors.neutral150};
+    cursor: not-allowed;
+  }
+
+  /* Required to ensure the below inputFocusStyles are adhered too */
+  &:focus-visible {
+    outline: none;
+  }
+
+  ${({theme:a,$hasError:y})=>(0,Ee.k3)()({theme:a,hasError:y})};
+`,le=(0,j.ZP)(p.hQ.TextInput)`
+  width: 100%;
+  font-size: ${14/16}rem;
+  color: ${({theme:a})=>a.colors.neutral800};
+  min-height: ${40/16}rem;
+  border: none;
+  background-color: transparent;
+
+  &:focus-visible {
+    outline: none;
+  }
+
+  &[aria-disabled='true'] {
+    cursor: inherit;
+  }
+`,ve=(0,j.ZP)(p.hQ.Icon)`
+  & > svg {
+    width: ${6/16}rem;
+
+    & > path {
+      fill: ${({theme:a})=>a.colors.neutral600};
+    }
+  }
+
+  &[aria-disabled='true'] {
+    cursor: inherit;
+  }
+`,Ce=(0,j.ZP)(p.hQ.Content)`
+  background: ${({theme:a})=>a.colors.neutral0};
+  box-shadow: ${({theme:a})=>a.shadows.filterShadow};
+  border: 1px solid ${({theme:a})=>a.colors.neutral150};
+  border-radius: ${({theme:a})=>a.borderRadius};
+  width: var(--radix-combobox-trigger-width);
+  /* This is from the design-system figma file. */
+  max-height: 15rem;
+  z-index: ${({theme:a})=>a.zIndices[1]};
+`,be=(0,j.ZP)(p.hQ.Viewport)`
+  padding: ${({theme:a})=>a.spaces[1]};
+`,Me=o.forwardRef(({children:a,value:y,disabled:U,textValue:Z,...K},q)=>(0,e.jsx)(p.hQ.ComboboxItem,{asChild:!0,value:y,disabled:U,textValue:Z,children:(0,e.jsx)(W,{ref:q,...K,children:(0,e.jsx)(p.hQ.ItemText,{asChild:!0,children:(0,e.jsx)(S.Z,{children:a})})})})),W=j.ZP.div`
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline-offset: -3px;
+  padding: ${({theme:a})=>a.spaces[2]} ${({theme:a})=>a.spaces[4]};
+  background-color: ${({theme:a})=>a.colors.neutral0};
+  border-radius: ${({theme:a})=>a.borderRadius};
+  user-select: none;
+
+  &[data-selected] {
+    background-color: ${({theme:a})=>a.colors.primary100};
+
+    ${S.Z} {
+      color: ${({theme:a})=>a.colors.primary600};
+      font-weight: bold;
+    }
+  }
+
+  &:hover,
+  &[data-highlighted] {
+    outline: none;
+    background-color: ${({theme:a,$hasHover:y=!0})=>y?a.colors.primary100:a.colors.neutral0};
+  }
+
+  &[data-highlighted] {
+    ${S.Z} {
+      color: ${({theme:a})=>a.colors.primary600};
+      font-weight: bold;
+    }
+  }
+`},90333:function(G,b,t){t.d(b,{O:function(){return o}});var e=t(21428);const o=e.Wx},29439:function(G,b,t){t.d(b,{Z:function(){return A}});var e=t(74512);const o=M=>(0,e.jsx)("svg",{xmlns:"http://www.w3.org/2000/svg",width:"1rem",height:"1rem",fill:"none",viewBox:"0 0 24 24",...M,children:(0,e.jsx)("path",{fill:"#212134",d:"M24 13.3a.2.2 0 0 1-.2.2H5.74l8.239 8.239a.2.2 0 0 1 0 .282L12.14 23.86a.2.2 0 0 1-.282 0L.14 12.14a.2.2 0 0 1 0-.282L11.86.14a.2.2 0 0 1 .282 0L13.98 1.98a.2.2 0 0 1 0 .282L5.74 10.5H23.8c.11 0 .2.09.2.2v2.6Z"})}),A=o}}]);

package/build/webhook-list-page.b0f5a02c.chunk.js

@@ -0,0 +1,71 @@
+"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[4121],{32393:function(w,M,t){t.r(M),t.d(M,{default:function(){return ce}});var e=t(32735),o=t(24989),m=t(83983),h=t(53038),u=t(67879),g=t(20108),x=t(7395),y=t(96709),f=t(27649),r=t(82055),E=t(99223),l=t(49372),D=t(41415),A=t(17e3),K=t(72850),_=t(56755),ee=t(73269),te=t(33827),V=t(94547),d=t(19786),F=t(82884),ne=t(3685),ae=t(35658),S=t(87933),p=t(74512),z=t(8471);const B=z.ZP.div`
+  background: ${({theme:s})=>s.colors.danger500};
+  border: none;
+  border-radius: 16px;
+  position: relative;
+  height: ${24/16}rem;
+  width: ${40/16}rem;
+
+  & span {
+    font-size: ${({visibleLabels:s})=>s?"1rem":0};
+  }
+
+  &:before {
+    content: '';
+    background: ${({theme:s})=>s.colors.neutral0};
+    width: 1rem;
+    height: 1rem;
+    border-radius: 50%;
+    position: absolute;
+    transition: all 0.5s;
+    left: ${({theme:s})=>s.spaces[1]};
+    top: ${({theme:s})=>s.spaces[1]};
+  }
+
+  @media (prefers-reduced-motion: reduce) {
+    &:before {
+      transition: none;
+    }
+  }
+`,se=z.ZP.button`
+  background: transparent;
+  padding: 0;
+  border: none;
+
+  &[aria-checked='true'] ${B} {
+    background: ${({theme:s})=>s.colors.success500};
+  }
+
+  &[aria-checked='true'] ${B}:before {
+    transform: translateX(1rem);
+  }
+`,oe=e.forwardRef(({label:s,onChange:v,onLabel:C="On",offLabel:c="Off",selected:a,visibleLabels:b=!1,...L},R)=>(0,p.jsx)(se,{ref:R,role:"switch","aria-checked":a,"aria-label":s,onClick:v,visibleLabels:b,type:"button",...L,children:(0,p.jsxs)(S.k,{children:[(0,p.jsxs)(B,{children:[(0,p.jsx)("span",{children:C}),(0,p.jsx)("span",{children:c})]}),b&&(0,p.jsx)(K.x,{as:"span","aria-hidden":!0,paddingLeft:2,color:a?"success600":"danger600",children:a?C:c})]})}));var H=t(50563),le=t(9695),$=t(19406),N=t(4038),ie=t(68625),re=t(54725),de=()=>{const[s,v]=(0,e.useState)(!1),[C,c]=(0,e.useState)([]),{formatMessage:a}=(0,u.Z)(),{formatAPIError:b}=(0,o.So)(),L=(0,o.lm)();(0,o.go)();const{push:R}=(0,h.k6)(),{pathname:Q}=(0,h.TH)(),{isLoading:me,allowedActions:{canCreate:W,canUpdate:Y,canDelete:G}}=(0,o.ss)(m.Z.settings.webhooks),{get:he,post:ue,put:ge}=(0,o.kY)(),{notifyStatus:X}=(0,x.G)(),Ee="webhooks",{isLoading:fe,data:T,error:Z,refetch:J}=(0,g.useQuery)(Ee,async()=>{const{data:{data:n}}=await he("/admin/webhooks");return n});(0,e.useEffect)(()=>{if(Z){L({type:"warning",message:b(Z)});return}T&&X(a({id:"Settings.webhooks.list.loading.success",defaultMessage:"Webhooks have been loaded"}))},[T,Z,L,a,X,b]);const q=(0,g.useMutation)(async()=>{await ue("/admin/webhooks/batch-delete",{ids:C})},{onError(n){L({type:"warning",message:b(n)}),v(!1)},onSuccess(){c([]),v(!1),J()}}),ve=(0,g.useMutation)(async({isEnabled:n,id:i})=>{const{id:j,...U}=T.find(Ce=>Ce.id===i)??{},pe={...U,isEnabled:n};await ge(`/admin/webhooks/${i}`,pe)},{onError(n){L({type:"warning",message:b(n)})},onSuccess(){J()}}),be=()=>q.mutate(),Me=n=>c(n?T.map(i=>i.id):[]),xe=(n,i)=>c(n?j=>[...j,i]:j=>j.filter(U=>U!==i)),k=n=>R(`${Q}/${n}`),I=me||fe,O=T?.length??0,P=C.length;return e.createElement(y.A,null,e.createElement(o.SL,{name:"Webhooks"}),e.createElement(f.o,{"aria-busy":I},e.createElement(r.T,{title:a({id:"Settings.webhooks.title",defaultMessage:"Webhooks"}),subtitle:a({id:"Settings.webhooks.list.description",defaultMessage:"Get POST changes notifications"}),primaryAction:W&&!I&&e.createElement(o.Qj,{startIcon:e.createElement($.Z,null),variant:"default",to:`${Q}/create`,size:"S"},a({id:"Settings.webhooks.list.button.add",defaultMessage:"Create new webhook"}))}),P>0&&G&&e.createElement(E.Z,{startActions:e.createElement(e.Fragment,null,e.createElement(l.Z,{variant:"epsilon",textColor:"neutral600"},a({id:"Settings.webhooks.to.delete",defaultMessage:"{webhooksToDeleteLength, plural, one {# webhook} other {# webhooks}} selected"},{webhooksToDeleteLength:P})),e.createElement(D.z,{onClick:()=>v(!0),startIcon:e.createElement(N.Z,null),size:"L",variant:"danger-light"},a({id:"global.delete",defaultMessage:"Delete"})))}),e.createElement(A.D,null,I?e.createElement(K.x,{background:"neutral0",padding:6,shadow:"filterShadow",hasRadius:!0},e.createElement(o.dO,null)):O>0?e.createElement(_.i,{colCount:5,rowCount:O+1,footer:e.createElement(ee.c,{onClick:()=>W?k("create"):{},icon:e.createElement($.Z,null)},a({id:"Settings.webhooks.list.button.add",defaultMessage:"Create new webhook"}))},e.createElement(te.h,null,e.createElement(V.Tr,null,e.createElement(d.Th,null,e.createElement(F.C,{"aria-label":a({id:"global.select-all-entries",defaultMessage:"Select all entries"}),indeterminate:P>0&&P<O,value:P===O,onValueChange:Me})),e.createElement(d.Th,{width:"20%"},e.createElement(l.Z,{variant:"sigma",textColor:"neutral600"},a({id:"global.name",defaultMessage:"Name"}))),e.createElement(d.Th,{width:"60%"},e.createElement(l.Z,{variant:"sigma",textColor:"neutral600"},a({id:"Settings.webhooks.form.url",defaultMessage:"URL"}))),e.createElement(d.Th,{width:"20%"},e.createElement(l.Z,{variant:"sigma",textColor:"neutral600"},a({id:"Settings.webhooks.list.th.status",defaultMessage:"Status"}))),e.createElement(d.Th,null,e.createElement(ne.T,null,a({id:"Settings.webhooks.list.th.actions",defaultMessage:"Actions"}))))),e.createElement(ae.p,null,T.map(n=>e.createElement(V.Tr,{key:n.id,...(0,o.X7)({fn:()=>k(n.id),condition:Y})},e.createElement(d.Td,{...o.UW},e.createElement(F.C,{"aria-label":`${a({id:"global.select",defaultMessage:"Select"})} ${n.name}`,value:C?.includes(n.id),onValueChange:i=>xe(i,n.id),name:"select"})),e.createElement(d.Td,null,e.createElement(l.Z,{fontWeight:"semiBold",textColor:"neutral800"},n.name)),e.createElement(d.Td,null,e.createElement(l.Z,{textColor:"neutral800"},n.url)),e.createElement(d.Td,null,e.createElement(S.k,null,e.createElement(oe,{onLabel:a({id:"global.enabled",defaultMessage:"Enabled"}),offLabel:a({id:"global.disabled",defaultMessage:"Disabled"}),label:`${n.name} ${a({id:"Settings.webhooks.list.th.status",defaultMessage:"Status"})}`,selected:n.isEnabled,onChange:i=>{i.stopPropagation(),ve.mutate({isEnabled:!n.isEnabled,id:n.id})},visibleLabels:!0}))),e.createElement(d.Td,null,e.createElement(S.k,{gap:1},Y&&e.createElement(H.h,{label:a({id:"Settings.webhooks.events.update",defaultMessage:"Update"}),icon:e.createElement(ie.Z,null),noBorder:!0}),G&&e.createElement(H.h,{onClick:i=>{i.stopPropagation(),c([n.id]),v(!0)},label:a({id:"Settings.webhooks.events.delete",defaultMessage:"Delete webhook"}),icon:e.createElement(N.Z,null),noBorder:!0}))))))):e.createElement(le.x,{icon:e.createElement(re.Z,{width:"160px"}),content:a({id:"Settings.webhooks.list.empty.description",defaultMessage:"No webhooks found"}),action:e.createElement(D.z,{variant:"secondary",startIcon:e.createElement($.Z,null),onClick:()=>W?k("create"):{}},a({id:"Settings.webhooks.list.button.add",defaultMessage:"Create new webhook"}))}))),e.createElement(o.QH,{isOpen:s,onToggleDialog:()=>v(n=>!n),onConfirm:be,isConfirmButtonLoading:q.isLoading}))},ce=()=>e.createElement(o.O4,{permissions:m.Z.settings.webhooks.main},e.createElement(de,null))},99223:function(w,M,t){t.d(M,{Z:function(){return f}});var e=t(74512),o=t(32735),m=t(60216),h=t(8471),u=t(87933),g=t(72850);const x=(0,h.ZP)(u.k)`
+  & > * + * {
+    margin-left: ${({theme:r})=>r.spaces[2]};
+  }
+
+  margin-left: ${({pullRight:r})=>r?"auto":void 0};
+`,y=(0,h.ZP)(x)`
+  flex-shrink: 0;
+`,f=({startActions:r,endActions:E})=>r||E?(0,e.jsx)(g.x,{paddingLeft:10,paddingRight:10,children:(0,e.jsx)(g.x,{paddingBottom:4,children:(0,e.jsxs)(u.k,{justifyContent:"space-between",alignItems:"flex-start",children:[r&&(0,e.jsx)(x,{wrap:"wrap",children:r}),E&&(0,e.jsx)(y,{pullRight:!0,children:E})]})})}):null;f.defaultProps={endActions:void 0,startActions:void 0},f.propTypes={endActions:m.node,startActions:m.node}},73269:function(w,M,t){t.d(M,{c:function(){return E}});var e=t(74512),o=t(32735),m=t(60216),h=t(8471),u=t(72850),g=t(9026),x=t(87933),y=t(49372);const f=(0,h.ZP)(u.x)`
+  height: ${24/16}rem;
+  width: ${24/16}rem;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  svg {
+    height: ${10/16}rem;
+    width: ${10/16}rem;
+  }
+
+  svg path {
+    fill: ${({theme:l})=>l.colors.primary600};
+  }
+`,r=(0,h.ZP)(u.x)`
+  border-radius: 0 0 ${({theme:l})=>l.borderRadius} ${({theme:l})=>l.borderRadius};
+  display: block;
+  width: 100%;
+  border: none;
+`,E=({children:l,icon:D,...A})=>(0,e.jsxs)("div",{children:[(0,e.jsx)(g.i,{}),(0,e.jsx)(r,{as:"button",background:"primary100",padding:5,...A,children:(0,e.jsxs)(x.k,{children:[(0,e.jsx)(f,{"aria-hidden":!0,background:"primary200",children:D}),(0,e.jsx)(u.x,{paddingLeft:3,children:(0,e.jsx)(y.Z,{variant:"pi",fontWeight:"bold",textColor:"primary600",children:l})})]})})]});E.propTypes={children:m.string.isRequired,icon:m.node.isRequired}}}]);

package/ee/LICENSE

@@ -1,21 +1 @@
-This Strapi Enterprise Edition (EE) supplemental license (this “EE Supplemental License”) governs the use of this software and documentation (collectively, the “EE Software”) by you and any entity you represent (collectively, “You”). If You have separately entered into the Strapi, Inc. Enterprise Agreement (the “Enterprise Agreement”), then this EE Supplemental License hereby incorporates by reference the Enterprise Agreement and modifies the Enterprise Agreement solely to the extent set forth herein. If You have separately entered into the Strapi, Inc. Subscription Agreement (the “Subscription Agreement”), then this EE Supplemental License hereby incorporates by reference the Agreement and modifies the Subscription Agreement solely to the extent set forth herein. If You have not entered into either the Enterprise Agreement or the Subscription Agreement, then You may use the EE Software solely as set forth in Section 2 below. 
-
-In the event of a direct conflict between the terms of this EE Supplemental License and the terms of the Enterprise Agreement or the Subscription Agreement, as applicable, the terms of this EE Supplemental License will control. Except to the extent modified by this EE Supplemental License, the Enterprise Agreement or the Subscription Agreement, as applicable, remain in full force and effect in accordance with its terms.
-
-By using the EE Software, You hereby agree to the below terms and conditions.
-
-1. Notwithstanding any terms to the contrary in the Enterprise Agreement or Subscription Agreement, You may copy, modify and publish patches to the EE Software in a production environment (such copies, “Production Copies,” such modifications, “Production Modifications” and such patches, “Production Patches”) if and only if (a) You have agreed to, and are in full compliance with, the Enterprise Agreement or Subscription Agreement, as applicable, and (b) You have a valid license to the EE Software for the correct number of projects. You agree that Strapi and/or its licensors (as applicable) will own all right, title and interest in and to all such Production Copies, Production Modifications and Production Patches. You may display and/or distribute such Production Copies, Production Modifications and Production Patches if and only if (i) You have a valid license to the EE Software for the correct number of projects and (ii) You are in compliance with the Enterprise Agreement or Subscription Agreement, as applicable. You hereby assign to Strapi all right, title and interest in and to all Production Copies, Production Modifications and Production Patches, including all intellectual property rights embodied in or related to the foregoing.
-
-2. Notwithstanding the foregoing, You may copy and modify the EE Software solely for development and testing purposes (such copies, “Development Copies” and such modifications, “Development Modifications”) with or without a license to the EE Software if your use is in compliance with this Section 2. You agree that Strapi and/or its licensors (as applicable) will own all right, title and interest in and to all Development Copies and Development Modifications and You hereby assign to Strapi all right, title and interest in and to all Development Copies and Development Modifications, including all intellectual property rights embodied in or related to the foregoing. If You do not have a license to the EE Software, then You further agree as follows:
-
-Other than as expressly set forth in this Section 2, You may not (a) copy or modify the EE Software, (b) create derivative works of the EE Software, (c) remove or modify any notice of any patent, copyright, trademark, or other proprietary rights that appear on or in the EE Software, (d) reverse engineer, decompile, translate, disassemble, or discover the source code of all or any portion of the EE Software, (e) publicly display all or any part of the EE Software, (f) distribute, disclose, market, lease, publish, merge, resell, assign, loan, sublicense, rent, or transfer the EE Software to any third party, (g) use the EE Software for any dial-up, remote access, interactive, or other on-line or hosted service, or to provide a service bureau, time share, or other services to third parties, (h) merge the EE Software into another product, (i) disclose the results of any EE Software performance benchmarks or test results to any third party without Strapi’s prior written consent, (j) use any trademarks, logos, service marks, trade names of Strapi, or any portion thereof, without Strapi’s prior written consent, (k) use the EE Software, or any portion thereof, in a manner that does not comply with applicable law, regulations, or governmental orders, or (l) use or store the EE Software on equipment not owned or controlled by Customer. 
-
-THE EE SOFTWARE IS PROVIDED ON AN “AS IS” BASIS WITHOUT ANY REPRESENTATIONS, WARRANTIES, COVENANTS, OR CONDITIONS OF ANY KIND (EXPRESS OR IMPLIED, STATUTORY OR OTHERWISE), INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, TITLE, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT.  FURTHER, STRAPI DOES NOT REPRESENT OR WARRANT THAT (A) THE ACCESS TO OR USE OF THE EE SOFTWARE WILL BE SECURE, TIMELY, UNINTERRUPTED, ERROR-FREE, OR OPERATE IN COMBINATION WITH ANY OTHER HARDWARE, SOFTWARE, SYSTEM, OR DATA, (B) THE EE SOFTWARE WILL MEET YOUR REQUIREMENTS OR EXPECTATIONS, OR OTHERWISE PRODUCE ANY PARTICULAR RESULTS, (C) ERRORS OR DEFECTS WILL BE CORRECTED, PATCHES OR WORKAROUNDS WILL BE PROVIDED, OR STRAPI WILL DETECT ANY BUG IN THE EE SOFTWARE, (D) THE SOFTWARE IS FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS, OR (E) THIRD-PARTY DISRUPTIONS OR SECURITY BREACHES OF THE EE SOFTWARE WILL BE PREVENTED.
-
-STRAPI WILL NOT BE LIABLE FOR ANY LOSS OF PROFITS OR ANY INDIRECT, SPECIAL, INCIDENTAL, RELIANCE, OR CONSEQUENTIAL DAMAGES OF ANY KIND, REGARDLESS OF THE FORM OF ACTION, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY, OR OTHERWISE, EVEN IF INFORMED OF THE POSSIBILITY OF SUCH DAMAGES IN ADVANCE. 
-
-STRAPI’S ENTIRE LIABILITY TO YOU FOR USE OF THE EE SOFTWARE WILL NOT EXCEED $100.
-
-3. You are not granted any other rights beyond what is expressly stated herein and in the Enterprise Agreement or Subscription Agreement, as applicable.
-
-4. This EE Supplemental License does not apply to Strapi software that is distributed as part of the Strapi Community Edition (CE) (the “CE Software”).
+If you or the company you represent has entered into a written agreement referencing the Enterprise Edition of the Strapi source code available at https://github.com/strapi/strapi, then such agreement applies to your use of the Enterprise Edition of the Strapi Software. If you or the company you represent is using the Enterprise Edition of the Strapi Software in connection with a subscription to our cloud offering, then the agreement you have agreed to with respect to our cloud offering and the licenses included in such agreement apply to your use of the Enterprise Edition of the Strapi Software. Otherwise, the Strapi Enterprise Software License Agreement (found here https://strapi.io/enterprise-terms) applies to your use of the Enterprise Edition of the Strapi Software.  BY ACCESSING OR USING THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE RELEVANT REFERENCED AGREEMENT.  IF YOU ARE NOT AUTHORIZED TO ACCEPT THESE TERMS ON BEHALF OF THE COMPANY YOU REPRESENT OR IF YOU DO NOT AGREE TO ALL OF THE RELEVANT TERMS AND CONDITIONS REFERENCED AND YOU HAVE NOT OTHERWISE EXECUTED A WRITTEN AGREEMENT WITH STRAPI, YOU ARE NOT AUTHORIZED TO ACCESS OR USE OR ALLOW ANY USER TO ACCESS OR USE ANY PART OF THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE.  YOUR ACCESS RIGHTS ARE CONDITIONAL ON YOUR CONSENT TO THE RELEVANT REFERENCED TERMS TO THE EXCLUSION OF ALL OTHER TERMS; IF THE RELEVANT REFERENCED TERMS ARE CONSIDERED AN OFFER BY YOU, ACCEPTANCE IS EXPRESSLY LIMITED TO THE RELEVANT REFERENCED TERMS.

package/ee/admin/content-manager/pages/EditView/InformationBox/InformationBoxEE.js

@@ -38,8 +38,7 @@ export function InformationBoxEE() {
   const { formatAPIError } = useAPIErrorHandler();
   const toggleNotification = useNotification();
 
-  const { workflows: { data: workflows, isLoading: workflowIsLoading } = {} } =
-    useReviewWorkflows();
+  const { workflows, isLoading: workflowIsLoading } = useReviewWorkflows();
   // TODO: this works only as long as we support one workflow
   const workflow = workflows?.[0] ?? null;
 

package/ee/admin/pages/AuthPage/components/Login/index.js

@@ -13,7 +13,7 @@ const DividerFull = styled(Divider)`
 `;
 
 const Login = (loginProps) => {
-  const ssoEnabled = strapi.features.isEnabled(strapi.features.SSO);
+  const ssoEnabled = window.strapi.features.isEnabled(window.strapi.features.SSO);
   const { isLoading, data: providers } = useAuthProviders({ ssoEnabled });
   const { formatMessage } = useIntl();
 

package/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js

@@ -35,7 +35,7 @@ const SSOProvidersWrapper = styled(Flex)`
 const SSOProviderButton = ({ provider }) => {
   return (
     <Tooltip label={provider.displayName}>
-      <SSOButton href={`${strapi.backendURL}/admin/connect/${provider.uid}`}>
+      <SSOButton href={`${window.strapi.backendURL}/admin/connect/${provider.uid}`}>
         {provider.icon ? (
           <img src={provider.icon} aria-hidden alt="" height="32px" />
         ) : (

package/ee/admin/pages/AuthPage/components/Providers/index.js

@@ -17,7 +17,7 @@ const DividerFull = styled(Divider)`
 `;
 
 const Providers = () => {
-  const ssoEnabled = strapi.features.isEnabled(strapi.features.SSO);
+  const ssoEnabled = window.strapi.features.isEnabled(window.strapi.features.SSO);
 
   const { push } = useHistory();
   const { formatMessage } = useIntl();

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useAuditLogsData.js

@@ -2,24 +2,13 @@ import { useQuery } from 'react-query';
 import { useNotification, useFetchClient } from '@strapi/helper-plugin';
 import { useLocation } from 'react-router-dom';
 
+import { useAdminUsers } from '../../../../../../../../admin/src/hooks/useAdminUsers';
+
 const useAuditLogsData = ({ canReadAuditLogs, canReadUsers }) => {
   const { get } = useFetchClient();
   const { search } = useLocation();
   const toggleNotification = useNotification();
 
-  const fetchAuditLogsPage = async ({ queryKey }) => {
-    const search = queryKey[1];
-    const { data } = await get(`/admin/audit-logs${search}`);
-
-    return data;
-  };
-
-  const fetchAllUsers = async () => {
-    const { data } = await get(`/admin/users`);
-
-    return data;
-  };
-
   const queryOptions = {
     keepPreviousData: true,
     retry: false,
@@ -27,24 +16,43 @@ const useAuditLogsData = ({ canReadAuditLogs, canReadUsers }) => {
     onError: (error) => toggleNotification({ type: 'warning', message: error.message }),
   };
 
+  const {
+    users,
+    isError: isUsersError,
+    isLoading: isLoadingUsers,
+  } = useAdminUsers(
+    {},
+    {
+      ...queryOptions,
+      enabled: canReadUsers,
+      staleTime: 2 * (1000 * 60), // 2 minutes
+    }
+  );
+
   const {
     data: auditLogs,
-    isLoading,
+    isLoading: isLoadingAuditLogs,
     isError: isAuditLogsError,
-  } = useQuery(['auditLogs', search], fetchAuditLogsPage, {
-    ...queryOptions,
-    enabled: canReadAuditLogs,
-  });
-
-  const { data: users, isError: isUsersError } = useQuery(['auditLogsUsers'], fetchAllUsers, {
-    ...queryOptions,
-    enabled: canReadUsers,
-    staleTime: 2 * (1000 * 60), // 2 minutes
-  });
-
-  const hasError = isAuditLogsError || isUsersError;
-
-  return { auditLogs, users: users?.data, isLoading, hasError };
+  } = useQuery(
+    ['auditLogs', search],
+    async ({ queryKey }) => {
+      const search = queryKey[1];
+      const { data } = await get(`/admin/audit-logs${search}`);
+
+      return data;
+    },
+    {
+      ...queryOptions,
+      enabled: canReadAuditLogs,
+    }
+  );
+
+  return {
+    auditLogs,
+    users,
+    isLoading: isLoadingUsers || isLoadingAuditLogs,
+    hasError: isAuditLogsError || isUsersError,
+  };
 };
 
 export default useAuditLogsData;

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js

@@ -74,7 +74,7 @@ const getDisplayedFilters = ({ formatMessage, users, canReadUsers }) => {
       return user.email;
     };
 
-    const userOptions = users.results.map((user) => {
+    const userOptions = users.map((user) => {
       return {
         label: getDisplayNameFromUser(user),
         // Combobox expects a string value

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/ReviewWorkflows.js

@@ -44,7 +44,7 @@ export function ReviewWorkflowsPage() {
   const { put } = useFetchClient();
   const { formatAPIError } = useAPIErrorHandler();
   const toggleNotification = useNotification();
-  const { workflows: workflowsData, refetchWorkflow } = useReviewWorkflows();
+  const { workflows, status: workflowStatus, refetch: refetchWorkflow } = useReviewWorkflows();
   const {
     status,
     clientState: {
@@ -124,8 +124,8 @@ export function ReviewWorkflowsPage() {
   useInjectReducer(REDUX_NAMESPACE, reducer);
 
   useEffect(() => {
-    dispatch(setWorkflows({ status: workflowsData.status, data: workflowsData.data }));
-  }, [workflowsData.status, workflowsData.data, dispatch]);
+    dispatch(setWorkflows({ status: workflowStatus, data: workflows }));
+  }, [workflowStatus, workflows, dispatch]);
 
   useEffect(() => {
     trackUsage('didViewWorkflow');

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/useReviewWorkflows.js

@@ -1,35 +1,46 @@
-import { useQuery, useQueryClient } from 'react-query';
+import { useQuery } from 'react-query';
 import { useFetchClient } from '@strapi/helper-plugin';
+import { stringify } from 'qs';
 
-const QUERY_BASE_KEY = 'review-workflows';
-const API_BASE_URL = '/admin/review-workflows';
+export function useReviewWorkflows(params = {}) {
+  const { id = '', ...queryParams } = params;
+  const defaultQueryParams = {
+    populate: 'stages',
+  };
 
-export function useReviewWorkflows(workflowId) {
   const { get } = useFetchClient();
-  const client = useQueryClient();
-  const workflowQueryKey = [QUERY_BASE_KEY, workflowId ?? 'default'];
+  const queryString = stringify({ ...defaultQueryParams, ...queryParams }, { encode: false });
 
-  async function fetchWorkflows({ params = { populate: 'stages' } }) {
-    try {
-      const {
-        data: { data },
-      } = await get(`${API_BASE_URL}/workflows/${workflowId ?? ''}`, { params });
+  const { data, isLoading, status, refetch } = useQuery(
+    ['review-workflows', 'workflows', id],
+    async () => {
+      try {
+        const {
+          data: { data },
+        } = await get(
+          `/admin/review-workflows/workflows/${id}${queryString ? `?${queryString}` : ''}`
+        );
 
-      return data;
-    } catch (err) {
-      // silence
-      return null;
+        return data;
+      } catch (err) {
+        // silence
+        return null;
+      }
     }
-  }
+  );
 
-  async function refetchWorkflow() {
-    await client.refetchQueries(workflowQueryKey);
-  }
+  let workflows = [];
 
-  const workflows = useQuery(workflowQueryKey, fetchWorkflows);
+  if (id && data) {
+    workflows = [data];
+  } else if (Array.isArray(data)) {
+    workflows = data;
+  }
 
   return {
     workflows,
-    refetchWorkflow,
+    isLoading,
+    status,
+    refetch,
   };
 }

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel.js

@@ -1,6 +1,6 @@
 import baseModel from '../../../../../../../../../admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel';
 
-const ssoInputsModel = strapi.features.isEnabled(strapi.features.SSO)
+const ssoInputsModel = window.strapi.features.isEnabled(window.strapi.features.SSO)
   ? {
       useSSORegistration: true,
     }

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm.js

@@ -1,4 +1,4 @@
-const form = strapi.features.isEnabled(strapi.features.SSO)
+const form = window.strapi.features.isEnabled(window.strapi.features.SSO)
   ? [
       [
         {

package/ee/server/services/audit-logs.js

@@ -124,7 +124,11 @@ const createAuditLogsService = (strapi) => {
     const processedEvent = processEvent(name, ...args);
 
     if (processedEvent) {
-      await state.provider.saveEvent(processedEvent);
+      // This stores the event when after the transaction is committed,
+      // so it's not stored if the transaction is rolled back
+      await strapi.db.transaction(({ onCommit }) => {
+        onCommit(() => state.provider.saveEvent(processedEvent));
+      });
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.11.0-alpha.0",
+  "version": "4.11.0-beta.1",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -48,18 +48,18 @@
     "@casl/ability": "^5.4.3",
     "@fingerprintjs/fingerprintjs": "3.4.1",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/babel-plugin-switch-ee-ce": "4.11.0-alpha.0",
-    "@strapi/data-transfer": "4.11.0-alpha.0",
-    "@strapi/design-system": "1.7.4",
-    "@strapi/helper-plugin": "4.11.0-alpha.0",
-    "@strapi/icons": "1.7.4",
-    "@strapi/permissions": "4.11.0-alpha.0",
-    "@strapi/provider-audit-logs-local": "4.11.0-alpha.0",
-    "@strapi/typescript-utils": "4.11.0-alpha.0",
-    "@strapi/utils": "4.11.0-alpha.0",
-    "axios": "1.3.4",
+    "@strapi/babel-plugin-switch-ee-ce": "4.11.0-beta.1",
+    "@strapi/data-transfer": "4.11.0-beta.1",
+    "@strapi/design-system": "0.0.0-3cf3ff39",
+    "@strapi/helper-plugin": "4.11.0-beta.1",
+    "@strapi/icons": "0.0.0-3cf3ff39",
+    "@strapi/permissions": "4.11.0-beta.1",
+    "@strapi/provider-audit-logs-local": "4.11.0-beta.1",
+    "@strapi/typescript-utils": "4.11.0-beta.1",
+    "@strapi/utils": "4.11.0-beta.1",
+    "axios": "1.4.0",
     "babel-loader": "^9.1.2",
-    "babel-plugin-styled-components": "2.0.2",
+    "babel-plugin-styled-components": "2.1.1",
     "bcryptjs": "2.4.3",
     "browserslist": "^4.17.3",
     "browserslist-to-esbuild": "1.2.0",
@@ -68,14 +68,14 @@
     "codemirror5": "npm:codemirror@^5.65.11",
     "cross-env": "^7.0.3",
     "css-loader": "^6.7.3",
-    "date-fns": "2.29.3",
+    "date-fns": "2.30.0",
     "dotenv": "8.5.1",
     "esbuild-loader": "^2.21.0",
     "execa": "^1.0.0",
     "fast-deep-equal": "3.1.3",
     "find-root": "1.1.0",
-    "fork-ts-checker-webpack-plugin": "7.2.1",
-    "formik": "^2.2.6",
+    "fork-ts-checker-webpack-plugin": "7.3.0",
+    "formik": "^2.4.0",
     "fractional-indexing": "3.2.0",
     "fs-extra": "10.0.0",
     "highlight.js": "^10.4.1",
@@ -110,16 +110,14 @@
     "prop-types": "^15.7.2",
     "qs": "6.11.1",
     "react": "^17.0.2",
-    "react-copy-to-clipboard": "^5.1.0",
     "react-dnd": "15.1.2",
     "react-dnd-html5-backend": "15.1.3",
     "react-dom": "^17.0.2",
     "react-error-boundary": "3.1.4",
-    "react-fast-compare": "^3.2.0",
     "react-helmet": "^6.1.0",
     "react-intl": "6.4.1",
     "react-is": "^17.0.2",
-    "react-query": "3.24.3",
+    "react-query": "3.39.3",
     "react-redux": "8.0.5",
     "react-refresh": "0.14.0",
     "react-router-dom": "5.3.4",
@@ -141,14 +139,13 @@
     "yup": "^0.32.9"
   },
   "devDependencies": {
-    "@testing-library/dom": "8.19.0",
+    "@testing-library/dom": "8.20.0",
     "@testing-library/react": "12.1.4",
     "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "14.4.3",
     "duplicate-dependencies-webpack-plugin": "^1.0.2",
     "glob": "8.0.3",
     "msw": "1.2.1",
-    "react-test-renderer": "^17.0.2",
     "speed-measure-webpack-plugin": "1.5.0",
     "webpack-bundle-analyzer": "^4.8.0"
   },
@@ -168,5 +165,5 @@
       }
     }
   },
-  "gitHead": "ca5fb0fcfab1b6784208d2ddf6d51617b8893b35"
+  "gitHead": "a5fa3bd7e1c4680dd350580620d383612597d25d"
 }