@strapi/admin 4.5.0-alpha.0 → 4.5.0-beta.0

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.
Files changed (191) hide show
  1. package/admin/src/StrapiApp.js +4 -12
  2. package/admin/src/components/Providers/index.js +14 -10
  3. package/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js +24 -0
  4. package/admin/src/content-manager/components/DynamicTable/TableRows/index.js +20 -15
  5. package/admin/src/content-manager/components/DynamicZone/components/Component/index.js +19 -9
  6. package/admin/src/content-manager/components/EditViewDataManagerProvider/index.js +50 -3
  7. package/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js +50 -9
  8. package/admin/src/content-manager/components/FieldTypeIcon/index.js +31 -1
  9. package/admin/src/content-manager/components/Inputs/index.js +36 -14
  10. package/admin/src/content-manager/components/NonRepeatableComponent/index.js +2 -0
  11. package/admin/src/content-manager/components/RelationInput/RelationInput.js +95 -32
  12. package/admin/src/content-manager/components/RelationInput/components/RelationItem.js +2 -2
  13. package/admin/src/content-manager/components/RelationInput/constants.js +1 -1
  14. package/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js +33 -22
  15. package/admin/src/content-manager/components/RelationInputDataManager/utils/index.js +1 -0
  16. package/admin/src/content-manager/components/RelationInputDataManager/utils/normalizeRelations.js +10 -3
  17. package/admin/src/content-manager/components/RelationInputDataManager/utils/normalizeSearchResults.js +12 -0
  18. package/admin/src/content-manager/components/RelationInputDataManager/utils/select.js +34 -11
  19. package/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js +5 -0
  20. package/admin/src/content-manager/components/SingleTypeFormWrapper/index.js +23 -0
  21. package/admin/src/content-manager/hooks/useRelation/useRelation.js +17 -9
  22. package/admin/src/content-manager/pages/EditSettingsView/components/FormModal.js +7 -2
  23. package/admin/src/content-manager/pages/EditSettingsView/index.js +2 -1
  24. package/admin/src/content-manager/pages/EditView/Header/index.js +118 -50
  25. package/admin/src/content-manager/pages/EditView/Header/utils/select.js +4 -0
  26. package/admin/src/content-manager/pages/EditView/index.js +102 -93
  27. package/admin/src/content-manager/pages/ListView/index.js +24 -15
  28. package/admin/src/content-manager/pages/ListView/utils/buildQueryString.js +14 -2
  29. package/admin/src/contexts/ApiTokenPermissions/index.js +24 -0
  30. package/admin/src/core/apis/CustomFields.js +80 -0
  31. package/admin/src/core/apis/index.js +1 -0
  32. package/admin/src/hooks/index.js +1 -0
  33. package/admin/src/hooks/useRegenerate/index.js +34 -0
  34. package/admin/src/pages/HomePage/SocialLinks.js +1 -1
  35. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ActionBoundRoutes/index.js +56 -0
  36. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/BoundRoute/getMethodColor.js +41 -0
  37. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/BoundRoute/index.js +72 -0
  38. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/CheckBoxWrapper.js +30 -0
  39. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/index.js +150 -0
  40. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ContenTypesSection/index.js +37 -0
  41. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormApiTokenContainer/index.js +254 -0
  42. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormBody/index.js +77 -0
  43. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormHead/index.js +85 -0
  44. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Permissions/index.js +40 -0
  45. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Regenerate/index.js +68 -0
  46. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js +215 -197
  47. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/init.js +13 -0
  48. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/reducer.js +72 -0
  49. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/getDateOfExpiration.js +16 -0
  50. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/index.js +5 -0
  51. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js +2 -1
  52. package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/transformPermissionsData.js +36 -0
  53. package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DefaultButton/index.js +63 -0
  54. package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DeleteButton/index.js +1 -0
  55. package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/ReadButton/index.js +19 -0
  56. package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/UpdateButton/index.js +3 -36
  57. package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/index.js +13 -11
  58. package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/index.js +3 -2
  59. package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/utils/tableHeaders.js +8 -8
  60. package/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedEditView/index.js +1 -1
  61. package/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js +2 -2
  62. package/admin/src/permissions/defaultPermissions.js +2 -6
  63. package/admin/src/translations/ca.json +3 -1
  64. package/admin/src/translations/de.json +4 -1
  65. package/admin/src/translations/dk.json +3 -0
  66. package/admin/src/translations/en.json +22 -1
  67. package/admin/src/translations/es.json +156 -157
  68. package/admin/src/translations/fr.json +3 -0
  69. package/admin/src/translations/gu.json +608 -606
  70. package/admin/src/translations/hi.json +689 -687
  71. package/admin/src/translations/hu.json +2 -0
  72. package/admin/src/translations/id.json +2 -0
  73. package/admin/src/translations/it.json +2 -0
  74. package/admin/src/translations/ja.json +2 -0
  75. package/admin/src/translations/ko.json +2 -0
  76. package/admin/src/translations/ml.json +689 -687
  77. package/admin/src/translations/nl.json +3 -0
  78. package/admin/src/translations/pl.json +2 -0
  79. package/admin/src/translations/pt-BR.json +3 -0
  80. package/admin/src/translations/ru.json +489 -491
  81. package/admin/src/translations/sa.json +85 -82
  82. package/admin/src/translations/sk.json +3 -0
  83. package/admin/src/translations/sv.json +3 -0
  84. package/admin/src/translations/zh-Hans.json +4 -1
  85. package/admin/src/translations/zh.json +3 -0
  86. package/build/1856.d8f13391.chunk.js +173 -0
  87. package/build/{9311.7cc03f29.chunk.js → 1939.e3c87653.chunk.js} +108 -291
  88. package/build/{2077.c935ee42.chunk.js → 2077.31a2d91e.chunk.js} +4 -4
  89. package/build/{2912.a015078a.chunk.js → 2912.ab68a736.chunk.js} +8 -8
  90. package/build/4318.7d167b58.chunk.js +30 -0
  91. package/build/4715.44b1ef9b.chunk.js +386 -0
  92. package/build/{4982.05eda880.chunk.js → 4982.c2a311b7.chunk.js} +9 -9
  93. package/build/7379.d246dd38.chunk.js +1 -0
  94. package/build/{7841.91f793dc.chunk.js → 7841.4b67af3f.chunk.js} +8 -8
  95. package/build/{7866.1201afbd.chunk.js → 7866.5fbeb7e5.chunk.js} +10 -10
  96. package/build/{8380.8789ff76.chunk.js → 8380.9b53a31d.chunk.js} +7 -7
  97. package/build/{8549.133c4473.chunk.js → 8549.cf10b5d1.chunk.js} +4 -4
  98. package/build/8738.a30a2160.chunk.js +461 -0
  99. package/build/{9066.08049eb1.chunk.js → 9066.26faf397.chunk.js} +4 -4
  100. package/build/{9166.037339e0.chunk.js → 9166.8fcb3019.chunk.js} +5 -5
  101. package/build/{9420.43a86e7c.chunk.js → 9420.0fe11290.chunk.js} +6 -6
  102. package/build/962.8651ba3f.chunk.js +184 -0
  103. package/build/Admin-authenticatedApp.883449a5.chunk.js +80 -0
  104. package/build/{Admin_homePage.118926e0.chunk.js → Admin_homePage.4b2be829.chunk.js} +2 -2
  105. package/build/{Admin_profilePage.9d50ac44.chunk.js → Admin_profilePage.da32abbc.chunk.js} +1 -1
  106. package/build/{Admin_settingsPage.98a711e5.chunk.js → Admin_settingsPage.98e2a62b.chunk.js} +16 -16
  107. package/build/admin-app.a61d5c2e.chunk.js +112 -0
  108. package/build/admin-edit-roles-page.4dd6bcb9.chunk.js +1 -0
  109. package/build/{admin-users.97a08630.chunk.js → admin-users.d71f198a.chunk.js} +3 -3
  110. package/build/api-tokens-create-page.93dd0689.chunk.js +1 -0
  111. package/build/api-tokens-edit-page.b0adac81.chunk.js +1 -0
  112. package/build/api-tokens-list-page.bb36535f.chunk.js +16 -0
  113. package/build/{ca-json.a16899ae.chunk.js → ca-json.82df6eab.chunk.js} +1 -1
  114. package/build/content-manager.933dc286.chunk.js +1201 -0
  115. package/build/content-type-builder-list-view.5b3cd768.chunk.js +194 -0
  116. package/build/content-type-builder-translation-en-json.f985c9c4.chunk.js +1 -0
  117. package/build/content-type-builder.a6e29716.chunk.js +145 -0
  118. package/build/{de-json.aa6026b3.chunk.js → de-json.0ad554eb.chunk.js} +1 -1
  119. package/build/{dk-json.fac2bcfb.chunk.js → dk-json.e195ea1a.chunk.js} +1 -1
  120. package/build/{email-settings-page.64037147.chunk.js → email-settings-page.bfe6227f.chunk.js} +4 -4
  121. package/build/en-json.1889403c.chunk.js +1 -0
  122. package/build/{es-json.d672e181.chunk.js → es-json.09f80f6e.chunk.js} +1 -1
  123. package/build/{fr-json.71a16175.chunk.js → fr-json.606d056b.chunk.js} +1 -1
  124. package/build/{gu-json.ca345cd1.chunk.js → gu-json.9881264f.chunk.js} +1 -1
  125. package/build/{hi-json.50c7e6d4.chunk.js → hi-json.83dcf48f.chunk.js} +1 -1
  126. package/build/{hu-json.e0521dcc.chunk.js → hu-json.6f328bce.chunk.js} +1 -1
  127. package/build/{i18n-settings-page.0b73785d.chunk.js → i18n-settings-page.18166125.chunk.js} +4 -4
  128. package/build/{id-json.4b1ff8d6.chunk.js → id-json.1f3c4303.chunk.js} +1 -1
  129. package/build/index.html +1 -1
  130. package/build/{it-json.86bac220.chunk.js → it-json.494ac432.chunk.js} +1 -1
  131. package/build/{ja-json.4e44e36b.chunk.js → ja-json.6f262117.chunk.js} +1 -1
  132. package/build/{ko-json.1003756e.chunk.js → ko-json.36dc3b9a.chunk.js} +1 -1
  133. package/build/main.63e7ea0a.js +9338 -0
  134. package/build/{ml-json.c7774425.chunk.js → ml-json.9566bf9a.chunk.js} +1 -1
  135. package/build/{nl-json.f58ea235.chunk.js → nl-json.94c3a289.chunk.js} +1 -1
  136. package/build/{pl-json.fed96aba.chunk.js → pl-json.ccc6ef23.chunk.js} +1 -1
  137. package/build/{pt-BR-json.073799ab.chunk.js → pt-BR-json.744f024d.chunk.js} +1 -1
  138. package/build/{ru-json.7ad2cbbf.chunk.js → ru-json.d22ea13c.chunk.js} +1 -1
  139. package/build/{runtime~main.feeac6d3.js → runtime~main.3a5e1b07.js} +1 -1
  140. package/build/{sa-json.f0f704f0.chunk.js → sa-json.8fb1c04d.chunk.js} +1 -1
  141. package/build/{sk-json.a848961b.chunk.js → sk-json.6c7335d4.chunk.js} +1 -1
  142. package/build/sso-settings-page.9ceb0140.chunk.js +1 -0
  143. package/build/{sv-json.b038acbe.chunk.js → sv-json.2e589a7d.chunk.js} +1 -1
  144. package/build/{upload-settings.80ff0974.chunk.js → upload-settings.3d613216.chunk.js} +4 -4
  145. package/build/{upload-translation-en-json.004a86c1.chunk.js → upload-translation-en-json.86da7b0a.chunk.js} +1 -1
  146. package/build/{users-advanced-settings-page.a02f4806.chunk.js → users-advanced-settings-page.f4051d92.chunk.js} +4 -4
  147. package/build/{webhook-edit-page.d2ea3351.chunk.js → webhook-edit-page.9e46fc3f.chunk.js} +1 -1
  148. package/build/{webhook-list-page.2775a683.chunk.js → webhook-list-page.a712ae40.chunk.js} +4 -4
  149. package/build/{zh-Hans-json.03d2bda1.chunk.js → zh-Hans-json.a4d7dc69.chunk.js} +1 -1
  150. package/build/{zh-json.3d0cc664.chunk.js → zh-json.66aa2ae1.chunk.js} +1 -1
  151. package/ee/server/controllers/user.js +5 -3
  152. package/package.json +9 -8
  153. package/server/bootstrap.js +19 -1
  154. package/server/config/admin-actions.js +20 -0
  155. package/server/content-types/api-token-permission.js +36 -0
  156. package/server/content-types/api-token.js +25 -1
  157. package/server/content-types/index.js +1 -0
  158. package/server/controllers/admin.js +3 -0
  159. package/server/controllers/api-token.js +24 -1
  160. package/server/controllers/content-api.js +15 -0
  161. package/server/controllers/index.js +1 -0
  162. package/server/controllers/user.js +3 -2
  163. package/server/routes/api-tokens.js +11 -0
  164. package/server/routes/content-api.js +20 -0
  165. package/server/routes/index.js +2 -0
  166. package/server/services/api-token.js +309 -29
  167. package/server/services/constants.js +10 -0
  168. package/server/services/permission/engine.js +36 -226
  169. package/server/services/permission.js +4 -1
  170. package/server/strategies/admin.js +7 -1
  171. package/server/strategies/api-token.js +72 -11
  172. package/server/validation/api-tokens.js +12 -2
  173. package/utils/get-custom-app-config-file.js +5 -0
  174. package/build/1856.47226450.chunk.js +0 -173
  175. package/build/4715.58cd558f.chunk.js +0 -387
  176. package/build/7098.40dcd7bf.chunk.js +0 -1
  177. package/build/8851.e4ac62f2.chunk.js +0 -158
  178. package/build/Admin-authenticatedApp.e39f36c9.chunk.js +0 -80
  179. package/build/admin-app.4f7618a9.chunk.js +0 -112
  180. package/build/admin-edit-roles-page.554ba3fa.chunk.js +0 -1
  181. package/build/api-tokens-create-page.4c262d6e.chunk.js +0 -1
  182. package/build/api-tokens-edit-page.10a9d368.chunk.js +0 -1
  183. package/build/api-tokens-list-page.442c9f3c.chunk.js +0 -15
  184. package/build/content-manager.7d57c9d1.chunk.js +0 -1200
  185. package/build/content-type-builder-list-view.8cc534e0.chunk.js +0 -194
  186. package/build/content-type-builder-translation-en-json.201bfb78.chunk.js +0 -1
  187. package/build/content-type-builder.684df7a4.chunk.js +0 -142
  188. package/build/en-json.0c69c7d7.chunk.js +0 -1
  189. package/build/main.b47db1a3.js +0 -9337
  190. package/build/sso-settings-page.445184e0.chunk.js +0 -1
  191. package/server/services/permission/engine-hooks.js +0 -82
