@strapi/admin 4.13.0-beta.0 → 4.13.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/admin/src/components/NpsSurvey/hooks/useNpsSurveySettings.js +17 -0
- package/admin/src/components/NpsSurvey/index.js +365 -0
- package/admin/src/content-manager/components/DynamicZone/components/DynamicZoneLabel.js +1 -1
- package/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js +7 -9
- package/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js +6 -0
- package/admin/src/content-manager/components/Filter/Filter.js +21 -23
- package/admin/src/content-manager/components/InputUID/index.js +222 -216
- package/admin/src/content-manager/components/RelationInput/RelationInput.js +4 -0
- package/admin/src/content-manager/components/RepeatableComponent/index.js +32 -2
- package/admin/src/content-manager/components/Wysiwyg/Editor.js +432 -68
- package/admin/src/content-manager/components/Wysiwyg/WysiwygNav.js +7 -30
- package/admin/src/content-manager/components/Wysiwyg/WysiwygStyles.js +0 -7
- package/admin/src/content-manager/components/Wysiwyg/index.js +147 -152
- package/admin/src/content-manager/constants/attributes.js +3 -0
- package/admin/src/content-manager/hooks/useAllowedAttributes.js +3 -7
- package/admin/src/content-manager/pages/CollectionTypeRecursivePath/index.js +1 -1
- package/admin/src/content-manager/pages/ListSettingsView/index.js +16 -41
- package/admin/src/content-manager/pages/ListView/components/ViewSettingsMenu/index.js +7 -1
- package/admin/src/content-manager/pages/ListView/index.js +14 -5
- package/admin/src/pages/Admin/index.js +3 -1
- package/admin/src/pages/AuthPage/components/Register/index.js +5 -0
- package/admin/src/pages/MarketplacePage/index.js +0 -1
- package/admin/src/pages/SettingsPage/components/SettingsNav/index.js +3 -3
- package/admin/src/pages/SettingsPage/index.js +16 -26
- package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/index.js +24 -31
- package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js +69 -35
- package/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/index.js +11 -6
- package/admin/src/pages/SettingsPage/pages/Users/EditPage/index.js +2 -0
- package/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js +1 -0
- package/admin/src/plugins.js +7 -8
- package/admin/src/translations/en.json +7 -0
- package/build/{1049.f76cb14b.chunk.js → 1049.ec69f5e0.chunk.js} +1 -1
- package/build/1227.9f37e1dc.chunk.js +1 -0
- package/build/{1386.879bcd90.chunk.js → 1386.ea73b677.chunk.js} +1 -1
- package/build/1504.eff012f7.chunk.js +95 -0
- package/build/{2225.c6244756.chunk.js → 2225.649fb7bc.chunk.js} +11 -11
- package/build/2237.b832ae6e.chunk.js +114 -0
- package/build/2379.1f98a31a.chunk.js +1 -0
- package/build/2395.0e5e8ded.chunk.js +26 -0
- package/build/2801.8e1aa82a.chunk.js +1 -0
- package/build/{3483.03c24f96.chunk.js → 3483.19381b40.chunk.js} +1 -1
- package/build/{4174.fa8f9954.chunk.js → 4174.f1f39e40.chunk.js} +1 -1
- package/build/{4546.ff09eeda.chunk.js → 4546.a5946d22.chunk.js} +1 -1
- package/build/4724.aea5c8c1.chunk.js +6 -0
- package/build/502.7bba43b1.chunk.js +1 -0
- package/build/7464.eb057bec.chunk.js +1 -0
- package/build/8276.be3ed581.chunk.js +26 -0
- package/build/{Admin-authenticatedApp.53a24d28.chunk.js → Admin-authenticatedApp.baece4ac.chunk.js} +2 -2
- package/build/{Admin_InternalErrorPage.f45f2462.chunk.js → Admin_InternalErrorPage.38155af3.chunk.js} +1 -1
- package/build/{Admin_homePage.ac9dfb86.chunk.js → Admin_homePage.6f128523.chunk.js} +1 -1
- package/build/{Admin_marketplace.dde9c148.chunk.js → Admin_marketplace.061a6e5a.chunk.js} +2 -2
- package/build/{Admin_pluginsPage.bbe79434.chunk.js → Admin_pluginsPage.16f837b8.chunk.js} +1 -1
- package/build/{Admin_profilePage.192edc52.chunk.js → Admin_profilePage.678bce24.chunk.js} +2 -2
- package/build/Admin_settingsPage.af7309e4.chunk.js +111 -0
- package/build/{Upload_ConfigureTheView.345ac1e0.chunk.js → Upload_ConfigureTheView.3fc1c100.chunk.js} +1 -1
- package/build/admin-app.d63bd229.chunk.js +36 -0
- package/build/{admin-edit-roles-page.6d567273.chunk.js → admin-edit-roles-page.38a6c863.chunk.js} +3 -3
- package/build/admin-edit-users.545fc882.chunk.js +10 -0
- package/build/{admin-roles-list.23ddff26.chunk.js → admin-roles-list.1e2e814d.chunk.js} +1 -1
- package/build/{admin-users.123aa08e.chunk.js → admin-users.b8ea5677.chunk.js} +2 -2
- package/build/{api-tokens-create-page.46c2ea84.chunk.js → api-tokens-create-page.e0c15627.chunk.js} +1 -1
- package/build/{api-tokens-edit-page.58139df9.chunk.js → api-tokens-edit-page.9f2dce47.chunk.js} +1 -1
- package/build/api-tokens-list-page.d747051c.chunk.js +16 -0
- package/build/{audit-logs-settings-page.0f73ccf8.chunk.js → audit-logs-settings-page.96f9d608.chunk.js} +1 -1
- package/build/content-manager.2d676432.chunk.js +1097 -0
- package/build/{content-type-builder-list-view.bf9be456.chunk.js → content-type-builder-list-view.b71cf240.chunk.js} +1 -1
- package/build/{content-type-builder.cd999f6e.chunk.js → content-type-builder.e5669749.chunk.js} +2 -2
- package/build/email-settings-page.2809f0bf.chunk.js +11 -0
- package/build/en-json.e12fd5fc.chunk.js +1 -0
- package/build/{i18n-settings-page.47f78016.chunk.js → i18n-settings-page.5f716172.chunk.js} +1 -1
- package/build/index.html +1 -1
- package/build/main.c6c9e04c.js +2859 -0
- package/build/review-workflows-settings-create-view.4a156a19.chunk.js +1 -0
- package/build/review-workflows-settings-edit-view.ce984d1f.chunk.js +1 -0
- package/build/review-workflows-settings-list-view.419b8deb.chunk.js +56 -0
- package/build/{runtime~main.b16af570.js → runtime~main.a883e1c1.js} +2 -2
- package/build/{sso-settings-page.12b6d8ae.chunk.js → sso-settings-page.45153df5.chunk.js} +1 -1
- package/build/{transfer-tokens-create-page.1597e6ab.chunk.js → transfer-tokens-create-page.ebba16d8.chunk.js} +1 -1
- package/build/{transfer-tokens-edit-page.8741529f.chunk.js → transfer-tokens-edit-page.d7bb2b3e.chunk.js} +1 -1
- package/build/transfer-tokens-list-page.cfe1736c.chunk.js +16 -0
- package/build/{upload-settings.7f93d4c0.chunk.js → upload-settings.cc5ad813.chunk.js} +1 -1
- package/build/{upload.37488080.chunk.js → upload.756efc28.chunk.js} +1 -1
- package/build/users-advanced-settings-page.818d84eb.chunk.js +9 -0
- package/build/users-email-settings-page.c1967c09.chunk.js +9 -0
- package/build/users-providers-settings-page.11893e08.chunk.js +14 -0
- package/build/users-roles-settings-page.2b051e6a.chunk.js +55 -0
- package/build/{webhook-edit-page.6cb479ff.chunk.js → webhook-edit-page.de45c635.chunk.js} +2 -2
- package/build/{webhook-list-page.65e1b5bb.chunk.js → webhook-list-page.ca91df8b.chunk.js} +1 -1
- package/ee/admin/content-manager/pages/EditView/InformationBox/components/AssigneeSelect/AssigneeSelect.js +69 -71
- package/ee/admin/content-manager/pages/EditView/InformationBox/components/StageSelect/StageSelect.js +3 -1
- package/ee/admin/content-manager/pages/ListView/ReviewWorkflowsColumn/ReviewWorkflowsAssigneeEE.js +8 -38
- package/ee/admin/hooks/useAuthProviders.js +25 -0
- package/ee/admin/hooks/{useLicenseLimitNotification/index.js → useLicenseLimitNotification.js} +2 -4
- package/ee/admin/hooks/{useLicenseLimits/useLicenseLimits.js → useLicenseLimits.js} +4 -1
- package/ee/admin/pages/AuthPage/components/Login/index.js +8 -4
- package/ee/admin/pages/AuthPage/components/Providers/index.js +8 -5
- package/ee/admin/pages/HomePage/index.js +1 -1
- package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/CreateView/CreateView.js +1 -1
- package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/EditView/EditView.js +1 -1
- package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/ListView/ListView.js +1 -1
- package/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js +1 -1
- package/ee/admin/pages/SettingsPage/pages/Users/ListPage/index.js +1 -1
- package/index.js +2 -6
- package/package.json +9 -9
- package/scripts/build.js +15 -15
- package/scripts/create-dev-plugins-file.js +5 -38
- package/server/controllers/role.js +2 -0
- package/server/controllers/user.js +2 -0
- package/server/services/permission/permissions-manager/index.js +3 -1
- package/server/services/permission/permissions-manager/sanitize.js +7 -7
- package/server/services/permission/permissions-manager/validate.js +218 -0
- package/utils/create-cache-dir.js +62 -16
- package/utils/create-plugins-exclude-path.js +3 -23
- package/utils/get-plugins.js +110 -0
- package/utils/index.js +1 -1
- package/webpack.config.js +10 -13
- package/admin/src/content-manager/components/Wysiwyg/EditorStylesContainer.js +0 -344
- package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js +0 -23
- package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/prefixAllUrls.js +0 -17
- package/admin/src/pages/SettingsPage/utils/createSectionsRoutes.js +0 -11
- package/admin/src/pages/SettingsPage/utils/getSectionsToDisplay.js +0 -5
- package/admin/src/pages/SettingsPage/utils/index.js +0 -2
- package/build/1227.32fe57ce.chunk.js +0 -1
- package/build/2379.f1641312.chunk.js +0 -1
- package/build/2395.46f8d0c1.chunk.js +0 -26
- package/build/2801.5cef5ec8.chunk.js +0 -1
- package/build/3929.5632f24d.chunk.js +0 -114
- package/build/4724.baf7c5b1.chunk.js +0 -6
- package/build/502.8ae8ef60.chunk.js +0 -1
- package/build/5542.2415a393.chunk.js +0 -63
- package/build/7464.3e64a1d5.chunk.js +0 -1
- package/build/8276.10a3f883.chunk.js +0 -26
- package/build/Admin_settingsPage.97cb9d41.chunk.js +0 -111
- package/build/admin-app.91898385.chunk.js +0 -36
- package/build/admin-edit-users.79eeb125.chunk.js +0 -10
- package/build/api-tokens-list-page.505bf7e0.chunk.js +0 -16
- package/build/content-manager.7f96a2f1.chunk.js +0 -1097
- package/build/email-settings-page.d494d1eb.chunk.js +0 -11
- package/build/en-json.4f06fe03.chunk.js +0 -1
- package/build/main.40b94779.js +0 -2859
- package/build/review-workflows-settings-create-view.cb08cfa2.chunk.js +0 -1
- package/build/review-workflows-settings-edit-view.3c7cbe63.chunk.js +0 -1
- package/build/review-workflows-settings-list-view.1611dc1f.chunk.js +0 -56
- package/build/transfer-tokens-list-page.22147d2c.chunk.js +0 -16
- package/build/users-advanced-settings-page.f0760eb8.chunk.js +0 -9
- package/build/users-email-settings-page.ff4b32f3.chunk.js +0 -9
- package/build/users-providers-settings-page.48de0306.chunk.js +0 -14
- package/build/users-roles-settings-page.9d9a1eff.chunk.js +0 -30
- package/ee/admin/hooks/index.js +0 -4
- package/ee/admin/hooks/useAuthProviders/index.js +0 -50
- package/ee/admin/hooks/useAuthProviders/reducer.js +0 -26
- package/ee/admin/hooks/useLicenseLimits/index.js +0 -1
- package/scripts/create-plugins-file.js +0 -92
- package/utils/get-plugins-path.js +0 -41
- /package/ee/admin/hooks/{useLicenseLimits/__mocks__/index.js → __mocks__/useLicenseLimits.js} +0 -0
- /package/server/services/permission/permissions-manager/{query-builers.js → query-builders.js} +0 -0
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
*/
|
|
24
24
|
padding-inline-start: ${({theme:s})=>s.spaces[2]};
|
|
25
25
|
}
|
|
26
|
-
`,oe=s=>{const r=[{id:"Settings.webhooks.events.create",defaultMessage:"Create"},{id:"Settings.webhooks.events.update",defaultMessage:"Update"},{id:"app.utils.delete",defaultMessage:"Delete"}];return s&&(r.push({id:"app.utils.publish",defaultMessage:"Publish"}),r.push({id:"app.utils.unpublish",defaultMessage:"Unpublish"})),r},Y=s=>{const r=["entry.create","entry.update","entry.delete"];return s&&r.push("entry.publish","entry.unpublish"),{entry:r,media:["media.create","media.update","media.delete"]}},J=e.createContext(),le=({children:s})=>{const{formatMessage:r}=(0,_.Z)(),{collectionTypes:d,isLoading:M}=(0,de.G)(),y=e.useMemo(()=>d.some(L=>L.options.draftAndPublish===!0),[d]),v=r({id:"Settings.webhooks.form.events",defaultMessage:"Events"});return e.createElement(J.Provider,{value:{isDraftAndPublish:y}},e.createElement(g.k,{direction:"column",alignItems:"stretch",gap:1},e.createElement(b.Q,{"aria-hidden":!0},v),M&&e.createElement(W.a,null,r({id:"Settings.webhooks.events.isLoading",defaultMessage:"Events loading"})),e.createElement(B,{"aria-label":v},s)))};le.propTypes={children:f().oneOfType([f().arrayOf(f().node),f().node]).isRequired};const q=({getHeaders:s=oe})=>{const{isDraftAndPublish:r}=e.useContext(J),{formatMessage:d}=(0,_.Z)(),M=s(r);return e.createElement(K.S,null,e.createElement(U.Z,null,e.createElement(i.g,null,e.createElement(se.T,null,d({id:"Settings.webhooks.event.select",defaultMessage:"Select event"}))),M.map(y=>["app.utils.publish","app.utils.unpublish"].includes(y.id)?e.createElement(i.g,{key:y.id,title:d({id:"Settings.webhooks.event.publish-tooltip",defaultMessage:"This event only exists for content with draft & publish enabled"})},e.createElement(re.Z,{variant:"sigma",textColor:"neutral600"},d(y))):e.createElement(i.g,{key:y.id},e.createElement(re.Z,{variant:"sigma",textColor:"neutral600"},d(y))))))};q.defaultProps={getHeaders:oe},q.propTypes={getHeaders:f().func};const ee=({providedEvents:s})=>{const{isDraftAndPublish:r}=e.useContext(J),d=s||Y(r),{values:M,handleChange:y}=(0,Q.u6)(),v="events",L=M.events,w=[],te=u(L),A=({target:{name:E,value:m}})=>{let C=new Set(L);m?C.add(E):C.delete(E),y({target:{name:v,value:Array.from(C)}})},$=({target:{name:E,value:m}})=>{let C=new Set(L);m?d[E].forEach(N=>{w.includes(N)||C.add(N)}):d[E].forEach(N=>C.delete(N)),y({target:{name:v,value:Array.from(C)}})};return e.createElement(j.X,null,Object.entries(d).map(([E,m])=>e.createElement(F,{disabledEvents:w,key:E,name:E,events:m,inputValue:te[E],handleSelect:A,handleSelectAll:$})))};ee.defaultProps={providedEvents:null},ee.propTypes={providedEvents:f().object};const ce=s=>s.replace(/-/g," ").split(" ").map(r=>r.charAt(0).toUpperCase()+r.slice(1).toLowerCase()).join(" "),F=({disabledEvents:s,name:r,events:d,inputValue:M,handleSelect:y,handleSelectAll:v})=>{const{formatMessage:L}=(0,_.Z)(),w=d.filter(m=>!s.includes(m)),te=M.length>0,A=M.length===w.length,$=({target:{name:m}})=>{v({target:{name:m,value:!A}})},E=5;return e.createElement(U.Z,null,e.createElement(i.f,null,e.createElement(X.X,{indeterminate:te&&!A,"aria-label":L({id:"global.select-all-entries",defaultMessage:"Select all entries"}),name:r,onChange:$,value:A},ce(r))),d.map(m=>e.createElement(i.f,{key:m},e.createElement(S.C,{disabled:s.includes(m),"aria-label":m,name:m,value:M.includes(m),onValueChange:C=>y({target:{name:m,value:C}})}))),d.length<E&&e.createElement(i.f,{colSpan:E-d.length}))};F.defaultProps={disabledEvents:[],events:[],inputValue:[],handleSelect(){},handleSelectAll(){}},F.propTypes={disabledEvents:f().array,events:f().array,inputValue:f().array,handleSelect:f().func,handleSelectAll:f().func,name:f().string.isRequired},P.Z={Root:le,Headers:q,Body:ee,EventRow:F}},77476:function(G,P,t){t.d(P,{Z:function(){return fe}});var e=t(32735),T=t(27649),g=t(
|
|
26
|
+
`,oe=s=>{const r=[{id:"Settings.webhooks.events.create",defaultMessage:"Create"},{id:"Settings.webhooks.events.update",defaultMessage:"Update"},{id:"app.utils.delete",defaultMessage:"Delete"}];return s&&(r.push({id:"app.utils.publish",defaultMessage:"Publish"}),r.push({id:"app.utils.unpublish",defaultMessage:"Unpublish"})),r},Y=s=>{const r=["entry.create","entry.update","entry.delete"];return s&&r.push("entry.publish","entry.unpublish"),{entry:r,media:["media.create","media.update","media.delete"]}},J=e.createContext(),le=({children:s})=>{const{formatMessage:r}=(0,_.Z)(),{collectionTypes:d,isLoading:M}=(0,de.G)(),y=e.useMemo(()=>d.some(L=>L.options.draftAndPublish===!0),[d]),v=r({id:"Settings.webhooks.form.events",defaultMessage:"Events"});return e.createElement(J.Provider,{value:{isDraftAndPublish:y}},e.createElement(g.k,{direction:"column",alignItems:"stretch",gap:1},e.createElement(b.Q,{"aria-hidden":!0},v),M&&e.createElement(W.a,null,r({id:"Settings.webhooks.events.isLoading",defaultMessage:"Events loading"})),e.createElement(B,{"aria-label":v},s)))};le.propTypes={children:f().oneOfType([f().arrayOf(f().node),f().node]).isRequired};const q=({getHeaders:s=oe})=>{const{isDraftAndPublish:r}=e.useContext(J),{formatMessage:d}=(0,_.Z)(),M=s(r);return e.createElement(K.S,null,e.createElement(U.Z,null,e.createElement(i.g,null,e.createElement(se.T,null,d({id:"Settings.webhooks.event.select",defaultMessage:"Select event"}))),M.map(y=>["app.utils.publish","app.utils.unpublish"].includes(y.id)?e.createElement(i.g,{key:y.id,title:d({id:"Settings.webhooks.event.publish-tooltip",defaultMessage:"This event only exists for content with draft & publish enabled"})},e.createElement(re.Z,{variant:"sigma",textColor:"neutral600"},d(y))):e.createElement(i.g,{key:y.id},e.createElement(re.Z,{variant:"sigma",textColor:"neutral600"},d(y))))))};q.defaultProps={getHeaders:oe},q.propTypes={getHeaders:f().func};const ee=({providedEvents:s})=>{const{isDraftAndPublish:r}=e.useContext(J),d=s||Y(r),{values:M,handleChange:y}=(0,Q.u6)(),v="events",L=M.events,w=[],te=u(L),A=({target:{name:E,value:m}})=>{let C=new Set(L);m?C.add(E):C.delete(E),y({target:{name:v,value:Array.from(C)}})},$=({target:{name:E,value:m}})=>{let C=new Set(L);m?d[E].forEach(N=>{w.includes(N)||C.add(N)}):d[E].forEach(N=>C.delete(N)),y({target:{name:v,value:Array.from(C)}})};return e.createElement(j.X,null,Object.entries(d).map(([E,m])=>e.createElement(F,{disabledEvents:w,key:E,name:E,events:m,inputValue:te[E],handleSelect:A,handleSelectAll:$})))};ee.defaultProps={providedEvents:null},ee.propTypes={providedEvents:f().object};const ce=s=>s.replace(/-/g," ").split(" ").map(r=>r.charAt(0).toUpperCase()+r.slice(1).toLowerCase()).join(" "),F=({disabledEvents:s,name:r,events:d,inputValue:M,handleSelect:y,handleSelectAll:v})=>{const{formatMessage:L}=(0,_.Z)(),w=d.filter(m=>!s.includes(m)),te=M.length>0,A=M.length===w.length,$=({target:{name:m}})=>{v({target:{name:m,value:!A}})},E=5;return e.createElement(U.Z,null,e.createElement(i.f,null,e.createElement(X.X,{indeterminate:te&&!A,"aria-label":L({id:"global.select-all-entries",defaultMessage:"Select all entries"}),name:r,onChange:$,value:A},ce(r))),d.map(m=>e.createElement(i.f,{key:m},e.createElement(S.C,{disabled:s.includes(m),"aria-label":m,name:m,value:M.includes(m),onValueChange:C=>y({target:{name:m,value:C}})}))),d.length<E&&e.createElement(i.f,{colSpan:E-d.length}))};F.defaultProps={disabledEvents:[],events:[],inputValue:[],handleSelect(){},handleSelectAll(){}},F.propTypes={disabledEvents:f().array,events:f().array,inputValue:f().array,handleSelect:f().func,handleSelectAll:f().func,name:f().string.isRequired},P.Z={Root:le,Headers:q,Body:ee,EventRow:F}},77476:function(G,P,t){t.d(P,{Z:function(){return fe}});var e=t(32735),T=t(27649),g=t(45509),b=t(20108),W=t(53038),K=t(90769),U=t(82055),i=t(87933),se=t(41415),re=t(17e3),j=t(72850),X=t(15335),S=t(5803),Q=t(10369),ie=t(2438),f=t(66456),_=t(29439),D=t(92802),de=t(60216),u=t.n(de),B=t(67879),oe=t(9592),Y=t(36795);function J(){return e.createElement(Y.Z.Root,null,e.createElement(Y.Z.Headers,null),e.createElement(Y.Z.Body,null))}var le=t(76437),q=t(7563),ee=t(19406),ce=t(21428),F=t(90333);const s=["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"],r=({name:n,onChange:a,value:o,...c})=>{const{values:{headers:h}}=(0,D.u6)(),[O,l]=(0,e.useState)(s);(0,e.useEffect)(()=>{l(s.filter(p=>!h?.some(x=>x.key!==o&&x.key===p)))},[h,o]);const H=p=>{a({target:{name:n,value:p}})},z=p=>{l(x=>[...x,p]),H(p)};return e.createElement(ce.XU,{...c,onClear:()=>H(""),onChange:H,onCreateOption:z,placeholder:"",value:o},O.map(p=>e.createElement(F.O,{value:p,key:p},p)))};r.defaultProps={value:void 0},r.propTypes={name:u().string.isRequired,onChange:u().func.isRequired,value:u().string};var d=r,y=()=>{const{formatMessage:n}=(0,B.Z)(),{values:a,errors:o}=(0,D.u6)();return e.createElement(i.k,{direction:"column",alignItems:"stretch",gap:1},e.createElement(le.Q,null,n({id:"Settings.webhooks.form.headers",defaultMessage:"Headers"})),e.createElement(j.x,{padding:8,background:"neutral100",hasRadius:!0},e.createElement(D.F2,{validateOnChange:!1,name:"headers",render:({push:c,remove:h})=>e.createElement(X.r,{gap:4},a.headers.map((O,l)=>e.createElement(e.Fragment,{key:`${l}.${O.key}`},e.createElement(S.P,{col:6},e.createElement(D.gN,{as:d,name:`headers.${l}.key`,"aria-label":`row ${l+1} key`,label:n({id:"Settings.webhooks.key",defaultMessage:"Key"}),error:o.headers?.[l]?.key&&o.headers[l].key})),e.createElement(S.P,{col:6},e.createElement(i.k,{alignItems:"flex-end"},e.createElement(j.x,{style:{flex:1}},e.createElement(D.gN,{as:Q.o,name:`headers.${l}.value`,"aria-label":`row ${l+1} value`,label:n({id:"Settings.webhooks.value",defaultMessage:"Value"}),error:o.headers?.[l]?.value&&o.headers[l].value})),e.createElement(i.k,{paddingLeft:2,style:{alignSelf:"center"},paddingTop:o.headers?.[l]?.value?0:5},e.createElement(g.fG,{disabled:a.headers.length===1,onClick:()=>h(l),label:n({id:"Settings.webhooks.headers.remove",defaultMessage:"Remove header row {number}"},{number:l+1})})))))),e.createElement(S.P,{col:12},e.createElement(q.A,{type:"button",onClick:()=>{c({key:"",value:""})},startIcon:e.createElement(ee.Z,null)},n({id:"Settings.webhooks.create.header",defaultMessage:"Create new header"}))))})))},v=t(49372),L=t(27169),w=t(35331),te=t(8471);const A=te.ZP.svg(({theme:n,color:a})=>`
|
|
27
27
|
width: ${12/16}rem;
|
|
28
28
|
height: ${12/16}rem;
|
|
29
29
|
|
|
30
30
|
path {
|
|
31
31
|
fill: ${n.colors[a]};
|
|
32
32
|
}
|
|
33
|
-
`),$=({isPending:n,statusCode:a})=>{const{formatMessage:o}=(0,B.Z)();return n?e.createElement(i.k,{gap:2,alignItems:"center"},e.createElement(A,{as:L.Z}),e.createElement(v.Z,null,o({id:"Settings.webhooks.trigger.pending",defaultMessage:"pending"}))):a>=200&&a<300?e.createElement(i.k,{gap:2,alignItems:"center"},e.createElement(A,{as:f.Z,color:"success700"}),e.createElement(v.Z,null,o({id:"Settings.webhooks.trigger.success",defaultMessage:"success"}))):a>=300?e.createElement(i.k,{gap:2,alignItems:"center"},e.createElement(A,{as:w.Z,color:"danger700"}),e.createElement(v.Z,null,o({id:"Settings.error",defaultMessage:"error"})," ",a)):null};$.propTypes={isPending:u().bool.isRequired,statusCode:u().number},$.defaultProps={statusCode:void 0};const E=({statusCode:n,message:a})=>{const{formatMessage:o}=(0,B.Z)();return n>=200&&n<300?e.createElement(i.k,{justifyContent:"flex-end"},e.createElement(v.Z,{textColor:"neutral600",ellipsis:!0},o({id:"Settings.webhooks.trigger.success.label",defaultMessage:"Trigger succeeded"}))):n>=300?e.createElement(i.k,{justifyContent:"flex-end"},e.createElement(i.k,{maxWidth:(0,g.Q1)(250),justifyContent:"flex-end",title:a},e.createElement(v.Z,{ellipsis:!0,textColor:"neutral600"},a))):null};E.propTypes={statusCode:u().number,message:u().string},E.defaultProps={statusCode:void 0,message:void 0};const m=({onCancel:n})=>{const{formatMessage:a}=(0,B.Z)();return e.createElement(i.k,{justifyContent:"flex-end"},e.createElement("button",{onClick:n,type:"button"},e.createElement(i.k,{gap:2,alignItems:"center"},e.createElement(v.Z,{textColor:"neutral400"},a({id:"Settings.webhooks.trigger.cancel",defaultMessage:"cancel"})),e.createElement(A,{as:w.Z,color:"neutral400"}))))};m.propTypes={onCancel:u().func.isRequired};const C=({isPending:n,onCancel:a,response:o})=>{const{statusCode:c,message:h}=o,{formatMessage:O}=(0,B.Z)();return e.createElement(j.x,{background:"neutral0",padding:5,shadow:"filterShadow",hasRadius:!0},e.createElement(X.r,{gap:4,style:{alignItems:"center"}},e.createElement(S.P,{col:3},e.createElement(v.Z,null,O({id:"Settings.webhooks.trigger.test",defaultMessage:"Test-trigger"}))),e.createElement(S.P,{col:3},e.createElement($,{isPending:n,statusCode:c})),e.createElement(S.P,{col:6},n?e.createElement(m,{onCancel:a}):e.createElement(E,{statusCode:c,message:h}))))};C.defaultProps={isPending:!1,onCancel(){},response:{}},C.propTypes={isPending:u().bool,onCancel:u().func,response:u().object};var N=C,k=t(24346);const ge=/(^$)|(^[A-Za-z][_0-9A-Za-z ]*$)/,Ee=/(^$)|((https?:\/\/.*)(d*)\/?(.*))/,he=({formatMessage:n})=>k.Ry().shape({name:k.Z_().required(n({id:"Settings.webhooks.validation.name.required",defaultMessage:"Name is required"})).matches(ge,n({id:"Settings.webhooks.validation.name.regex",defaultMessage:"The name must start with a letter and only contain letters, numbers, spaces and underscores"})),url:k.Z_().required(n({id:"Settings.webhooks.validation.url.required",defaultMessage:"Url is required"})).matches(Ee,n({id:"Settings.webhooks.validation.url.regex",defaultMessage:"The value must be a valid Url"})),headers:k.Vo(a=>{let o=k.IX();if(a.length===1){const{key:c,value:h}=a[0];if(!c&&!h)return o}return o.of(k.Ry().shape({key:k.Z_().required(n({id:"Settings.webhooks.validation.key",defaultMessage:"Key is required"})),value:k.Z_().required(n({id:"Settings.webhooks.validation.value",defaultMessage:"Value is required"}))}))}),events:k.IX()}),ue=({handleSubmit:n,triggerWebhook:a,isCreating:o,isTriggering:c,triggerResponse:h,data:O})=>{const{formatMessage:l}=(0,B.Z)(),[H,z]=(0,e.useState)(!1),p=(0,oe.c)(J,async()=>(await t.e(7030).then(t.bind(t,61442))).EventTableEE),x=Z=>Object.keys(Z).length?Object.entries(Z).map(([ne,ae])=>({key:ne,value:ae})):[{key:"",value:""}],R=(0,D.TA)({initialValues:{name:O?.name||"",url:O?.url||"",headers:x(O?.headers||{}),events:O?.events||[]},onSubmit(Z,{resetForm:ne,setSubmitting:ae}){n(Z),ne({values:Z}),ae(!1)},validationSchema:he({formatMessage:l}),validateOnChange:!1,validateOnBlur:!1});return p?e.createElement(D.Hy,{value:R},e.createElement(g.l0,{onSubmit:R.handleSubmit},e.createElement(U.T,{primaryAction:e.createElement(i.k,{gap:2},e.createElement(se.z,{onClick:()=>{a(),z(!0)},variant:"tertiary",startIcon:e.createElement(ie.Z,null),disabled:o||c,size:"L"},l({id:"Settings.webhooks.trigger",defaultMessage:"Trigger"})),e.createElement(se.z,{startIcon:e.createElement(f.Z,null),type:"submit",size:"L",disabled:!R.dirty,loading:R.isSubmitting},l({id:"global.save",defaultMessage:"Save"}))),title:o?l({id:"Settings.webhooks.create",defaultMessage:"Create a webhook"}):O?.name,navigationAction:e.createElement(g.rU,{startIcon:e.createElement(_.Z,null),to:"/settings/webhooks"},l({id:"global.back",defaultMessage:"Back"}))}),e.createElement(re.D,null,e.createElement(i.k,{direction:"column",alignItems:"stretch",gap:4},H&&e.createElement(N,{isPending:c,response:h,onCancel:()=>z(!1)}),e.createElement(j.x,{background:"neutral0",padding:8,shadow:"filterShadow",hasRadius:!0},e.createElement(i.k,{direction:"column",alignItems:"stretch",gap:6},e.createElement(X.r,{gap:6},e.createElement(S.P,{col:6},e.createElement(D.gN,{as:Q.o,name:"name",error:R?.errors?.name&&R.errors.name,label:l({id:"global.name",defaultMessage:"Name"}),required:!0})),e.createElement(S.P,{col:12},e.createElement(D.gN,{as:Q.o,name:"url",error:R?.errors?.url&&R.errors.url,label:l({id:"Settings.roles.form.input.url",defaultMessage:"Url"}),required:!0}))),e.createElement(y,null),e.createElement(p,null))))))):null};ue.propTypes={data:u().object,handleSubmit:u().func.isRequired,triggerWebhook:u().func.isRequired,isCreating:u().bool.isRequired,isTriggering:u().bool.isRequired,triggerResponse:u().object},ue.defaultProps={data:void 0,triggerResponse:void 0};var pe=ue;const me=n=>({...n,headers:n.headers.reduce((a,{key:o,value:c})=>(o!==""&&(a[o]=c),a),{})});var fe=()=>{const{params:{id:n}}=(0,W.$B)("/settings/webhooks/:id"),a=n==="create",{replace:o}=(0,W.k6)(),c=(0,g.lm)(),{formatAPIError:h}=(0,g.So)(),O=(0,b.useQueryClient)(),{isLoading:l}=(0,K.G)(),{put:H,get:z,post:p}=(0,g.kY)(),{isLoading:x,data:R,error:Z}=(0,b.useQuery)(["webhooks",n],async()=>{const{data:{data:I}}=await z(`/admin/webhooks/${n}`);return I},{enabled:!a});e.useEffect(()=>{Z&&c({type:"warning",message:h(Z)})},[Z,c,h]);const{isLoading:ne,data:ae,isIdle:ve,mutate:Me}=(0,b.useMutation)(()=>p(`/admin/webhooks/${n}/trigger`)),ye=()=>Me(null,{onError(I){c({type:"warning",message:h(I)})}}),Ce=(0,b.useMutation)(I=>p("/admin/webhooks",I)),Pe=(0,b.useMutation)(({id:I,body:V})=>H(`/admin/webhooks/${I}`,V)),be=async I=>{if(a){Ce.mutate(me(I),{onSuccess({data:V}){c({type:"success",message:{id:"Settings.webhooks.created"}}),o(`/settings/webhooks/${V.data.id}`)},onError(V){c({type:"warning",message:h(V)})}});return}Pe.mutate({id:n,body:me(I)},{onSuccess(){O.invalidateQueries(["webhooks",n]),c({type:"success",message:{id:"notification.form.success.fields"}})},onError(V){c({type:"warning",message:h(V)})}})};return x||l?e.createElement(g.dO,null):e.createElement(T.o,null,e.createElement(g.SL,{name:"Webhooks"}),e.createElement(pe,{data:R,handleSubmit:be,triggerWebhook:ye,isCreating:a,isTriggering:ne,isTriggerIdle:ve,triggerResponse:ae?.data.data}))}},5722:function(G,P,t){t.r(P);var e=t(32735),T=t(
|
|
33
|
+
`),$=({isPending:n,statusCode:a})=>{const{formatMessage:o}=(0,B.Z)();return n?e.createElement(i.k,{gap:2,alignItems:"center"},e.createElement(A,{as:L.Z}),e.createElement(v.Z,null,o({id:"Settings.webhooks.trigger.pending",defaultMessage:"pending"}))):a>=200&&a<300?e.createElement(i.k,{gap:2,alignItems:"center"},e.createElement(A,{as:f.Z,color:"success700"}),e.createElement(v.Z,null,o({id:"Settings.webhooks.trigger.success",defaultMessage:"success"}))):a>=300?e.createElement(i.k,{gap:2,alignItems:"center"},e.createElement(A,{as:w.Z,color:"danger700"}),e.createElement(v.Z,null,o({id:"Settings.error",defaultMessage:"error"})," ",a)):null};$.propTypes={isPending:u().bool.isRequired,statusCode:u().number},$.defaultProps={statusCode:void 0};const E=({statusCode:n,message:a})=>{const{formatMessage:o}=(0,B.Z)();return n>=200&&n<300?e.createElement(i.k,{justifyContent:"flex-end"},e.createElement(v.Z,{textColor:"neutral600",ellipsis:!0},o({id:"Settings.webhooks.trigger.success.label",defaultMessage:"Trigger succeeded"}))):n>=300?e.createElement(i.k,{justifyContent:"flex-end"},e.createElement(i.k,{maxWidth:(0,g.Q1)(250),justifyContent:"flex-end",title:a},e.createElement(v.Z,{ellipsis:!0,textColor:"neutral600"},a))):null};E.propTypes={statusCode:u().number,message:u().string},E.defaultProps={statusCode:void 0,message:void 0};const m=({onCancel:n})=>{const{formatMessage:a}=(0,B.Z)();return e.createElement(i.k,{justifyContent:"flex-end"},e.createElement("button",{onClick:n,type:"button"},e.createElement(i.k,{gap:2,alignItems:"center"},e.createElement(v.Z,{textColor:"neutral400"},a({id:"Settings.webhooks.trigger.cancel",defaultMessage:"cancel"})),e.createElement(A,{as:w.Z,color:"neutral400"}))))};m.propTypes={onCancel:u().func.isRequired};const C=({isPending:n,onCancel:a,response:o})=>{const{statusCode:c,message:h}=o,{formatMessage:O}=(0,B.Z)();return e.createElement(j.x,{background:"neutral0",padding:5,shadow:"filterShadow",hasRadius:!0},e.createElement(X.r,{gap:4,style:{alignItems:"center"}},e.createElement(S.P,{col:3},e.createElement(v.Z,null,O({id:"Settings.webhooks.trigger.test",defaultMessage:"Test-trigger"}))),e.createElement(S.P,{col:3},e.createElement($,{isPending:n,statusCode:c})),e.createElement(S.P,{col:6},n?e.createElement(m,{onCancel:a}):e.createElement(E,{statusCode:c,message:h}))))};C.defaultProps={isPending:!1,onCancel(){},response:{}},C.propTypes={isPending:u().bool,onCancel:u().func,response:u().object};var N=C,k=t(24346);const ge=/(^$)|(^[A-Za-z][_0-9A-Za-z ]*$)/,Ee=/(^$)|((https?:\/\/.*)(d*)\/?(.*))/,he=({formatMessage:n})=>k.Ry().shape({name:k.Z_().required(n({id:"Settings.webhooks.validation.name.required",defaultMessage:"Name is required"})).matches(ge,n({id:"Settings.webhooks.validation.name.regex",defaultMessage:"The name must start with a letter and only contain letters, numbers, spaces and underscores"})),url:k.Z_().required(n({id:"Settings.webhooks.validation.url.required",defaultMessage:"Url is required"})).matches(Ee,n({id:"Settings.webhooks.validation.url.regex",defaultMessage:"The value must be a valid Url"})),headers:k.Vo(a=>{let o=k.IX();if(a.length===1){const{key:c,value:h}=a[0];if(!c&&!h)return o}return o.of(k.Ry().shape({key:k.Z_().required(n({id:"Settings.webhooks.validation.key",defaultMessage:"Key is required"})),value:k.Z_().required(n({id:"Settings.webhooks.validation.value",defaultMessage:"Value is required"}))}))}),events:k.IX()}),ue=({handleSubmit:n,triggerWebhook:a,isCreating:o,isTriggering:c,triggerResponse:h,data:O})=>{const{formatMessage:l}=(0,B.Z)(),[H,z]=(0,e.useState)(!1),p=(0,oe.c)(J,async()=>(await t.e(7030).then(t.bind(t,61442))).EventTableEE),x=Z=>Object.keys(Z).length?Object.entries(Z).map(([ne,ae])=>({key:ne,value:ae})):[{key:"",value:""}],R=(0,D.TA)({initialValues:{name:O?.name||"",url:O?.url||"",headers:x(O?.headers||{}),events:O?.events||[]},onSubmit(Z,{resetForm:ne,setSubmitting:ae}){n(Z),ne({values:Z}),ae(!1)},validationSchema:he({formatMessage:l}),validateOnChange:!1,validateOnBlur:!1});return p?e.createElement(D.Hy,{value:R},e.createElement(g.l0,{onSubmit:R.handleSubmit},e.createElement(U.T,{primaryAction:e.createElement(i.k,{gap:2},e.createElement(se.z,{onClick:()=>{a(),z(!0)},variant:"tertiary",startIcon:e.createElement(ie.Z,null),disabled:o||c,size:"L"},l({id:"Settings.webhooks.trigger",defaultMessage:"Trigger"})),e.createElement(se.z,{startIcon:e.createElement(f.Z,null),type:"submit",size:"L",disabled:!R.dirty,loading:R.isSubmitting},l({id:"global.save",defaultMessage:"Save"}))),title:o?l({id:"Settings.webhooks.create",defaultMessage:"Create a webhook"}):O?.name,navigationAction:e.createElement(g.rU,{startIcon:e.createElement(_.Z,null),to:"/settings/webhooks"},l({id:"global.back",defaultMessage:"Back"}))}),e.createElement(re.D,null,e.createElement(i.k,{direction:"column",alignItems:"stretch",gap:4},H&&e.createElement(N,{isPending:c,response:h,onCancel:()=>z(!1)}),e.createElement(j.x,{background:"neutral0",padding:8,shadow:"filterShadow",hasRadius:!0},e.createElement(i.k,{direction:"column",alignItems:"stretch",gap:6},e.createElement(X.r,{gap:6},e.createElement(S.P,{col:6},e.createElement(D.gN,{as:Q.o,name:"name",error:R?.errors?.name&&R.errors.name,label:l({id:"global.name",defaultMessage:"Name"}),required:!0})),e.createElement(S.P,{col:12},e.createElement(D.gN,{as:Q.o,name:"url",error:R?.errors?.url&&R.errors.url,label:l({id:"Settings.roles.form.input.url",defaultMessage:"Url"}),required:!0}))),e.createElement(y,null),e.createElement(p,null))))))):null};ue.propTypes={data:u().object,handleSubmit:u().func.isRequired,triggerWebhook:u().func.isRequired,isCreating:u().bool.isRequired,isTriggering:u().bool.isRequired,triggerResponse:u().object},ue.defaultProps={data:void 0,triggerResponse:void 0};var pe=ue;const me=n=>({...n,headers:n.headers.reduce((a,{key:o,value:c})=>(o!==""&&(a[o]=c),a),{})});var fe=()=>{const{params:{id:n}}=(0,W.$B)("/settings/webhooks/:id"),a=n==="create",{replace:o}=(0,W.k6)(),c=(0,g.lm)(),{formatAPIError:h}=(0,g.So)(),O=(0,b.useQueryClient)(),{isLoading:l}=(0,K.G)(),{put:H,get:z,post:p}=(0,g.kY)(),{isLoading:x,data:R,error:Z}=(0,b.useQuery)(["webhooks",n],async()=>{const{data:{data:I}}=await z(`/admin/webhooks/${n}`);return I},{enabled:!a});e.useEffect(()=>{Z&&c({type:"warning",message:h(Z)})},[Z,c,h]);const{isLoading:ne,data:ae,isIdle:ve,mutate:Me}=(0,b.useMutation)(()=>p(`/admin/webhooks/${n}/trigger`)),ye=()=>Me(null,{onError(I){c({type:"warning",message:h(I)})}}),Ce=(0,b.useMutation)(I=>p("/admin/webhooks",I)),Pe=(0,b.useMutation)(({id:I,body:V})=>H(`/admin/webhooks/${I}`,V)),be=async I=>{if(a){Ce.mutate(me(I),{onSuccess({data:V}){c({type:"success",message:{id:"Settings.webhooks.created"}}),o(`/settings/webhooks/${V.data.id}`)},onError(V){c({type:"warning",message:h(V)})}});return}Pe.mutate({id:n,body:me(I)},{onSuccess(){O.invalidateQueries(["webhooks",n]),c({type:"success",message:{id:"notification.form.success.fields"}})},onError(V){c({type:"warning",message:h(V)})}})};return x||l?e.createElement(g.dO,null):e.createElement(T.o,null,e.createElement(g.SL,{name:"Webhooks"}),e.createElement(pe,{data:R,handleSubmit:be,triggerWebhook:ye,isCreating:a,isTriggering:ne,isTriggerIdle:ve,triggerResponse:ae?.data.data}))}},5722:function(G,P,t){t.r(P);var e=t(32735),T=t(45509),g=t(15062),b=t(30305),W=t(77476);const K=()=>{const U=(0,g.v9)(b._);return e.createElement(T.O4,{permissions:U.settings.webhooks.create},e.createElement(W.Z,null))};P.default=K},63939:function(G,P,t){t.r(P);var e=t(32735),T=t(45509),g=t(15062),b=t(30305),W=t(77476);const K=()=>{const U=(0,g.v9)(b._);return e.createElement(T.O4,{permissions:U.settings.webhooks.update},e.createElement(W.Z,null))};P.default=K},90333:function(G,P,t){t.d(P,{O:function(){return T}});var e=t(21428);const T=e.Wx},29439:function(G,P,t){t.d(P,{Z:function(){return g}});var e=t(74512);const T=b=>(0,e.jsx)("svg",{xmlns:"http://www.w3.org/2000/svg",width:"1rem",height:"1rem",fill:"none",viewBox:"0 0 24 24",...b,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"})}),g=T}}]);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[4121],{93826:function(I,h,t){t.r(h),t.d(h,{default:function(){return me}});var e=t(32735),s=t(
|
|
1
|
+
"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[4121],{93826:function(I,h,t){t.r(h),t.d(h,{default:function(){return me}});var e=t(32735),s=t(45509),c=t(15062),m=t(30305),g=t(94638),T=t(96709),D=t(27649),S=t(82055),P=t(99223),l=t(49372),y=t(41415),j=t(17e3),U=t(72850),_=t(56755),ee=t(73269),te=t(33827),K=t(94547),i=t(19786),V=t(82884),ne=t(3685),ae=t(35658),k=t(87933),E=t(74512),F=t(8471);const $=F.ZP.div`
|
|
2
2
|
background: ${({theme:o})=>o.colors.danger500};
|
|
3
3
|
border: none;
|
|
4
4
|
border-radius: 16px;
|
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { Combobox, ComboboxOption, Field, Flex, Loader, Typography } from '@strapi/design-system';
|
|
4
4
|
import {
|
|
5
|
-
// eslint-disable-next-line no-restricted-imports
|
|
6
|
-
ReactSelect,
|
|
7
5
|
useCMEditViewDataManager,
|
|
8
6
|
useAPIErrorHandler,
|
|
9
7
|
useFetchClient,
|
|
10
8
|
useNotification,
|
|
9
|
+
useRBAC,
|
|
11
10
|
} from '@strapi/helper-plugin';
|
|
12
11
|
import { useIntl } from 'react-intl';
|
|
13
12
|
import { useMutation } from 'react-query';
|
|
13
|
+
import { useSelector } from 'react-redux';
|
|
14
14
|
|
|
15
|
+
import { getDisplayName } from '../../../../../../../../admin/src/content-manager/utils';
|
|
15
16
|
import { useAdminUsers } from '../../../../../../../../admin/src/hooks/useAdminUsers';
|
|
17
|
+
import { selectAdminPermissions } from '../../../../../../../../admin/src/pages/App/selectors';
|
|
16
18
|
import { ASSIGNEE_ATTRIBUTE_NAME } from '../../constants';
|
|
17
19
|
|
|
18
20
|
export function AssigneeSelect() {
|
|
@@ -22,18 +24,29 @@ export function AssigneeSelect() {
|
|
|
22
24
|
isSingleType,
|
|
23
25
|
onChange,
|
|
24
26
|
} = useCMEditViewDataManager();
|
|
27
|
+
const permissions = useSelector(selectAdminPermissions);
|
|
25
28
|
const { formatMessage } = useIntl();
|
|
26
29
|
const { formatAPIError } = useAPIErrorHandler();
|
|
27
30
|
const toggleNotification = useNotification();
|
|
28
31
|
const { put } = useFetchClient();
|
|
29
|
-
const {
|
|
32
|
+
const {
|
|
33
|
+
allowedActions: { canReadUsers },
|
|
34
|
+
} = useRBAC({
|
|
35
|
+
readUsers: permissions.settings.users.read,
|
|
36
|
+
});
|
|
37
|
+
const { users, isLoading, isError } = useAdminUsers(
|
|
38
|
+
{},
|
|
39
|
+
{
|
|
40
|
+
enabled: canReadUsers,
|
|
41
|
+
}
|
|
42
|
+
);
|
|
30
43
|
|
|
31
44
|
const currentAssignee = initialData?.[ASSIGNEE_ATTRIBUTE_NAME] ?? null;
|
|
32
45
|
|
|
33
46
|
const handleChange = async ({ value: assigneeId }) => {
|
|
34
47
|
mutation.mutate({
|
|
35
48
|
entityId: initialData.id,
|
|
36
|
-
assigneeId,
|
|
49
|
+
assigneeId: parseInt(assigneeId, 10),
|
|
37
50
|
uid,
|
|
38
51
|
});
|
|
39
52
|
};
|
|
@@ -65,84 +78,69 @@ export function AssigneeSelect() {
|
|
|
65
78
|
type: 'success',
|
|
66
79
|
message: {
|
|
67
80
|
id: 'content-manager.reviewWorkflows.assignee.notification.saved',
|
|
68
|
-
defaultMessage: '
|
|
81
|
+
defaultMessage: 'Assignee updated',
|
|
69
82
|
},
|
|
70
83
|
});
|
|
71
84
|
},
|
|
72
85
|
}
|
|
73
86
|
);
|
|
74
87
|
|
|
75
|
-
const formattedError =
|
|
76
|
-
(isError &&
|
|
77
|
-
formatMessage({
|
|
78
|
-
id: 'content-manager.reviewWorkflows.assignee.error',
|
|
79
|
-
defaultMessage: 'An error occurred while fetching users',
|
|
80
|
-
})) ||
|
|
81
|
-
(mutation.error && formatAPIError(mutation.error));
|
|
82
|
-
|
|
83
88
|
return (
|
|
84
|
-
<Field
|
|
89
|
+
<Field name={ASSIGNEE_ATTRIBUTE_NAME} id={ASSIGNEE_ATTRIBUTE_NAME}>
|
|
85
90
|
<Flex direction="column" gap={2} alignItems="stretch">
|
|
86
|
-
<
|
|
87
|
-
{formatMessage({
|
|
91
|
+
<Combobox
|
|
92
|
+
clearLabel={formatMessage({
|
|
93
|
+
id: 'content-manager.reviewWorkflows.assignee.clear',
|
|
94
|
+
defaultMessage: 'Clear assignee',
|
|
95
|
+
})}
|
|
96
|
+
error={
|
|
97
|
+
(isError &&
|
|
98
|
+
canReadUsers &&
|
|
99
|
+
formatMessage({
|
|
100
|
+
id: 'content-manager.reviewWorkflows.assignee.error',
|
|
101
|
+
defaultMessage: 'An error occurred while fetching users',
|
|
102
|
+
})) ||
|
|
103
|
+
(mutation.error && formatAPIError(mutation.error))
|
|
104
|
+
}
|
|
105
|
+
disabled={!isLoading && users.length === 0}
|
|
106
|
+
name={ASSIGNEE_ATTRIBUTE_NAME}
|
|
107
|
+
id={ASSIGNEE_ATTRIBUTE_NAME}
|
|
108
|
+
value={currentAssignee ? currentAssignee.id : null}
|
|
109
|
+
onChange={(value) => handleChange({ value })}
|
|
110
|
+
onClear={() => handleChange({ value: null })}
|
|
111
|
+
placeholder={formatMessage({
|
|
112
|
+
id: 'content-manager.reviewWorkflows.assignee.placeholder',
|
|
113
|
+
defaultMessage: 'Select …',
|
|
114
|
+
})}
|
|
115
|
+
label={formatMessage({
|
|
88
116
|
id: 'content-manager.reviewWorkflows.assignee.label',
|
|
89
117
|
defaultMessage: 'Assignee',
|
|
90
118
|
})}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
disabled={isError}
|
|
98
|
-
error={formattedError}
|
|
99
|
-
inputId={ASSIGNEE_ATTRIBUTE_NAME}
|
|
100
|
-
isLoading={isLoading || mutation.isLoading}
|
|
101
|
-
isSearchable
|
|
102
|
-
isClearable
|
|
103
|
-
name={ASSIGNEE_ATTRIBUTE_NAME}
|
|
104
|
-
onChange={(selectedOption, triggeredAction) => {
|
|
105
|
-
if (triggeredAction.action === 'clear') {
|
|
106
|
-
handleChange({ value: null });
|
|
107
|
-
|
|
108
|
-
return;
|
|
109
|
-
}
|
|
119
|
+
// eslint-disable-next-line react/no-unstable-nested-components
|
|
120
|
+
customizeContent={() => (
|
|
121
|
+
<Flex as="span" justifyContent="space-between" alignItems="center" width="100%">
|
|
122
|
+
<Typography textColor="neutral800" ellipsis>
|
|
123
|
+
{currentAssignee ? getDisplayName(currentAssignee, formatMessage) : null}
|
|
124
|
+
</Typography>
|
|
110
125
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
value: currentAssignee.id,
|
|
130
|
-
label: formatMessage(
|
|
131
|
-
{
|
|
132
|
-
id: 'content-manager.reviewWorkflows.assignee.name',
|
|
133
|
-
defaultMessage: '{firstname} {lastname}',
|
|
134
|
-
},
|
|
135
|
-
{
|
|
136
|
-
firstname: currentAssignee.firstname,
|
|
137
|
-
lastname: currentAssignee.lastname,
|
|
138
|
-
}
|
|
139
|
-
),
|
|
140
|
-
}
|
|
141
|
-
: null
|
|
142
|
-
}
|
|
143
|
-
/>
|
|
144
|
-
|
|
145
|
-
<FieldError />
|
|
126
|
+
{isLoading || mutation.isLoading ? (
|
|
127
|
+
<Loader small style={{ display: 'flex' }} />
|
|
128
|
+
) : null}
|
|
129
|
+
</Flex>
|
|
130
|
+
)}
|
|
131
|
+
>
|
|
132
|
+
{users.map((user) => {
|
|
133
|
+
return (
|
|
134
|
+
<ComboboxOption
|
|
135
|
+
key={user.id}
|
|
136
|
+
value={user.id}
|
|
137
|
+
textValue={getDisplayName(user, formatMessage)}
|
|
138
|
+
>
|
|
139
|
+
{getDisplayName(user, formatMessage)}
|
|
140
|
+
</ComboboxOption>
|
|
141
|
+
);
|
|
142
|
+
})}
|
|
143
|
+
</Combobox>
|
|
146
144
|
</Flex>
|
|
147
145
|
</Field>
|
|
148
146
|
);
|
package/ee/admin/content-manager/pages/EditView/InformationBox/components/StageSelect/StageSelect.js
CHANGED
|
@@ -114,7 +114,8 @@ export function StageSelect() {
|
|
|
114
114
|
*/
|
|
115
115
|
} else if (
|
|
116
116
|
limits?.[CHARGEBEE_STAGES_PER_WORKFLOW_ENTITLEMENT_NAME] &&
|
|
117
|
-
parseInt(limits[CHARGEBEE_STAGES_PER_WORKFLOW_ENTITLEMENT_NAME], 10) <
|
|
117
|
+
parseInt(limits[CHARGEBEE_STAGES_PER_WORKFLOW_ENTITLEMENT_NAME], 10) <
|
|
118
|
+
workflow.stages.length
|
|
118
119
|
) {
|
|
119
120
|
setShowLimitModal('stage');
|
|
120
121
|
} else {
|
|
@@ -176,6 +177,7 @@ export function StageSelect() {
|
|
|
176
177
|
|
|
177
178
|
return (
|
|
178
179
|
<SingleSelectOption
|
|
180
|
+
key={id}
|
|
179
181
|
startIcon={
|
|
180
182
|
<Flex
|
|
181
183
|
height={2}
|
package/ee/admin/content-manager/pages/ListView/ReviewWorkflowsColumn/ReviewWorkflowsAssigneeEE.js
CHANGED
|
@@ -4,48 +4,18 @@ import { Typography } from '@strapi/design-system';
|
|
|
4
4
|
import PropTypes from 'prop-types';
|
|
5
5
|
import { useIntl } from 'react-intl';
|
|
6
6
|
|
|
7
|
-
import
|
|
7
|
+
import { getDisplayName } from '../../../../../../admin/src/content-manager/utils';
|
|
8
8
|
|
|
9
|
-
export function ReviewWorkflowsAssigneeEE({
|
|
9
|
+
export function ReviewWorkflowsAssigneeEE({ user }) {
|
|
10
10
|
const { formatMessage } = useIntl();
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
// https://github.com/strapi/strapi/pull/17043/
|
|
14
|
-
if (displayname) {
|
|
15
|
-
return (
|
|
16
|
-
<Typography textColor="neutral800">
|
|
17
|
-
{formatMessage(
|
|
18
|
-
{
|
|
19
|
-
id: getTrad(`containers.ListPage.reviewWorkflows.assignee`),
|
|
20
|
-
defaultMessage: '{displayname}',
|
|
21
|
-
},
|
|
22
|
-
{ displayname }
|
|
23
|
-
)}
|
|
24
|
-
</Typography>
|
|
25
|
-
);
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
return (
|
|
29
|
-
<Typography textColor="neutral800">
|
|
30
|
-
{formatMessage(
|
|
31
|
-
{
|
|
32
|
-
id: getTrad(`containers.ListPage.reviewWorkflows.assignee`),
|
|
33
|
-
defaultMessage: '{firstname} {lastname}',
|
|
34
|
-
},
|
|
35
|
-
{ firstname, lastname }
|
|
36
|
-
)}
|
|
37
|
-
</Typography>
|
|
38
|
-
);
|
|
12
|
+
return <Typography textColor="neutral800">{getDisplayName(user, formatMessage)}</Typography>;
|
|
39
13
|
}
|
|
40
14
|
|
|
41
|
-
ReviewWorkflowsAssigneeEE.defaultProps = {
|
|
42
|
-
firstname: '',
|
|
43
|
-
lastname: '',
|
|
44
|
-
displayname: '',
|
|
45
|
-
};
|
|
46
|
-
|
|
47
15
|
ReviewWorkflowsAssigneeEE.propTypes = {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
16
|
+
user: PropTypes.shape({
|
|
17
|
+
firstname: PropTypes.string,
|
|
18
|
+
lastname: PropTypes.string,
|
|
19
|
+
username: PropTypes.string,
|
|
20
|
+
}).isRequired,
|
|
51
21
|
};
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
|
|
3
|
+
import { useFetchClient } from '@strapi/helper-plugin';
|
|
4
|
+
import { useQuery } from 'react-query';
|
|
5
|
+
|
|
6
|
+
export const useAuthProviders = (queryOptions = {}) => {
|
|
7
|
+
const { get } = useFetchClient();
|
|
8
|
+
|
|
9
|
+
const { data, isLoading } = useQuery(
|
|
10
|
+
['ee', 'providers'],
|
|
11
|
+
async () => {
|
|
12
|
+
const { data } = await get('/admin/providers');
|
|
13
|
+
|
|
14
|
+
return data;
|
|
15
|
+
},
|
|
16
|
+
queryOptions
|
|
17
|
+
);
|
|
18
|
+
|
|
19
|
+
// the return value needs to be memoized, because a fresh
|
|
20
|
+
// instantiated array would cause an infinite rendering loop
|
|
21
|
+
// when used as an effect dependency
|
|
22
|
+
const providers = React.useMemo(() => data ?? [], [data]);
|
|
23
|
+
|
|
24
|
+
return { providers, isLoading };
|
|
25
|
+
};
|
package/ee/admin/hooks/{useLicenseLimitNotification/index.js → useLicenseLimitNotification.js}
RENAMED
|
@@ -10,14 +10,14 @@ import isNil from 'lodash/isNil';
|
|
|
10
10
|
import { useIntl } from 'react-intl';
|
|
11
11
|
import { useLocation } from 'react-router-dom';
|
|
12
12
|
|
|
13
|
-
import { useLicenseLimits } from '
|
|
13
|
+
import { useLicenseLimits } from './useLicenseLimits';
|
|
14
14
|
|
|
15
15
|
const STORAGE_KEY_PREFIX = 'strapi-notification-seat-limit';
|
|
16
16
|
|
|
17
17
|
const BILLING_STRAPI_CLOUD_URL = 'https://cloud.strapi.io/profile/billing';
|
|
18
18
|
const BILLING_SELF_HOSTED_URL = 'https://strapi.io/billing/request-seats';
|
|
19
19
|
|
|
20
|
-
const useLicenseLimitNotification = () => {
|
|
20
|
+
export const useLicenseLimitNotification = () => {
|
|
21
21
|
const { formatMessage } = useIntl();
|
|
22
22
|
let { license, isError, isLoading } = useLicenseLimits();
|
|
23
23
|
const toggleNotification = useNotification();
|
|
@@ -97,5 +97,3 @@ const useLicenseLimitNotification = () => {
|
|
|
97
97
|
isError,
|
|
98
98
|
]);
|
|
99
99
|
};
|
|
100
|
-
|
|
101
|
-
export default useLicenseLimitNotification;
|
|
@@ -19,7 +19,10 @@ export function useLicenseLimits({ enabled } = { enabled: true }) {
|
|
|
19
19
|
}
|
|
20
20
|
);
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
// this needs memoization, because a default value of `{}`
|
|
23
|
+
// would lead to infinite rendering loops, when used as
|
|
24
|
+
// effect dependency
|
|
25
|
+
const license = React.useMemo(() => data ?? {}, [data]);
|
|
23
26
|
|
|
24
27
|
const getFeature = React.useCallback(
|
|
25
28
|
(name) => {
|
|
@@ -7,7 +7,7 @@ import styled from 'styled-components';
|
|
|
7
7
|
|
|
8
8
|
import UnauthenticatedLayout from '../../../../../../admin/src/layouts/UnauthenticatedLayout';
|
|
9
9
|
import BaseLogin from '../../../../../../admin/src/pages/AuthPage/components/Login/BaseLogin';
|
|
10
|
-
import { useAuthProviders } from '../../../../hooks';
|
|
10
|
+
import { useAuthProviders } from '../../../../hooks/useAuthProviders';
|
|
11
11
|
import SSOProviders from '../Providers/SSOProviders';
|
|
12
12
|
|
|
13
13
|
const DividerFull = styled(Divider)`
|
|
@@ -15,11 +15,15 @@ const DividerFull = styled(Divider)`
|
|
|
15
15
|
`;
|
|
16
16
|
|
|
17
17
|
export const LoginEE = (loginProps) => {
|
|
18
|
-
const ssoEnabled = window.strapi.features.isEnabled(window.strapi.features.SSO);
|
|
19
|
-
const { isLoading, data: providers } = useAuthProviders({ ssoEnabled });
|
|
20
18
|
const { formatMessage } = useIntl();
|
|
19
|
+
const { isLoading, providers } = useAuthProviders({
|
|
20
|
+
enabled: window.strapi.features.isEnabled(window.strapi.features.SSO),
|
|
21
|
+
});
|
|
21
22
|
|
|
22
|
-
if (
|
|
23
|
+
if (
|
|
24
|
+
!window.strapi.features.isEnabled(window.strapi.features.SSO) ||
|
|
25
|
+
(!isLoading && providers.length === 0)
|
|
26
|
+
) {
|
|
23
27
|
return (
|
|
24
28
|
<UnauthenticatedLayout>
|
|
25
29
|
<BaseLogin {...loginProps} />
|
|
@@ -11,7 +11,7 @@ import UnauthenticatedLayout, {
|
|
|
11
11
|
Column,
|
|
12
12
|
LayoutContent,
|
|
13
13
|
} from '../../../../../../admin/src/layouts/UnauthenticatedLayout';
|
|
14
|
-
import { useAuthProviders } from '../../../../hooks';
|
|
14
|
+
import { useAuthProviders } from '../../../../hooks/useAuthProviders';
|
|
15
15
|
|
|
16
16
|
import SSOProviders from './SSOProviders';
|
|
17
17
|
|
|
@@ -20,17 +20,20 @@ const DividerFull = styled(Divider)`
|
|
|
20
20
|
`;
|
|
21
21
|
|
|
22
22
|
const Providers = () => {
|
|
23
|
-
const ssoEnabled = window.strapi.features.isEnabled(window.strapi.features.SSO);
|
|
24
|
-
|
|
25
23
|
const { push } = useHistory();
|
|
26
24
|
const { formatMessage } = useIntl();
|
|
27
|
-
const { isLoading,
|
|
25
|
+
const { isLoading, providers } = useAuthProviders({
|
|
26
|
+
enabled: window.strapi.features.isEnabled(window.strapi.features.SSO),
|
|
27
|
+
});
|
|
28
28
|
|
|
29
29
|
const handleClick = () => {
|
|
30
30
|
push('/auth/login');
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
-
if (
|
|
33
|
+
if (
|
|
34
|
+
!window.strapi.features.isEnabled(window.strapi.features.SSO) ||
|
|
35
|
+
(!isLoading && providers.length === 0)
|
|
36
|
+
) {
|
|
34
37
|
return <Redirect to="/auth/login" />;
|
|
35
38
|
}
|
|
36
39
|
|
|
@@ -2,7 +2,7 @@ import * as React from 'react';
|
|
|
2
2
|
|
|
3
3
|
// eslint-disable-next-line import/no-cycle
|
|
4
4
|
import { HomePageCE } from '../../../../admin/src/pages/HomePage';
|
|
5
|
-
import { useLicenseLimitNotification } from '../../hooks';
|
|
5
|
+
import { useLicenseLimitNotification } from '../../hooks/useLicenseLimitNotification';
|
|
6
6
|
|
|
7
7
|
export function HomePageEE() {
|
|
8
8
|
useLicenseLimitNotification();
|
|
@@ -17,7 +17,7 @@ import { useHistory } from 'react-router-dom';
|
|
|
17
17
|
|
|
18
18
|
import { useContentTypes } from '../../../../../../../../admin/src/hooks/useContentTypes';
|
|
19
19
|
import { useInjectReducer } from '../../../../../../../../admin/src/hooks/useInjectReducer';
|
|
20
|
-
import { useLicenseLimits } from '../../../../../../hooks';
|
|
20
|
+
import { useLicenseLimits } from '../../../../../../hooks/useLicenseLimits';
|
|
21
21
|
import { addStage, resetWorkflow } from '../../actions';
|
|
22
22
|
import * as Layout from '../../components/Layout';
|
|
23
23
|
import * as LimitsModal from '../../components/LimitsModal';
|
|
@@ -19,7 +19,7 @@ import { useParams } from 'react-router-dom';
|
|
|
19
19
|
import { useContentTypes } from '../../../../../../../../admin/src/hooks/useContentTypes';
|
|
20
20
|
import { useInjectReducer } from '../../../../../../../../admin/src/hooks/useInjectReducer';
|
|
21
21
|
import { selectAdminPermissions } from '../../../../../../../../admin/src/pages/App/selectors';
|
|
22
|
-
import { useLicenseLimits } from '../../../../../../hooks';
|
|
22
|
+
import { useLicenseLimits } from '../../../../../../hooks/useLicenseLimits';
|
|
23
23
|
import { resetWorkflow, setWorkflow } from '../../actions';
|
|
24
24
|
import * as Layout from '../../components/Layout';
|
|
25
25
|
import * as LimitsModal from '../../components/LimitsModal';
|
|
@@ -35,7 +35,7 @@ import styled from 'styled-components';
|
|
|
35
35
|
|
|
36
36
|
import { useContentTypes } from '../../../../../../../../admin/src/hooks/useContentTypes';
|
|
37
37
|
import { selectAdminPermissions } from '../../../../../../../../admin/src/pages/App/selectors';
|
|
38
|
-
import { useLicenseLimits } from '../../../../../../hooks';
|
|
38
|
+
import { useLicenseLimits } from '../../../../../../hooks/useLicenseLimits';
|
|
39
39
|
import * as Layout from '../../components/Layout';
|
|
40
40
|
import * as LimitsModal from '../../components/LimitsModal';
|
|
41
41
|
import { CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME } from '../../constants';
|
|
@@ -6,7 +6,7 @@ import isNil from 'lodash/isNil';
|
|
|
6
6
|
import PropTypes from 'prop-types';
|
|
7
7
|
import { useIntl } from 'react-intl';
|
|
8
8
|
|
|
9
|
-
import { useLicenseLimits } from '../../../../../../hooks';
|
|
9
|
+
import { useLicenseLimits } from '../../../../../../hooks/useLicenseLimits';
|
|
10
10
|
|
|
11
11
|
export const CreateActionEE = ({ onClick }) => {
|
|
12
12
|
const { formatMessage } = useIntl();
|
|
@@ -2,7 +2,7 @@ import * as React from 'react';
|
|
|
2
2
|
|
|
3
3
|
// eslint-disable-next-line import/no-cycle
|
|
4
4
|
import { UserListPageCE } from '../../../../../../../admin/src/pages/SettingsPage/pages/Users/ListPage';
|
|
5
|
-
import { useLicenseLimitNotification } from '../../../../../hooks';
|
|
5
|
+
import { useLicenseLimitNotification } from '../../../../../hooks/useLicenseLimitNotification';
|
|
6
6
|
|
|
7
7
|
function UserListPageEE() {
|
|
8
8
|
useLicenseLimitNotification();
|
package/index.js
CHANGED
|
@@ -30,7 +30,6 @@ async function build({ appDir, buildDestDir, env, forceBuild, optimize, options,
|
|
|
30
30
|
const entry = path.resolve(cacheDir, 'admin', 'src');
|
|
31
31
|
const dest = path.resolve(buildDestDir, 'build');
|
|
32
32
|
|
|
33
|
-
const pluginsPath = Object.keys(plugins).map((pluginName) => plugins[pluginName].pathToPlugin);
|
|
34
33
|
const enforceSourceMaps = process.env.STRAPI_ENFORCE_SOURCEMAPS === 'true' ?? false;
|
|
35
34
|
|
|
36
35
|
// Either use the tsconfig file from the generated app or the one inside the .cache folder
|
|
@@ -41,14 +40,13 @@ async function build({ appDir, buildDestDir, env, forceBuild, optimize, options,
|
|
|
41
40
|
|
|
42
41
|
const config = getCustomWebpackConfig(appDir, {
|
|
43
42
|
appDir,
|
|
44
|
-
cacheDir,
|
|
45
43
|
dest,
|
|
46
44
|
enforceSourceMaps,
|
|
47
45
|
entry,
|
|
48
46
|
env,
|
|
49
47
|
optimize,
|
|
50
48
|
options,
|
|
51
|
-
|
|
49
|
+
plugins,
|
|
52
50
|
tsConfigFilePath,
|
|
53
51
|
});
|
|
54
52
|
|
|
@@ -100,8 +98,6 @@ async function watchAdmin({ appDir, browser, buildDestDir, host, options, plugin
|
|
|
100
98
|
const dest = path.join(buildDestDir, 'build');
|
|
101
99
|
const env = 'development';
|
|
102
100
|
|
|
103
|
-
const pluginsPath = Object.keys(plugins).map((pluginName) => plugins[pluginName].pathToPlugin);
|
|
104
|
-
|
|
105
101
|
// Either use the tsconfig file from the generated app or the one inside the .cache folder
|
|
106
102
|
// so we can develop plugins in TS while being in a JS app
|
|
107
103
|
const tsConfigFilePath = useTypeScript
|
|
@@ -115,7 +111,7 @@ async function watchAdmin({ appDir, browser, buildDestDir, host, options, plugin
|
|
|
115
111
|
entry,
|
|
116
112
|
env,
|
|
117
113
|
options,
|
|
118
|
-
|
|
114
|
+
plugins,
|
|
119
115
|
devServer: {
|
|
120
116
|
port,
|
|
121
117
|
client: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@strapi/admin",
|
|
3
|
-
"version": "4.13.
|
|
3
|
+
"version": "4.13.1",
|
|
4
4
|
"description": "Strapi Admin",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -42,15 +42,15 @@
|
|
|
42
42
|
"dependencies": {
|
|
43
43
|
"@casl/ability": "^5.4.3",
|
|
44
44
|
"@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
|
|
45
|
-
"@strapi/data-transfer": "4.13.
|
|
45
|
+
"@strapi/data-transfer": "4.13.1",
|
|
46
46
|
"@strapi/design-system": "1.9.0",
|
|
47
|
-
"@strapi/helper-plugin": "4.13.
|
|
47
|
+
"@strapi/helper-plugin": "4.13.1",
|
|
48
48
|
"@strapi/icons": "1.9.0",
|
|
49
|
-
"@strapi/permissions": "4.13.
|
|
50
|
-
"@strapi/provider-audit-logs-local": "4.13.
|
|
51
|
-
"@strapi/typescript-utils": "4.13.
|
|
52
|
-
"@strapi/utils": "4.13.
|
|
53
|
-
"axios": "1.
|
|
49
|
+
"@strapi/permissions": "4.13.1",
|
|
50
|
+
"@strapi/provider-audit-logs-local": "4.13.1",
|
|
51
|
+
"@strapi/typescript-utils": "4.13.1",
|
|
52
|
+
"@strapi/utils": "4.13.1",
|
|
53
|
+
"axios": "1.5.0",
|
|
54
54
|
"bcryptjs": "2.4.3",
|
|
55
55
|
"browserslist": "^4.17.3",
|
|
56
56
|
"browserslist-to-esbuild": "1.2.0",
|
|
@@ -154,5 +154,5 @@
|
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
},
|
|
157
|
-
"gitHead": "
|
|
157
|
+
"gitHead": "a9afeb90c525d9b8ab033aa0c87e03a72134e0dd"
|
|
158
158
|
}
|