remove explicit _ and $ dependecies (#1487)

6 files changed, 54 insertions, 63 deletions

diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.js b/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.js
index d4d5b55c456..88c034de322 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.js
@@ -57,7 +57,7 @@ export default class ActionsCell extends React.Component {
     new DeleteView({
       model: new Backbone.Model(this.props.permissionTemplate)
     }).on('done', () => {
-      this.context.router.replace('/');
+      this.context.router.replace('/permission_templates');
       this.props.refresh();
     }).render();
   }
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Header.js b/server/sonar-web/src/main/js/apps/permission-templates/components/Header.js
index 578e42822c8..b0f66504edd 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/Header.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Header.js
@@ -39,16 +39,14 @@ export default class Header extends React.Component {
   handleCreateClick (e) {
     e.preventDefault();
 
-    new CreateView()
-        .on('done', r => {
-          this.props.refresh().then(() => {
-            this.context.router.push({
-              pathname: '/',
-              query: { id: r.permissionTemplate.id }
-            });
-          });
-        })
-        .render();
+    new CreateView().on('done', r => {
+      this.props.refresh().then(() => {
+        this.context.router.push({
+          pathname: '/permission_templates',
+          query: { id: r.permissionTemplate.id }
+        });
+      });
+    }).render();
   }
 
   render () {
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/views/CreateView.js b/server/sonar-web/src/main/js/apps/permission-templates/views/CreateView.js
index 07026ad82a9..c444d48705d 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/views/CreateView.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/views/CreateView.js
@@ -19,27 +19,24 @@
  */
 import FormView from './FormView';
 import { createPermissionTemplate } from '../../../api/permissions';
+import { parseError } from '../../code/utils';
 
 export default FormView.extend({
   sendRequest () {
-    const that = this;
     this.disableForm();
-    return createPermissionTemplate({
-      data: {
-        name: this.$('#permission-template-name').val(),
-        description: this.$('#permission-template-description').val(),
-        projectKeyPattern: this.$('#permission-template-project-key-pattern').val()
-      },
-      statusCode: {
-        // do not show global error
-        400: null
-      }
-    }).done(r => {
-      that.trigger('done', r);
-      that.destroy();
-    }).fail(jqXHR => {
-      that.enableForm();
-      that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings);
-    });
+    createPermissionTemplate({
+      name: this.$('#permission-template-name').val(),
+      description: this.$('#permission-template-description').val(),
+      projectKeyPattern: this.$('#permission-template-project-key-pattern').val()
+    }).then(
+        r => {
+          this.trigger('done', r);
+          this.destroy();
+        },
+        e => {
+          this.enableForm();
+          parseError(e).then(message => this.showSingleError(message));
+        }
+    );
   }
 });
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/views/DeleteView.js b/server/sonar-web/src/main/js/apps/permission-templates/views/DeleteView.js
index a07024adc8c..af38e325b36 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/views/DeleteView.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/views/DeleteView.js
@@ -20,6 +20,7 @@
 import ModalForm from '../../../components/common/modal-form';
 import { deletePermissionTemplate } from '../../../api/permissions';
 import Template from '../templates/permission-templates-delete.hbs';
+import { parseError } from '../../code/utils';
 
 export default ModalForm.extend({
   template: Template,
@@ -30,17 +31,15 @@ export default ModalForm.extend({
   },
 
   sendRequest () {
-    return deletePermissionTemplate({
-      data: { templateId: this.model.id },
-      statusCode: {
-        // do not show global error
-        400: null
-      }
-    }).done(() => {
-      this.trigger('done');
-      this.destroy();
-    }).fail(jqXHR => {
-      this.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings);
-    });
+    deletePermissionTemplate({ templateId: this.model.id }).then(
+        () => {
+          this.trigger('done');
+          this.destroy();
+        },
+        e => {
+          this.enableForm();
+          parseError(e).then(message => this.showSingleError(message));
+        }
+    );
   }
 });
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/views/GroupsView.js b/server/sonar-web/src/main/js/apps/permission-templates/views/GroupsView.js
index 56ad56e4a41..721454373b6 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/views/GroupsView.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/views/GroupsView.js
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import _ from 'underscore';
 import Modal from '../../../components/common/modals';
 import Template from '../templates/permission-templates-groups.hbs';
 import '../../../components/SelectList';
@@ -65,9 +64,10 @@ export default Modal.extend({
   },
 
   serializeData () {
-    return _.extend(Modal.prototype.serializeData.apply(this, arguments), {
+    return {
+      ...Modal.prototype.serializeData.apply(this, arguments),
       permissionName: this.options.permission.name,
       permissionTemplateName: this.options.permissionTemplate.name
-    });
+    };
   }
 });
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/views/UpdateView.js b/server/sonar-web/src/main/js/apps/permission-templates/views/UpdateView.js
index 7105d2eafaa..347981ed599 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/views/UpdateView.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/views/UpdateView.js
@@ -19,28 +19,25 @@
  */
 import FormView from './FormView';
 import { updatePermissionTemplate } from '../../../api/permissions';
+import { parseError } from '../../code/utils';
 
 export default FormView.extend({
   sendRequest () {
-    const that = this;
     this.disableForm();
-    return updatePermissionTemplate({
-      data: {
-        id: this.model.id,
-        name: this.$('#permission-template-name').val(),
-        description: this.$('#permission-template-description').val(),
-        projectKeyPattern: this.$('#permission-template-project-key-pattern').val()
-      },
-      statusCode: {
-        // do not show global error
-        400: null
-      }
-    }).done(() => {
-      that.options.refresh();
-      that.destroy();
-    }).fail(jqXHR => {
-      that.enableForm();
-      that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings);
-    });
+    updatePermissionTemplate({
+      id: this.model.id,
+      name: this.$('#permission-template-name').val(),
+      description: this.$('#permission-template-description').val(),
+      projectKeyPattern: this.$('#permission-template-project-key-pattern').val()
+    }).then(
+        () => {
+          this.options.refresh();
+          this.destroy();
+        },
+        e => {
+          this.enableForm();
+          parseError(e).then(message => this.showSingleError(message));
+        }
+    );
   }
 });