Move 'parseError' to request lib

diff --git a/server/sonar-web/src/main/js/apps/code/components/App.tsx b/server/sonar-web/src/main/js/apps/code/components/App.tsx
index a7a7432e3cd8a840e0981b917f7018b685f6a63a..77110f20481db91707be847e5ee33f5c5d426a5d 100644 (file)
--- a/server/sonar-web/src/main/js/apps/code/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/App.tsx
@@ -26,12 +26,8 @@ import { Component as CodeComponent } from '../types';
 import SourceViewer from './../../../components/SourceViewer/SourceViewer';
 import Search from './Search';
 import ListFooter from '../../../components/controls/ListFooter';
-import {
-  retrieveComponentChildren,
-  retrieveComponent,
-  loadMoreChildren,
-  parseError
-} from '../utils';
+import { retrieveComponentChildren, retrieveComponent, loadMoreChildren } from '../utils';
+import { parseError } from '../../../helpers/request';
 import { addComponent, addComponentBreadcrumbs, clearBucket } from '../bucket';
 import { getBranchName } from '../../../helpers/branches';
 import { translate } from '../../../helpers/l10n';

diff --git a/server/sonar-web/src/main/js/apps/code/components/Search.tsx b/server/sonar-web/src/main/js/apps/code/components/Search.tsx
index 3e666e19317d9c0a86cdca2c49eb375ae823580e..14539241c9aa6d9fcb53af37ace72f836dd139b0 100644 (file)
--- a/server/sonar-web/src/main/js/apps/code/components/Search.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/Search.tsx
@@ -22,7 +22,7 @@ import * as PropTypes from 'prop-types';
 import * as classNames from 'classnames';
 import Components from './Components';
 import { getTree } from '../../../api/components';
-import { parseError } from '../utils';
+import { parseError } from '../../../helpers/request';
 import { getProjectUrl } from '../../../helpers/urls';
 import { Component } from '../types';
 import SearchBox from '../../../components/controls/SearchBox';

diff --git a/server/sonar-web/src/main/js/apps/code/utils.ts b/server/sonar-web/src/main/js/apps/code/utils.ts
index 9e8c7c3ceb659feea501d1f372d33f687bb05885..8b705b6c3392fcd5fa90ebbd15685a82e30b9224 100644 (file)
--- a/server/sonar-web/src/main/js/apps/code/utils.ts
+++ b/server/sonar-web/src/main/js/apps/code/utils.ts
@@ -28,7 +28,6 @@ import {
 } from './bucket';
 import { Breadcrumb, Component } from './types';
 import { getChildren, getComponent, getBreadcrumbs } from '../../api/components';
-import { translate } from '../../helpers/l10n';
 
 const METRICS = [
   'ncloc',
@@ -236,17 +235,3 @@ export function loadMoreChildren(
       return r;
     });
 }
