@strapi/admin 4.6.0 → 4.7.0-beta.0

package/build/webhook-edit-page.73e51e64.chunk.js

@@ -0,0 +1,75 @@
+"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[5162],{41513:function(re,x,t){t.d(x,{Z:function(){return We}});var e=t(32735),n=t(88425),D=t(27649),O=t(84968),S=t(5141),f=t(8888),u=t(60216),i=t.n(u),X=t(29439),m=t(66456),$=t(74512);function Te(a){return(0,$.jsx)("svg",{width:"1em",height:"1em",viewBox:"0 0 8 8",fill:"none",xmlns:"http://www.w3.org/2000/svg",...a,children:(0,$.jsx)("path",{d:"M2 .93c0-.4.45-.63.78-.41l4.6 3.06c.3.2.3.64 0 .84l-4.6 3.06A.5.5 0 012 7.07V.93z",fill:"#212134"})})}var ye=t(28356),Me=t(17e3),le=t(72850),Pe=t(41415),B=t(27677),ue=t(10369),Q=t(15335),U=t(5803),w=t(83281),j=t(5636),xe=t(76437),K=t(49372),Oe=t(83292),Ae=t(44426),G=t(8284),me=t(23940),s=t.n(me);const I=({disabledEvents:a,name:r,events:l,inputValue:o,handleChange:g,handleChangeAll:h})=>{const c=l.filter(M=>!a.includes(M)),p=o.length===c.length,E=o.length>0,v=({target:{name:M}})=>{h({target:{name:M,value:!p}})};return e.createElement("tr",null,e.createElement("td",null,e.createElement(G.X,{indeterminate:E&&!p,"aria-label":"Select all entries",name:r,onChange:v,value:p},s()(r))),l.map(M=>e.createElement("td",{key:M},e.createElement(Ae.C,{disabled:a.includes(M),"aria-label":M,name:M,value:o.includes(M),onValueChange:L=>g({target:{name:M,value:L}})}))))};I.defaultProps={disabledEvents:[],events:[],inputValue:[],handleChange(){},handleChangeAll(){}},I.propTypes={disabledEvents:i().array,events:i().array,inputValue:i().array,handleChange:i().func,handleChangeAll:i().func,name:i().string.isRequired};var k=I,T=a=>a.reduce((r,l)=>{const o=l.split(".")[0];return r[o]||(r[o]=[]),r[o].push(l),r},{});const oe=Oe.default.table`
+  td {
+    height: ${52/16}rem;
+    width: 10%;
+    vertical-align: middle;
+    text-align: center;
+  }
+
+  tbody tr:nth-child(odd) {
+    background: ${({theme:a})=>a.colors.neutral100};
+  }
+
+  tbody tr td:first-child {
+    padding-left: ${({theme:a})=>a.spaces[7]};
+  }
+`,se={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"]}}},ie=({isDraftAndPublish:a})=>{const r=a?se.headers.draftAndPublish:se.headers.default,l=a?se.events.draftAndPublish:se.events.default,{formatMessage:o}=(0,j.useIntl)(),{values:g,handleChange:h}=(0,w.useFormikContext)(),c="events",p=g.events,E=[],v=T(p),M=({target:{name:b,value:ae}})=>{let F=new Set(p);ae?F.add(b):F.delete(b),h({target:{name:c,value:Array.from(F)}})},L=({target:{name:b,value:ae}})=>{let F=new Set(p);ae?l[b].forEach(z=>{E.includes(z)||F.add(z)}):l[b].forEach(z=>F.delete(z)),h({target:{name:c,value:Array.from(F)}})};return e.createElement(B.K,{spacing:1},e.createElement(xe.Q,null,o({id:"Settings.webhooks.form.events",defaultMessage:"Events"})),e.createElement(oe,null,e.createElement("thead",null,e.createElement("tr",null,e.createElement("td",null),r.map(b=>b==="app.utils.publish"||b==="app.utils.unpublish"?e.createElement("td",{key:b.id,title:o({id:"Settings.webhooks.event.publish-tooltip",defaultMessage:"This event only exists for content with draft & publish enabled"})},e.createElement(K.Z,{variant:"sigma",textColor:"neutral600"},o(b))):e.createElement("td",{key:b.id},e.createElement(K.Z,{variant:"sigma",textColor:"neutral600"},o(b)))))),e.createElement("tbody",null,Object.keys(l).map(b=>e.createElement(k,{disabledEvents:E,key:b,name:b,events:l[b],inputValue:v[b],handleChange:M,handleChangeAll:L})))))};ie.propTypes={isDraftAndPublish:i().bool.isRequired};var De=ie,ee=t(19406),J=t(87933),ge=t(7563),ke=t(42623),$e=t(90333),pe=["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 fe=({name:a,onChange:r,value:l,...o})=>{const[g,h]=(0,e.useState)(l?[...pe,l]:pe),c=E=>{r({target:{name:a,value:E}})},p=E=>{h(v=>[...v,E]),r({target:{name:a,value:E}})};return e.createElement(ke.X,{...o,onChange:c,onCreateOption:p,placeholder:"",value:l},g.map(E=>e.createElement($e.O,{value:E,key:E},E)))};fe.defaultProps={value:void 0},fe.propTypes={name:i().string.isRequired,onChange:i().func.isRequired,value:i().string};var Se=fe,Ke=()=>{const{formatMessage:a}=(0,j.useIntl)(),{values:r,errors:l}=(0,w.useFormikContext)();return e.createElement(B.K,{spacing:1},e.createElement(xe.Q,null,a({id:"Settings.webhooks.form.headers",defaultMessage:"Headers"})),e.createElement(le.x,{padding:8,background:"neutral100",hasRadius:!0},e.createElement(w.FieldArray,{validateOnChange:!1,name:"headers",render:({push:o,remove:g})=>e.createElement(Q.r,{gap:4},r.headers?.map((h,c)=>e.createElement(e.Fragment,{key:c},e.createElement(U.P,{col:6},e.createElement(w.Field,{as:Se,name:`headers.${c}.key`,"aria-label":`row ${c+1} key`,label:a({id:"Settings.webhooks.key",defaultMessage:"Key"}),error:l.headers?.[c]?.key&&a({id:l.headers[c]?.key,defaultMessage:l.headers[c]?.key})})),e.createElement(U.P,{col:6},e.createElement(J.k,{alignItems:"flex-end"},e.createElement(le.x,{style:{flex:1}},e.createElement(w.Field,{as:ue.o,"aria-label":`row ${c+1} value`,label:a({id:"Settings.webhooks.value",defaultMessage:"Value"}),name:`headers.${c}.value`,error:l.headers?.[c]?.value&&a({id:l.headers[c]?.value,defaultMessage:l.headers[c]?.value})})),e.createElement(J.k,{paddingLeft:2,style:{alignSelf:"center"},paddingTop:l.headers?.[c]?.value?0:5},e.createElement(n.RemoveRoundedButton,{onClick:()=>r.headers.length!==1&&g(c),label:a({id:"Settings.webhooks.headers.remove",defaultMessage:"Remove header row {number}"},{number:c+1})})))))),e.createElement(U.P,{col:12},e.createElement(ge.A,{type:"button",onClick:()=>{o({key:"",value:""})},startIcon:e.createElement(ee.default,null)},a({id:"Settings.webhooks.create.header",defaultMessage:"Create new header"}))))})))},he=t(35331),Z=t(27169);const de=Oe.default.svg(({theme:a,color:r})=>`
+  width: ${12/16}rem;
+  height: ${12/16}rem;
+
+  path {
+    fill: ${a.colors[r]};
+  }
+`),Ee=({isPending:a,statusCode:r})=>{const{formatMessage:l}=(0,j.useIntl)();return a?e.createElement(B.K,{horizontal:!0,spacing:2,style:{alignItems:"center"}},e.createElement(de,{as:Z.Z}),e.createElement(K.Z,null,l({id:"Settings.webhooks.trigger.pending",defaultMessage:"pending"}))):r>=200&&r<300?e.createElement(B.K,{horizontal:!0,spacing:2,style:{alignItems:"center"}},e.createElement(de,{as:m.Z,color:"success700"}),e.createElement(K.Z,null,l({id:"Settings.webhooks.trigger.success",defaultMessage:"success"}))):r>=300?e.createElement(B.K,{horizontal:!0,spacing:2,style:{alignItems:"center"}},e.createElement(de,{as:he.default,color:"danger700"}),e.createElement(K.Z,null,l({id:"Settings.error",defaultMessage:"error"})," ",r)):null};Ee.propTypes={isPending:i().bool.isRequired,statusCode:i().number},Ee.defaultProps={statusCode:void 0};const P=({statusCode:a,message:r})=>{const{formatMessage:l}=(0,j.useIntl)();return a>=200&&a<300?e.createElement(J.k,{justifyContent:"flex-end"},e.createElement(K.Z,{textColor:"neutral600",ellipsis:!0},l({id:"Settings.webhooks.trigger.success.label",defaultMessage:"Trigger succeeded"}))):a>=300?e.createElement(J.k,{justifyContent:"flex-end"},e.createElement(J.k,{maxWidth:(0,n.pxToRem)(250),justifyContent:"flex-end",title:r},e.createElement(K.Z,{ellipsis:!0,textColor:"neutral600"},r))):null};P.propTypes={statusCode:i().number,message:i().string},P.defaultProps={statusCode:void 0,message:void 0};const ve=({onCancel:a})=>{const{formatMessage:r}=(0,j.useIntl)();return e.createElement(J.k,{justifyContent:"flex-end"},e.createElement("button",{onClick:a,type:"button"},e.createElement(B.K,{horizontal:!0,spacing:2,style:{alignItems:"center"}},e.createElement(K.Z,{textColor:"neutral400"},r({id:"Settings.webhooks.trigger.cancel",defaultMessage:"cancel"})),e.createElement(de,{as:he.default,color:"neutral400"}))))};ve.propTypes={onCancel:i().func.isRequired};const be=({isPending:a,onCancel:r,response:l})=>{const{statusCode:o,message:g}=l,{formatMessage:h}=(0,j.useIntl)();return e.createElement(le.x,{background:"neutral0",padding:5,shadow:"filterShadow",hasRadius:!0},e.createElement(Q.r,{gap:4,style:{alignItems:"center"}},e.createElement(U.P,{col:3},e.createElement(K.Z,null,h({id:"Settings.webhooks.trigger.test",defaultMessage:"Test-trigger"}))),e.createElement(U.P,{col:3},e.createElement(Ee,{isPending:a,statusCode:o})),e.createElement(U.P,{col:6},a?e.createElement(ve,{onCancel:r}):e.createElement(P,{statusCode:o,message:g}))))};be.defaultProps={isPending:!1,onCancel(){},response:{}},be.propTypes={isPending:i().bool,onCancel:i().func,response:i().object};var Fe=be,y=t(5173);const Ie=/(^$)|(^[A-Za-z][_0-9A-Za-z ]*$)/,N=/(^$)|((https?:\/\/.*)(d*)\/?(.*))/;var R=y.Ry().shape({name:y.Z_(n.translatedErrors.string).required(n.translatedErrors.required).matches(Ie,n.translatedErrors.regex),url:y.Z_(n.translatedErrors.string).required(n.translatedErrors.required).matches(N,n.translatedErrors.regex),headers:y.Vo(a=>{let r=y.IX();if(a.length===1){const{key:l,value:o}=a[0];if(!l&&!o)return r}return r.of(y.Ry().shape({key:y.Z_().required(n.translatedErrors.required),value:y.Z_().required(n.translatedErrors.required)}))}),events:y.IX()});const Y=({handleSubmit:a,data:r,triggerWebhook:l,isCreating:o,isTriggering:g,triggerResponse:h,isDraftAndPublishEvents:c})=>{const{formatMessage:p}=(0,j.useIntl)(),[E,v]=(0,e.useState)(!1);return e.createElement(w.Formik,{onSubmit:a,initialValues:{name:r?.name||"",url:r?.url||"",headers:Object.keys(r?.headers||[]).length?Object.entries(r.headers).map(([M,L])=>({key:M,value:L})):[{key:"",value:""}],events:r?.events||[]},validationSchema:R,validateOnChange:!1,validateOnBlur:!1},({handleSubmit:M,errors:L})=>e.createElement(n.Form,{noValidate:!0},e.createElement(ye.T,{primaryAction:e.createElement(B.K,{horizontal:!0,spacing:2},e.createElement(Pe.z,{onClick:()=>{l(),v(!0)},variant:"tertiary",startIcon:e.createElement(Te,null),disabled:o||g,size:"L"},p({id:"Settings.webhooks.trigger",defaultMessage:"Trigger"})),e.createElement(Pe.z,{startIcon:e.createElement(m.Z,null),onClick:M,type:"submit",size:"L"},p({id:"global.save",defaultMessage:"Save"}))),title:o?p({id:"Settings.webhooks.create",defaultMessage:"Create a webhook"}):r?.name,navigationAction:e.createElement(n.Link,{startIcon:e.createElement(X.Z,null),to:"/settings/webhooks"},p({id:"global.back",defaultMessage:"Back"}))}),e.createElement(Me.D,null,e.createElement(B.K,{spacing:4},E&&e.createElement("div",{className:"trigger-wrapper"},e.createElement(Fe,{isPending:g,response:h,onCancel:()=>v(!1)})),e.createElement(le.x,{background:"neutral0",padding:8,shadow:"filterShadow",hasRadius:!0},e.createElement(B.K,{spacing:6},e.createElement(Q.r,{gap:6},e.createElement(U.P,{col:6},e.createElement(w.Field,{as:ue.o,name:"name",error:L.name&&p({id:L.name}),label:p({id:"global.name",defaultMessage:"Name"}),required:!0})),e.createElement(U.P,{col:12},e.createElement(w.Field,{as:ue.o,name:"url",error:L.url&&p({id:L.url}),label:p({id:"Settings.roles.form.input.url",defaultMessage:"Url"}),required:!0}))),e.createElement(Ke,null),e.createElement(De,{isDraftAndPublish:c})))))))};Y.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},Y.defaultProps={data:void 0,triggerResponse:void 0};var te=Y,ce=t(92891);const ne=a=>{const r={...a};return(0,ce.set)(r,"headers",Re(a.headers)),r},Re=a=>a.reduce((r,l)=>{const{key:o,value:g}=l;return o!==""?{...r,[o]:g}:r},{});var Le=ne,Ce=t(98399),We=()=>{const{params:{id:a}}=(0,S.useRouteMatch)("/settings/webhooks/:id"),{replace:r}=(0,S.useHistory)(),{lockApp:l,unlockApp:o}=(0,n.useOverlayBlocker)(),g=(0,n.useNotification)(),h=(0,O.useQueryClient)(),{isLoading:c,collectionTypes:p}=(0,f.bP)(),{post:E}=(0,n.useFetchClient)(),v=a==="create",M=(0,e.useCallback)(async V=>{const[H,{data:Ve}]=await(0,n.to)((0,n.request)(`/admin/webhooks/${V}`,{method:"GET"}));return H?(g({type:"warning",message:{id:"notification.error"}}),null):Ve},[g]),{isLoading:L,data:b}=(0,O.useQuery)(["get-webhook",a],()=>M(a),{enabled:!v}),{isLoading:ae,data:F,isIdle:z,mutate:d}=(0,O.useMutation)(()=>E(`/admin/webhooks/${a}/trigger`)),C=()=>d(null,{onError(){g({type:"warning",message:{id:"notification.error"}})}}),W=(0,O.useMutation)(V=>(0,n.request)("/admin/webhooks",{method:"POST",body:V})),q=(0,O.useMutation)(({id:V,body:H})=>(0,n.request)(`/admin/webhooks/${V}`,{method:"PUT",body:H})),Ze=async V=>{v?(l(),W.mutate(Le(V),{onSuccess(H){g({type:"success",message:{id:"Settings.webhooks.created"}}),r(`/settings/webhooks/${H.data.id}`),o()},onError(H){g({type:"warning",message:{id:"notification.error"}}),Ce.log(H),o()}})):(l(),q.mutate({id:a,body:Le(V)},{onSuccess(){h.invalidateQueries(["get-webhook",a]),g({type:"success",message:{id:"notification.form.success.fields"}}),o()},onError(H){g({type:"warning",message:{id:"notification.error"}}),Ce.log(H),o()}}))},ze=(0,e.useMemo)(()=>p.some(V=>V.options.draftAndPublish===!0),[p]);return L||c?e.createElement(n.LoadingIndicatorPage,null):e.createElement(D.o,null,e.createElement(n.SettingsPageTitle,{name:"Webhooks"}),e.createElement(te,{handleSubmit:Ze,data:b,triggerWebhook:C,isCreating:v,isTriggering:ae,isTriggerIdle:z,triggerResponse:F?.data.data,isDraftAndPublishEvents:ze}))}},33238:function(re,x,t){t.r(x);var e=t(32735),n=t(88425),D=t.n(n),O=t(72041),S=t(41513);const f=()=>e.createElement(n.CheckPagePermissions,{permissions:O.Z.settings.webhooks.create},e.createElement(S.Z,null));x.default=f},59021:function(re,x,t){t.r(x);var e=t(32735),n=t(88425),D=t.n(n),O=t(72041),S=t(41513);const f=()=>e.createElement(n.CheckPagePermissions,{permissions:O.Z.settings.webhooks.update},e.createElement(S.Z,null));x.default=f},42623:function(re,x,t){t.d(x,{h:function(){return G},X:function(){return me}});var e=t(32735),n=t(60216),D=t(57269),O=t(66436),S=t(96892),f=t(94486);const u={Close:"Close",CloseSelect:"CloseSelect",First:"First",Last:"Last",Next:"Next",Open:"Open",PageDown:"PageDown",PageUp:"PageUp",Previous:"Previous",Select:"Select",Space:"Space",Type:"Type"},i={Close:"Close",First:"First",Last:"Last",Next:"Next",Open:"Open",Previous:"Previous",Select:"Select",UpLevel:"UpLevel"};function X(s=[],I=null,k=[]){const _=String(I??"").toLowerCase();return _?s.filter(T=>T.props.children.toString().toLowerCase().includes(_)&&k.indexOf(T)<0):s}function m(s,I){if(!I&&s===f.y.DOWN)return u.Open;if(s===f.y.DOWN)return u.Next;if(s===f.y.UP)return u.Previous;if(s===f.y.HOME)return u.First;if(s===f.y.END)return u.Last;if(s===f.y.ESCAPE)return u.Close;if(s===f.y.ENTER)return u.CloseSelect;if(s===f.y.BACKSPACE||s===f.y.CLEAR||s.length===1)return u.Type}function $(s,I,k){switch(k){case u.First:return 0;case u.Last:return I;case u.Previous:return Math.max(0,s-1);case u.Next:return Math.min(I,s+1);default:return s}}function Te(s){S(s,{scrollMode:"if-needed",block:"nearest",inline:"nearest"}).forEach(({el:I,top:k,left:_})=>{I.scrollTop=k,I.scrollLeft=_})}var ye=t(87933),Me=t(93958),le=t(46406),Pe=t(72850),B=t(49372),ue=t(97405),Q=t(91225),U=t(90333),w=t(87107),j=t(76437),xe=t(67014),K=t(47851),Oe=t(27677),Ae=t(3685);const G=({children:s,clearLabel:I,creatable:k,createMessage:_,disabled:T,error:oe,hasMoreItems:se,hint:ie,id:De,label:ee,labelAction:J,loading:ge,loadingMessage:ke,noOptionsMessage:$e,onChange:Be,onClear:pe,onCreateOption:fe,onInputChange:Se,onLoadMore:Ue,placeholder:Ke,required:he,value:Z,...de})=>{const Ee=()=>s.find(d=>d.props?.value.toLowerCase()===Z.toLowerCase()).props?.children,[P,ve]=(0,e.useState)(0),[be,Fe]=(0,e.useState)(null),[y,Ie]=(0,e.useState)(s),[N,we]=(0,e.useState)(!1),[R,Y]=(0,e.useState)(""),te=(0,e.useRef)(),ce=(0,e.useRef)(!1),ne=(0,e.useRef)(),Re=(0,e.useRef)(),Le=(0,e.useRef)(),Ce=(0,e.useRef)(!0),A=(0,O.M)(De),We=`${A}-label`;if(!ee&&!de["aria-label"])throw new Error('The Combobox component needs a "label" or an "aria-label" props');(0,e.useEffect)(()=>{Ie(X(s,R))},[R,s]),(0,e.useEffect)(()=>{N&&te.current&&Te(te.current)},[P,N]),(0,e.useLayoutEffect)(()=>{Ce.current&&(Ce.current=!1)},[Z]);const a=N?`${A}-${P}`:"",r=()=>{Be(null),Y("")},l=d=>{Se&&Se(d);const C=ne.current.value;Ie(X(s,C)),ve(0),Fe(null),R!==C&&Y(C),N||v(!0,!1)},o=d=>{const{key:C}=d,W=k&&R?y.length:y.length-1,q=m(C,N);switch(Z&&!R&&C===f.y.BACKSPACE&&r(),q){case u.Next:{if(P===W){h(0);break}h($(P,W,q));break}case u.Previous:{if(P===0){h(W);break}h($(P,W,q));break}case u.Last:case u.First:{if(P===W){h(0);break}h($(P,W,q));break}case u.CloseSelect:d.preventDefault(),E(P);break;case u.Close:d.preventDefault(),v(!1);break;case u.Open:v(!0);break}},g=d=>{if(d.preventDefault(),Z&&!ce.current&&Y(""),ce.current){ce.current=!1;return}v(!1,!1)},h=d=>{ve(d)},c=d=>{h(d),E(d)},p=()=>{ce.current=!0},E=d=>{const C=y[d];if(Y(""),C){Be(C.props.value),v(!1);return}k&&(fe(R),v(!1))},v=(d,C=!0)=>{we(d),C&&ne.current.focus()},M=e.Children.toArray(y).map((d,C)=>{const W=P===C;return(0,e.cloneElement)(d,{id:`${A}-${C}`,"aria-selected":be===C,"aria-posinset":C+1,"aria-setsize":e.Children.toArray(y).length,ref(q){W&&(te.current=q)},onClick:()=>c(C),onMouseDown:p,isSelected:W})}),L=()=>{ne.current.focus(),pe&&pe(),r()},b=()=>{ne.current.focus(),v(!0)},ae=()=>{const d=y.findIndex(C=>C.props?.children===R);return R&&d===-1},F=d=>{d.preventDefault(),v(d,!0)};let z;return oe?z=`${A}-error`:ie&&(z=`${A}-hint`),e.createElement(w.g,{hint:ie,error:oe,id:A,required:he},e.createElement(Ae.T,{"aria-live":"polite","aria-atomic":"false","aria-relevant":"additions text"},Z),e.createElement(Oe.K,{spacing:ee||ie||oe?1:0},ee&&e.createElement(j.Q,{action:J},ee),e.createElement(Q.d8,{ref:Re,$disabled:T,hasError:oe},e.createElement(Q.fv,{wrap:"wrap"},!R&&Z&&e.createElement(Q.K7,{id:`${A}-selected-value`},e.createElement(B.Z,null,Ee())),e.createElement(Q.II,{"aria-activedescendant":a,"aria-autocomplete":"list","aria-controls":`${A}-listbox`,"aria-disabled":T,"aria-expanded":N,"aria-haspopup":"listbox","aria-describedby":z,autoComplete:"off",autoCorrect:"off",id:A,onBlur:T?void 0:g,onClick:T?void 0:F,onInput:T?void 0:l,onKeyDown:T?void 0:o,placeholder:Z?"":Ke,readOnly:T,ref:ne,required:he,role:"combobox",spellCheck:"off",type:"text",value:R})),e.createElement(ye.k,null,(Z||R)&&e.createElement(Me.zb,{id:`${A}-clear`,"aria-label":I,disabled:T,paddingLeft:3,as:"button",onClick:L,type:"button"},e.createElement(D.Cross,null)),e.createElement(Me.AV,{disabled:T,paddingLeft:3,"aria-hidden":!0,as:"button",onClick:b,tabIndex:-1,type:"button"},e.createElement(D.CarretDown,null)))),e.createElement(xe.J,null),e.createElement(K.c,null)),N&&e.createElement(le.J2,{id:`${A}-popover`,source:Re,spacing:4,fullWidth:!0,intersectionId:`${A}-listbox-popover-intersection`,onReachEnd:se&&!ge?Ue:void 0},e.createElement("div",{role:"listbox",ref:Le,id:`${A}-listbox`,"aria-labelledby":ee?We:void 0},(Boolean(y.length)||k)&&e.createElement(e.Fragment,null,M,ae()&&k&&e.createElement(U.O,{isSelected:P===y.length,ref:d=>{P===y.length&&(te.current=d)},onMouseDown:p,onClick:()=>E(),taindex:0},_(R))),!y.length&&!k&&!ge&&e.createElement(Pe.x,{paddingLeft:4,paddingRight:4,paddingTop:2,paddingBottom:2,ref:te},e.createElement(B.Z,{textColor:"neutral800"},$e(R))),ge&&e.createElement(ye.k,{justifyContent:"center",alignItems:"center",paddingTop:2,paddingBottom:2},e.createElement(ue.a,{small:!0},ke)))))},me=s=>e.createElement(G,{...s,creatable:!0});G.defaultProps={"aria-label":void 0,clearLabel:"clear",creatable:!1,createMessage:s=>`Create "${s}"`,disabled:!1,error:void 0,hasMoreItems:!1,hint:void 0,id:void 0,label:void 0,loading:!1,loadingMessage:"Loading content...",noOptionsMessage:()=>"No results found",onClear:void 0,onCreateOption:void 0,onInputChange:void 0,onLoadMore:void 0,placeholder:"Select or enter a value",value:void 0},me.defaultProps=G.defaultProps,G.propTypes={"aria-label":n.string,children:n.oneOfType([n.arrayOf(n.node),n.node]),clearLabel:n.string,creatable:n.bool,createMessage:n.func,disabled:n.bool,error:n.string,hasMoreItems:n.bool,id:n.string,hint:n.oneOfType([n.string,n.node,n.arrayOf(n.node)]),label:n.string,labelAction:n.element,loading:n.bool,loadingMessage:n.string,noOptionsMessage:n.func,onChange:n.func.isRequired,onClear:n.func,onCreateOption:n.func,onInputChange:n.func,onLoadMore:n.func,placeholder:n.string,value:n.string},me.propTypes={...G.propTypes,onCreateOption:n.func.isRequired}},90333:function(re,x,t){t.d(x,{O:function(){return S}});var e=t(32735),n=t(60216),D=t(49372),O=t(91225);const S=(0,e.forwardRef)(({isSelected:f,children:u,...i},X)=>e.createElement(O.Zq,{hasRadius:!0,paddingLeft:4,paddingRight:4,paddingTop:2,paddingBottom:2,role:"option",background:"neutral0",isSelected:f,ref:X,...i},e.createElement(D.Z,{textColor:f?"primary600":"neutral800",fontWeight:f?"bold":null},u)));S.defaultProps={isSelected:!1},S.propTypes={children:n.oneOfType([n.string,n.number]).isRequired,isSelected:n.bool},S.displayName="ComboboxOption"},91225:function(re,x,t){t.d(x,{II:function(){return i},K7:function(){return f},Zq:function(){return X},d8:function(){return S},fv:function(){return u}});var e=t(83292),n=t(72850),D=t(87933),O=t(30350);const S=(0,e.default)(D.k)`
+  position: relative;
+  border: 1px solid ${({theme:m,hasError:$})=>$?m.colors.danger600:m.colors.neutral200};
+  padding-right: ${({theme:m})=>m.spaces[3]};
+  padding-left: ${({theme:m})=>m.spaces[3]};
+  border-radius: ${({theme:m})=>m.borderRadius};
+  background: ${({theme:m})=>m.colors.neutral0};
+
+  ${({theme:m,$disabled:$})=>$?`
+    color: ${m.colors.neutral600};
+    background: ${m.colors.neutral150};
+  `:void 0}
+
+  ${(0,O.k3)()}
+`,f=e.default.div`
+  padding: 1px 2px;
+  grid-area: 1 / 1 / 2 / 3;
+`,u=(0,e.default)(D.k)`
+  display: grid;
+  flex: 1 1 0%;
+  position: relative;
+`,i=e.default.input`
+  display: inline-grid;
+  grid-area: 1 / 1 / 2 / 3;
+  grid-template-columns: 0px min-content;
+  background: transparent;
+  min-height: ${40/16}rem;
+  border: none;
+  flex: 1;
+  font-size: ${14/16}rem;
+  color: ${({theme:m})=>m.colors.neutral800};
+  outline: none;
+  &:focus-visible {
+    outline: none;
+    box-shadow: none;
+    outline-offset: 0;
+  }
+  &[aria-disabled='true'] {
+    background: inherit;
+    color: inherit;
+    cursor: not-allowed;
+  }
+`,X=(0,e.default)(n.x)`
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline-offset: -3px;
+  ${({isSelected:m,theme:$})=>m&&`background: ${$.colors.primary100};`}
+
+  &:hover {
+    background: ${({theme:m})=>m.colors.primary100};
+  }
+`},27169:function(re,x,t){t.d(x,{Z:function(){return n}});var e=t(74512);function n(D){return(0,e.jsx)("svg",{width:"1em",height:"1em",viewBox:"0 0 24 24",fill:"none",xmlns:"http://www.w3.org/2000/svg",...D,children:(0,e.jsx)("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M12.057 18c.552 0 1 .451 1 .997v4.006a1 1 0 01-.941.995l-.059.002c-.552 0-1-.451-1-.997v-4.006a1 1 0 01.941-.995l.06-.002zm-3.06-.736l.055.03c.478.276.64.89.367 1.364l-2.002 3.468a1 1 0 01-1.31.394l-.055-.03a1.002 1.002 0 01-.368-1.363l2.003-3.469a1 1 0 011.31-.394zm7.42.394l2.002 3.468a1 1 0 01-.314 1.331l-.053.033a1.002 1.002 0 01-1.365-.363l-2.003-3.469a1 1 0 01.314-1.33l.054-.034a1.002 1.002 0 011.364.364zm-9.548-2.66l.033.054c.276.478.11 1.091-.364 1.364L3.07 18.42a1 1 0 01-1.331-.314l-.033-.053a1.001 1.001 0 01.364-1.365l3.468-2.003a1 1 0 011.33.314zm11.79-.313l3.468 2.002a1 1 0 01.393 1.31l-.03.055c-.276.478-.89.64-1.363.367l-3.469-2.003a1 1 0 01-.394-1.309l.03-.055c.276-.479.89-.64 1.364-.367zm4.344-3.628a1 1 0 01.995.941l.002.06c0 .551-.451 1-.997 1h-4.006a1 1 0 01-.995-.942L18 12.057c0-.552.451-1 .997-1h4.006zm-18 0a1 1 0 01.995.941l.002.06c0 .551-.451 1-.998 1H.998a1 1 0 01-.996-.942L0 12.057c0-.552.451-1 .998-1h4.004zm17.454-5.059l.033.054c.277.478.11 1.091-.363 1.365l-3.469 2.002a1 1 0 01-1.33-.314l-.034-.053a1.002 1.002 0 01.364-1.365l3.468-2.003a1 1 0 011.331.314zM3.07 5.684l3.468 2.003a1 1 0 01.394 1.31l-.03.055c-.276.478-.89.64-1.364.367L2.07 7.417a1 1 0 01-.394-1.31l.03-.055c.276-.479.89-.64 1.364-.368zm14.926-4.008l.056.03c.478.276.64.89.367 1.364l-2.003 3.468a1 1 0 01-1.309.394l-.055-.03a1.002 1.002 0 01-.367-1.364l2.002-3.468a1 1 0 011.31-.394zm-10.58.394L9.42 5.538a1 1 0 01-.314 1.33l-.053.034a1.002 1.002 0 01-1.365-.364L5.684 3.07a1 1 0 01.314-1.331l.054-.033a1.002 1.002 0 011.365.364zM12.058 0c.552 0 1 .451 1 .998v4.004a1 1 0 01-.941.996L12.057 6c-.552 0-1-.451-1-.998V.998a1 1 0 01.941-.996l.06-.002z",fill:"#212134"})})}}}]);

package/build/{webhook-list-page.f75ba3f2.chunk.js → webhook-list-page.1134f130.chunk.js}

@@ -1,4 +1,4 @@
-"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[4121],{74767:function(We,S,t){t.r(S),t.d(S,{default:function(){return ge}});var e=t(32735),s=t(88425),W=t(83983),B=t(5141),U=t(5636),F=t(96709),X=t(28356),j=t(99223),J=t(17e3),Q=t(9695),M=t(87933),Y=t(27677),A=t(50563),x=t(44426),q=t(94745),_=t(73269),ee=t(76330),$=t(29005),d=t(66735),te=t(3594),g=t(49372),H=t(41415),ne=t(3685),b=t(60216),P=t(83292),K=t(72850);const y=P.default.div`
+"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[4121],{74767:function(We,S,t){t.r(S),t.d(S,{default:function(){return ge}});var e=t(32735),s=t(88425),W=t(72041),B=t(5141),U=t(5636),F=t(96709),X=t(28356),j=t(99223),J=t(17e3),Q=t(9695),M=t(87933),Y=t(27677),A=t(50563),x=t(44426),q=t(94745),_=t(73269),ee=t(76330),$=t(29005),d=t(66735),te=t(3594),g=t(49372),H=t(41415),ne=t(3685),b=t(60216),P=t(83292),K=t(72850);const y=P.default.div`
   background: ${({theme:a})=>a.colors.danger500};
   border: none;
   border-radius: 16px;

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/ComboboxFilter/index.js

