diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json index dc107668b0..590c648289 100755 --- a/packages/strapi-bookshelf/package.json +++ b/packages/strapi-bookshelf/package.json @@ -55,4 +55,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json index 8221d0f30d..bcc43f517e 100755 --- a/packages/strapi-ejs/package.json +++ b/packages/strapi-ejs/package.json @@ -46,4 +46,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index 0bbaa2a21f..a4b2a99851 100755 --- a/packages/strapi-generate-api/package.json +++ b/packages/strapi-generate-api/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index 6f38e7de43..1ec0a1c872 100755 --- a/packages/strapi-generate-controller/package.json +++ b/packages/strapi-generate-controller/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index 5c098933e9..65cd21fb4c 100755 --- a/packages/strapi-generate-model/package.json +++ b/packages/strapi-generate-model/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index b84b986c04..261f76f1be 100755 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -48,4 +48,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index 0588cc1024..21250bd6ca 100755 --- a/packages/strapi-generate-plugin/package.json +++ b/packages/strapi-generate-plugin/package.json @@ -44,4 +44,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index 33fa26b59f..810bcfd27f 100755 --- a/packages/strapi-generate-policy/package.json +++ b/packages/strapi-generate-policy/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index 005be9e8cd..f65a53c7d3 100755 --- a/packages/strapi-generate-service/package.json +++ b/packages/strapi-generate-service/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index 242c3e61d7..03b141eb78 100755 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -47,4 +47,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index 4cbdac0053..9e13dcac21 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -49,4 +49,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json index bd50a4be09..cbd06820c3 100755 --- a/packages/strapi-plugin-settings-manager/package.json +++ b/packages/strapi-plugin-settings-manager/package.json @@ -48,4 +48,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js index 04cb1409c7..6b856e3745 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js @@ -40,11 +40,11 @@ class ListRow extends React.Component { // eslint-disable-line react/prefer-stat switch (this.props.settingType) { case 'roles': - if (includes(this.protectedRoleIDs, get(this.props.item, 'type').toString())) { + if (includes(this.protectedRoleIDs, get(this.props.item, 'type', ''))) { icons = []; } - if (includes(this.undeletableIDs, get(this.props.item, 'type').toString())) { + if (includes(this.undeletableIDs, get(this.props.item, 'type', ''))) { icons = [{ icoType: 'pencil', onClick: this.handleClick }]; } @@ -129,7 +129,7 @@ class ListRow extends React.Component { // eslint-disable-line react/prefer-stat handleClick = () => { switch (this.props.settingType) { case 'roles': { - if (!includes(this.protectedRoleIDs, get(this.props.item, 'type').toString())) { + if (!includes(this.protectedRoleIDs, get(this.props.item, 'type', ''))) { return router.push(`${router.location.pathname}/edit/${this.props.item.id}`); } return; diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/saga.js b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/saga.js index 4fb5774655..ebc4939ef9 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/saga.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/saga.js @@ -99,7 +99,7 @@ export function* submit() { }; const requestURL = actionType === 'POST' ? '/users-permissions/roles' : `/users-permissions/roles/${roleId}`; - const response = yield call(request, requestURL, opts, true); + const response = yield call(request, requestURL, opts); if (response.ok) { yield put(submitSucceeded()); diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/index.js index 10ee81114f..260037f17e 100755 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/index.js @@ -57,6 +57,10 @@ export class HomePage extends React.Component { if (shouldRedirect) { this.props.history.push('/404'); } + + if (nextProps.didDeleteData !== this.props.didDeleteData) { + this.props.fetchData(nextProps.match.params.settingType); + } } componentDidUpdate(prevProps) { @@ -161,6 +165,7 @@ HomePage.defaultProps = {}; HomePage.propTypes = { data: PropTypes.array.isRequired, deleteData: PropTypes.func.isRequired, + didDeleteData: PropTypes.bool.isRequired, fetchData: PropTypes.func.isRequired, history: PropTypes.object.isRequired, location: PropTypes.object.isRequired, diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/reducer.js b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/reducer.js index 5382c8e40c..cac91381c5 100755 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/reducer.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/reducer.js @@ -21,6 +21,7 @@ const initialState = fromJS({ initialData: Map({}), modifiedData: Map({}), showButtons: false, + didDeleteData: false, }); function homePageReducer(state = initialState, action) { @@ -33,7 +34,8 @@ function homePageReducer(state = initialState, action) { return state .update('data', list => list.splice(action.indexDataToDelete, 1)) .set('deleteEndPoint', '') - .set('dataToDelete', Map({})); + .set('dataToDelete', Map({})) + .update('didDeleteData', (v) => !v); case FETCH_DATA_SUCCEEDED: return state.set('data', List(action.data)); case ON_CHANGE: diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/saga.js b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/saga.js index cd109009e8..5876b28e6e 100755 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/saga.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/HomePage/saga.js @@ -34,7 +34,7 @@ export function* dataDelete() { if (indexDataToDelete !== -1) { const id = dataToDelete.id; const requestURL = `/users-permissions/${endPointAPI}/${id}`; - const response = yield call(request, requestURL, { method: 'DELETE' }, true); + const response = yield call(request, requestURL, { method: 'DELETE' }); if (response.ok) { yield put(deleteDataSucceeded(indexDataToDelete)); diff --git a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js index 5979966bea..015ad07b29 100644 --- a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js +++ b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js @@ -20,14 +20,10 @@ module.exports = { return ctx.badRequest(null, [{ messages: [{ id: 'Cannot be empty' }] }]); } - strapi.reload.isWatching = false; - try { await strapi.plugins['users-permissions'].services.userspermissions.createRole(ctx.request.body); ctx.send({ ok: true }); - - strapi.reload(); } catch(err) { ctx.badRequest(null, [{ messages: [{ id: 'An error occured' }] }]); } diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index 31e5b9a735..09a921ee1a 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-users-permissions", - "version": "3.0.0-alpha.8", + "version": "3.0.0-alpha.8.3", "description": "Protect your API with a full-authentication process based on JWT", "strapi": { "name": "Auth & Permissions", @@ -55,4 +55,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} +} \ No newline at end of file