Removed Project ID Props

8 files changed, 10 insertions, 28 deletions

diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 1c3b97f8b56..07df3c216b1 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -73,7 +73,6 @@ import initLegacyFilters from './init_legacy_filters';
 import initIssuableSidebar from './init_issuable_sidebar';
 import initProjectVisibilitySelector from './project_visibility';
 import GpgBadges from './gpg_badges';
-import UserFeatureHelper from './helpers/user_feature_helper';
 import initChangesDropdown from './init_changes_dropdown';
 import NewGroupChild from './groups/new_group_child';
 import AbuseReports from './abuse_reports';
diff --git a/app/assets/javascripts/helpers/user_feature_helper.js b/app/assets/javascripts/helpers/user_feature_helper.js
deleted file mode 100644
index 638118a5204..00000000000
--- a/app/assets/javascripts/helpers/user_feature_helper.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Cookies from 'js-cookie';
-
-export default {
-  isNewRepoEnabled() {
-    return Cookies.get('new_repo') === 'true';
-  },
-};
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue
index d1706ecfcfd..6e67e99a70f 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
@@ -5,10 +5,6 @@
 
   export default {
     props: {
-      projectId: {
-        type: String,
-        required: true,
-      },
       branch: {
         type: String,
         required: true,
@@ -77,7 +73,6 @@
         </li>
         <li>
           <upload
-            :project-id="projectId"
             :branch-id="branch"
             :path="path"
             :parent="parent"
@@ -97,7 +92,6 @@
     <new-modal
       v-if="openModal"
       :type="modalType"
-      :project-id="projectId"
       :branch-id="branch"
       :path="path"
       :parent="parent"
diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
index 7567604b107..ab7d7f4a8dc 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
@@ -1,14 +1,10 @@
 <script>
-  import { mapActions } from 'vuex';
+  import { mapActions, mapState } from 'vuex';
   import { __ } from '../../../locale';
   import modal from '../../../vue_shared/components/modal.vue';
 
   export default {
     props: {
-      projectId: {
-        type: String,
-        required: true,
-      },
       branchId: {
         type: String,
         required: true,
@@ -40,7 +36,7 @@
       ]),
       createEntryInStore() {
         this.createTempEntry({
-          projectId: this.projectId,
+          projectId: this.currentProjectId,
           branchId: this.branchId,
           parent: this.parent,
           name: this.entryName.replace(new RegExp(`^${this.path}/`), ''),
@@ -54,6 +50,9 @@
       },
     },
     computed: {
+      ...mapState([
+        'currentProjectId'
+      ]),
       modalTitle() {
         if (this.type === 'tree') {
           return __('Create new directory');
diff --git a/app/assets/javascripts/ide/components/new_dropdown/upload.vue b/app/assets/javascripts/ide/components/new_dropdown/upload.vue
index a04e7f8939b..2a2f2a241fc 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/upload.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/upload.vue
@@ -3,10 +3,6 @@
 
   export default {
     props: {
-      projectId: {
-        type: String,
-        required: true,
-      },
       branchId: {
         type: String,
         required: true,
@@ -19,6 +15,7 @@
     computed: {
       ...mapState([
         'trees',
+        'currentProjectId',
       ]),
     },
     methods: {
@@ -35,7 +32,7 @@
 
         this.createTempEntry({
           name,
-          projectId: this.projectId,
+          projectId: this.currentProjectId,
           branchId: this.branchId,
           parent: this.parent,
           type: 'blob',
diff --git a/spec/javascripts/repo/components/new_dropdown/index_spec.js b/spec/javascripts/repo/components/new_dropdown/index_spec.js
index c53b483ba1e..b001c1655b4 100644
--- a/spec/javascripts/repo/components/new_dropdown/index_spec.js
+++ b/spec/javascripts/repo/components/new_dropdown/index_spec.js
@@ -11,11 +11,11 @@ describe('new dropdown component', () => {
     const component = Vue.extend(newDropdown);
 
     vm = createComponentWithStore(component, store, {
-      projectId: 'abcproject',
       branch: 'master',
       path: '',
     });
 
+    vm.$store.state.currentProjectId = 'abcproject';
     vm.$store.state.path = '';
 
     vm.$mount();
diff --git a/spec/javascripts/repo/components/new_dropdown/modal_spec.js b/spec/javascripts/repo/components/new_dropdown/modal_spec.js
index c55423f6a41..233cca06ed0 100644
--- a/spec/javascripts/repo/components/new_dropdown/modal_spec.js
+++ b/spec/javascripts/repo/components/new_dropdown/modal_spec.js
@@ -55,10 +55,10 @@ describe('new file modal component', () => {
           tree: [],
         };
         projectTree = store.state.trees['abcproject/mybranch'];
+        store.state.currentProjectId = 'abcproject';
 
         vm = createComponentWithStore(Component, store, {
           type,
-          projectId: 'abcproject',
           branchId: 'master',
           path: '',
           parent: projectTree,
diff --git a/spec/javascripts/repo/components/new_dropdown/upload_spec.js b/spec/javascripts/repo/components/new_dropdown/upload_spec.js
index 5af5fc8c1e3..788c08e5279 100644
--- a/spec/javascripts/repo/components/new_dropdown/upload_spec.js
+++ b/spec/javascripts/repo/components/new_dropdown/upload_spec.js
@@ -41,6 +41,7 @@ describe('new dropdown upload', () => {
     store.state.projects.abcproject = {
       web_url: '',
     };
+    store.state.currentProjectId = 'abcproject';
     store.state.trees = [];
     store.state.trees['abcproject/mybranch'] = {
       tree: [],
@@ -48,7 +49,6 @@ describe('new dropdown upload', () => {
     projectTree = store.state.trees['abcproject/mybranch'];
 
     vm = createComponentWithStore(Component, store, {
-      projectId: 'abcproject',
       branchId: 'master',
       path: '',
       parent: projectTree,