@@ -0,0 +1,41 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import { Combobox, ComboboxOption } from '@strapi/design-system';
+
+const ComboboxFilter = ({ value, options, onChange }) => {
+  const { formatMessage } = useIntl();
+  const ariaLabel = formatMessage({
+    id: 'Settings.permissions.auditLogs.filter.aria-label',
+    defaultMessage: 'Search and select an option to filter',
+  });
+
+  return (
+    <Combobox aria-label={ariaLabel} value={value} onChange={onChange}>
+      {options.map(({ label, customValue }) => {
+        return (
+          <ComboboxOption key={customValue} value={customValue}>
+            {label}
+          </ComboboxOption>
+        );
+      })}
+    </Combobox>
+  );
+};
+
+ComboboxFilter.defaultProps = {
+  value: null,
+};
+
+ComboboxFilter.propTypes = {
+  value: PropTypes.string,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      label: PropTypes.string.isRequired,
+      customValue: PropTypes.string.isRequired,
+    }).isRequired
+  ).isRequired,
+  onChange: PropTypes.func.isRequired,
+};
+
+export default ComboboxFilter;

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js

@@ -7,8 +7,7 @@ import { Box } from '@strapi/design-system/Box';
 import { Flex } from '@strapi/design-system/Flex';
 import { Typography } from '@strapi/design-system/Typography';
 import { JSONInput } from '@strapi/design-system/JSONInput';
