fix(amazon/securityGroup): Resolve angular/react modal-body conflict (#…

…9426)
spinnaker · Jul 13, 2021 · 5cd3743 · 5cd3743
1 parent b4ad37a
commit 5cd3743
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/packages/amazon/src/securityGroup/details/securityGroupDetail.controller.js b/packages/amazon/src/securityGroup/details/securityGroupDetail.controller.js
@@ -156,20 +156,24 @@ angular
 
       this.editInboundRules = function editInboundRules() {
         confirmNotManaged($scope.securityGroup, application).then((notManaged) => {
-          notManaged &&
-            $uibModal.open({
-              templateUrl: require('../configure/editSecurityGroup.html'),
-              controller: 'awsEditSecurityGroupCtrl as ctrl',
-              size: 'lg',
-              resolve: {
-                securityGroup: function () {
-                  return angular.copy($scope.securityGroup);
-                },
-                application: function () {
-                  return application;
+          // Wait for the MD confirmation modal to go away first to avoid react/angular bootstrap fighting over the body.modal-open class
+          return new Promise((resolve) => setTimeout(resolve, 500)).then(() => {
+            if (notManaged) {
+              $uibModal.open({
+                templateUrl: require('../configure/editSecurityGroup.html'),
+                controller: 'awsEditSecurityGroupCtrl as ctrl',
+                size: 'lg',
+                resolve: {
+                  securityGroup: function () {
+                    return angular.copy($scope.securityGroup);
+                  },
+                  application: function () {
+                    return application;
+                  },
                 },
-              },
-            });
+              });
+            }
+          });
         });
       };