Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab-ci.yml

@@ -63,7 +63,7 @@ workflow:
 
 variables:
   PG_VERSION: "12"
-  DEFAULT_CI_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}.patched-golang-1.17-node-16.14-postgresql-${PG_VERSION}:rubygems-3.2-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-yarn-1.22-graphicsmagick-1.3.36"
+  DEFAULT_CI_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}.patched-golang-${GO_VERSION}-node-16.14-postgresql-${PG_VERSION}:rubygems-3.2-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-yarn-1.22-graphicsmagick-1.3.36"
   RAILS_ENV: "test"
   NODE_ENV: "test"
   BUNDLE_WITHOUT: "production:development"
@@ -80,6 +80,7 @@ variables:
   CHROME_VERSION: "103"
   DOCKER_VERSION: "20.10.14"
   RUBY_VERSION: "2.7"
+  GO_VERSION: "1.18"
 
   TMP_TEST_FOLDER: "${CI_PROJECT_DIR}/tmp/tests"
   GITLAB_WORKHORSE_FOLDER: "gitlab-workhorse"

.gitlab/ci/workhorse.gitlab-ci.yml

@@ -1,6 +1,6 @@
 workhorse:verify:
   extends: .workhorse:rules:workhorse
-  image: ${GITLAB_DEPENDENCY_PROXY}golang:1.17
+  image: ${GITLAB_DEPENDENCY_PROXY}golang:1.18
   stage: test
   needs: []
   script:
@@ -12,7 +12,7 @@ workhorse:verify:
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}:git-2.36
   variables:
     GITALY_ADDRESS: "tcp://127.0.0.1:8075"
-    GO_VERSION: "1.17"
+    GO_VERSION: "1.18"
   stage: test
   needs:
     - setup-test-env

app/assets/javascripts/admin/broadcast_messages/components/base.vue

@@ -0,0 +1,21 @@
+<script>
+import MessagesTable from './messages_table.vue';
+
+export default {
+  name: 'BroadcastMessagesBase',
+  components: {
+    MessagesTable,
+  },
+  props: {
+    messages: {
+      type: Array,
+      required: true,
+    },
+  },
+};
+</script>
+<template>
+  <div>
+    <messages-table v-if="messages.length > 0" :messages="messages" />
+  </div>
+</template>

app/assets/javascripts/admin/broadcast_messages/components/messages_table.vue

@@ -0,0 +1,21 @@
+<script>
+import MessagesTableRow from './messages_table_row.vue';
+
+export default {
+  name: 'MessagesTable',
+  components: {
+    MessagesTableRow,
+  },
+  props: {
+    messages: {
+      type: Array,
+      required: true,
+    },
+  },
+};
+</script>
+<template>
+  <div>
+    <messages-table-row v-for="message in messages" :key="message.id" :message="message" />
+  </div>
+</template>

app/assets/javascripts/admin/broadcast_messages/components/messages_table_row.vue