@@ -1,4 +1,4 @@
1
- import React, { useEffect, useRef } from 'react';
1
+ import React, { useEffect, useState, useRef, useReducer } from 'react';
2
2
  import { useIntl } from 'react-intl';
3
3
  import {
4
4
  SettingsPageTitle,
@@ -8,62 +8,134 @@ import {
8
8
  useNotification,
9
9
  useTracking,
10
10
  useGuidedTour,
11
- Link,
11
+ useRBAC,
12
12
  } from '@strapi/helper-plugin';
13
- import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
14
13
  import { Main } from '@strapi/design-system/Main';
15
- import { Button } from '@strapi/design-system/Button';
16
- import Check from '@strapi/icons/Check';
17
- import ArrowLeft from '@strapi/icons/ArrowLeft';
18
14
  import { Formik } from 'formik';
19
- import { Stack } from '@strapi/design-system/Stack';
20
- import { Box } from '@strapi/design-system/Box';
21
- import { Typography } from '@strapi/design-system/Typography';
22
- import { Grid, GridItem } from '@strapi/design-system/Grid';
23
- import { TextInput } from '@strapi/design-system/TextInput';
24
- import { Textarea } from '@strapi/design-system/Textarea';
25
- import { Select, Option } from '@strapi/design-system/Select';
26
- import get from 'lodash/get';
15
+ import { get } from 'lodash';
27
16
  import { useRouteMatch, useHistory } from 'react-router-dom';
28
17
  import { useQuery } from 'react-query';
29
18
  import { formatAPIErrors } from '../../../../../utils';
30
19
  import { axiosInstance } from '../../../../../core/utils';
31
- import schema from './utils/schema';
20
+ import { schema } from './utils';
32
21
  import LoadingView from './components/LoadingView';
33
- import HeaderContentBox from './components/ContentBox';
22
+ import FormHead from './components/FormHead';
23
+ import FormBody from './components/FormBody';
24
+ import adminPermissions from '../../../../../permissions';
25
+ import { ApiTokenPermissionsContextProvider } from '../../../../../contexts/ApiTokenPermissions';
26
+ import init from './init';
27
+ import reducer, { initialState } from './reducer';
28
+
29
+ const MSG_ERROR_NAME_TAKEN = 'Name already taken';
34
30
 
35
31
  const ApiTokenCreateView = () => {
36
- let apiToken;
37
32
  useFocusWhenNavigate();
38
33
  const { formatMessage } = useIntl();
39
34
  const { lockApp, unlockApp } = useOverlayBlocker();
40
35
  const toggleNotification = useNotification();
41
36
  const history = useHistory();
37
+ const [apiToken, setApiToken] = useState(
38
+ history.location.state?.apiToken.accessKey
39
+ ? {
40
+ ...history.location.state.apiToken,
41
+ }
42
+ : null
43
+ );
42
44
  const { trackUsage } = useTracking();
43
45
  const trackUsageRef = useRef(trackUsage);
44
46
  const { setCurrentStep } = useGuidedTour();
45
-
47
+ const {
48
+ allowedActions: { canCreate, canUpdate, canRegenerate },
49
+ } = useRBAC(adminPermissions.settings['api-tokens']);
50
+ const [state, dispatch] = useReducer(reducer, initialState, (state) => init(state, {}));
46
51
  const {
47
52
  params: { id },
48
53
  } = useRouteMatch('/settings/api-tokens/:id');
49
54
 
50
55
  const isCreating = id === 'create';
51
56
 
57
+ useQuery(
58
+ 'content-api-permissions',
59
+ async () => {
60
+ const [permissions, routes] = await Promise.all(
61
+ ['/admin/content-api/permissions', '/admin/content-api/routes'].map(async (url) => {
62
+ const { data } = await axiosInstance.get(url);
63
+
64
+ return data.data;
65
+ })
66
+ );
67
+
68
+ dispatch({
69
+ type: 'UPDATE_PERMISSIONS_LAYOUT',
70
+ value: permissions,
71
+ });
72
+
73
+ dispatch({
74
+ type: 'UPDATE_ROUTES',
75
+ value: routes,
76
+ });
77
+
78
+ if (apiToken) {
79
+ if (apiToken?.type === 'read-only') {
80
+ dispatch({
81
+ type: 'ON_CHANGE_READ_ONLY',
82
+ });
83
+ }
84
+ if (apiToken?.type === 'full-access') {
85
+ dispatch({
86
+ type: 'SELECT_ALL_ACTIONS',
87
+ });
88
+ }
89
+ if (apiToken?.type === 'custom') {
90
+ dispatch({
91
+ type: 'UPDATE_PERMISSIONS',
92
+ value: apiToken?.permissions,
93
+ });
94
+ }
95
+ }
96
+ },
97
+ {
98
+ onError() {
99
+ toggleNotification({
100
+ type: 'warning',
101
+ message: { id: 'notification.error', defaultMessage: 'An error occured' },
102
+ });
103
+ },
104
+ }
105
+ );
106
+
52
107
  useEffect(() => {
53
108
  trackUsageRef.current(isCreating ? 'didAddTokenFromList' : 'didEditTokenFromList');
54
109
  }, [isCreating]);
55
110
 
56
- if (history.location.state?.apiToken.accessKey) {
57
- apiToken = history.location.state.apiToken;
58
- }
59
-
60
- const { status, data } = useQuery(
111
+ const { status } = useQuery(
61
112
  ['api-token', id],
62
113
  async () => {
63
114
  const {
64
115
  data: { data },
65
116
  } = await axiosInstance.get(`/admin/api-tokens/${id}`);
66
117
 
118
+ setApiToken({
119
+ ...data,
120
+ });
121
+
122
+ if (data?.type === 'read-only') {
123
+ dispatch({
124
+ type: 'ON_CHANGE_READ_ONLY',
125
+ });
126
+ }
127
+ if (data?.type === 'full-access') {
128
+ dispatch({
129
+ type: 'SELECT_ALL_ACTIONS',
130
+ });
131
+ }
132
+ if (data?.type === 'custom') {
133
+ dispatch({
134
+ type: 'UPDATE_PERMISSIONS',
135
+ value: data?.permissions,
136
+ });
137
+ }
138
+
67
139
  return data;
68
140
  },
69
141
  {
@@ -77,10 +149,6 @@ const ApiTokenCreateView = () => {
77
149
  }
78
150
  );
79
151
 
80
- if (data) {
81
- apiToken = data;
82
- }
83
-
84
152
  const handleSubmit = async (body, actions) => {
85
153
  trackUsageRef.current(isCreating ? 'willCreateToken' : 'willEditToken');
86
154
  lockApp();
@@ -89,37 +157,98 @@ const ApiTokenCreateView = () => {
89
157
  const {
90
158
  data: { data: response },
91
159
  } = isCreating
92
- ? await axiosInstance.post(`/admin/api-tokens`, body)
93
- : await axiosInstance.put(`/admin/api-tokens/${id}`, body);
160
+ ? await axiosInstance.post(`/admin/api-tokens`, {
161
+ ...body,
162
+ lifespan:
163
+ body.lifespan && parseInt(body.lifespan, 10)
164
+ ? parseInt(body.lifespan, 10)
165
+ : body.lifespan,
166
+ permissions: body.type === 'custom' ? state.selectedActions : null,
167
+ })
168
+ : await axiosInstance.put(`/admin/api-tokens/${id}`, {
169
+ name: body.name,
170
+ description: body.description,
171
+ type: body.type,
172
+ permissions: body.type === 'custom' ? state.selectedActions : null,
173
+ });
94
174
 
95
- apiToken = response;
175
+ if (isCreating) {
176
+ history.replace(`/settings/api-tokens/${response.id}`, { apiToken: response });
177
+ setCurrentStep('apiTokens.success');
178
+ }
179
+ unlockApp();
180
+ setApiToken({
181
+ ...response,
182
+ });
96
183
 
97
184
  toggleNotification({
98
185
  type: 'success',
99
- message: formatMessage({ id: 'notification.success.saved', defaultMessage: 'Saved' }),
186
+ message: isCreating
187
+ ? formatMessage({
188
+ id: 'notification.success.tokencreated',
189
+ defaultMessage: 'API Token successfully created',
190
+ })
191
+ : formatMessage({
192
+ id: 'notification.success.tokenedited',
193
+ defaultMessage: 'API Token successfully edited',
194
+ }),
100
195
  });
101
196
 
102
197
  trackUsageRef.current(isCreating ? 'didCreateToken' : 'didEditToken', {
103
198
  type: apiToken.type,
104
199
  });
105
-
106
- if (isCreating) {
107
- history.replace(`/settings/api-tokens/${response.id}`, { apiToken: response });
108
- setCurrentStep('apiTokens.success');
109
- }
110
200
  } catch (err) {
111
201
  const errors = formatAPIErrors(err.response.data);
112
202
  actions.setErrors(errors);
113
203
 
114
- toggleNotification({
115
- type: 'warning',
116
- message: get(err, 'response.data.message', 'notification.error'),
117
- });
204
+ if (err?.response?.data?.error?.message === MSG_ERROR_NAME_TAKEN) {
205
+ toggleNotification({
206
+ type: 'warning',
207
+ message: get(err, 'response.data.message', 'notification.error.tokennamenotunique'),
208
+ });
209
+ } else {
210
+ toggleNotification({
211
+ type: 'warning',
212
+ message: get(err, 'response.data.message', 'notification.error'),
213
+ });
214
+ }
215
+ unlockApp();
118
216
  }
217
+ };
119
218
 
120
- unlockApp();
219
+ const [hasChangedPermissions, setHasChangedPermissions] = useState(false);
220
+
221
+ const handleChangeCheckbox = ({ target: { value } }) => {
222
+ setHasChangedPermissions(true);
223
+ dispatch({
224
+ type: 'ON_CHANGE',
225
+ value,
226
+ });
227
+ };
228
+
229
+ const handleChangeSelectAllCheckbox = ({ target: { value } }) => {
230
+ setHasChangedPermissions(true);
231
+ dispatch({
232
+ type: 'SELECT_ALL_IN_PERMISSION',
233
+ value,
234
+ });
235
+ };
236
+
237
+ const setSelectedAction = ({ target: { value } }) => {
238
+ dispatch({
239
+ type: 'SET_SELECTED_ACTION',
240
+ value,
241
+ });
242
+ };
243
+
244
+ const providerValue = {
245
+ ...state,
246
+ onChange: handleChangeCheckbox,
247
+ onChangeSelectAll: handleChangeSelectAllCheckbox,
248
+ setSelectedAction,
121
249
  };
122
250
 
251
+ const canEditInputs = (canUpdate && !isCreating) || (canCreate && isCreating);
123
252
  const isLoading = !isCreating && !apiToken && status !== 'success';
124
253
 
125
254
  if (isLoading) {
@@ -127,162 +256,51 @@ const ApiTokenCreateView = () => {
127
256
  }
128
257
 
129
258
  return (
130
- <Main>
131
- <SettingsPageTitle name="API Tokens" />
132
- <Formik
133
- validationSchema={schema}
134
- validateOnChange={false}
135
- initialValues={{
136
- name: apiToken?.name || '',
137
- description: apiToken?.description || '',
138
- type: apiToken?.type || 'read-only',
139
- }}
140
- onSubmit={handleSubmit}
141
- >
142
- {({ errors, handleChange, isSubmitting, values }) => {
143
- return (
144
- <Form>
145
- <HeaderLayout
146
- title={
147
- apiToken?.name ||
148
- formatMessage({
149
- id: 'Settings.apiTokens.createPage.title',
150
- defaultMessage: 'Create API Token',
151
- })
152
- }
153
- primaryAction={
154
- <Button
155
- disabled={isSubmitting}
156
- loading={isSubmitting}
157
- startIcon={<Check />}
158
- type="submit"
159
- size="L"
160
- >
161
- {formatMessage({
162
- id: 'global.save',
163
- defaultMessage: 'Save',
164
- })}
165
- </Button>
166
- }
167
- navigationAction={
168
- <Link startIcon={<ArrowLeft />} to="/settings/api-tokens">
169
- {formatMessage({
170
- id: 'global.back',
171
- defaultMessage: 'Back',
172
- })}
173
- </Link>
174
- }
175
- />
176
- <ContentLayout>
177
- <Stack spacing={6}>
178
- {Boolean(apiToken?.name) && <HeaderContentBox apiToken={apiToken.accessKey} />}
179
- <Box
180
- background="neutral0"
181
- hasRadius
182
- shadow="filterShadow"
183
- paddingTop={6}
184
- paddingBottom={6}
185
- paddingLeft={7}
186
- paddingRight={7}
187
- >
188
- <Stack spacing={4}>
189
- <Typography variant="delta" as="h2">
190
- {formatMessage({
191
- id: 'global.details',
192
- defaultMessage: 'Details',
193
- })}
194
- </Typography>
195
- <Grid gap={5}>
196
- <GridItem key="name" col={6} xs={12}>
197
- <TextInput
198
- name="name"
199
- error={
200
- errors.name
201
- ? formatMessage(
202
- errors.name?.id
203
- ? errors.name
204
- : { id: errors.name, defaultMessage: errors.name }
205
- )
206
- : null
207
- }
208
- label={formatMessage({
209
- id: 'Settings.apiTokens.form.name',
210
- defaultMessage: 'Name',
211
- })}
212
- onChange={handleChange}
213
- value={values.name}
214
- required
215
- />
216
- </GridItem>
217
- <GridItem key="description" col={6} xs={12}>
218
- <Textarea
219
- label={formatMessage({
220
- id: 'Settings.apiTokens.form.description',
221
- defaultMessage: 'Description',
222
- })}
223
- name="description"
224
- error={
225
- errors.description
226
- ? formatMessage(
227
- errors.description?.id
228
- ? errors.description
229
- : {
230
- id: errors.description,
231
- defaultMessage: errors.description,
232
- }
233
- )
234
- : null
235
- }
236
- onChange={handleChange}
237
- >
238
- {values.description}
239
- </Textarea>
240
- </GridItem>
241
- <GridItem key="type" col={6} xs={12}>
242
- <Select
243
- name="type"
244
- label={formatMessage({
245
- id: 'Settings.apiTokens.form.type',
246
- defaultMessage: 'Token type',
247
- })}
248
- value={values.type}
249
- error={
250
- errors.type
251
- ? formatMessage(
252
- errors.type?.id
253
- ? errors.type
254
- : { id: errors.type, defaultMessage: errors.type }
255
- )
256
- : null
257
- }
258
- onChange={(value) => {
259
- handleChange({ target: { name: 'type', value } });
260
- }}
261
- >
262
- <Option value="read-only">
263
- {formatMessage({
264
- id: 'Settings.apiTokens.types.read-only',
265
- defaultMessage: 'Read-only',
266
- })}
267
- </Option>
268
- <Option value="full-access">
269
- {formatMessage({
270
- id: 'Settings.apiTokens.types.full-access',
271
- defaultMessage: 'Full access',
272
- })}
273
- </Option>
274
- </Select>
275
- </GridItem>
276
- </Grid>
277
- </Stack>
278
- </Box>
279
- </Stack>
280
- </ContentLayout>
281
- </Form>
282
- );
283
- }}
284
- </Formik>
285
- </Main>
259
+ <ApiTokenPermissionsContextProvider value={providerValue}>
260
+ <Main>
261
+ <SettingsPageTitle name="API Tokens" />
262
+ <Formik
263
+ validationSchema={schema}
264
+ validateOnChange={false}
265
+ initialValues={{
266
+ name: apiToken?.name || '',
267
+ description: apiToken?.description || '',
268
+ type: apiToken?.type,
269
+ lifespan: apiToken?.lifespan ? apiToken.lifespan.toString() : apiToken?.lifespan,
270
+ }}
271
+ enableReinitialize
272
+ onSubmit={(body, actions) => handleSubmit(body, actions)}
273
+ >
274
+ {({ errors, handleChange, isSubmitting, values, setFieldValue }) => {
275
+ if (hasChangedPermissions && values?.type !== 'custom') {
276
+ setFieldValue('type', 'custom');
277
+ }
278
+
279
+ return (
280
+ <Form>
281
+ <FormHead
282
+ apiToken={apiToken}
283
+ setApiToken={setApiToken}
284
+ canEditInputs={canEditInputs}
285
+ canRegenerate={canRegenerate}
286
+ isSubmitting={isSubmitting}
287
+ />
288
+ <FormBody
289
+ apiToken={apiToken}
290
+ errors={errors}
291
+ onChange={handleChange}
292
+ canEditInputs={canEditInputs}
293
+ isCreating={isCreating}
294
+ values={values}
295
+ onDispatch={dispatch}
296
+ setHasChangedPermissions={setHasChangedPermissions}
297
+ />
298
+ </Form>
299
+ );
300
+ }}
301
+ </Formik>
302
+ </Main>
303
+ </ApiTokenPermissionsContextProvider>
286
304
  );
287
305
  };
288
306
 
@@ -0,0 +1,13 @@
1
+ import { transformPermissionsData } from './utils';
2
+
3
+ const init = (state, permissions = []) => {
4
+ return {
5
+ ...state,
6
+ selectedAction: null,
7
+ routes: [],
8
+ selectedActions: [],
9
+ data: transformPermissionsData(permissions),
10
+ };
11
+ };
12
+
13
+ export default init;
@@ -0,0 +1,72 @@
1
+ /* eslint-disable consistent-return */
2
+ import produce from 'immer';
3
+ import { pull } from 'lodash';
4
+ import { transformPermissionsData } from './utils';
5
+
6
+ export const initialState = {
7
+ data: {},
8
+ selectedActions: [],
9
+ };
10
+
11
+ const reducer = (state, action) =>
12
+ produce(state, (draftState) => {
13
+ switch (action.type) {
14
+ case 'ON_CHANGE': {
15
+ if (draftState.selectedActions.includes(action.value)) {
16
+ pull(draftState.selectedActions, action.value);
17
+ } else {
18
+ draftState.selectedActions.push(action.value);
19
+ }
20
+ break;
21
+ }
22
+ case 'SELECT_ALL_IN_PERMISSION': {
23
+ const areAllSelected = action.value.every((item) =>
24
+ draftState.selectedActions.includes(item.actionId)
25
+ );
26
+
27
+ if (areAllSelected) {
28
+ action.value.forEach((item) => {
29
+ pull(draftState.selectedActions, item.actionId);
30
+ });
31
+ } else {
32
+ action.value.forEach((item) => {
33
+ draftState.selectedActions.push(item.actionId);
34
+ });
35
+ }
36
+ break;
37
+ }
38
+
39
+ case 'SELECT_ALL_ACTIONS': {
40
+ draftState.selectedActions = [...draftState.data.allActionsIds];
41
+
42
+ break;
43
+ }
44
+ case 'ON_CHANGE_READ_ONLY': {
45
+ const onlyReadOnlyActions = draftState.data.allActionsIds.filter(
46
+ (actionId) => actionId.includes('find') || actionId.includes('findOne')
47
+ );
48
+ draftState.selectedActions = [...onlyReadOnlyActions];
49
+ break;
50
+ }
51
+ case 'UPDATE_PERMISSIONS_LAYOUT': {
52
+ draftState.data = transformPermissionsData(action.value);
53
+ break;
54
+ }
55
+ case 'UPDATE_ROUTES': {
56
+ draftState.routes = { ...action.value };
57
+ break;
58
+ }
59
+ case 'UPDATE_PERMISSIONS': {
60
+ draftState.selectedActions = [...action.value];
61
+ break;
62
+ }
63
+ case 'SET_SELECTED_ACTION': {
64
+ draftState.selectedAction = action.value;
65
+ break;
66
+ }
67
+ default:
68
+ return draftState;
69
+ }
70
+ });
71
+
72
+ export default reducer;
@@ -0,0 +1,16 @@
1
+ import { addDays, format } from 'date-fns';
2
+ import * as locales from 'date-fns/locale';
3
+
4
+ const getDateOfExpiration = (createdAt, duration, language = 'en') => {
5
+ if (duration && typeof duration === 'number') {
6
+ const durationInDays = duration / 24 / 60 / 60 / 1000;
7
+
8
+ return format(addDays(new Date(createdAt), durationInDays), 'PPP', {
9
+ locale: locales[language],
10
+ });
11
+ }
12
+
13
+ return 'Unlimited';
14
+ };
15
+
16
+ export default getDateOfExpiration;
@@ -0,0 +1,5 @@
1
+ import getDateOfExpiration from './getDateOfExpiration';
2
+ import schema from './schema';
3
+ import transformPermissionsData from './transformPermissionsData';
4
+
5
+ export { getDateOfExpiration, schema, transformPermissionsData };
@@ -5,9 +5,10 @@ const schema = yup.object().shape({
5
5
  name: yup.string(translatedErrors.string).required(translatedErrors.required),
6
6
  type: yup
7
7
  .string(translatedErrors.string)
8
- .oneOf(['read-only', 'full-access'])
8
+ .oneOf(['read-only', 'full-access', 'custom'])
9
9
  .required(translatedErrors.required),
10
10
  description: yup.string().nullable(),
11
+ lifespan: yup.number().integer().min(1).nullable().defined(translatedErrors.required),
11
12
  });
12
13
 
13
14
  export default schema;
@@ -0,0 +1,36 @@
1
+ import { flatten } from 'lodash';
2
+
3
+ const transformPermissionsData = (data) => {
4
+ const layout = {
5
+ allActionsIds: [],
6
+ permissions: [],
7
+ };
8
+
9
+ layout.permissions = Object.keys(data).map((apiId) => ({
10
+ apiId,
11
+ label: apiId.split('::')[1],
12
+ controllers: flatten(
13
+ Object.keys(data[apiId].controllers).map((controller) => ({
14
+ controller,
15
+ actions: flatten(
16
+ data[apiId].controllers[controller].map((action) => {
17
+ const actionId = `${apiId}.${controller}.${action}`;
18
+
19
+ if (apiId.includes('api::')) {
20
+ layout.allActionsIds.push(actionId);
21
+ }
22
+
23
+ return {
24
+ action,
25
+ actionId,
26
+ };
27
+ })
28
+ ),
29
+ }))
30
+ ),
31
+ }));
32
+
33
+ return layout;
34
+ };
35
+
36
+ export default transformPermissionsData;