Remove import *

4 files changed, 178 insertions, 152 deletions

diff --git a/app/assets/javascripts/badges/store/actions.js b/app/assets/javascripts/badges/store/actions.js
index d5ec9dc7fe2..b3d1ac5acf5 100644
--- a/app/assets/javascripts/badges/store/actions.js
+++ b/app/assets/javascripts/badges/store/actions.js
@@ -1,11 +1,7 @@
 import axios from '~/lib/utils/axios_utils';
-import * as types from './mutation_types';
+import types from './mutation_types';
 
-export const requestNewBadge = ({ commit }) => commit(types.REQUEST_NEW_BADGE);
-export const receiveNewBadge = ({ commit }, newBadge) => commit(types.RECEIVE_NEW_BADGE, newBadge);
-export const receiveNewBadgeError = ({ commit }) => commit(types.RECEIVE_NEW_BADGE_ERROR);
-
-const transformBackendBadge = badge => ({
+export const transformBackendBadge = badge => ({
   id: badge.id,
   imageUrl: badge.image_url,
   kind: badge.kind,
@@ -15,129 +11,157 @@ const transformBackendBadge = badge => ({
   isDeleting: false,
 });
 
-export const addBadge = ({ dispatch, state }) => {
-  const newBadge = state.badgeInAddForm;
-  const endpoint = state.apiEndpointUrl;
-  dispatch('requestNewBadge');
-  return axios
-    .post(endpoint, {
-      image_url: newBadge.imageUrl,
-      link_url: newBadge.linkUrl,
-    })
-    .catch(error => {
-      dispatch('receiveNewBadgeError');
-      throw error;
-    })
-    .then(res => {
-      dispatch('receiveNewBadge', transformBackendBadge(res.data));
-    });
-};
-
-export const requestDeleteBadge = ({ commit }, badgeId) =>
-  commit(types.REQUEST_DELETE_BADGE, badgeId);
-export const receiveDeleteBadge = ({ commit }, badgeId) =>
-  commit(types.RECEIVE_DELETE_BADGE, badgeId);
-export const receiveDeleteBadgeError = ({ commit }, badgeId) =>
-  commit(types.RECEIVE_DELETE_BADGE_ERROR, badgeId);
-
-export const deleteBadge = ({ dispatch, state }, badge) => {
-  const badgeId = badge.id;
-  dispatch('requestDeleteBadge', badgeId);
-  const endpoint = `${state.apiEndpointUrl}/${badgeId}`;
-  return axios
-    .delete(endpoint)
-    .catch(error => {
-      dispatch('receiveDeleteBadgeError', badgeId);
-      throw error;
-    })
-    .then(() => {
-      dispatch('receiveDeleteBadge', badgeId);
-    });
-};
-
-export const editBadge = ({ commit }, badge) => {
-  commit(types.START_EDITING, badge);
-};
-
-export const requestLoadBadges = ({ commit }, data) => commit(types.REQUEST_LOAD_BADGES, data);
-export const receiveLoadBadges = ({ commit }, badges) => commit(types.RECEIVE_LOAD_BADGES, badges);
-export const receiveLoadBadgesError = ({ commit }) => commit(types.RECEIVE_LOAD_BADGES_ERROR);
-
-export const loadBadges = ({ dispatch, state }, data) => {
-  dispatch('requestLoadBadges', data);
-  const endpoint = state.apiEndpointUrl;
-  return axios
-    .get(endpoint)
-    .catch(error => {
-      dispatch('receiveLoadBadgesError');
-      throw error;
-    })
-    .then(res => {
-      dispatch('receiveLoadBadges', res.data.map(transformBackendBadge));
-    });
-};
-
-export const requestRenderBadge = ({ commit }) => commit(types.REQUEST_RENDERED_BADGE);
-export const receiveRenderBadge = ({ commit }, renderedBadge) =>
-  commit(types.RECEIVE_RENDERED_BADGE, renderedBadge);
-export const receiveRenderBadgeError = ({ commit }) => commit(types.RECEIVE_RENDERED_BADGE_ERROR);
-
-export const renderBadge = ({ dispatch, state }) => {
-  const badge = state.isEditing ? state.badgeInEditForm : state.badgeInAddForm;
-  const { linkUrl, imageUrl } = badge;
-  if (!linkUrl || linkUrl.trim() === '' || !imageUrl || imageUrl.trim() === '') {
-    return Promise.resolve(badge);
-  }
-
-  dispatch('requestRenderBadge');
-
-  const parameters = [
-    `link_url=${encodeURIComponent(linkUrl)}`,
-    `image_url=${encodeURIComponent(imageUrl)}`,
-  ].join('&');
-  const renderEndpoint = `${state.apiEndpointUrl}/render?${parameters}`;
-  return axios
-    .get(renderEndpoint)
-    .catch(error => {
-      dispatch('receiveRenderBadgeError');
-      throw error;
-    })
-    .then(res => {
-      dispatch('receiveRenderBadge', transformBackendBadge(res.data));
-    });
-};
-
-export const requestUpdateBadge = ({ commit }) => commit(types.REQUEST_UPDATED_BADGE);
-export const receiveUpdateBadge = ({ commit }, updatedBadge) =>
-  commit(types.RECEIVE_UPDATED_BADGE, updatedBadge);
-export const receiveUpdateBadgeError = ({ commit }) => commit(types.RECEIVE_UPDATED_BADGE_ERROR);
-
-export const saveBadge = ({ dispatch, state }) => {
-  const badge = state.badgeInEditForm;
-  const endpoint = `${state.apiEndpointUrl}/${badge.id}`;
-  dispatch('requestUpdateBadge');
-  return axios
-    .put(endpoint, {
-      image_url: badge.imageUrl,
-      link_url: badge.linkUrl,
-    })
-    .catch(error => {
-      dispatch('receiveUpdateBadgeError');
-      throw error;
-    })
-    .then(res => {
-      dispatch('receiveUpdateBadge', transformBackendBadge(res.data));
-    });
-};
-
-export const stopEditing = ({ commit }) => {
-  commit(types.STOP_EDITING);
-};
-
-export const updateModal = ({ commit }, badge) => {
-  commit(types.UPDATE_BADGE_IN_MODAL, badge);
-};
-
-export const updateBadgeInForm = ({ commit }, badge) => {
-  commit(types.UPDATE_BADGE_IN_FORM, badge);
+export default {
+  requestNewBadge({ commit }) {
+    commit(types.REQUEST_NEW_BADGE);
+  },
+  receiveNewBadge({ commit }, newBadge) {
+    commit(types.RECEIVE_NEW_BADGE, newBadge);
+  },
+  receiveNewBadgeError({ commit }) {
+    commit(types.RECEIVE_NEW_BADGE_ERROR);
+  },
+  addBadge({ dispatch, state }) {
+    const newBadge = state.badgeInAddForm;
+    const endpoint = state.apiEndpointUrl;
+    dispatch('requestNewBadge');
+    return axios
+      .post(endpoint, {
+        image_url: newBadge.imageUrl,
+        link_url: newBadge.linkUrl,
+      })
+      .catch(error => {
+        dispatch('receiveNewBadgeError');
+        throw error;
+      })
+      .then(res => {
+        dispatch('receiveNewBadge', transformBackendBadge(res.data));
+      });
+  },
+  requestDeleteBadge({ commit }, badgeId) {
+    commit(types.REQUEST_DELETE_BADGE, badgeId);
+  },
+  receiveDeleteBadge({ commit }, badgeId) {
+    commit(types.RECEIVE_DELETE_BADGE, badgeId);
+  },
+  receiveDeleteBadgeError({ commit }, badgeId) {
+    commit(types.RECEIVE_DELETE_BADGE_ERROR, badgeId);
+  },
+  deleteBadge({ dispatch, state }, badge) {
+    const badgeId = badge.id;
+    dispatch('requestDeleteBadge', badgeId);
+    const endpoint = `${state.apiEndpointUrl}/${badgeId}`;
+    return axios
+      .delete(endpoint)
+      .catch(error => {
+        dispatch('receiveDeleteBadgeError', badgeId);
+        throw error;
+      })
+      .then(() => {
+        dispatch('receiveDeleteBadge', badgeId);
+      });
+  },
+
+  editBadge({ commit }, badge) {
+    commit(types.START_EDITING, badge);
+  },
+
+  requestLoadBadges({ commit }, data) {
+    commit(types.REQUEST_LOAD_BADGES, data);
+  },
+  receiveLoadBadges({ commit }, badges) {
+    commit(types.RECEIVE_LOAD_BADGES, badges);
+  },
+  receiveLoadBadgesError({ commit }) {
+    commit(types.RECEIVE_LOAD_BADGES_ERROR);
+  },
+
+  loadBadges({ dispatch, state }, data) {
+    dispatch('requestLoadBadges', data);
+    const endpoint = state.apiEndpointUrl;
+    return axios
+      .get(endpoint)
+      .catch(error => {
+        dispatch('receiveLoadBadgesError');
+        throw error;
+      })
+      .then(res => {
+        dispatch('receiveLoadBadges', res.data.map(transformBackendBadge));
+      });
+  },
+
+  requestRenderBadge({ commit }) {
+    commit(types.REQUEST_RENDERED_BADGE);
+  },
+  receiveRenderBadge({ commit }, renderedBadge) {
+    commit(types.RECEIVE_RENDERED_BADGE, renderedBadge);
+  },
+  receiveRenderBadgeError({ commit }) {
+    commit(types.RECEIVE_RENDERED_BADGE_ERROR);
+  },
+
+  renderBadge({ dispatch, state }) {
+    const badge = state.isEditing ? state.badgeInEditForm : state.badgeInAddForm;
+    const { linkUrl, imageUrl } = badge;
+    if (!linkUrl || linkUrl.trim() === '' || !imageUrl || imageUrl.trim() === '') {
+      return Promise.resolve(badge);
+    }
+
+    dispatch('requestRenderBadge');
+
+    const parameters = [
+      `link_url=${encodeURIComponent(linkUrl)}`,
+      `image_url=${encodeURIComponent(imageUrl)}`,
+    ].join('&');
+    const renderEndpoint = `${state.apiEndpointUrl}/render?${parameters}`;
+    return axios
+      .get(renderEndpoint)
+      .catch(error => {
+        dispatch('receiveRenderBadgeError');
+        throw error;
+      })
+      .then(res => {
+        dispatch('receiveRenderBadge', transformBackendBadge(res.data));
+      });
+  },
+
+  requestUpdateBadge({ commit }) {
+    commit(types.REQUEST_UPDATED_BADGE);
+  },
+  receiveUpdateBadge({ commit }, updatedBadge) {
+    commit(types.RECEIVE_UPDATED_BADGE, updatedBadge);
+  },
+  receiveUpdateBadgeError({ commit }) {
+    commit(types.RECEIVE_UPDATED_BADGE_ERROR);
+  },
+
+  saveBadge({ dispatch, state }) {
+    const badge = state.badgeInEditForm;
+    const endpoint = `${state.apiEndpointUrl}/${badge.id}`;
+    dispatch('requestUpdateBadge');
+    return axios
+      .put(endpoint, {
+        image_url: badge.imageUrl,
+        link_url: badge.linkUrl,
+      })
+      .catch(error => {
+        dispatch('receiveUpdateBadgeError');
+        throw error;
+      })
+      .then(res => {
+        dispatch('receiveUpdateBadge', transformBackendBadge(res.data));
+      });
+  },
+
+  stopEditing({ commit }) {
+    commit(types.STOP_EDITING);
+  },
+
+  updateModal({ commit }, badge) {
+    commit(types.UPDATE_BADGE_IN_MODAL, badge);
+  },
+
+  updateBadgeInForm({ commit }, badge) {
+    commit(types.UPDATE_BADGE_IN_FORM, badge);
+  },
 };
diff --git a/app/assets/javascripts/badges/store/index.js b/app/assets/javascripts/badges/store/index.js
index a5bfb2c6d8e..7a5df403a0e 100644
--- a/app/assets/javascripts/badges/store/index.js
+++ b/app/assets/javascripts/badges/store/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
 import createState from './state';
-import * as actions from './actions';
+import actions from './actions';
 import mutations from './mutations';
 
 Vue.use(Vuex);
diff --git a/app/assets/javascripts/badges/store/mutation_types.js b/app/assets/javascripts/badges/store/mutation_types.js
index 814fcb044ee..d73f91b6005 100644
--- a/app/assets/javascripts/badges/store/mutation_types.js
+++ b/app/assets/javascripts/badges/store/mutation_types.js
@@ -1,19 +1,21 @@
-export const RECEIVE_DELETE_BADGE = 'RECEIVE_DELETE_BADGE';
-export const RECEIVE_DELETE_BADGE_ERROR = 'RECEIVE_DELETE_BADGE_ERROR';
-export const RECEIVE_LOAD_BADGES = 'RECEIVE_LOAD_BADGES';
-export const RECEIVE_LOAD_BADGES_ERROR = 'RECEIVE_LOAD_BADGES_ERROR';
-export const RECEIVE_NEW_BADGE = 'RECEIVE_NEW_BADGE';
-export const RECEIVE_NEW_BADGE_ERROR = 'RECEIVE_NEW_BADGE_ERROR';
-export const RECEIVE_RENDERED_BADGE = 'RECEIVE_RENDERED_BADGE';
-export const RECEIVE_RENDERED_BADGE_ERROR = 'RECEIVE_RENDERED_BADGE_ERROR';
-export const RECEIVE_UPDATED_BADGE = 'RECEIVE_UPDATED_BADGE';
-export const RECEIVE_UPDATED_BADGE_ERROR = 'RECEIVE_UPDATED_BADGE_ERROR';
-export const REQUEST_DELETE_BADGE = 'REQUEST_DELETE_BADGE';
-export const REQUEST_LOAD_BADGES = 'REQUEST_LOAD_BADGES';
-export const REQUEST_NEW_BADGE = 'REQUEST_NEW_BADGE';
-export const REQUEST_RENDERED_BADGE = 'REQUEST_RENDERED_BADGE';
-export const REQUEST_UPDATED_BADGE = 'REQUEST_UPDATED_BADGE';
-export const START_EDITING = 'START_EDITING';
-export const STOP_EDITING = 'STOP_EDITING';
-export const UPDATE_BADGE_IN_FORM = 'UPDATE_BADGE_IN_FORM';
-export const UPDATE_BADGE_IN_MODAL = 'UPDATE_BADGE_IN_MODAL';
+export default {
+  RECEIVE_DELETE_BADGE: 'RECEIVE_DELETE_BADGE',
+  RECEIVE_DELETE_BADGE_ERROR: 'RECEIVE_DELETE_BADGE_ERROR',
+  RECEIVE_LOAD_BADGES: 'RECEIVE_LOAD_BADGES',
+  RECEIVE_LOAD_BADGES_ERROR: 'RECEIVE_LOAD_BADGES_ERROR',
+  RECEIVE_NEW_BADGE: 'RECEIVE_NEW_BADGE',
+  RECEIVE_NEW_BADGE_ERROR: 'RECEIVE_NEW_BADGE_ERROR',
+  RECEIVE_RENDERED_BADGE: 'RECEIVE_RENDERED_BADGE',
+  RECEIVE_RENDERED_BADGE_ERROR: 'RECEIVE_RENDERED_BADGE_ERROR',
+  RECEIVE_UPDATED_BADGE: 'RECEIVE_UPDATED_BADGE',
+  RECEIVE_UPDATED_BADGE_ERROR: 'RECEIVE_UPDATED_BADGE_ERROR',
+  REQUEST_DELETE_BADGE: 'REQUEST_DELETE_BADGE',
+  REQUEST_LOAD_BADGES: 'REQUEST_LOAD_BADGES',
+  REQUEST_NEW_BADGE: 'REQUEST_NEW_BADGE',
+  REQUEST_RENDERED_BADGE: 'REQUEST_RENDERED_BADGE',
+  REQUEST_UPDATED_BADGE: 'REQUEST_UPDATED_BADGE',
+  START_EDITING: 'START_EDITING',
+  STOP_EDITING: 'STOP_EDITING',
+  UPDATE_BADGE_IN_FORM: 'UPDATE_BADGE_IN_FORM',
+  UPDATE_BADGE_IN_MODAL: 'UPDATE_BADGE_IN_MODAL',
+};
diff --git a/app/assets/javascripts/badges/store/mutations.js b/app/assets/javascripts/badges/store/mutations.js
index fc9af41384c..aa4d82045a8 100644
--- a/app/assets/javascripts/badges/store/mutations.js
+++ b/app/assets/javascripts/badges/store/mutations.js
@@ -1,4 +1,4 @@
-import * as types from './mutation_types';
+import types from './mutation_types';
 import { PROJECT_BADGE } from '../constants';
 
 const reorderBadges = badges =>