-
-/** Parse response of failed request */
-export function parseError(error: { response: Response }): Promise<string> {
-  const DEFAULT_MESSAGE = translate('default_error_message');
-
-  try {
-    return error.response
-      .json()
-      .then(r => r.errors.map((error: any) => error.msg).join('. '))
-      .catch(() => DEFAULT_MESSAGE);
-  } catch (ex) {
-    return Promise.resolve(DEFAULT_MESSAGE);
-  }
-}

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 70e80add9951385cd2d8712aecfb39d79b7fa989..11869ffcf47fdb9add0ce0a1370020052383284f 100644 (file)
--- 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,7 +19,7 @@
  */
 import FormView from './FormView';
 import { createPermissionTemplate } from '../../../api/permissions';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 
 export default FormView.extend({
   sendRequest() {

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 4304ab0b0eea91eb3d165719a7de5d2a52506eec..152d6eaff2ebb493d7eec0a7287f9dbd053bf2da 100644 (file)
--- 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,7 +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';
+import { parseError } from '../../../helpers/request';
 
 export default ModalForm.extend({
   template: Template,

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 886cd53934b36c3d6e2bd9f4ec0dcb33e4855414..20621cf4bb4c12435958766a144c2b908dc62fcf 100644 (file)
--- 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,7 +19,7 @@
  */
 import FormView from './FormView';
 import { updatePermissionTemplate } from '../../../api/permissions';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 
 export default FormView.extend({
   sendRequest() {

diff --git a/server/sonar-web/src/main/js/apps/permissions/global/store/actions.js b/server/sonar-web/src/main/js/apps/permissions/global/store/actions.js
index 82dfc9e1b67c59b61c560491000dacd97f5d5151..c25f252a9c2c799858a8748831e552e63f6ac7a8 100644 (file)
--- a/server/sonar-web/src/main/js/apps/permissions/global/store/actions.js
+++ b/server/sonar-web/src/main/js/apps/permissions/global/store/actions.js
@@ -19,7 +19,7 @@
  */
 // @flow
 import * as api from '../../../../api/permissions';
-import { parseError } from '../../../code/utils';
+import { parseError } from '../../../../helpers/request';
 import {
   raiseError,
   REQUEST_HOLDERS,

diff --git a/server/sonar-web/src/main/js/apps/project-admin/key/BulkUpdate.js b/server/sonar-web/src/main/js/apps/project-admin/key/BulkUpdate.js
index 93996b99b1236b19ce23c29741bf03c9694aee1b..ff7c49e772a2c1f719386389dc3a896f4ac1ed28 100644 (file)
--- a/server/sonar-web/src/main/js/apps/project-admin/key/BulkUpdate.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/key/BulkUpdate.js
@@ -24,7 +24,7 @@ import BulkUpdateForm from './BulkUpdateForm';
 import BulkUpdateResults from './BulkUpdateResults';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
 import { bulkChangeKey } from '../../../api/components';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 import {
   addGlobalErrorMessage,
   addGlobalSuccessMessage,

diff --git a/server/sonar-web/src/main/js/apps/project-admin/key/Key.js b/server/sonar-web/src/main/js/apps/project-admin/key/Key.js
index 18aa4ef3fc7b68efe0de00ac76488a5a7bef496f..e94839f6b2eba6d4a725b9f5bac877a3c4b9ab0f 100644 (file)
--- a/server/sonar-web/src/main/js/apps/project-admin/key/Key.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/key/Key.js
@@ -32,7 +32,7 @@ import {
   closeAllGlobalMessages,
   addGlobalSuccessMessage
 } from '../../../store/globalMessages/duck';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 import { reloadUpdateKeyPage } from './utils';
 import RecentHistory from '../../../app/components/RecentHistory';
 import { getProjectAdminProjectModules } from '../../../store/rootReducer';

diff --git a/server/sonar-web/src/main/js/apps/project-admin/links/views/CreationModal.js b/server/sonar-web/src/main/js/apps/project-admin/links/views/CreationModal.js
index c0ed8620108dc41c0afb282663fa8e38fabc3590..764bfded48b304a1823aafbb95073202a178903f 100644 (file)
--- a/server/sonar-web/src/main/js/apps/project-admin/links/views/CreationModal.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/links/views/CreationModal.js
@@ -19,7 +19,7 @@
  */
 import ModalForm from '../../../../components/common/modal-form';
 import Template from './CreationModalTemplate.hbs';
-import { parseError } from '../../../code/utils';
+import { parseError } from '../../../../helpers/request';
 
 export default ModalForm.extend({
   template: Template,

diff --git a/server/sonar-web/src/main/js/apps/project-admin/links/views/DeletionModal.js b/server/sonar-web/src/main/js/apps/project-admin/links/views/DeletionModal.js
index 232857084c54a9288d5603a3586cd6018d9789bd..e04175c4f1b254c06bf610f0dc98cd2ebc649900 100644 (file)
--- a/server/sonar-web/src/main/js/apps/project-admin/links/views/DeletionModal.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/links/views/DeletionModal.js
@@ -20,7 +20,7 @@
 import ModalForm from '../../../../components/common/modal-form';
 import Template from './DeletionModalTemplate.hbs';
 import { deleteLink } from '../../../../api/projectLinks';
-import { parseError } from '../../../code/utils';
+import { parseError } from '../../../../helpers/request';
 
 export default ModalForm.extend({
   template: Template,

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/views/copy-view.js b/server/sonar-web/src/main/js/apps/quality-gates/views/copy-view.js
index 56e431a1d1c18c8e23aee001c8b90dc0e8e7eb26..a9b6da0d2f20b92b31cec4b86fbcd3da2c96be8a 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/views/copy-view.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/views/copy-view.js
@@ -20,7 +20,7 @@
 import ModalForm from '../../../components/common/modal-form';
 import Template from '../templates/quality-gate-form.hbs';
 import { copyQualityGate } from '../../../api/quality-gates';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 
 export default ModalForm.extend({
   template: Template,

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/views/create-view.js b/server/sonar-web/src/main/js/apps/quality-gates/views/create-view.js
index 52857783c484986b438a0db7dfa01c0dc1df263d..3580b45fcf6b5b6f51597e4ac784c42cbbc378b8 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/views/create-view.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/views/create-view.js
@@ -20,7 +20,7 @@
 import ModalForm from '../../../components/common/modal-form';
 import Template from '../templates/quality-gate-form.hbs';
 import { createQualityGate } from '../../../api/quality-gates';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 
 export default ModalForm.extend({
   template: Template,

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/views/delete-view.js b/server/sonar-web/src/main/js/apps/quality-gates/views/delete-view.js
index 3596864451891965a811327b99cf75a13d46ebb8..3327a6d3a10a7dcc1946d6d64b3830fad4fe6ebe 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/views/delete-view.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/views/delete-view.js
@@ -20,7 +20,7 @@
 import ModalForm from '../../../components/common/modal-form';
 import Template from '../templates/quality-gates-delete.hbs';
 import { deleteQualityGate } from '../../../api/quality-gates';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 
 export default ModalForm.extend({
   template: Template,

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/views/gate-conditions-delete-view.js b/server/sonar-web/src/main/js/apps/quality-gates/views/gate-conditions-delete-view.js
index 6ab820440876b4b172872b015ccdf8d1a608562f..f9f01acf28552e5bd1d3fb96d429904eca9009f7 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/views/gate-conditions-delete-view.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/views/gate-conditions-delete-view.js
@@ -21,7 +21,7 @@ import ModalForm from '../../../components/common/modal-form';
 import Template from '../templates/quality-gates-condition-delete.hbs';
 import { deleteCondition } from '../../../api/quality-gates';
 import { getLocalizedMetricName } from '../../../helpers/l10n';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 
 export default ModalForm.extend({
   template: Template,

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/views/rename-view.js b/server/sonar-web/src/main/js/apps/quality-gates/views/rename-view.js
index acc5f71c4d3e6c4682ade9f002ff22406f03fffd..2614ea6af67a82cc7b2af94a9d9c595909a844fb 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/views/rename-view.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/views/rename-view.js
@@ -20,7 +20,7 @@
 import ModalForm from '../../../components/common/modal-form';
 import Template from '../templates/quality-gate-form.hbs';
 import { renameQualityGate } from '../../../api/quality-gates';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 
 export default ModalForm.extend({
   template: Template,

diff --git a/server/sonar-web/src/main/js/apps/settings/components/EmailForm.js b/server/sonar-web/src/main/js/apps/settings/components/EmailForm.js
index f8b2329d4aff64e71e4d8739505651a53bac264a..7c2b8ff34e06c1ce1b25bfc37f46fbe429ac9a3e 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/EmailForm.js
+++ b/server/sonar-web/src/main/js/apps/settings/components/EmailForm.js
@@ -21,7 +21,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { translate, translateWithParameters } from '../../../helpers/l10n';
 import { sendTestEmail } from '../../../api/settings';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 import { getCurrentUser } from '../../../store/rootReducer';
 
 class EmailForm extends React.PureComponent {

diff --git a/server/sonar-web/src/main/js/apps/settings/store/actions.js b/server/sonar-web/src/main/js/apps/settings/store/actions.js
index 1e61966af34f021528c7dfb1689e9e98822bf6e0..6b8a6d9cdc00c1cd58886b4b468baa68bbeb940d 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/store/actions.js
+++ b/server/sonar-web/src/main/js/apps/settings/store/actions.js
@@ -26,7 +26,7 @@ import {
 import { receiveValues } from './values/actions';
 import { receiveDefinitions } from './definitions/actions';
 import { startLoading, stopLoading } from './settingsPage/loading/actions';
-import { parseError } from '../../code/utils';
+import { parseError } from '../../../helpers/request';
 import { addGlobalErrorMessage, closeAllGlobalMessages } from '../../../store/globalMessages/duck';
 import { passValidation, failValidation } from './settingsPage/validationMessages/actions';
 import { cancelChange } from './settingsPage/changedValues/actions';

diff --git a/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js b/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
index 3c9ee71d9343b59689bd549e06b63e66b7849530..0afb176767a1240ec77372ce43989b658a7092e5 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
+++ b/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as api from '../../../../api/settings';
-import { parseError } from '../../../code/utils';
+import { parseError } from '../../../../helpers/request';
 import {
   addGlobalErrorMessage,
   closeAllGlobalMessages

diff --git a/server/sonar-web/src/main/js/components/controls/FavoriteContainer.ts b/server/sonar-web/src/main/js/components/controls/FavoriteContainer.ts
index 087ace39dbb091cbf83ac7f9dbdc83cc79a0bf68..59f6e07fef4a73db37c2f608849e8a3d4b6a5dea 100644 (file)
--- a/server/sonar-web/src/main/js/components/controls/FavoriteContainer.ts
+++ b/server/sonar-web/src/main/js/components/controls/FavoriteContainer.ts
@@ -23,7 +23,7 @@ import { isFavorite } from '../../store/rootReducer';
 import * as actionCreators from '../../store/favorites/duck';
 import * as api from '../../api/favorites';
 import { addGlobalErrorMessage } from '../../store/globalMessages/duck';
-import { parseError } from '../../apps/code/utils';
+import { parseError } from '../../helpers/request';
 
 const addFavorite = (componentKey: string) => (dispatch: Function) => {
   // optimistic update

diff --git a/server/sonar-web/src/main/js/helpers/request.ts b/server/sonar-web/src/main/js/helpers/request.ts
index 6e955baeeac4ea008f41e0e34c279cf1ea67bbfc..3aa3a90248c1705eef2ab410f5e800b22af38ee7 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/request.ts
+++ b/server/sonar-web/src/main/js/helpers/request.ts
@@ -20,6 +20,7 @@
 import { stringify } from 'querystring';
 import { omitBy, isNil } from 'lodash';
 import { getCookie } from './cookies';
+import { translate } from './l10n';
 
 export function getCSRFTokenName(): string {
   return 'X-XSRF-TOKEN';
@@ -166,6 +167,22 @@ export function parseJSON(response: Response): Promise<any> {
   return response.json();
 }
 
+/** 
+ * Parse response of failed request
+ */
+export function parseError(error: { response: Response }): Promise<string> {
+  const DEFAULT_MESSAGE = translate('default_error_message');
+
+  try {
+    return error.response
+      .json()
+      .then(r => r.errors.map((error: any) => error.msg).join('. '))
+      .catch(() => DEFAULT_MESSAGE);
+  } catch (ex) {
+    return Promise.resolve(DEFAULT_MESSAGE);
+  }
+}
+
 /**
  * Shortcut to do a GET request and return response json
  */

diff --git a/server/sonar-web/src/main/js/store/rootActions.js b/server/sonar-web/src/main/js/store/rootActions.js
index 3f41686b56762c62cc5184ab30e408ff6cd8220f..3775e1d039155cd03bb13d5f7aba78a7f552f123 100644 (file)
--- a/server/sonar-web/src/main/js/store/rootActions.js
+++ b/server/sonar-web/src/main/js/store/rootActions.js
@@ -25,7 +25,7 @@ import { getAllMetrics } from '../api/metrics';
 import { receiveLanguages } from './languages/actions';
 import { receiveMetrics } from './metrics/actions';
 import { addGlobalErrorMessage } from './globalMessages/duck';
-import { parseError } from '../apps/code/utils';
+import { parseError } from '../helpers/request';
 import { setAppState } from './appState/duck';
 import { receiveOrganizations } from './organizations/duck';