Changed all data to come through the JSON script element

[ci skip]

3 files changed, 14 insertions, 35 deletions

diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue
index 0bb9acd4f82..90312bade2f 100644
--- a/app/assets/javascripts/issue_show/components/app.vue
+++ b/app/assets/javascripts/issue_show/components/app.vue
@@ -32,7 +32,11 @@ export default {
       type: String,
       required: true,
     },
-    initialTitle: {
+    initialTitleHtml: {
+      type: String,
+      required: true,
+    },
+    initialTitleText: {
       type: String,
       required: true,
     },
@@ -78,7 +82,8 @@ export default {
   },
   data() {
     const store = new Store({
-      titleHtml: this.initialTitle,
+      titleHtml: this.initialTitleHtml,
+      titleText: this.initialTitleText,
       descriptionHtml: this.initialDescriptionHtml,
       descriptionText: this.initialDescriptionText,
     });
@@ -107,6 +112,7 @@ export default {
           title: this.state.titleText,
           confidential: this.isConfidential,
           description: this.state.descriptionText,
+          lockedWarningVisible: false,
           move_to_project_id: 0,
         });
       }
diff --git a/app/assets/javascripts/issue_show/index.js b/app/assets/javascripts/issue_show/index.js
index 790194db57f..faf79471946 100644
--- a/app/assets/javascripts/issue_show/index.js
+++ b/app/assets/javascripts/issue_show/index.js
@@ -6,6 +6,7 @@ import '../vue_shared/vue_resource_interceptor';
 document.addEventListener('DOMContentLoaded', () => {
   const initialDataEl = document.getElementById('js-issuable-app-initial-data');
   const initialData = JSON.parse(initialDataEl.innerHTML.replace(/"/g, '"'));
+
   $('.issuable-edit').on('click', (e) => {
     e.preventDefault();
 
@@ -18,38 +19,8 @@ document.addEventListener('DOMContentLoaded', () => {
       issuableApp,
     },
     data() {
-      const issuableElement = this.$options.el;
-      const issuableTitleElement = issuableElement.querySelector('.title');
-      const issuableDescriptionElement = issuableElement.querySelector('.wiki');
-      const issuableDescriptionTextarea = issuableElement.querySelector('.js-task-list-field');
-      const {
-        canUpdate,
-        canDestroy,
-        canMove,
-        endpoint,
-        issuableRef,
-        isConfidential,
-        markdownPreviewUrl,
-        markdownDocs,
-        projectsAutocompleteUrl,
-      } = issuableElement.dataset;
-
       return {
-        canUpdate: gl.utils.convertPermissionToBoolean(canUpdate),
-        canDestroy: gl.utils.convertPermissionToBoolean(canDestroy),
-        canMove: gl.utils.convertPermissionToBoolean(canMove),
-        endpoint,
-        issuableRef,
-        initialTitle: issuableTitleElement.innerHTML,
-        initialDescriptionHtml: issuableDescriptionElement ? issuableDescriptionElement.innerHTML : '',
-        initialDescriptionText: issuableDescriptionTextarea ? issuableDescriptionTextarea.textContent : '',
-        isConfidential: gl.utils.convertPermissionToBoolean(isConfidential),
-        markdownPreviewUrl,
-        markdownDocs,
-        projectPath: initialData.project_path,
-        projectNamespace: initialData.namespace_path,
-        projectsAutocompleteUrl,
-        issuableTemplates: initialData.templates,
+        ...initialData,
       };
     },
     render(createElement) {
@@ -60,7 +31,8 @@ document.addEventListener('DOMContentLoaded', () => {
           canMove: this.canMove,
           endpoint: this.endpoint,
           issuableRef: this.issuableRef,
-          initialTitle: this.initialTitle,
+          initialTitleHtml: this.initialTitleHtml,
+          initialTitleText: this.initialTitleText,
           initialDescriptionHtml: this.initialDescriptionHtml,
           initialDescriptionText: this.initialDescriptionText,
           issuableTemplates: this.issuableTemplates,
diff --git a/app/assets/javascripts/issue_show/stores/index.js b/app/assets/javascripts/issue_show/stores/index.js
index ea6f4e6a4fa..76abcc64ed3 100644
--- a/app/assets/javascripts/issue_show/stores/index.js
+++ b/app/assets/javascripts/issue_show/stores/index.js
@@ -1,12 +1,13 @@
 export default class Store {
   constructor({
     titleHtml,
+    titleText,
     descriptionHtml,
     descriptionText,
   }) {
     this.state = {
       titleHtml,
-      titleText: '',
+      titleText,
       descriptionHtml,
       descriptionText,
       taskStatus: '',