Refetch roles after delete

packages/strapi-bookshelf/package.json

@@ -55,4 +55,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-ejs/package.json

@@ -46,4 +46,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-api/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-controller/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-model/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-new/package.json

@@ -48,4 +48,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-plugin/package.json

@@ -44,4 +44,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-policy/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-generate-service/package.json

@@ -43,4 +43,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-plugin-content-manager/package.json

@@ -47,4 +47,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-plugin-email/package.json

@@ -49,4 +49,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-plugin-settings-manager/package.json

@@ -48,4 +48,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}

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;

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());

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,

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:

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));

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' }] }]);
     }

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"
-}
+}