Add latest changes from gitlab-org/gitlab@13-2-stable-ee

2 files changed, 30 insertions, 9 deletions

diff --git a/app/assets/javascripts/prometheus_alerts/components/reset_key.vue b/app/assets/javascripts/prometheus_alerts/components/reset_key.vue
index 15b6a29e5cf..941a05583ad 100644
--- a/app/assets/javascripts/prometheus_alerts/components/reset_key.vue
+++ b/app/assets/javascripts/prometheus_alerts/components/reset_key.vue
@@ -41,6 +41,11 @@ export default {
       type: String,
       required: true,
     },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -88,7 +93,11 @@ export default {
         <div class="input-group">
           <gl-form-input id="notify-url" :readonly="true" :value="notifyUrl" />
           <span class="input-group-append">
-            <clipboard-button :text="notifyUrl" :title="$options.copyToClipboard" />
+            <clipboard-button
+              :text="notifyUrl"
+              :title="$options.copyToClipboard"
+              :disabled="disabled"
+            />
           </span>
         </div>
       </gl-form-group>
@@ -100,7 +109,11 @@ export default {
         <div class="input-group">
           <gl-form-input id="authorization-key" :readonly="true" :value="authorizationKey" />
           <span class="input-group-append">
-            <clipboard-button :text="authorizationKey" :title="$options.copyToClipboard" />
+            <clipboard-button
+              :text="authorizationKey"
+              :title="$options.copyToClipboard"
+              :disabled="disabled"
+            />
           </span>
         </div>
       </gl-form-group>
@@ -118,13 +131,20 @@ export default {
             )
           }}
         </gl-modal>
-        <gl-deprecated-button v-gl-modal.authKeyModal class="js-reset-auth-key">{{
-          __('Reset key')
-        }}</gl-deprecated-button>
+        <gl-deprecated-button
+          v-gl-modal.authKeyModal
+          class="js-reset-auth-key"
+          :disabled="disabled"
+          >{{ __('Reset key') }}</gl-deprecated-button
+        >
       </template>
-      <gl-deprecated-button v-else class="js-reset-auth-key" @click="resetKey">{{
-        __('Generate key')
-      }}</gl-deprecated-button>
+      <gl-deprecated-button
+        v-else
+        :disabled="disabled"
+        class="js-reset-auth-key"
+        @click="resetKey"
+        >{{ __('Generate key') }}</gl-deprecated-button
+      >
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/prometheus_alerts/index.js b/app/assets/javascripts/prometheus_alerts/index.js
index a42f19e5245..7efe6ed186b 100644
--- a/app/assets/javascripts/prometheus_alerts/index.js
+++ b/app/assets/javascripts/prometheus_alerts/index.js
@@ -8,7 +8,7 @@ export default () => {
     return;
   }
 
-  const { authorizationKey, changeKeyUrl, notifyUrl, learnMoreUrl } = el.dataset;
+  const { authorizationKey, changeKeyUrl, notifyUrl, learnMoreUrl, disabled } = el.dataset;
 
   // eslint-disable-next-line no-new
   new Vue({
@@ -20,6 +20,7 @@ export default () => {
           changeKeyUrl,
           notifyUrl,
           learnMoreUrl,
+          disabled,
         },
       });
     },