Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 5 insertions, 2 deletions

diff --git a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue
index 3b38d715ea5..4f68c7984e8 100644
--- a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue
+++ b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue
@@ -107,7 +107,7 @@ export default {
     MarkdownEditor,
   },
   mixins: [trackingMixin],
-  inject: ['formatOptions', 'pageInfo'],
+  inject: ['formatOptions', 'pageInfo', 'drawioUrl'],
   data() {
     return {
       editingMode: 'source',
@@ -183,6 +183,9 @@ export default {
     disableSubmitButton() {
       return this.noContent || !this.title;
     },
+    drawioEnabled() {
+      return typeof this.drawioUrl === 'string' && this.drawioUrl.length > 0;
+    },
   },
   mounted() {
     if (!this.commitMessage) this.updateCommitMessage();
@@ -356,7 +359,7 @@ export default {
             :autofocus="pageInfo.persisted"
             :enable-autocomplete="true"
             :autocomplete-data-sources="autocompleteDataSources"
-            :drawio-enabled="true"
+            :drawio-enabled="drawioEnabled"
             @contentEditor="notifyContentEditorActive"
             @markdownField="notifyContentEditorInactive"
             @keydown.ctrl.enter="submitFormShortcut"