remove need for getter, allow state to set component

3 files changed, 5 insertions, 16 deletions

diff --git a/app/assets/javascripts/ide/components/ide_side_bar.vue b/app/assets/javascripts/ide/components/ide_side_bar.vue
index 21074e933c0..191210fd828 100644
--- a/app/assets/javascripts/ide/components/ide_side_bar.vue
+++ b/app/assets/javascripts/ide/components/ide_side_bar.vue
@@ -23,8 +23,8 @@ export default {
     IdeTree,
   },
   computed: {
-    ...mapState(['loading', 'currentBranchId']),
-    ...mapGetters(['currentProject', 'activityBarComponent']),
+    ...mapState(['loading', 'currentBranchId', 'currentActivityView']),
+    ...mapGetters(['currentProject']),
   },
 };
 </script>
@@ -88,7 +88,7 @@ export default {
         </div>
         <div class="multi-file-commit-panel-inner-scroll">
           <component
-            :is="activityBarComponent"
+            :is="currentActivityView"
           />
         </div>
       </template>
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index 69cf5a5fc95..cdaa5e05c18 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -39,15 +39,4 @@ export const hasChanges = state => !!state.changedFiles.length || !!state.staged
 
 export const hasMergeRequest = state => !!state.currentMergeRequestId;
 
-export const activityBarComponent = state => {
-  switch (state.currentActivityView) {
-    case ActivityBarViews.edit:
-      return 'ide-tree';
-    case ActivityBarViews.commit:
-      return 'commit-section';
-    default:
-      return null;
-  }
-};
-
 export const getStagedFile = state => path => state.stagedFiles.find(f => f.path === path);
diff --git a/app/assets/javascripts/ide/stores/state.js b/app/assets/javascripts/ide/stores/state.js
index 2beefce32ac..c7f7e9562ac 100644
--- a/app/assets/javascripts/ide/stores/state.js
+++ b/app/assets/javascripts/ide/stores/state.js
@@ -1,6 +1,6 @@
 export const ActivityBarViews = {
-  edit: 0,
-  commit: 1,
+  edit: 'ide-tree',
+  commit: 'commit-section',
 };
 
 export default () => ({