@akemona-org/strapi-admin 3.7.0 → 3.7.2
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/app.js +15 -15
- package/admin/src/components/Header/index.js +4 -4
- package/admin/src/components/LeftMenu/LeftMenuFooter/Wrapper.js +1 -1
- package/admin/src/components/LeftMenu/LeftMenuFooter/index.js +6 -1
- package/admin/src/components/LeftMenu/LeftMenuHeader/Wrapper.js +3 -3
- package/admin/src/components/LeftMenu/LeftMenuLink/A.js +7 -7
- package/admin/src/components/LeftMenu/LeftMenuLink/LeftMenuLinkContent.js +1 -1
- package/admin/src/components/LeftMenu/LeftMenuLinkHeader/Title.js +1 -1
- package/admin/src/components/LeftMenu/LeftMenuLinkHeader/index.js +2 -2
- package/admin/src/components/LeftMenu/LeftMenuLinkSection/index.js +1 -1
- package/admin/src/components/LeftMenu/LinksContainer/index.js +2 -2
- package/admin/src/components/Notifications/Notification/Li.js +15 -15
- package/admin/src/components/Roles/ConditionsModal/ConditionsSelect/ClearIndicator.js +1 -1
- package/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/index.js +7 -6
- package/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/utils/createCollapsesObject.js +1 -1
- package/admin/src/components/Roles/ConditionsModal/ConditionsSelect/SingleValue.js +1 -1
- package/admin/src/components/Roles/ConditionsModal/index.js +2 -2
- package/admin/src/components/Roles/ConditionsModal/utils/selectStyle.js +8 -8
- package/admin/src/components/Roles/ContentTypeCollapse/Collapse/index.js +4 -7
- package/admin/src/components/Roles/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js +1 -1
- package/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js +1 -1
- package/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/getRowLabelCheckboxeState.js +1 -1
- package/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js +1 -1
- package/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js +6 -10
- package/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/utils/generateHeadersFromActions.js +1 -1
- package/admin/src/components/Roles/ContentTypeCollapse/utils/activeStyle.js +1 -1
- package/admin/src/components/Roles/ContentTypeCollapse/utils/getAvailableActions.js +1 -1
- package/admin/src/components/Roles/ContentTypeCollapses/index.js +1 -1
- package/admin/src/components/Roles/Curve/index.js +1 -1
- package/admin/src/components/Roles/GlobalActions/utils/findDisplayedActions.js +1 -1
- package/admin/src/components/Roles/GlobalActions/utils/getRowLabelCheckboxesState.js +2 -2
- package/admin/src/components/Roles/Permissions/index.js +5 -4
- package/admin/src/components/Roles/Permissions/reducer.js +4 -4
- package/admin/src/components/Roles/Permissions/utils/createDefaultCTFormFromLayout.js +1 -1
- package/admin/src/components/Roles/Permissions/utils/findMatchingPermissions.js +1 -1
- package/admin/src/components/Roles/Permissions/utils/formatContentTypesPermissionToAPI.js +2 -2
- package/admin/src/components/Roles/Permissions/utils/formatLayoutForSettingsAndPlugins.js +1 -1
- package/admin/src/components/Roles/Permissions/utils/formatPermissionsToAPI.js +1 -1
- package/admin/src/components/Roles/Permissions/utils/formatSettingsPermissionsToAPI.js +4 -4
- package/admin/src/components/Roles/Permissions/utils/updateConditionsToFalse.js +2 -2
- package/admin/src/components/Roles/PluginsAndSettings/Row/Wrapper.js +1 -1
- package/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js +4 -7
- package/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/formatActions.js +2 -2
- package/admin/src/components/Roles/PluginsAndSettings/SubCategory/utils/getConditionsButtonState.js +2 -2
- package/admin/src/components/Roles/PluginsAndSettings/index.js +1 -1
- package/admin/src/components/Roles/RoleForm/NameInput.js +1 -1
- package/admin/src/components/Roles/RoleList/RoleDescription.js +1 -1
- package/admin/src/components/Roles/Tabs/index.js +1 -1
- package/admin/src/components/Roles/utils/createArrayOfValues.js +2 -2
- package/admin/src/components/Roles/utils/getCheckboxState.js +3 -3
- package/admin/src/components/Roles/utils/removeConditionKeyFromData.js +1 -1
- package/admin/src/components/Users/FilterPicker/Card/Input.js +1 -1
- package/admin/src/components/Users/FilterPicker/Card/index.js +2 -2
- package/admin/src/components/Users/FilterPicker/Card/init.js +1 -1
- package/admin/src/components/Users/FilterPicker/Card/reducer.js +1 -1
- package/admin/src/components/Users/FilterPicker/index.js +1 -1
- package/admin/src/components/Users/List/index.js +5 -5
- package/admin/src/components/Users/List/init.js +1 -1
- package/admin/src/components/Users/List/reducer.js +1 -1
- package/admin/src/components/Users/List/utils/checkIfAllEntriesAreSelected.js +1 -1
- package/admin/src/components/Users/List/utils/headers.js +2 -2
- package/admin/src/components/Users/List/utils/updateRows.js +1 -1
- package/admin/src/components/Users/ModalCreateBody/index.js +3 -3
- package/admin/src/components/Users/ModalCreateBody/init.js +1 -1
- package/admin/src/components/Users/ModalCreateBody/reducer.js +1 -1
- package/admin/src/components/Users/ModalCreateBody/utils/schema.js +2 -8
- package/admin/src/components/Users/RoleSettingsModalSection/index.js +1 -1
- package/admin/src/components/Users/SelectRoles/ClearIndicator.js +1 -1
- package/admin/src/components/Users/SelectRoles/MultiValueContainer.js +1 -1
- package/admin/src/components/Users/SelectRoles/index.js +3 -3
- package/admin/src/components/Users/SelectRoles/utils/styles.js +4 -4
- package/admin/src/components/Users/SortPicker/Button.js +1 -1
- package/admin/src/components/Users/SortPicker/List.js +1 -1
- package/admin/src/components/Users/SortPicker/ListWrapper.js +1 -1
- package/admin/src/components/Users/SortPicker/index.js +2 -2
- package/admin/src/components/Webhooks/EventInput/EventRow.js +2 -2
- package/admin/src/components/Webhooks/EventInput/index.js +5 -5
- package/admin/src/components/Webhooks/EventInput/utils/formatValue.js +1 -1
- package/admin/src/components/Webhooks/HeadersInput/index.js +6 -6
- package/admin/src/components/Webhooks/Inputs/index.js +2 -2
- package/admin/src/components/Webhooks/ListRow/index.js +3 -3
- package/admin/src/configureStore.js +1 -1
- package/admin/src/containers/Admin/Content.js +5 -5
- package/admin/src/containers/Admin/Logout/index.js +1 -1
- package/admin/src/containers/Admin/Wrapper.js +1 -1
- package/admin/src/containers/Admin/reducer.js +1 -1
- package/admin/src/containers/Admin/selectors.js +2 -2
- package/admin/src/containers/App/selectors.js +9 -8
- package/admin/src/containers/App/styles/website.css +5 -5
- package/admin/src/containers/ApplicationInfosPage/index.js +4 -4
- package/admin/src/containers/AuthPage/components/ForgotPassword/index.js +1 -1
- package/admin/src/containers/AuthPage/components/Login/BaseLogin.js +1 -1
- package/admin/src/containers/AuthPage/components/Login/index.js +2 -2
- package/admin/src/containers/AuthPage/components/Register/index.js +3 -3
- package/admin/src/containers/AuthPage/components/ResetPassword/index.js +1 -1
- package/admin/src/containers/AuthPage/init.js +1 -1
- package/admin/src/containers/AuthPage/reducer.js +1 -1
- package/admin/src/containers/AuthPage/utils/forms.js +2 -8
- package/admin/src/containers/HomePage/index.js +15 -16
- package/admin/src/containers/InstalledPluginsPage/Row.js +1 -1
- package/admin/src/containers/InstalledPluginsPage/index.js +1 -1
- package/admin/src/containers/InstalledPluginsPage/utils/generateRows.js +1 -1
- package/admin/src/containers/LanguageProvider/hooks/useChangeLanguage.js +1 -1
- package/admin/src/containers/LanguageProvider/index.js +1 -1
- package/admin/src/containers/LanguageProvider/selectors.js +3 -10
- package/admin/src/containers/LeftMenu/Wrapper.js +5 -5
- package/admin/src/containers/LeftMenu/reducer.js +1 -1
- package/admin/src/containers/LeftMenu/selectors.js +1 -1
- package/admin/src/containers/LeftMenu/utils/generateModelsLinks.js +2 -2
- package/admin/src/containers/LeftMenu/utils/getCtOrStLinks.js +5 -4
- package/admin/src/containers/LeftMenu/utils/getGeneralLinks.js +1 -1
- package/admin/src/containers/LeftMenu/utils/getSettingsMenuLinksPermissions.js +1 -1
- package/admin/src/containers/LeftMenu/utils/toPluginLinks.js +2 -2
- package/admin/src/containers/LocaleToggle/index.js +2 -2
- package/admin/src/containers/LocaleToggle/selectors.js +4 -7
- package/admin/src/containers/MarketplacePage/PluginCard/index.js +3 -3
- package/admin/src/containers/MarketplacePage/index.js +2 -2
- package/admin/src/containers/NewNotification/Notification/index.js +4 -12
- package/admin/src/containers/NewNotification/Notification/styledComponents.js +1 -1
- package/admin/src/containers/NewNotification/index.js +2 -2
- package/admin/src/containers/NewNotification/reducer.js +2 -2
- package/admin/src/containers/NotFoundPage/index.js +1 -1
- package/admin/src/containers/NotificationProvider/actions.js +1 -1
- package/admin/src/containers/NotificationProvider/index.js +1 -1
- package/admin/src/containers/NotificationProvider/selectors.js +3 -3
- package/admin/src/containers/Onboarding/StaticLinks/index.js +2 -2
- package/admin/src/containers/Onboarding/Video.js +1 -1
- package/admin/src/containers/Onboarding/index.js +2 -2
- package/admin/src/containers/Onboarding/init.js +1 -1
- package/admin/src/containers/Onboarding/reducer.js +6 -6
- package/admin/src/containers/Onboarding/utils/formatAndStoreVideoArray.js +2 -2
- package/admin/src/containers/PermissionsManager/index.js +1 -1
- package/admin/src/containers/PermissionsManager/reducer.js +2 -2
- package/admin/src/containers/PrivateRoute/index.js +1 -1
- package/admin/src/containers/ProfilePage/index.js +4 -4
- package/admin/src/containers/Roles/EditPage/index.js +1 -1
- package/admin/src/containers/Roles/ListPage/index.js +5 -5
- package/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Icon.js +1 -1
- package/admin/src/containers/SettingsPage/components/MenuWrapper/index.js +1 -1
- package/admin/src/containers/SettingsPage/index.js +3 -3
- package/admin/src/containers/SettingsPage/utils/createPluginsLinksRoutes.js +3 -3
- package/admin/src/containers/SettingsPage/utils/findFirstAllowedEndpoint.js +3 -3
- package/admin/src/containers/SettingsPage/utils/getSectionsToDisplay.js +2 -2
- package/admin/src/containers/SettingsPage/utils/makeUniqueRoutes.js +2 -2
- package/admin/src/containers/Users/EditPage/index.js +2 -2
- package/admin/src/containers/Users/ListPage/Header.js +2 -2
- package/admin/src/containers/Users/ListPage/index.js +4 -4
- package/admin/src/containers/Users/ListPage/init.js +1 -1
- package/admin/src/containers/Users/ListPage/reducer.js +1 -1
- package/admin/src/containers/Users/ListPage/utils/getFilters.js +1 -1
- package/admin/src/containers/Webhooks/EditView/index.js +11 -17
- package/admin/src/containers/Webhooks/EditView/reducer.js +4 -4
- package/admin/src/containers/Webhooks/EditView/utils/formatData.js +2 -2
- package/admin/src/containers/Webhooks/EditView/utils/schema.js +1 -1
- package/admin/src/containers/Webhooks/ListView/index.js +5 -5
- package/admin/src/containers/Webhooks/ListView/reducer.js +5 -5
- package/admin/src/contexts/MarketPlace/index.js +2 -10
- package/admin/src/hooks/useFetchPermissionsLayout/index.js +1 -1
- package/admin/src/hooks/useFetchPermissionsLayout/reducer.js +1 -1
- package/admin/src/hooks/useFetchPluginsFromMarketPlace/index.js +1 -1
- package/admin/src/hooks/useFetchRole/index.js +4 -4
- package/admin/src/hooks/useFetchRole/reducer.js +1 -1
- package/admin/src/hooks/useModels/index.js +1 -1
- package/admin/src/hooks/useModels/reducer.js +3 -3
- package/admin/src/hooks/useRolesList/reducer.js +1 -1
- package/admin/src/hooks/useSettingsForm/index.js +2 -2
- package/admin/src/hooks/useSettingsForm/reducer.js +1 -1
- package/admin/src/hooks/useSettingsMenu/index.js +2 -2
- package/admin/src/hooks/useSettingsMenu/reducer.js +3 -3
- package/admin/src/hooks/useSettingsMenu/utils/formatLinks.js +3 -3
- package/admin/src/plugins.js +2 -2
- package/admin/src/public-path.js +1 -3
- package/admin/src/utils/ComponentApi.js +3 -3
- package/admin/src/utils/FieldApi.js +3 -3
- package/admin/src/utils/Plugin.js +1 -1
- package/admin/src/utils/Strapi.js +2 -2
- package/admin/src/utils/checkStore.js +1 -4
- package/admin/src/utils/getAttributesToDisplay.js +1 -1
- package/admin/src/utils/getExistingActions.js +2 -2
- package/admin/src/utils/getRequestUrl.js +1 -1
- package/admin/src/utils/injectReducer.js +26 -25
- package/admin/src/utils/injectSaga.js +28 -27
- package/admin/src/utils/reducerInjectors.js +1 -5
- package/admin/src/utils/retrieveGlobalLinks.js +1 -1
- package/admin/src/utils/retrievePluginsMenu.js +1 -1
- package/admin/src/utils/sagaInjectors.js +4 -7
- package/admin/src/utils/sortLinks.js +1 -1
- package/admin/src/validations/users/profile.js +1 -5
- package/admin/src/validations/users/roles.js +1 -4
- package/config/admin-conditions.js +3 -3
- package/config/migrations/permissions-fields-to-properties.js +4 -4
- package/controllers/admin.js +1 -1
- package/controllers/formatters/format-actions-by-sections.js +1 -1
- package/doc/customize-menu.md +3 -3
- package/domain/action/index.js +3 -3
- package/domain/condition/index.js +2 -2
- package/domain/permission/index.js +3 -3
- package/domain/user.js +2 -2
- package/index.js +16 -14
- package/middlewares/auth/index.js +1 -1
- package/package.json +4 -4
- package/services/action.js +1 -1
- package/services/condition.js +1 -1
- package/services/passport/local-strategy.js +2 -2
- package/services/passport.js +2 -4
- package/services/permission/engine.js +9 -9
- package/services/permission/queries.js +11 -12
- package/services/permission/sections-builder/utils.js +5 -5
- package/services/token.js +2 -2
- package/utils/index.js +1 -1
- package/validation/common-functions/check-fields-are-correctly-nested.js +3 -2
- package/validation/common-functions/check-fields-dont-have-duplicates.js +1 -1
- package/webpack.config.js +2 -2
|
@@ -43,11 +43,11 @@ const allowedOperations = [
|
|
|
43
43
|
];
|
|
44
44
|
const operations = pick(allowedOperations, sift);
|
|
45
45
|
|
|
46
|
-
const conditionsMatcher = conditions => {
|
|
46
|
+
const conditionsMatcher = (conditions) => {
|
|
47
47
|
return sift.createQueryTester(conditions, { operations });
|
|
48
48
|
};
|
|
49
49
|
|
|
50
|
-
module.exports = conditionProvider => {
|
|
50
|
+
module.exports = (conditionProvider) => {
|
|
51
51
|
const state = {
|
|
52
52
|
hooks: createEngineHooks(),
|
|
53
53
|
};
|
|
@@ -112,7 +112,7 @@ module.exports = conditionProvider => {
|
|
|
112
112
|
);
|
|
113
113
|
|
|
114
114
|
const permissionWithSanitizedProperties = invalidProperties.reduce(
|
|
115
|
-
property => permissionDomain.deleteProperty(property, permission),
|
|
115
|
+
(property) => permissionDomain.deleteProperty(property, permission),
|
|
116
116
|
permission
|
|
117
117
|
);
|
|
118
118
|
|
|
@@ -174,13 +174,13 @@ module.exports = conditionProvider => {
|
|
|
174
174
|
const resolveConditions = map(conditionProvider.get);
|
|
175
175
|
|
|
176
176
|
// 2. Filter conditions, only keep those whose handler is a function
|
|
177
|
-
const filterValidConditions = filter(condition => isFunction(condition.handler));
|
|
177
|
+
const filterValidConditions = filter((condition) => isFunction(condition.handler));
|
|
178
178
|
|
|
179
179
|
// 3. Evaluate the conditions handler and returns an object
|
|
180
180
|
// containing both the original condition and its result
|
|
181
|
-
const evaluateConditions = conditions => {
|
|
181
|
+
const evaluateConditions = (conditions) => {
|
|
182
182
|
return Promise.all(
|
|
183
|
-
conditions.map(async condition => ({
|
|
183
|
+
conditions.map(async (condition) => ({
|
|
184
184
|
condition,
|
|
185
185
|
result: await condition.handler(
|
|
186
186
|
user,
|
|
@@ -237,7 +237,7 @@ module.exports = conditionProvider => {
|
|
|
237
237
|
* @returns {function}
|
|
238
238
|
*/
|
|
239
239
|
createRegisterFunction(can, permission, user) {
|
|
240
|
-
const registerToCasl = caslPermission => {
|
|
240
|
+
const registerToCasl = (caslPermission) => {
|
|
241
241
|
const { action, subject, fields, condition } = caslPermission;
|
|
242
242
|
|
|
243
243
|
can(
|
|
@@ -248,7 +248,7 @@ module.exports = conditionProvider => {
|
|
|
248
248
|
);
|
|
249
249
|
};
|
|
250
250
|
|
|
251
|
-
const runWillRegisterHook = async caslPermission => {
|
|
251
|
+
const runWillRegisterHook = async (caslPermission) => {
|
|
252
252
|
const hookContext = createWillRegisterContext(caslPermission, {
|
|
253
253
|
permission,
|
|
254
254
|
user,
|
|
@@ -259,7 +259,7 @@ module.exports = conditionProvider => {
|
|
|
259
259
|
return caslPermission;
|
|
260
260
|
};
|
|
261
261
|
|
|
262
|
-
return async caslPermission => {
|
|
262
|
+
return async (caslPermission) => {
|
|
263
263
|
await runWillRegisterHook(caslPermission);
|
|
264
264
|
registerToCasl(caslPermission);
|
|
265
265
|
};
|
|
@@ -25,7 +25,7 @@ const permissionDomain = require('../../domain/permission/index');
|
|
|
25
25
|
* @param rolesIds ids of roles
|
|
26
26
|
* @returns {Promise<array>}
|
|
27
27
|
*/
|
|
28
|
-
const deleteByRolesIds = async rolesIds => {
|
|
28
|
+
const deleteByRolesIds = async (rolesIds) => {
|
|
29
29
|
const deletedPermissions = await strapi
|
|
30
30
|
.query('permission', 'admin')
|
|
31
31
|
.delete({ role_in: rolesIds });
|
|
@@ -38,7 +38,7 @@ const deleteByRolesIds = async rolesIds => {
|
|
|
38
38
|
* @param ids ids of permissions
|
|
39
39
|
* @returns {Promise<array>}
|
|
40
40
|
*/
|
|
41
|
-
const deleteByIds = async ids => {
|
|
41
|
+
const deleteByIds = async (ids) => {
|
|
42
42
|
const deletedPermissions = await strapi.query('permission', 'admin').delete({ id_in: ids });
|
|
43
43
|
|
|
44
44
|
return permissionDomain.toPermission(deletedPermissions);
|
|
@@ -49,7 +49,7 @@ const deleteByIds = async ids => {
|
|
|
49
49
|
* @param permissions
|
|
50
50
|
* @returns {Promise<*[]|*>}
|
|
51
51
|
*/
|
|
52
|
-
const createMany = async permissions => {
|
|
52
|
+
const createMany = async (permissions) => {
|
|
53
53
|
const createdPermissions = await strapi.query('permission', 'admin').createMany(permissions);
|
|
54
54
|
|
|
55
55
|
return permissionDomain.toPermission(createdPermissions);
|
|
@@ -91,7 +91,7 @@ const findUserPermissions = async ({ roles }) => {
|
|
|
91
91
|
return find({ role_in: roles.map(prop('id')), _limit: -1 });
|
|
92
92
|
};
|
|
93
93
|
|
|
94
|
-
const filterPermissionsToRemove = async permissions => {
|
|
94
|
+
const filterPermissionsToRemove = async (permissions) => {
|
|
95
95
|
const { actionProvider } = getService('permission');
|
|
96
96
|
|
|
97
97
|
const permissionsToRemove = [];
|
|
@@ -101,7 +101,7 @@ const filterPermissionsToRemove = async permissions => {
|
|
|
101
101
|
const { applyToProperties } = options;
|
|
102
102
|
|
|
103
103
|
const invalidProperties = await Promise.all(
|
|
104
|
-
(applyToProperties || []).map(async property => {
|
|
104
|
+
(applyToProperties || []).map(async (property) => {
|
|
105
105
|
const applies = await actionProvider.appliesToProperty(
|
|
106
106
|
property,
|
|
107
107
|
permission.action,
|
|
@@ -147,11 +147,10 @@ const cleanPermissionsInDatabase = async () => {
|
|
|
147
147
|
|
|
148
148
|
// 2. Clean permissions' fields (add required ones, remove the non-existing ones)
|
|
149
149
|
const remainingPermissions = permissions.filter(
|
|
150
|
-
permission => !permissionsIdToRemove.includes(permission.id)
|
|
151
|
-
);
|
|
152
|
-
const permissionsWithCleanFields = getService('content-type').cleanPermissionFields(
|
|
153
|
-
remainingPermissions
|
|
150
|
+
(permission) => !permissionsIdToRemove.includes(permission.id)
|
|
154
151
|
);
|
|
152
|
+
const permissionsWithCleanFields =
|
|
153
|
+
getService('content-type').cleanPermissionFields(remainingPermissions);
|
|
155
154
|
|
|
156
155
|
// Update only the ones that need to be updated
|
|
157
156
|
const permissionsNeedingToBeUpdated = differenceWith(
|
|
@@ -162,7 +161,7 @@ const cleanPermissionsInDatabase = async () => {
|
|
|
162
161
|
remainingPermissions
|
|
163
162
|
);
|
|
164
163
|
|
|
165
|
-
const updatePromiseProvider = permission => {
|
|
164
|
+
const updatePromiseProvider = (permission) => {
|
|
166
165
|
return update({ id: permission.id }, permission);
|
|
167
166
|
};
|
|
168
167
|
|
|
@@ -214,11 +213,11 @@ const ensureBoundPermissionsInDatabase = async () => {
|
|
|
214
213
|
if (missingActions.length > 0) {
|
|
215
214
|
const permissions = pipe(
|
|
216
215
|
// Create a permission skeleton from the action id
|
|
217
|
-
map(action => ({ action, subject: contentType.uid, role: editorRole.id })),
|
|
216
|
+
map((action) => ({ action, subject: contentType.uid, role: editorRole.id })),
|
|
218
217
|
// Use the permission domain to create a clean permission from the given object
|
|
219
218
|
map(permissionDomain.create),
|
|
220
219
|
// Adds the fields property if the permission action is eligible
|
|
221
|
-
map(permission =>
|
|
220
|
+
map((permission) =>
|
|
222
221
|
BOUND_ACTIONS_FOR_FIELDS.includes(permission.action)
|
|
223
222
|
? permissionDomain.setProperty('fields', fields, permission)
|
|
224
223
|
: permission
|
|
@@ -2,19 +2,19 @@
|
|
|
2
2
|
|
|
3
3
|
const { curry, matchesProperty, pick } = require('lodash/fp');
|
|
4
4
|
|
|
5
|
-
const isOfKind = kind => matchesProperty('kind', kind);
|
|
5
|
+
const isOfKind = (kind) => matchesProperty('kind', kind);
|
|
6
6
|
|
|
7
|
-
const resolveContentType = uid => strapi.contentTypes[uid];
|
|
7
|
+
const resolveContentType = (uid) => strapi.contentTypes[uid];
|
|
8
8
|
|
|
9
|
-
const isNotInSubjects = subjects => uid => !subjects.find(subject => subject.uid === uid);
|
|
9
|
+
const isNotInSubjects = (subjects) => (uid) => !subjects.find((subject) => subject.uid === uid);
|
|
10
10
|
|
|
11
11
|
const hasProperty = curry((property, subject) => {
|
|
12
|
-
return !!subject.properties.find(prop => prop.value === property);
|
|
12
|
+
return !!subject.properties.find((prop) => prop.value === property);
|
|
13
13
|
});
|
|
14
14
|
|
|
15
15
|
const getValidOptions = pick(['applyToProperties']);
|
|
16
16
|
|
|
17
|
-
const toSubjectTemplate = ct => ({ uid: ct.uid, label: ct.info.name, properties: [] });
|
|
17
|
+
const toSubjectTemplate = (ct) => ({ uid: ct.uid, label: ct.info.name, properties: [] });
|
|
18
18
|
|
|
19
19
|
module.exports = {
|
|
20
20
|
isOfKind,
|
package/services/token.js
CHANGED
|
@@ -27,7 +27,7 @@ const createToken = () => {
|
|
|
27
27
|
* Creates a JWT token for an administration user
|
|
28
28
|
* @param {object} user - admin user
|
|
29
29
|
*/
|
|
30
|
-
const createJwtToken = user => {
|
|
30
|
+
const createJwtToken = (user) => {
|
|
31
31
|
const { options, secret } = getTokenOptions();
|
|
32
32
|
|
|
33
33
|
return jwt.sign({ id: user.id }, secret, options);
|
|
@@ -38,7 +38,7 @@ const createJwtToken = user => {
|
|
|
38
38
|
* @param {string} token - a token to decode
|
|
39
39
|
* @return {Object} decodeInfo - the decoded info
|
|
40
40
|
*/
|
|
41
|
-
const decodeJwtToken = token => {
|
|
41
|
+
const decodeJwtToken = (token) => {
|
|
42
42
|
const { secret } = getTokenOptions();
|
|
43
43
|
|
|
44
44
|
try {
|
package/utils/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
const _ = require('lodash');
|
|
4
4
|
|
|
5
|
-
const checkFieldsAreCorrectlyNested = fields => {
|
|
5
|
+
const checkFieldsAreCorrectlyNested = (fields) => {
|
|
6
6
|
if (_.isNil(fields)) {
|
|
7
7
|
// Only check if the fields exist
|
|
8
8
|
return true;
|
|
@@ -15,7 +15,8 @@ const checkFieldsAreCorrectlyNested = fields => {
|
|
|
15
15
|
failed = fields
|
|
16
16
|
.slice(indexA + 1)
|
|
17
17
|
.some(
|
|
18
|
-
fieldB =>
|
|
18
|
+
(fieldB) =>
|
|
19
|
+
fieldB.startsWith(`${fields[indexA]}.`) || fields[indexA].startsWith(`${fieldB}.`)
|
|
19
20
|
);
|
|
20
21
|
if (failed) break;
|
|
21
22
|
}
|
package/webpack.config.js
CHANGED
|
@@ -11,7 +11,7 @@ const DuplicatePckgChecker = require('duplicate-package-checker-webpack-plugin')
|
|
|
11
11
|
const TerserPlugin = require('terser-webpack-plugin');
|
|
12
12
|
const WebpackBar = require('webpackbar');
|
|
13
13
|
const isWsl = require('is-wsl');
|
|
14
|
-
const alias = require('./webpack.alias
|
|
14
|
+
const alias = require('./webpack.alias');
|
|
15
15
|
|
|
16
16
|
// TODO: parametrize
|
|
17
17
|
const URLs = {
|
|
@@ -191,7 +191,7 @@ module.exports = ({
|
|
|
191
191
|
PROJECT_TYPE: JSON.stringify(useEE ? 'Enterprise' : 'Community'),
|
|
192
192
|
ENABLED_EE_FEATURES: JSON.stringify(options.features),
|
|
193
193
|
}),
|
|
194
|
-
new webpack.NormalModuleReplacementPlugin(/ee_else_ce(\.*)/, function(resource) {
|
|
194
|
+
new webpack.NormalModuleReplacementPlugin(/ee_else_ce(\.*)/, function (resource) {
|
|
195
195
|
let wantedPath = path.join(
|
|
196
196
|
resource.context.substr(0, resource.context.lastIndexOf(`${path.sep}src${path.sep}`)),
|
|
197
197
|
'src'
|