Merge branch 'ide-more-error-improvements' into 'master'

Improve error messaging across various IDE actions

See merge request gitlab-org/gitlab-ce!20241

6 files changed, 74 insertions, 86 deletions

diff --git a/app/assets/javascripts/ide/components/error_message.vue b/app/assets/javascripts/ide/components/error_message.vue
index e7408264c80..acbc98b7a7b 100644
--- a/app/assets/javascripts/ide/components/error_message.vue
+++ b/app/assets/javascripts/ide/components/error_message.vue
@@ -24,8 +24,8 @@ export default {
 
       this.isLoading = true;
 
-      this.$store
-        .dispatch(this.message.action, this.message.actionPayload)
+      this.message
+        .action(this.message.actionPayload)
         .then(() => {
           this.isLoading = false;
         })
diff --git a/app/assets/javascripts/ide/services/index.js b/app/assets/javascripts/ide/services/index.js
index 5e642067141..3e939f0c1a3 100644
--- a/app/assets/javascripts/ide/services/index.js
+++ b/app/assets/javascripts/ide/services/index.js
@@ -1,16 +1,11 @@
-import Vue from 'vue';
-import VueResource from 'vue-resource';
 import axios from '~/lib/utils/axios_utils';
 import Api from '~/api';
 
-Vue.use(VueResource);
-
 export default {
-  getTreeData(endpoint) {
-    return Vue.http.get(endpoint, { params: { format: 'json' } });
-  },
   getFileData(endpoint) {
-    return Vue.http.get(endpoint, { params: { format: 'json', viewer: 'none' } });
+    return axios.get(endpoint, {
+      params: { format: 'json', viewer: 'none' },
+    });
   },
   getRawFileData(file) {
     if (file.tempFile) {
@@ -21,7 +16,11 @@ export default {
       return Promise.resolve(file.raw);
     }
 
-    return Vue.http.get(file.rawPath, { params: { format: 'json' } }).then(res => res.text());
+    return axios
+      .get(file.rawPath, {
+        params: { format: 'json' },
+      })
+      .then(({ data }) => data);
   },
   getBaseRawFileData(file, sha) {
     if (file.tempFile) {
@@ -32,11 +31,11 @@ export default {
       return Promise.resolve(file.baseRaw);
     }
 
-    return Vue.http
+    return axios
       .get(file.rawPath.replace(`/raw/${file.branchId}/${file.path}`, `/raw/${sha}/${file.path}`), {
         params: { format: 'json' },
       })
-      .then(res => res.text());
+      .then(({ data }) => data);
   },
   getProjectData(namespace, project) {
     return Api.project(`${namespace}/${project}`);
@@ -53,21 +52,9 @@ export default {
   getBranchData(projectId, currentBranchId) {
     return Api.branchSingle(projectId, currentBranchId);
   },
-  createBranch(projectId, payload) {
-    const url = Api.buildUrl(Api.createBranchPath).replace(':id', projectId);
-
-    return Vue.http.post(url, payload);
-  },
   commit(projectId, payload) {
     return Api.commitMultiple(projectId, payload);
   },
-  getTreeLastCommit(endpoint) {
-    return Vue.http.get(endpoint, {
-      params: {
-        format: 'json',
-      },
-    });
-  },
   getFiles(projectUrl, branchId) {
     const url = `${projectUrl}/files/${branchId}`;
     return axios.get(url, { params: { format: 'json' } });
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index 29995a29d1a..6c0887e11ee 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -1,5 +1,5 @@
-import { normalizeHeaders } from '~/lib/utils/common_utils';
-import flash from '~/flash';
+import { __ } from '../../../locale';
+import { normalizeHeaders } from '../../../lib/utils/common_utils';
 import eventHub from '../../eventhub';
 import service from '../../services';
 import * as types from '../mutation_types';
@@ -66,13 +66,10 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive
     .getFileData(
       `${gon.relative_url_root ? gon.relative_url_root : ''}${file.url.replace('/-/', '/')}`,
     )
-    .then(res => {
-      const pageTitle = decodeURI(normalizeHeaders(res.headers)['PAGE-TITLE']);
-      setPageTitle(pageTitle);
+    .then(({ data, headers }) => {
+      const normalizedHeaders = normalizeHeaders(headers);
+      setPageTitle(decodeURI(normalizedHeaders['PAGE-TITLE']));
 
-      return res.json();
-    })
-    .then(data => {
       commit(types.SET_FILE_DATA, { data, file });
       commit(types.TOGGLE_FILE_OPEN, path);
       if (makeFileActive) dispatch('setFileActive', path);
@@ -80,7 +77,13 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive
     })
     .catch(() => {
       commit(types.TOGGLE_LOADING, { entry: file });
-      flash('Error loading file data. Please try again.', 'alert', document, null, false, true);
+      dispatch('setErrorMessage', {
+        text: __('An error occured whilst loading the file.'),
+        action: payload =>
+          dispatch('getFileData', payload).then(() => dispatch('setErrorMessage', null)),
+        actionText: __('Please try again'),
+        actionPayload: { path, makeFileActive },
+      });
     });
 };
 
@@ -88,7 +91,7 @@ export const setFileMrChange = ({ commit }, { file, mrChange }) => {
   commit(types.SET_FILE_MERGE_REQUEST_CHANGE, { file, mrChange });
 };
 
-export const getRawFileData = ({ state, commit }, { path, baseSha }) => {
+export const getRawFileData = ({ state, commit, dispatch }, { path, baseSha }) => {
   const file = state.entries[path];
   return new Promise((resolve, reject) => {
     service
@@ -113,7 +116,13 @@ export const getRawFileData = ({ state, commit }, { path, baseSha }) => {
         }
       })
       .catch(() => {
-        flash('Error loading file content. Please try again.');
+        dispatch('setErrorMessage', {
+          text: __('An error occured whilst loading the file content.'),
+          action: payload =>
+            dispatch('getRawFileData', payload).then(() => dispatch('setErrorMessage', null)),
+          actionText: __('Please try again'),
+          actionPayload: { path, baseSha },
+        });
         reject();
       });
   });
diff --git a/app/assets/javascripts/ide/stores/actions/merge_request.js b/app/assets/javascripts/ide/stores/actions/merge_request.js
index edb20ff96fc..4aa151abcb7 100644
--- a/app/assets/javascripts/ide/stores/actions/merge_request.js
+++ b/app/assets/javascripts/ide/stores/actions/merge_request.js
@@ -1,17 +1,16 @@
-import flash from '~/flash';
+import { __ } from '../../../locale';
 import service from '../../services';
 import * as types from '../mutation_types';
 
 export const getMergeRequestData = (
-  { commit, state },
+  { commit, dispatch, state },
   { projectId, mergeRequestId, force = false } = {},
 ) =>
   new Promise((resolve, reject) => {
     if (!state.projects[projectId].mergeRequests[mergeRequestId] || force) {
       service
         .getProjectMergeRequestData(projectId, mergeRequestId)
-        .then(res => res.data)
-        .then(data => {
+        .then(({ data }) => {
           commit(types.SET_MERGE_REQUEST, {
             projectPath: projectId,
             mergeRequestId,
@@ -21,7 +20,15 @@ export const getMergeRequestData = (
           resolve(data);
         })
         .catch(() => {
-          flash('Error loading merge request data. Please try again.');
+          dispatch('setErrorMessage', {
+            text: __('An error occured whilst loading the merge request.'),
+            action: payload =>
+              dispatch('getMergeRequestData', payload).then(() =>
+                dispatch('setErrorMessage', null),
+              ),
+            actionText: __('Please try again'),
+            actionPayload: { projectId, mergeRequestId, force },
+          });
           reject(new Error(`Merge Request not loaded ${projectId}`));
         });
     } else {
@@ -30,15 +37,14 @@ export const getMergeRequestData = (
   });
 
 export const getMergeRequestChanges = (
-  { commit, state },
+  { commit, dispatch, state },
   { projectId, mergeRequestId, force = false } = {},
 ) =>
   new Promise((resolve, reject) => {
     if (!state.projects[projectId].mergeRequests[mergeRequestId].changes.length || force) {
       service
         .getProjectMergeRequestChanges(projectId, mergeRequestId)
-        .then(res => res.data)
-        .then(data => {
+        .then(({ data }) => {
           commit(types.SET_MERGE_REQUEST_CHANGES, {
             projectPath: projectId,
             mergeRequestId,
@@ -47,7 +53,15 @@ export const getMergeRequestChanges = (
           resolve(data);
         })
         .catch(() => {
-          flash('Error loading merge request changes. Please try again.');
+          dispatch('setErrorMessage', {
+            text: __('An error occured whilst loading the merge request changes.'),
+            action: payload =>
+              dispatch('getMergeRequestChanges', payload).then(() =>
+                dispatch('setErrorMessage', null),
+              ),
+            actionText: __('Please try again'),
+            actionPayload: { projectId, mergeRequestId, force },
+          });
           reject(new Error(`Merge Request Changes not loaded ${projectId}`));
         });
     } else {
@@ -56,7 +70,7 @@ export const getMergeRequestChanges = (
   });
 
 export const getMergeRequestVersions = (
-  { commit, state },
+  { commit, dispatch, state },
   { projectId, mergeRequestId, force = false } = {},
 ) =>
   new Promise((resolve, reject) => {
@@ -73,7 +87,15 @@ export const getMergeRequestVersions = (
           resolve(data);
         })
         .catch(() => {
-          flash('Error loading merge request versions. Please try again.');
+          dispatch('setErrorMessage', {
+            text: __('An error occured whilst loading the merge request version data.'),
+            action: payload =>
+              dispatch('getMergeRequestVersions', payload).then(() =>
+                dispatch('setErrorMessage', null),
+              ),
+            actionText: __('Please try again'),
+            actionPayload: { projectId, mergeRequestId, force },
+          });
           reject(new Error(`Merge Request Versions not loaded ${projectId}`));
         });
     } else {
diff --git a/app/assets/javascripts/ide/stores/actions/project.js b/app/assets/javascripts/ide/stores/actions/project.js
index ab5cd8e4742..501e25d452b 100644
--- a/app/assets/javascripts/ide/stores/actions/project.js
+++ b/app/assets/javascripts/ide/stores/actions/project.js
@@ -104,7 +104,7 @@ export const createNewBranchFromDefault = ({ state, dispatch, getters }, branch)
     .catch(() => {
       dispatch('setErrorMessage', {
         text: __('An error occured creating the new branch.'),
-        action: 'createNewBranchFromDefault',
+        action: payload => dispatch('createNewBranchFromDefault', payload),
         actionText: __('Please try again'),
         actionPayload: branch,
       });
@@ -119,7 +119,7 @@ export const showBranchNotFoundError = ({ dispatch }, branchId) => {
       },
       false,
     ),
-    action: 'createNewBranchFromDefault',
+    action: payload => dispatch('createNewBranchFromDefault', payload),
     actionText: __('Create branch'),
     actionPayload: branchId,
   });
diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js
index dcdd900fc7e..ffaaaabff17 100644
--- a/app/assets/javascripts/ide/stores/actions/tree.js
+++ b/app/assets/javascripts/ide/stores/actions/tree.js
@@ -1,9 +1,6 @@
-import { normalizeHeaders } from '~/lib/utils/common_utils';
-import flash from '~/flash';
 import { __ } from '../../../locale';
 import service from '../../services';
 import * as types from '../mutation_types';
-import { findEntry } from '../utils';
 import FilesDecoratorWorker from '../workers/files_decorator_worker';
 
 export const toggleTreeOpen = ({ commit }, path) => {
@@ -37,32 +34,6 @@ export const handleTreeEntryAction = ({ commit, dispatch }, row) => {
   dispatch('showTreeEntry', row.path);
 };
 
-export const getLastCommitData = ({ state, commit, dispatch }, tree = state) => {
-  if (!tree || tree.lastCommitPath === null || !tree.lastCommitPath) return;
-
-  service
-    .getTreeLastCommit(tree.lastCommitPath)
-    .then(res => {
-      const lastCommitPath = normalizeHeaders(res.headers)['MORE-LOGS-URL'] || null;
-
-      commit(types.SET_LAST_COMMIT_URL, { tree, url: lastCommitPath });
-
-      return res.json();
-    })
-    .then(data => {
-      data.forEach(lastCommit => {
-        const entry = findEntry(tree.tree, lastCommit.type, lastCommit.file_name);
-
-        if (entry) {
-          commit(types.SET_LAST_COMMIT_DATA, { entry, lastCommit });
-        }
-      });
-
-      dispatch('getLastCommitData', tree);
-    })
-    .catch(() => flash('Error fetching log data.', 'alert', document, null, false, true));
-};
-
 export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } = {}) =>
   new Promise((resolve, reject) => {
     if (
@@ -106,14 +77,13 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } =
           if (e.response.status === 404) {
             dispatch('showBranchNotFoundError', branchId);
           } else {
-            flash(
-              __('Error loading tree data. Please try again.'),
-              'alert',
-              document,
-              null,
-              false,
-              true,
-            );
+            dispatch('setErrorMessage', {
+              text: __('An error occured whilst loading all the files.'),
+              action: payload =>
+                dispatch('getFiles', payload).then(() => dispatch('setErrorMessage', null)),
+              actionText: __('Please try again'),
+              actionPayload: { projectId, branchId },
+            });
           }
           reject(e);
         });