-import { pxToRem } from '@strapi/helper-plugin';
-import getDefaultMessage from '../utils/getActionTypesDefaultMessages';
+import { getDefaultMessage } from '../utils/getActionTypesDefaultMessages';
 import ActionItem from './ActionItem';
 
 const ActionBody = ({ status, data, formattedDate }) => {
@@ -83,7 +82,6 @@ const ActionBody = ({ status, data, formattedDate }) => {
       <JSONInput
         value={JSON.stringify(payload, null, 2)}
         disabled
-        height={pxToRem(150)}
         label={formatMessage({
           id: 'Settings.permissions.auditLogs.payload',
           defaultMessage: 'Payload',

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js

@@ -8,7 +8,7 @@ import { Tbody, Td, Tr } from '@strapi/design-system/Table';
 import Eye from '@strapi/icons/Eye';
 import { onRowClick, stopPropagation } from '@strapi/helper-plugin';
 import useFormatTimeStamp from '../hooks/useFormatTimeStamp';
-import getDefaultMessage from '../utils/getActionTypesDefaultMessages';
+import { getDefaultMessage } from '../utils/getActionTypesDefaultMessages';
 
 const TableRows = ({ headers, rows, onOpenModal }) => {
   const { formatMessage } = useIntl();

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

@@ -0,0 +1,47 @@
+import { useQuery } from 'react-query';
+import { useNotification, useFetchClient } from '@strapi/helper-plugin';
+import { useLocation } from 'react-router-dom';
+
+const useAuditLogsData = ({ canRead }) => {
+  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 = {
+    enabled: canRead,
+    keepPreviousData: true,
+    retry: false,
+    staleTime: 1000 * 20, // 20 seconds
+    onError: (error) => toggleNotification({ type: 'warning', message: error.message }),
+  };
+
+  const {
+    data: auditLogs,
+    isLoading,
+    isError: isAuditLogsError,
+  } = useQuery(['auditLogs', search], fetchAuditLogsPage, queryOptions);
+
+  const { data: users, isError: isUsersError } = useQuery(['auditLogsUsers'], fetchAllUsers, {
+    ...queryOptions,
+    staleTime: 2 * (1000 * 60), // 2 minutes
+  });
+
+  const hasError = isAuditLogsError || isUsersError;
+
+  return { auditLogs, users: users?.data, isLoading, hasError };
+};
+
+export default useAuditLogsData;

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/index.js

@@ -4,52 +4,38 @@ import {
   SettingsPageTitle,
   DynamicTable,
   useRBAC,
-  useNotification,
   useFocusWhenNavigate,
-  useFetchClient,
   useQueryParams,
+  AnErrorOccurred,
 } from '@strapi/helper-plugin';
-import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
-import { Main } from '@strapi/design-system/Main';
-import { useLocation } from 'react-router-dom';
-import { useQuery } from 'react-query';
+import {
+  Box,
+  HeaderLayout,
+  ContentLayout,
+  ActionLayout,
+  Layout,
+  Main,
+} from '@strapi/design-system';
 import adminPermissions from '../../../../../../../admin/src/permissions';
 import TableRows from './TableRows';
 import tableHeaders from './utils/tableHeaders';
 import PaginationFooter from './PaginationFooter';
 import Modal from './Modal';
+import Filters from '../../../../../../../admin/src/pages/SettingsPage/components/Filters';
+import getDisplayedFilters from './utils/getDisplayedFilters';
+import useAuditLogsData from './hooks/useAuditLogsData';
 
 const ListView = () => {
   const { formatMessage } = useIntl();
-  const toggleNotification = useNotification();
   const {
     allowedActions: { canRead },
   } = useRBAC(adminPermissions.settings.auditLogs);
-  const { get } = useFetchClient();
-  const { search } = useLocation();
   const [{ query }, setQuery] = useQueryParams();
+  const { auditLogs, users, isLoading, hasError } = useAuditLogsData({ canRead });
 
   useFocusWhenNavigate();
 
-  const fetchAuditLogsPage = async ({ queryKey }) => {
-    const search = queryKey[1];
-    const { data } = await get(`/admin/audit-logs${search}`);
-
-    return data;
-  };
-
-  const { data, isLoading } = useQuery(['auditLogs', search], fetchAuditLogsPage, {
-    enabled: canRead,
-    keepPreviousData: true,
-    retry: false,
-    staleTime: 1000 * 10,
-    onError() {
-      toggleNotification({
-        type: 'warning',
-        message: { id: 'notification.error', defaultMessage: 'An error occured' },
-      });
-    },
-  });
+  const displayedFilters = getDisplayedFilters({ formatMessage, users });
 
   const title = formatMessage({
     id: 'global.auditLogs',
@@ -64,6 +50,18 @@ const ListView = () => {
     },
   }));
 
+  if (hasError) {
+    return (
+      <Layout>
+        <ContentLayout>
+          <Box paddingTop={8}>
+            <AnErrorOccurred />
+          </Box>
+        </ContentLayout>
+      </Layout>
+    );
+  }
+
   return (
     <Main aria-busy={isLoading}>
       <SettingsPageTitle name={title} />
@@ -74,21 +72,22 @@ const ListView = () => {
           defaultMessage: 'Logs of all the activities that happened in your environment',
         })}
       />
+      <ActionLayout startActions={<Filters displayedFilters={displayedFilters} />} />
       <ContentLayout canRead={canRead}>
         <DynamicTable
           contentType="Audit logs"
           headers={headers}
-          rows={data?.results || []}
+          rows={auditLogs?.results || []}
           withBulkActions
           isLoading={isLoading}
         >
           <TableRows
             headers={headers}
-            rows={data?.results || []}
+            rows={auditLogs?.results || []}
             onOpenModal={(id) => setQuery({ id })}
           />
         </DynamicTable>
-        <PaginationFooter pagination={data?.pagination} />
+        <PaginationFooter pagination={auditLogs?.pagination} />
       </ContentLayout>
       {query?.id && <Modal handleClose={() => setQuery({ id: null }, 'remove')} logId={query.id} />}
     </Main>

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

@@ -1,9 +1,9 @@
-const actionTypes = {
-  'entry.create': 'Create entry ({model})',
-  'entry.update': 'Update entry ({model})',
-  'entry.delete': 'Delete entry ({model})',
-  'entry.publish': 'Publish entry ({model})',
-  'entry.unpublish': 'Unpublish entry ({model})',
+export const actionTypes = {
+  'entry.create': 'Create entry{model, select, undefined {} other { ({model})}}',
+  'entry.update': 'Update entry{model, select, undefined {} other { ({model})}}',
+  'entry.delete': 'Delete entry{model, select, undefined {} other { ({model})}}',
+  'entry.publish': 'Publish entry{model, select, undefined {} other { ({model})}}',
+  'entry.unpublish': 'Unpublish entry{model, select, undefined {} other { ({model})}}',
   'media.create': 'Create media',
   'media.update': 'Update media',
   'media.delete': 'Delete media',
@@ -29,8 +29,6 @@ const actionTypes = {
   'permission.delete': 'Delete permission',
 };
 
-const getDefaultMessage = (value) => {
+export const getDefaultMessage = (value) => {
   return actionTypes[value] || value;
 };
-
-export default getDefaultMessage;

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

@@ -0,0 +1,88 @@
+import ComboboxFilter from '../ComboboxFilter';
+import { getDefaultMessage, actionTypes } from './getActionTypesDefaultMessages';
+
+const customOperators = [
+  {
+    intlLabel: { id: 'components.FilterOptions.FILTER_TYPES.$eq', defaultMessage: 'is' },
+    value: '$eq',
+  },
+  {
+    intlLabel: { id: 'components.FilterOptions.FILTER_TYPES.$ne', defaultMessage: 'is not' },
+    value: '$ne',
+  },
+];
+
+const getDisplayedFilters = ({ formatMessage, users }) => {
+  const actionOptions = Object.keys(actionTypes).map((action) => {
+    return {
+      label: formatMessage(
+        {
+          id: `Settings.permissions.auditLogs.${action}`,
+          defaultMessage: getDefaultMessage(action),
+        },
+        { model: undefined }
+      ),
+      customValue: action,
+    };
+  });
+
+  const userOptions =
+    users &&
+    users.results.map((user) => {
+      return {
+        label: formatMessage(
+          {
+            id: 'Settings.permissions.auditLogs.user.fullname',
+            defaultMessage: '{firstname} {lastname}',
+          },
+          {
+            firstname: user.firstname,
+            lastname: user.lastname,
+          }
+        ),
+        // Combobox expects a string value
+        customValue: user.id.toString(),
+      };
+    });
+
+  return [
+    {
+      name: 'action',
+      metadatas: {
+        customOperators,
+        label: formatMessage({
+          id: 'Settings.permissions.auditLogs.action',
+          defaultMessage: 'Action',
+        }),
+        options: actionOptions,
+        customInput: ComboboxFilter,
+      },
+      fieldSchema: { type: 'enumeration' },
+    },
+    {
+      name: 'date',
+      metadatas: {
+        label: formatMessage({
+          id: 'Settings.permissions.auditLogs.date',
+          defaultMessage: 'Date',
+        }),
+      },
+      fieldSchema: { type: 'datetime' },
+    },
+    {
+      name: 'user',
+      metadatas: {
+        customOperators,
+        label: formatMessage({
+          id: 'Settings.permissions.auditLogs.user',
+          defaultMessage: 'User',
+        }),
+        options: userOptions,
+        customInput: ComboboxFilter,
+      },
+      fieldSchema: { type: 'relation', mainField: { name: 'id' } },
+    },
+  ];
+};
+
+export default getDisplayedFilters;

package/ee/admin/pages/SettingsPage/pages/Roles/ListPage/index.js

@@ -4,6 +4,7 @@ import {
   LoadingIndicatorPage,
   SearchURLQuery,
   SettingsPageTitle,
+  getFetchClient,
   useNotification,
   useQueryParams,
   useRBAC,
@@ -23,7 +24,6 @@ import { get } from 'lodash';
 import matchSorter from 'match-sorter';
 import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
-import { axiosInstance } from '../../../../../../../admin/src/core/utils';
 import { useRolesList } from '../../../../../../../admin/src/hooks';
 import adminPermissions from '../../../../../../../admin/src/permissions';
 import EmptyRole from '../../../../../../../admin/src/pages/SettingsPage/pages/Roles/ListPage/components/EmptyRole';
@@ -72,13 +72,15 @@ const useRoleActions = ({ getData, canCreate, canDelete, canUpdate }) => {
     initialState
   );
 
+  const { post } = getFetchClient();
+
   const handleDeleteData = async () => {
     try {
       dispatch({
         type: 'ON_REMOVE_ROLES',
       });
 
-      await axiosInstance.post('/admin/roles/batch-delete', {
+      await post('/admin/roles/batch-delete', {
         ids: [roleToDelete],
       });
 

package/ee/server/migrations/audit-logs-table.js

@@ -0,0 +1,45 @@
+'use strict';
+
+/**
+ * Migrate the audit logs table name for users coming from v4.6.0
+ */
+async function migrateAuditLogsTable({ oldContentTypes, contentTypes }) {
+  // Check if the audit logs table name was changed
+  const oldName = oldContentTypes?.['admin::audit-log']?.collectionName;
+  const newName = contentTypes['admin::audit-log']?.collectionName;
+  const hasRenamedAuditLogsTable = oldName === 'audit_logs' && newName === 'strapi_audit_logs';
+
+  if (!hasRenamedAuditLogsTable) {
+    return;
+  }
+
+  // Check if the previous audit log tables exist
+  const hasAuditLogsTable = await strapi.db.getSchemaConnection().hasTable('audit_logs');
+  const hasLinkTable = await strapi.db.getSchemaConnection().hasTable('audit_logs_user_links');
+
+  if (!hasAuditLogsTable || !hasLinkTable) {
+    return;
+  }
+
+  // Check if the existing tables match the expected schema
+  const auditLogsColumnInfo = await strapi.db.connection('audit_logs').columnInfo();
+  const linkColumnInfo = await strapi.db.connection('audit_logs_user_links').columnInfo();
+
+  if (
+    !auditLogsColumnInfo.action ||
+    !auditLogsColumnInfo.date ||
+    !auditLogsColumnInfo.payload ||
+    !linkColumnInfo.audit_log_id ||
+    !linkColumnInfo.user_id
+  ) {
+    return;
+  }
+
+  // Do the actual migrations
+  await strapi.db.getSchemaConnection().renameTable('audit_logs', 'strapi_audit_logs');
+  await strapi.db
+    .getSchemaConnection()
+    .renameTable('audit_logs_user_links', 'strapi_audit_logs_user_links');
+}
+
+module.exports = migrateAuditLogsTable;

package/ee/server/register.js

@@ -2,10 +2,12 @@
 
 const { features } = require('@strapi/strapi/lib/utils/ee');
 const executeCERegister = require('../../server/register');
+const migrateAuditLogsTable = require('./migrations/audit-logs-table');
 const createAuditLogsService = require('./services/audit-logs');
 
 module.exports = async ({ strapi }) => {
   if (features.isEnabled('audit-logs')) {
+    strapi.hook('strapi::content-types.beforeSync').register(migrateAuditLogsTable);
     const auditLogsService = createAuditLogsService(strapi);
     strapi.container.register('audit-logs', auditLogsService);
     await auditLogsService.register();

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

@@ -58,6 +58,16 @@ const createAuditLogsService = (strapi) => {
   const eventMap = getEventMap(defaultEvents);
 
   const processEvent = (name, ...args) => {
+    const state = strapi.requestContext.get()?.state;
+
+    // Ignore events with auth strategies different from admin
+    const isUsingAdminAuth = state?.auth?.strategy.name === 'admin';
+    const user = state?.user;
+
+    if (!isUsingAdminAuth || !user) {
+      return null;
+    }
+
     const getPayload = eventMap[name];
 
     // Ignore the event if it's not in the map
@@ -75,7 +85,7 @@ const createAuditLogsService = (strapi) => {
       action: name,
       date: new Date().toISOString(),
       payload: getPayload(...args) || {},
-      userId: strapi.requestContext.get()?.state?.user?.id,
+      userId: user.id,
     };
   };