Add latest changes from gitlab-org/gitlab@master

4 files changed, 77 insertions, 0 deletions

diff --git a/app/assets/javascripts/admin/broadcast_messages/components/base.vue b/app/assets/javascripts/admin/broadcast_messages/components/base.vue
new file mode 100644
index 00000000000..bc395a83625
--- /dev/null
+++ b/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>
diff --git a/app/assets/javascripts/admin/broadcast_messages/components/messages_table.vue b/app/assets/javascripts/admin/broadcast_messages/components/messages_table.vue
new file mode 100644
index 00000000000..7b531b850c6
--- /dev/null
+++ b/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>
diff --git a/app/assets/javascripts/admin/broadcast_messages/components/messages_table_row.vue b/app/assets/javascripts/admin/broadcast_messages/components/messages_table_row.vue
new file mode 100644
index 00000000000..bd45bcc4fc4
--- /dev/null
+++ b/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>
diff --git a/app/assets/javascripts/admin/broadcast_messages/index.js b/app/assets/javascripts/admin/broadcast_messages/index.js
new file mode 100644
index 00000000000..e71495804ee
--- /dev/null
+++ b/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),
+        },
+      });
+    },
+  });
+};