@@ -0,0 +1,16 @@
+<script>
+export default {
+  name: 'MessagesTableRow',
+  props: {
+    message: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>
+<template>
+  <div>
+    {{ message.id }}
+  </div>
+</template>

app/assets/javascripts/admin/broadcast_messages/index.js

@@ -0,0 +1,19 @@
+import Vue from 'vue';
+import BroadcastMessagesBase from './components/base.vue';
+
+export default () => {
+  const el = document.querySelector('#js-broadcast-messages');
+  const { messages } = el.dataset;
+
+  return new Vue({
+    el,
+    name: 'BroadcastMessagesBase',
+    render(createElement) {
+      return createElement(BroadcastMessagesBase, {
+        props: {
+          messages: JSON.parse(messages),
+        },
+      });
+    },
+  });
+};

app/assets/javascripts/pages/admin/broadcast_messages/index.js

@@ -1,5 +1,10 @@
+import initBroadcastMessages from '~/admin/broadcast_messages';
 import initDeprecatedRemoveRowBehavior from '~/behaviors/deprecated_remove_row_behavior';
 import initBroadcastMessagesForm from './broadcast_message';
 
-initBroadcastMessagesForm();
-initDeprecatedRemoveRowBehavior();
+if (gon.features.vueBroadcastMessages) {
+  initBroadcastMessages();
+} else {
+  initBroadcastMessagesForm();
+  initDeprecatedRemoveRowBehavior();
+}

app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue

@@ -9,6 +9,7 @@ import {
   GlFormInput,
   GlFormSelect,
 } from '@gitlab/ui';
+import { getDraft, clearDraft, updateDraft } from '~/lib/utils/autosave';
 import csrf from '~/lib/utils/csrf';
 import { setUrlFragment } from '~/lib/utils/url_utility';
 import { s__, sprintf } from '~/locale';
@@ -33,6 +34,29 @@ const MARKDOWN_LINK_TEXT = {
   org: '[[page-slug]]',
 };
 
+function getPagePath(pageInfo) {
+  return pageInfo.persisted ? pageInfo.path : pageInfo.createPath;
+}
+
+const autosaveKey = (pageInfo, field) => {
+  const path = pageInfo.persisted ? pageInfo.path : pageInfo.createPath;
+
+  return `${path}/${field}`;
+};
+
+const titleAutosaveKey = (pageInfo) => autosaveKey(pageInfo, 'title');
+const formatAutosaveKey = (pageInfo) => autosaveKey(pageInfo, 'format');
+const contentAutosaveKey = (pageInfo) => autosaveKey(pageInfo, 'content');
+const commitAutosaveKey = (pageInfo) => autosaveKey(pageInfo, 'commit');
+
+const getTitle = (pageInfo) => getDraft(titleAutosaveKey(pageInfo)) || pageInfo.title?.trim() || '';
+const getFormat = (pageInfo) =>
+  getDraft(formatAutosaveKey(pageInfo)) || pageInfo.format || 'markdown';
+const getContent = (pageInfo) => getDraft(contentAutosaveKey(pageInfo)) || pageInfo.content || '';
+const getCommitMessage = (pageInfo) =>
+  getDraft(commitAutosaveKey(pageInfo)) || pageInfo.commitMessage || '';
+const getIsFormDirty = (pageInfo) => Boolean(getDraft(titleAutosaveKey(pageInfo)));
+
 export default {
   i18n: {
     title: {
@@ -87,13 +111,14 @@ export default {
   data() {
     return {
       editingMode: 'source',
-      title: this.pageInfo.title?.trim() || '',
-      format: this.pageInfo.format || 'markdown',
-      content: this.pageInfo.content || '',
-      commitMessage: '',
-      isDirty: false,
+      title: getTitle(this.pageInfo),
+      format: getFormat(this.pageInfo),
+      content: getContent(this.pageInfo),
+      commitMessage: getCommitMessage(this.pageInfo),
       contentEditorEmpty: false,
       isContentEditorActive: false,
+      switchEditingControlDisabled: false,
+      isFormDirty: getIsFormDirty(this.pageInfo),
     };
   },
   computed: {
@@ -104,7 +129,7 @@ export default {
       return csrf.token;
     },
     formAction() {
-      return this.pageInfo.persisted ? this.pageInfo.path : this.pageInfo.createPath;
+      return getPagePath(this.pageInfo);
     },
     helpPath() {
       return setUrlFragment(
@@ -151,7 +176,7 @@ export default {
     },
   },
   mounted() {
-    this.updateCommitMessage();
+    if (!this.commitMessage) this.updateCommitMessage();
 
     window.addEventListener('beforeunload', this.onPageUnload);
   },
@@ -160,6 +185,8 @@ export default {
   },
   methods: {
     async handleFormSubmit(e) {
+      this.isFormDirty = false;
+
       e.preventDefault();
 
       this.trackFormSubmit();
@@ -169,18 +196,33 @@ export default {
       await this.$nextTick();
 
       e.target.submit();
+    },
 
-      this.isDirty = false;
+    updateDrafts() {
+      updateDraft(titleAutosaveKey(this.pageInfo), this.title);
+      updateDraft(formatAutosaveKey(this.pageInfo), this.format);
+      updateDraft(contentAutosaveKey(this.pageInfo), this.content);
+      updateDraft(commitAutosaveKey(this.pageInfo), this.commitMessage);
     },
 
-    onPageUnload(event) {
-      if (!this.isDirty) return undefined;
+    clearDrafts() {
+      clearDraft(titleAutosaveKey(this.pageInfo));
+      clearDraft(formatAutosaveKey(this.pageInfo));
+      clearDraft(contentAutosaveKey(this.pageInfo));
+      clearDraft(commitAutosaveKey(this.pageInfo));
+    },
 
-      event.preventDefault();
+    handleContentEditorChange({ empty, markdown }) {
+      this.contentEditorEmpty = empty;
+      this.content = markdown;
+    },
 
-      // eslint-disable-next-line no-param-reassign
-      event.returnValue = '';
-      return '';
+    onPageUnload() {
+      if (this.isFormDirty) {
+        this.updateDrafts();
+      } else {
+        this.clearDrafts();
+      }
     },
 
     updateCommitMessage() {
@@ -222,10 +264,6 @@ export default {
     trackContentEditorLoaded() {
       this.track(CONTENT_EDITOR_LOADED_ACTION);
     },
-
-    checkDirty(markdown) {
-      this.isDirty = this.pageInfo.content !== markdown;
-    },
   },
 };
 </script>
@@ -236,6 +274,7 @@ export default {
     method="post"
     class="wiki-form common-note-form gl-mt-3 js-quick-submit"
     @submit="handleFormSubmit"
+    @input="isFormDirty = true"
   >
     <input :value="csrfToken" type="hidden" name="authenticity_token" />
     <input v-if="pageInfo.persisted" type="hidden" name="_method" value="put" />
@@ -306,7 +345,6 @@ export default {
             form-field-name="wiki[content]"
             @contentEditor="notifyContentEditorActive"
             @markdownField="notifyContentEditorInactive"
-            @input="checkDirty"
           />
           <div class="form-text gl-text-gray-600">
             <gl-sprintf
@@ -358,9 +396,14 @@ export default {
         :disabled="disableSubmitButton"
         >{{ submitButtonText }}</gl-button
       >
-      <gl-button data-testid="wiki-cancel-button" :href="cancelFormPath" class="float-right">{{
-        $options.i18n.cancel
-      }}</gl-button>
+      <gl-button
+        data-testid="wiki-cancel-button"
+        :href="cancelFormPath"
+        class="float-right"
+        @click="isFormDirty = false"
+      >
+        {{ $options.i18n.cancel }}</gl-button
+      >
     </div>
   </gl-form>
 </template>