Merge branch 'issue-1712-add-status-information' of github.com:Aiven-…

…Open/klaw into issue-1712-add-status-information
Aiven-Open · Sep 26, 2023 · 1455587 · 1455587
2 parents 65637a7 + b084f90
commit 1455587
Show file tree

Hide file tree

Showing 40 changed files with 188 additions and 125 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,28 @@
-About this change - What it does
+# Linked issue
 
 Resolves: #xxxxx
-Why this way
+
+# What kind of change does this PR introduce?
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Refactor
+- [ ] Docs update
+- [ ] CI update
+
+# What is the current behavior?
+
+_Describe the state of the application before this PR. Illustrations appreciated (videos, gifs, screenshots)._
+
+# What is the new behavior?
+
+_Describe the state of the application after this PR. Illustrations appreciated (videos, gifs, screenshots)._
+
+# Other information:
+
+_Additional changes, explanations of the approach taken, unresolved issues, necessary follow ups, etc._
+
+# Please check if the PR fulfills these requirements
+
+- [ ] The commit message follows [our guidelines](https://github.com/Aiven-Open/klaw/blob/main/CONTRIBUTING.md#guideline-commit-messages)
+- [ ] Tests for the changes have been added (for bug fixes / features)
diff --git a/core/src/main/resources/static/js/analytics.js b/core/src/main/resources/static/js/analytics.js
@@ -134,7 +134,7 @@ app.controller("showAnalyticsCtrl", function($scope, $http, $location, $window)
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -158,6 +158,7 @@ app.controller("showAnalyticsCtrl", function($scope, $http, $location, $window)
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -197,7 +198,7 @@ app.controller("showAnalyticsCtrl", function($scope, $http, $location, $window)
 						closeOnConfirm: true,
 						closeOnCancel: true
 					}).then(function(isConfirm){
-						if (isConfirm.dismiss != "cancel") {
+						if (isConfirm.value) {
 							$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
 						} else {
 							return;

diff --git a/core/src/main/resources/static/js/browseAcls.js b/core/src/main/resources/static/js/browseAcls.js
@@ -144,7 +144,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -168,6 +168,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -207,7 +208,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
 						closeOnConfirm: true,
 						closeOnCancel: true
 					}).then(function(isConfirm){
-						if (isConfirm.dismiss != "cancel") {
+						if (isConfirm.value) {
 							$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
 						} else {
 							return;
@@ -260,7 +261,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
                     closeOnConfirm: true,
                     closeOnCancel: true
                 }).then(function(isConfirm){
-                    if (isConfirm.dismiss !== "cancel") {
+                    if (isConfirm.value) {
                         swal({
                             title: "Delete schema ?",
                             text: "Delete associated schema (all versions) of this topic, if it exists ?",
@@ -272,7 +273,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
                             closeOnConfirm: true,
                             closeOnCancel: true
                         }).then(function(isConfirm){
-                            if (isConfirm.dismiss !== "cancel") {
+                            if (isConfirm.value) {
                                 $scope.createTopicDeleteRequestHttpCall(env, true); // delete schema
                             } else {
                                 $scope.createTopicDeleteRequestHttpCall(env, false); // don't delete schema
@@ -330,7 +331,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
                         closeOnConfirm: true,
                         closeOnCancel: true
                     }).then(function(isConfirm){
-                        if (isConfirm.dismiss !== "cancel") {
+                        if (isConfirm.value) {
                             $http({
                                     method: "POST",
                                     url: "createClaimTopicRequest",
@@ -390,7 +391,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
                         closeOnConfirm: true,
                         closeOnCancel: true
                     }).then(function(isConfirm){
-                        if (isConfirm.dismiss !== "cancel") {
+                        if (isConfirm.value) {
                             $http({
                                     method: "POST",
                                     url: "createDeleteAclSubscriptionRequest",
@@ -543,7 +544,7 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
                         closeOnConfirm: true,
                         closeOnCancel: true
                     }).then(function(isConfirm){
-                        if (isConfirm.dismiss !== "cancel") {
+                        if (isConfirm.value) {
                             $http({
                                     method: "POST",
                                     url: "saveTopicDocumentation",

diff --git a/core/src/main/resources/static/js/browseTopics.js b/core/src/main/resources/static/js/browseTopics.js
@@ -107,7 +107,7 @@ app.controller("browseTopicsCtrl", function($scope, $http, $location, $window) {
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -131,6 +131,7 @@ app.controller("browseTopicsCtrl", function($scope, $http, $location, $window) {
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -170,7 +171,7 @@ app.controller("browseTopicsCtrl", function($scope, $http, $location, $window) {
 						closeOnConfirm: true,
 						closeOnCancel: true
 					}).then(function(isConfirm){
-						if (isConfirm.dismiss != "cancel") {
+						if (isConfirm.value) {
 							$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
 						} else {
 							return;

diff --git a/core/src/main/resources/static/js/connectorOverview.js b/core/src/main/resources/static/js/connectorOverview.js
@@ -134,7 +134,7 @@ app.controller("connectorOverviewCtrl", function($scope, $http, $location, $wind
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -158,6 +158,7 @@ app.controller("connectorOverviewCtrl", function($scope, $http, $location, $wind
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -197,7 +198,7 @@ app.controller("connectorOverviewCtrl", function($scope, $http, $location, $wind
 						closeOnConfirm: true,
 						closeOnCancel: true
 					}).then(function(isConfirm){
-						if (isConfirm.dismiss != "cancel") {
+						if (isConfirm.value) {
 							$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
 						} else {
 							return;
@@ -245,7 +246,7 @@ app.controller("connectorOverviewCtrl", function($scope, $http, $location, $wind
                     closeOnConfirm: true,
                     closeOnCancel: true
                 }).then(function(isConfirm){
-                    if (isConfirm.dismiss != "cancel") {
+                    if (isConfirm.value) {
                         $http({
                                 method: "POST",
                                 url: "createConnectorDeleteRequest",
@@ -294,7 +295,7 @@ app.controller("connectorOverviewCtrl", function($scope, $http, $location, $wind
                         closeOnConfirm: true,
                         closeOnCancel: true
                     }).then(function(isConfirm){
-                        if (isConfirm.dismiss != "cancel") {
+                        if (isConfirm.value) {
                             $http({
                                     method: "POST",
                                     url: "createClaimConnectorRequest",
@@ -362,7 +363,7 @@ app.controller("connectorOverviewCtrl", function($scope, $http, $location, $wind
                         closeOnConfirm: true,
                         closeOnCancel: true
                     }).then(function(isConfirm){
-                        if (isConfirm.dismiss !== "cancel") {
+                        if (isConfirm.value) {
                             $http({
                                     method: "POST",
                                     url: "createConnector",
@@ -451,7 +452,7 @@ app.controller("connectorOverviewCtrl", function($scope, $http, $location, $wind
                         closeOnConfirm: true,
                         closeOnCancel: true
                     }).then(function(isConfirm){
-                        if (isConfirm.dismiss !== "cancel") {
+                        if (isConfirm.value) {
                             $http({
                                     method: "POST",
                                     url: "saveConnectorDocumentation",

diff --git a/core/src/main/resources/static/js/docs.js b/core/src/main/resources/static/js/docs.js
@@ -173,7 +173,7 @@ app.controller("docsCtrl", function($scope, $http, $location, $window) {
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -197,6 +197,7 @@ app.controller("docsCtrl", function($scope, $http, $location, $window) {
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -236,7 +237,7 @@ app.controller("docsCtrl", function($scope, $http, $location, $window) {
 						closeOnConfirm: true,
 						closeOnCancel: true
 					}).then(function(isConfirm){
-						if (isConfirm.dismiss != "cancel") {
+						if (isConfirm.value) {
 							$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
 						} else {
 							return;

diff --git a/core/src/main/resources/static/js/editAclRequest.js b/core/src/main/resources/static/js/editAclRequest.js
@@ -120,7 +120,7 @@ app.controller("editAclRequestCtrl", function($scope, $http, $location, $window)
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -144,6 +144,7 @@ app.controller("editAclRequestCtrl", function($scope, $http, $location, $window)
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -183,7 +184,7 @@ app.controller("editAclRequestCtrl", function($scope, $http, $location, $window)
 						closeOnConfirm: true,
 						closeOnCancel: true
 					}).then(function(isConfirm){
-						if (isConfirm.dismiss !== "cancel") {
+						if (isConfirm.value) {
 							$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
 						} else {
 							return;

diff --git a/core/src/main/resources/static/js/editTopicRequest.js b/core/src/main/resources/static/js/editTopicRequest.js
@@ -290,7 +290,7 @@ app.controller("editTopicRequestCtrl", function($scope, $http, $location, $windo
                          } else {
                                serviceInput['remarks'] += " Warning To decrease partitions of a topic the topic has to be deleted";
                          }
-                             if (isConfirm.dismiss !== "cancel") {
+                             if (isConfirm.value) {
                                  $scope.httpCreateUpdateTopicReq(serviceInput);
                              }
                          });
@@ -532,7 +532,7 @@ app.controller("editTopicRequestCtrl", function($scope, $http, $location, $windo
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -556,6 +556,7 @@ app.controller("editTopicRequestCtrl", function($scope, $http, $location, $windo
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -595,7 +596,7 @@ app.controller("editTopicRequestCtrl", function($scope, $http, $location, $windo
 						closeOnConfirm: true,
 						closeOnCancel: true
 					}).then(function(isConfirm){
-						if (isConfirm.dismiss != "cancel") {
+						if (isConfirm.value) {
 							$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
 						} else {
 							return;

diff --git a/core/src/main/resources/static/js/envs.js b/core/src/main/resources/static/js/envs.js
@@ -354,7 +354,7 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
                     closeOnConfirm: true,
                     closeOnCancel: true
                 }).then(function(isConfirm){
-                    if (isConfirm.dismiss !== "cancel") {
+                    if (isConfirm.value) {
                         $http({
                                 method: "POST",
                                 url: "deleteTenant",
@@ -601,7 +601,7 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
                     closeOnConfirm: true,
                     closeOnCancel: true
                 }).then(function(isConfirm){
-                    if (isConfirm.dismiss != "cancel") {
+                    if (isConfirm.value) {
                         $http({
                                 method: "POST",
                                 url: "deleteCluster",
@@ -645,7 +645,7 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
             		closeOnConfirm: true,
             		closeOnCancel: true
             	}).then(function(isConfirm){
-            		if (isConfirm.dismiss != "cancel") {
+            		if (isConfirm.value) {
             			$http({
                                 method: "POST",
                                 url: "deleteEnvironmentRequest",
@@ -1179,7 +1179,7 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -1203,6 +1203,7 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -1242,7 +1243,7 @@ app.controller("envsCtrl", function($scope, $http, $location, $window) {
 						closeOnConfirm: true,
 						closeOnCancel: true
 					}).then(function(isConfirm){
-						if (isConfirm.dismiss != "cancel") {
+						if (isConfirm.value) {
 							$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
 						} else {
 							return;

diff --git a/core/src/main/resources/static/js/execAcls.js b/core/src/main/resources/static/js/execAcls.js
@@ -97,7 +97,7 @@ app.controller("execAclsCtrl", function($scope, $http, $location, $window) {
                 closeOnConfirm: true,
                 closeOnCancel: true
             }).then(function(isConfirm) {
-                if (isConfirm.dismiss !== "cancel") {
+                if (isConfirm.value) {
                     $http({
                         method: "POST",
                         url: "user/updateTeam",
@@ -121,6 +121,7 @@ app.controller("execAclsCtrl", function($scope, $http, $location, $window) {
                         }
                     );
                 } else {
+                    $scope.checkSwitchTeams($scope.dashboardDetails.canSwitchTeams, $scope.dashboardDetails.teamId, $scope.userlogged);
                     return;
                 }
             });
@@ -160,7 +161,7 @@ app.controller("execAclsCtrl", function($scope, $http, $location, $window) {
                             closeOnConfirm: true,
                             closeOnCancel: true
                         }).then(function(isConfirm){
-                            if (isConfirm.dismiss != "cancel") {
+                            if (isConfirm.value) {
                                 $window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/"+redirectPage;
                             } else {
                                 return;
@@ -264,7 +265,7 @@ app.controller("execAclsCtrl", function($scope, $http, $location, $window) {
                     closeOnConfirm: true,
                     closeOnCancel: true
                 }).then(function(isConfirm){
-                    if (isConfirm.dismiss != "cancel") {
+                    if (isConfirm.value) {
                             $http({
                                     method: "POST",
                                     url: "execAclRequest",
@@ -345,7 +346,7 @@ app.controller("execAclsCtrl", function($scope, $http, $location, $window) {
                         closeOnConfirm: true,
                         closeOnCancel: true
                     }).then(function(isConfirm){
-                        if (isConfirm.dismiss != "cancel") {
+                        if (isConfirm.value) {
                                 $http({
                                          method: "POST",
                                          url: "execAclRequestDecline",