Add latest changes from gitlab-org/gitlab@master

7 files changed, 168 insertions, 0 deletions

diff --git a/app/assets/javascripts/jobs/components/table/jobs_table_app.vue b/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
index 2e386fd786e..ff7982319e7 100644
--- a/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
+++ b/app/assets/javascripts/jobs/components/table/jobs_table_app.vue
@@ -140,6 +140,19 @@ export default {
       this.infiniteScrollingTriggered = false;
       this.filterSearchTriggered = true;
 
+      // all filters have been cleared reset query param
+      // and refetch jobs/count with defaults
+      if (!filters.length) {
+        updateHistory({
+          url: setUrlParams({ statuses: null }, window.location.href, true),
+        });
+
+        this.$apollo.queries.jobs.refetch({ statuses: null });
+        this.$apollo.queries.jobsCount.refetch({ statuses: null });
+
+        return;
+      }
+
       // Eventually there will be more tokens available
       // this code is written to scale for those tokens
       filters.forEach((filter) => {
diff --git a/app/assets/javascripts/oauth_application/components/oauth_secret.vue b/app/assets/javascripts/oauth_application/components/oauth_secret.vue
new file mode 100644
index 00000000000..fabda19c27b
--- /dev/null
+++ b/app/assets/javascripts/oauth_application/components/oauth_secret.vue
@@ -0,0 +1,106 @@
+<script>
+import { GlButton, GlModal } from '@gitlab/ui';
+import { createAlert, VARIANT_SUCCESS, VARIANT_WARNING } from '~/alert';
+import axios from '~/lib/utils/axios_utils';
+import InputCopyToggleVisibility from '~/vue_shared/components/form/input_copy_toggle_visibility.vue';
+import {
+  CONFIRM_MODAL,
+  CONFIRM_MODAL_TITLE,
+  COPY_SECRET,
+  DESCRIPTION_SECRET,
+  RENEW_SECRET,
+  RENEW_SECRET_FAILURE,
+  RENEW_SECRET_SUCCESS,
+  WARNING_NO_SECRET,
+} from '../constants';
+
+export default {
+  CONFIRM_MODAL,
+  CONFIRM_MODAL_TITLE,
+  COPY_SECRET,
+  DESCRIPTION_SECRET,
+  RENEW_SECRET,
+  name: 'OAuthSecret',
+  components: {
+    GlButton,
+    GlModal,
+    InputCopyToggleVisibility,
+  },
+  inject: ['initialSecret', 'renewPath'],
+  data() {
+    return {
+      secret: this.initialSecret,
+      alert: null,
+      isModalVisible: false,
+      isLoading: false,
+    };
+  },
+  computed: {
+    actionPrimary() {
+      return {
+        text: this.$options.RENEW_SECRET,
+        attributes: {
+          variant: 'confirm',
+          loading: this.isLoading,
+        },
+      };
+    },
+  },
+  created() {
+    if (!this.secret) {
+      this.alert = createAlert({ message: WARNING_NO_SECRET, variant: VARIANT_WARNING });
+    }
+  },
+  methods: {
+    displayModal() {
+      this.isModalVisible = true;
+    },
+    async renewSecret(event) {
+      event.preventDefault();
+      this.isLoading = true;
+      this.alert?.dismiss();
+
+      try {
+        const { data } = await axios.put(this.renewPath);
+        this.alert = createAlert({ message: RENEW_SECRET_SUCCESS, variant: VARIANT_SUCCESS });
+        this.secret = data.secret;
+      } catch {
+        this.alert = createAlert({ message: RENEW_SECRET_FAILURE });
+      } finally {
+        this.isLoading = false;
+        this.isModalVisible = false;
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="gl-display-flex gl-flex-wrap-wrap gl-gap-5">
+    <input-copy-toggle-visibility
+      v-if="secret"
+      :copy-button-title="$options.COPY_SECRET"
+      :value="secret"
+      class="gl-mt-n3 gl-mb-0"
+    >
+      <template #description>
+        {{ $options.DESCRIPTION_SECRET }}
+      </template>
+    </input-copy-toggle-visibility>
+
+    <gl-button category="secondary" class="gl-align-self-start" @click="displayModal">{{
+      $options.RENEW_SECRET
+    }}</gl-button>
+
+    <gl-modal
+      v-model="isModalVisible"
+      :title="$options.CONFIRM_MODAL_TITLE"
+      size="sm"
+      modal-id="modal-renew-secret"
+      :action-primary="actionPrimary"
+      @primary="renewSecret"
+    >
+      {{ $options.CONFIRM_MODAL }}
+    </gl-modal>
+  </div>
+</template>
diff --git a/app/assets/javascripts/oauth_application/constants.js b/app/assets/javascripts/oauth_application/constants.js
new file mode 100644
index 00000000000..5eaacadda78
--- /dev/null
+++ b/app/assets/javascripts/oauth_application/constants.js
@@ -0,0 +1,20 @@
+import { __, s__ } from '~/locale';
+
+export const CONFIRM_MODAL = s__(
+  'AuthorizedApplication|Are you sure you want to renew this secret? Any applications using the old secret will no longer be able to authenticate with GitLab.',
+);
+export const CONFIRM_MODAL_TITLE = s__('AuthorizedApplication|Renew secret?');
+export const COPY_SECRET = __('Copy secret');
+export const DESCRIPTION_SECRET = __(
+  'This is the only time the secret is accessible. Copy the secret and store it securely.',
+);
+export const RENEW_SECRET = s__('AuthorizedApplication|Renew secret');
+export const RENEW_SECRET_FAILURE = s__(
+  'AuthorizedApplication|There was an error trying to renew the application secret. Please try again.',
+);
+export const RENEW_SECRET_SUCCESS = s__(
+  'AuthorizedApplication|Application secret was successfully renewed.',
+);
+export const WARNING_NO_SECRET = __(
+  'The secret is only available when you create the application or renew the secret.',
+);
diff --git a/app/assets/javascripts/oauth_application/index.js b/app/assets/javascripts/oauth_application/index.js
new file mode 100644
index 00000000000..f8f1f647a15
--- /dev/null
+++ b/app/assets/javascripts/oauth_application/index.js
@@ -0,0 +1,21 @@
+import Vue from 'vue';
+import OAuthSecret from './components/oauth_secret.vue';
+
+export const initOAuthApplicationSecret = () => {
+  const el = document.querySelector('#js-oauth-application-secret');
+
+  if (!el) {
+    return null;
+  }
+
+  const { initialSecret, renewPath } = el.dataset;
+
+  return new Vue({
+    el,
+    name: 'OAuthSecretRoot',
+    provide: { initialSecret, renewPath },
+    render(h) {
+      return h(OAuthSecret);
+    },
+  });
+};
diff --git a/app/assets/javascripts/pages/admin/applications/index.js b/app/assets/javascripts/pages/admin/applications/index.js
index 3397b02aeba..df9e38431b0 100644
--- a/app/assets/javascripts/pages/admin/applications/index.js
+++ b/app/assets/javascripts/pages/admin/applications/index.js
@@ -1,3 +1,5 @@
 import initApplicationDeleteButtons from '~/admin/applications';
+import { initOAuthApplicationSecret } from '~/oauth_application';
 
 initApplicationDeleteButtons();
+initOAuthApplicationSecret();
diff --git a/app/assets/javascripts/pages/groups/settings/applications/index.js b/app/assets/javascripts/pages/groups/settings/applications/index.js
new file mode 100644
index 00000000000..4dee5433ec9
--- /dev/null
+++ b/app/assets/javascripts/pages/groups/settings/applications/index.js
@@ -0,0 +1,3 @@
+import { initOAuthApplicationSecret } from '~/oauth_application';
+
+initOAuthApplicationSecret();
diff --git a/app/assets/javascripts/pages/oauth/applications/index.js b/app/assets/javascripts/pages/oauth/applications/index.js
new file mode 100644
index 00000000000..4dee5433ec9
--- /dev/null
+++ b/app/assets/javascripts/pages/oauth/applications/index.js
@@ -0,0 +1,3 @@
+import { initOAuthApplicationSecret } from '~/oauth_application';
+
+initOAuthApplicationSecret();