Merge branch 'justin_ho-fix-confirmation-modal-showing-on-project-integrations' into 'master'

[RUN-AS-IF-FOSS]Fix confirmation modal showing on project

See merge request gitlab-org/gitlab!48720

app/assets/javascripts/integrations/edit/components/integration_form.vue

@@ -33,7 +33,14 @@ export default {
   mixins: [glFeatureFlagsMixin()],
   computed: {
     ...mapGetters(['currentKey', 'propsSource', 'isDisabled']),
-    ...mapState(['defaultState', 'override', 'isSaving', 'isTesting', 'isResetting']),
+    ...mapState([
+      'defaultState',
+      'customState',
+      'override',
+      'isSaving',
+      'isTesting',
+      'isResetting',
+    ]),
     isEditable() {
       return this.propsSource.editable;
     },
@@ -42,8 +49,8 @@ export default {
     },
     isInstanceOrGroupLevel() {
       return (
-        this.propsSource.integrationLevel === integrationLevels.INSTANCE ||
-        this.propsSource.integrationLevel === integrationLevels.GROUP
+        this.customState.integrationLevel === integrationLevels.INSTANCE ||
+        this.customState.integrationLevel === integrationLevels.GROUP
       );
     },
     showJiraIssuesFields() {

changelogs/unreleased/justin_ho-fix-confirmation-modal-showing-on-project-integrations.yml

+---
+title: Fix confirmation modal showing on project integration
+merge_request: 48720
+author:
+type: fixed