Merge branch 'add-approval-rule-action-buttons' into 'master'

Add approval rule: Move action buttons to content

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159883



Merged-by: Paul Slaughter <pslaughter@gitlab.com>
Approved-by: Michael Le <mle@gitlab.com>
Approved-by: Nataliia Radina <nradina@gitlab.com>
Approved-by: Paul Slaughter <pslaughter@gitlab.com>
Co-authored-by: Sascha Eggenberger <seggenberger@gitlab.com>

ee/app/assets/javascripts/approvals/components/rule_drawer/create_rule.vue

@@ -77,20 +77,7 @@ export default {
       <h2 class="gl-mt-0 gl-text-size-h2">{{ title }}</h2>
     </template>
 
-    <template #header>
-      <gl-button
-        variant="confirm"
-        data-testid="save-approval-rule-button"
-        :loading="isLoading"
-        @click="submit"
-      >
-        {{ $options.I18N.saveChanges }}
-      </gl-button>
-      <gl-button variant="confirm" category="secondary" @click="$emit('close')">
-        {{ $options.I18N.cancel }}
-      </gl-button>
-    </template>
-    <template #default>
+    <div>
       <rule-form
         ref="form"
         :init-rule="rule"
@@ -99,6 +86,20 @@ export default {
         :default-rule-name="defaultRuleName"
         v-on="$listeners"
       />
-    </template>
+
+      <div class="gl-flex gl-gap-3">
+        <gl-button
+          variant="confirm"
+          data-testid="save-approval-rule-button"
+          :loading="isLoading"
+          @click="submit"
+        >
+          {{ $options.I18N.saveChanges }}
+        </gl-button>
+        <gl-button variant="confirm" category="secondary" @click="$emit('close')">
+          {{ $options.I18N.cancel }}
+        </gl-button>
+      </div>
+    </div>
   </gl-drawer>
 </template>

ee/spec/frontend/approvals/components/rule_drawer/create_rule_spec.js

@@ -36,7 +36,10 @@ describe('Approvals DrawerRuleCreate', () => {
 
     wrapper = shallowMountExtended(DrawerRuleCreate, {
       store: new Vuex.Store(store),
-      stubs: { RuleForm: RuleFormStub },
+      stubs: {
+        RuleForm: RuleFormStub,
+        GlDrawer,
+      },
       propsData,
     });
   };