From 44e94d203ef71ce5566902b07ac9458c1cbe6f61 Mon Sep 17 00:00:00 2001 From: cbcc <827718623@qq.com> Date: Tue, 26 May 2020 23:38:16 +0800 Subject: [PATCH 1/4] support rollback to specified release (#2858) --- .../controller/ReleaseController.java | 8 ++- .../biz/repository/ReleaseRepository.java | 2 + .../apollo/biz/service/ReleaseService.java | 65 +++++++++++++++++ .../biz/service/ReleaseServiceTest.java | 67 ++++++++++++++++++ .../apollo/portal/api/AdminServiceAPI.java | 6 ++ .../portal/controller/ReleaseController.java | 19 ++++- .../apollo/portal/service/ReleaseService.java | 4 ++ .../main/resources/static/config/history.html | 21 ++++++ .../src/main/resources/static/i18n/en.json | 4 ++ .../src/main/resources/static/i18n/zh-CN.json | 4 ++ .../config/ReleaseHistoryController.js | 46 ++++++++++-- .../directive/rollback-modal-directive.js | 70 ++++++++++++++++++- .../static/scripts/services/EventManager.js | 1 + .../static/scripts/services/ReleaseService.js | 39 ++++++++++- .../resources/static/styles/common-style.css | 5 ++ .../views/component/rollback-modal.html | 5 +- 16 files changed, 354 insertions(+), 12 deletions(-) diff --git a/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java b/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java index 790ad0d4d5a..3fa20a9fe77 100644 --- a/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java +++ b/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java @@ -168,9 +168,15 @@ public ReleaseDTO updateAndPublish(@PathVariable("appId") String appId, @Transactional @PutMapping("/releases/{releaseId}/rollback") public void rollback(@PathVariable("releaseId") long releaseId, + @RequestParam(name="toReleaseId", defaultValue = "-1") long toReleaseId, @RequestParam("operator") String operator) { - Release release = releaseService.rollback(releaseId, operator); + Release release; + if (toReleaseId > -1) { + release = releaseService.rollbackTo(releaseId, toReleaseId, operator); + } else { + release = releaseService.rollback(releaseId, operator); + } String appId = release.getAppId(); String clusterName = release.getClusterName(); diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseRepository.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseRepository.java index ceb9827aaaf..11e8fd517ec 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseRepository.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseRepository.java @@ -25,6 +25,8 @@ Release findFirstByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderBy List findByAppIdAndClusterNameAndNamespaceNameAndIsAbandonedFalseOrderByIdDesc(String appId, String clusterName, String namespaceName, Pageable page); + List findByAppIdAndClusterNameAndNamespaceNameAndIdBetweenOrderByIdDesc(String appId, String clusterName, String namespaceName, long formId, long toId); + List findByReleaseKeyIn(Set releaseKey); List findByIdIn(Set releaseIds); diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java index 6f551ad3098..42536570326 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java @@ -131,6 +131,20 @@ public List findActiveReleases(String appId, String clusterName, String return releases; } + public List findByReleaseIdBetween(String appId, String clusterName, String namespaceName, + long fromReleaseId, long toReleaseId) { + List + releases = + releaseRepository.findByAppIdAndClusterNameAndNamespaceNameAndIdBetweenOrderByIdDesc(appId, clusterName, + namespaceName, + fromReleaseId, + toReleaseId); + if (releases == null) { + return Collections.emptyList(); + } + return releases; + } + @Transactional public Release mergeBranchChangeSetsAndRelease(Namespace namespace, String branchName, String releaseName, String releaseComment, boolean isEmergencyPublish, @@ -454,6 +468,57 @@ public Release rollback(long releaseId, String operator) { return release; } + @Transactional + public Release rollbackTo(long releaseId, long toReleaseId, String operator) { + if (releaseId == toReleaseId) { + throw new BadRequestException("current release equal to target release"); + } + + Release release = findOne(releaseId); + Release toRelease = findOne(toReleaseId); + if (release == null || toRelease == null) { + throw new NotFoundException("release not found"); + } + if (release.isAbandoned()) { + throw new BadRequestException("release is not active"); + } + + String appId = release.getAppId(); + String clusterName = release.getClusterName(); + String namespaceName = release.getNamespaceName(); + + List releases; + boolean isBackward = toReleaseId < releaseId; + if (isBackward) { + releases = findByReleaseIdBetween(appId, clusterName, namespaceName, + toReleaseId, releaseId); + if (toRelease.isAbandoned()) { + toRelease.setAbandoned(false); + toRelease.setDataChangeLastModifiedBy(operator); + releaseRepository.save(toRelease); + } + } else { + releases = findByReleaseIdBetween(appId, clusterName, namespaceName, + releaseId, toReleaseId); + } + + for (int i = 0; i < releases.size() - 1; i++) { + releases.get(i).setAbandoned(isBackward); + releases.get(i).setDataChangeLastModifiedBy(operator); + } + + releaseRepository.saveAll(releases); + + releaseHistoryService.createReleaseHistory(appId, clusterName, + namespaceName, clusterName, toReleaseId, + release.getId(), ReleaseOperation.ROLLBACK, null, operator); + + //publish child namespace if namespace has child + rollbackChildNamespace(appId, clusterName, namespaceName, Lists.newArrayList(release, toRelease), operator); + + return release; + } + private void rollbackChildNamespace(String appId, String clusterName, String namespaceName, List parentNamespaceTwoLatestActiveRelease, String operator) { Namespace parentNamespace = namespaceService.findOne(appId, clusterName, namespaceName); diff --git a/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ReleaseServiceTest.java b/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ReleaseServiceTest.java index 0a459d2229f..405ab17508b 100644 --- a/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ReleaseServiceTest.java +++ b/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ReleaseServiceTest.java @@ -9,6 +9,7 @@ import com.ctrip.framework.apollo.biz.repository.ReleaseRepository; import com.ctrip.framework.apollo.common.exception.BadRequestException; +import java.util.ArrayList; import java.util.Optional; import org.junit.Assert; import org.junit.Before; @@ -108,6 +109,72 @@ public void testRollback() { Assert.assertEquals(user, firstRelease.getDataChangeLastModifiedBy()); } + @Test + public void testRollbackToBackward() { + List releaseList = new ArrayList<>(); + for (int i = 0; i < 3; i++) { + Release release = new Release(); + release.setId(3 - i); + release.setAppId(appId); + release.setClusterName(clusterName); + release.setNamespaceName(namespaceName); + release.setAbandoned(false); + releaseList.add(release); + } + long releaseId1 = 1; + long releaseId3 = 3; + when(releaseRepository.findById(releaseId1)).thenReturn(Optional.of(releaseList.get(2))); + when(releaseRepository.findById(releaseId3)).thenReturn(Optional.of(releaseList.get(0))); + when(releaseRepository.findByAppIdAndClusterNameAndNamespaceNameAndIdBetweenOrderByIdDesc(appId, + clusterName, + namespaceName, + releaseId1, + releaseId3)) + .thenReturn(releaseList); + + releaseService.rollbackTo(releaseId3, releaseId1, user); + + verify(releaseRepository).saveAll(releaseList); + Assert.assertTrue(releaseList.get(0).isAbandoned()); + Assert.assertTrue(releaseList.get(1).isAbandoned()); + Assert.assertFalse(releaseList.get(2).isAbandoned()); + Assert.assertEquals(user, releaseList.get(0).getDataChangeLastModifiedBy()); + Assert.assertEquals(user, releaseList.get(1).getDataChangeLastModifiedBy()); + } + + @Test + public void testRollbackToForward() { + List releaseList = new ArrayList<>(); + for (int i = 0; i < 3; i++) { + Release release = new Release(); + release.setId(3 - i); + release.setAppId(appId); + release.setClusterName(clusterName); + release.setNamespaceName(namespaceName); + release.setAbandoned(true); + releaseList.add(release); + } + releaseList.get(2).setAbandoned(false); + long releaseId1 = 1; + long releaseId3 = 3; + when(releaseRepository.findById(releaseId1)).thenReturn(Optional.of(releaseList.get(2))); + when(releaseRepository.findById(releaseId3)).thenReturn(Optional.of(releaseList.get(0))); + when(releaseRepository.findByAppIdAndClusterNameAndNamespaceNameAndIdBetweenOrderByIdDesc(appId, + clusterName, + namespaceName, + releaseId1, + releaseId3)) + .thenReturn(releaseList); + + releaseService.rollbackTo(releaseId1, releaseId3, user); + + verify(releaseRepository).saveAll(releaseList); + Assert.assertFalse(releaseList.get(0).isAbandoned()); + Assert.assertFalse(releaseList.get(1).isAbandoned()); + Assert.assertFalse(releaseList.get(2).isAbandoned()); + Assert.assertEquals(user, releaseList.get(0).getDataChangeLastModifiedBy()); + Assert.assertEquals(user, releaseList.get(1).getDataChangeLastModifiedBy()); + } @Test public void testFindRelease() throws Exception { diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java index 9168f95f357..71791a704f8 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java @@ -347,6 +347,12 @@ public void rollback(Env env, long releaseId, String operator) { "releases/{releaseId}/rollback?operator={operator}", null, releaseId, operator); } + + public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) { + restTemplate.put(env, + "releases/{releaseId}/rollback?toReleaseId={toReleaseId}&operator={operator}", + null, releaseId, toReleaseId, operator); + } } @Service diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ReleaseController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ReleaseController.java index d585cc4ab7a..0a00acd9655 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ReleaseController.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ReleaseController.java @@ -112,6 +112,16 @@ public ReleaseDTO createGrayRelease(@PathVariable String appId, return createdRelease; } + @GetMapping("/envs/{env}/releases/{releaseId}") + public ReleaseDTO get(@PathVariable String env, + @PathVariable long releaseId) { + ReleaseDTO release = releaseService.findReleaseById(Env.valueOf(env), releaseId); + + if (release == null) { + throw new NotFoundException("release not found"); + } + return release; + } @GetMapping(value = "/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases/all") public List findAllReleases(@PathVariable String appId, @@ -153,7 +163,8 @@ public ReleaseCompareResult compareRelease(@PathVariable String env, @PutMapping(path = "/envs/{env}/releases/{releaseId}/rollback") public void rollback(@PathVariable String env, - @PathVariable long releaseId) { + @PathVariable long releaseId, + @RequestParam(defaultValue = "-1") long toReleaseId) { ReleaseDTO release = releaseService.findReleaseById(Env.valueOf(env), releaseId); if (release == null) { @@ -164,7 +175,11 @@ public void rollback(@PathVariable String env, throw new AccessDeniedException("Access is denied"); } - releaseService.rollback(Env.valueOf(env), releaseId, userInfoHolder.getUser().getUserId()); + if (toReleaseId > -1) { + releaseService.rollbackTo(Env.valueOf(env), releaseId, toReleaseId, userInfoHolder.getUser().getUserId()); + } else { + releaseService.rollback(Env.valueOf(env), releaseId, userInfoHolder.getUser().getUserId()); + } ConfigPublishEvent event = ConfigPublishEvent.instance(); event.withAppId(release.getAppId()) diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java index b2bf159b80b..95f533fea79 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java @@ -143,6 +143,10 @@ public void rollback(Env env, long releaseId, String operator) { releaseAPI.rollback(env, releaseId, operator); } + public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) { + releaseAPI.rollbackTo(env, releaseId, toReleaseId, operator); + } + public ReleaseCompareResult compare(Env env, long baseReleaseId, long toCompareReleaseId) { ReleaseDTO baseRelease = null; diff --git a/apollo-portal/src/main/resources/static/config/history.html b/apollo-portal/src/main/resources/static/config/history.html index 637e233ce00..f6102d9a03a 100644 --- a/apollo-portal/src/main/resources/static/config/history.html +++ b/apollo-portal/src/main/resources/static/config/history.html @@ -111,6 +111,16 @@
+
@@ -291,6 +310,7 @@

+ @@ -299,6 +319,7 @@

+ \ No newline at end of file diff --git a/apollo-portal/src/main/resources/static/i18n/en.json b/apollo-portal/src/main/resources/static/i18n/en.json index df985ac8bb2..fa75dfe9001 100644 --- a/apollo-portal/src/main/resources/static/i18n/en.json +++ b/apollo-portal/src/main/resources/static/i18n/en.json @@ -289,6 +289,7 @@ "Component.Publish.OpPublish": "Release", "Component.Rollback.To": "roll back to", "Component.Rollback.Tips": "This operation will roll back to the last released version, and the current version is abandoned, but there is no impact to the currently editing configurations. You may view the currently effective version in the release history page", + "Component.RollbackTo.Tips": "This operation will roll back to this released version, and the current version is abandoned, but there is no impact to the currently editing configurations", "Component.Rollback.ClickToView": "Click to view", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", @@ -646,6 +647,8 @@ "Config.History.OperationType8": "Delete Grayscale(Full Release)", "Config.History.UrgentPublish": "Emergency Release", "Config.History.LoadMore": "Load more", + "Config.History.RollbackTo": "Rollback To This Release", + "Config.History.RollbackToTips": "Rollback released configuration to this release", "Config.History.ChangedItem": "Changed Configuration", "Config.History.ChangedItemTips": "View changes between this release and the previous release", "Config.History.AllItem": "Full Configuration", @@ -749,6 +752,7 @@ "ReleaseModal.AllPublished": "Full Release Successfully", "ReleaseModal.AllPublishFailed": "Failed to Full Release", "Rollback.NoRollbackList": "No released history to rollback", + "Rollback.SameAsCurrentRelease": "This release is the same as current release", "Rollback.RollbackSuccessfully": "Rollback Successfully", "Rollback.RollbackFailed": "Failed to Rollback", "Revoke.RevokeFailed": "Failed to Revoke", diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json index 868168b5c41..f0823494a9b 100644 --- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json +++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json @@ -289,6 +289,7 @@ "Component.Publish.OpPublish": "发布", "Component.Rollback.To": "回滚到", "Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本", + "Component.RollbackTo.Tips":"此操作将会回滚到此发布版本，且当前版本作废，但不影响正在修改的配置", "Component.Rollback.ClickToView": "点击查看", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", @@ -646,6 +647,8 @@ "Config.History.OperationType8": "删除灰度(全量发布)", "Config.History.UrgentPublish": "紧急发布", "Config.History.LoadMore": "加载更多", + "Config.History.RollbackTo": "回滚到此版本", + "Config.History.RollbackToTips": "回滚已发布的配置到此版本", "Config.History.ChangedItem": "变更的配置", "Config.History.ChangedItemTips": "查看此次发布与上次版本的变更", "Config.History.AllItem": "全部配置", @@ -749,6 +752,7 @@ "ReleaseModal.AllPublished": "全量发布成功", "ReleaseModal.AllPublishFailed": "全量发布失败", "Rollback.NoRollbackList": "没有可以回滚的发布历史", + "Rollback.SameAsCurrentRelease": "该版本与当前版本相同", "Rollback.RollbackSuccessfully": "回滚成功", "Rollback.RollbackFailed": "回滚失败", "Revoke.RevokeFailed": "撤销失败", diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js b/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js index 6bbdefaee3a..4f3705427c9 100644 --- a/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js +++ b/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js @@ -1,10 +1,10 @@ release_history_module.controller("ReleaseHistoryController", - ['$scope', '$location', '$translate', 'AppUtil', - 'ReleaseService', 'ConfigService', 'ReleaseHistoryService', releaseHistoryController + ['$scope', '$location', '$translate', 'AppUtil', 'EventManager', + 'ReleaseService', 'ConfigService', 'PermissionService', 'ReleaseHistoryService', releaseHistoryController ]); -function releaseHistoryController($scope, $location, $translate, AppUtil, - ReleaseService, ConfigService, ReleaseHistoryService) { +function releaseHistoryController($scope, $location, $translate, AppUtil, EventManager, + ReleaseService, ConfigService, PermissionService, ReleaseHistoryService) { var params = AppUtil.parseParams($location.$$url); $scope.pageContext = { @@ -20,7 +20,9 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, DIFF: 'diff', ALL: 'all' }; + var selectedReleaseId = -1; + $scope.namespace = {}; $scope.page = 0; $scope.releaseHistories = []; $scope.hasLoadAll = false; @@ -30,10 +32,16 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, $scope.isConfigHidden = false; $scope.showReleaseHistoryDetail = showReleaseHistoryDetail; + $scope.rollback = rollback; + $scope.preRollback = preRollback; $scope.switchConfigViewType = switchConfigViewType; $scope.findReleaseHistory = findReleaseHistory; $scope.showText = showText; + EventManager.subscribe(EventManager.EventType.REFRESH_RELEASE_HISTORY, function () { + location.reload(true); + }); + init(); function init() { @@ -43,6 +51,14 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, loadNamespace(); } + function preRollback() { + EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: $scope.namespace, toReleaseId: selectedReleaseId }); + } + + function rollback() { + EventManager.emit(EventManager.EventType.ROLLBACK_NAMESPACE, { toReleaseId: selectedReleaseId }); + } + function findReleaseHistory() { if ($scope.hasLoadAll) { return; @@ -97,11 +113,13 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, $scope.pageContext.clusterName, $scope.pageContext.namespaceName) .then(function (result) { + $scope.namespace = result; $scope.isTextNamespace = result.format != "properties"; if ($scope.isTextNamespace) { fixTextNamespaceViewType(); } $scope.isConfigHidden = result.isConfigHidden; + initPermission(); }) } @@ -109,6 +127,7 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, $scope.history = history; $scope.selectedReleaseHistory = history.id; + selectedReleaseId = history.releaseId; if (!history.viewType) {//default view type history.viewType = CONFIG_VIEW_TYPE.DIFF; getReleaseDiffConfiguration(history); @@ -116,6 +135,25 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, } + function initPermission() { + PermissionService.has_release_namespace_permission( + $scope.pageContext.appId, + $scope.namespace.baseInfo.namespaceName) + .then(function (result) { + if (!result.hasPermission) { + PermissionService.has_release_namespace_env_permission( + $scope.pageContext.appId, + $scope.pageContext.env, + $scope.namespace.baseInfo.namespaceName) + .then(function (result) { + $scope.namespace.hasReleasePermission = result.hasPermission; + }); + } else { + $scope.namespace.hasReleasePermission = result.hasPermission; + } + }); + } + function fixTextNamespaceViewType() { $scope.releaseHistories.forEach(function (history) { // text namespace doesn't support ALL view diff --git a/apollo-portal/src/main/resources/static/scripts/directive/rollback-modal-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/rollback-modal-directive.js index ea5e0a1184d..fb80887236e 100644 --- a/apollo-portal/src/main/resources/static/scripts/directive/rollback-modal-directive.js +++ b/apollo-portal/src/main/resources/static/scripts/directive/rollback-modal-directive.js @@ -13,16 +13,25 @@ function rollbackModalDirective($translate, AppUtil, EventManager, ReleaseServic }, link: function (scope) { + scope.isRollbackTo = false; scope.showRollbackAlertDialog = showRollbackAlertDialog; EventManager.subscribe(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, function (context) { - preRollback(context.namespace); + if (context.toReleaseId) { + preRollbackTo(context.namespace, context.toReleaseId); + } else { + preRollback(context.namespace); + } }); EventManager.subscribe(EventManager.EventType.ROLLBACK_NAMESPACE, function (context) { - rollback(); + if (context.toReleaseId) { + rollbackTo(context.toReleaseId); + } else { + rollback(); + } }); function preRollback(namespace) { @@ -52,6 +61,46 @@ function rollbackModalDirective($translate, AppUtil, EventManager, ReleaseServic }); } + function preRollbackTo(namespace, toReleaseId) { + scope.isRollbackTo = true; + scope.toRollbackNamespace = namespace; + scope.toRollbackNamespace.isPropertiesFormat = namespace.format == 'properties'; + + ReleaseService.findLatestActiveRelease(scope.appId, + scope.env, + namespace.baseInfo.clusterName, + namespace.baseInfo.namespaceName) + .then(function (result) { + if (!result) { + toastr.error($translate.instant('Rollback.NoRollbackList')); + return; + } + scope.toRollbackNamespace.firstRelease = result; + + ReleaseService.get(scope.env, + toReleaseId) + .then(function (result) { + scope.toRollbackNamespace.secondRelease = result; + + if (scope.toRollbackNamespace.firstRelease.id == scope.toRollbackNamespace.secondRelease.id) { + toastr.error($translate.instant('Rollback.SameAsCurrentRelease')); + return; + } + + ReleaseService.compare(scope.env, + scope.toRollbackNamespace.firstRelease.id, + scope.toRollbackNamespace.secondRelease.id) + .then(function (result) { + scope.toRollbackNamespace.releaseCompareResult = result.changes; + + AppUtil.showModal('#rollbackModal'); + }) + + }) + + }) + } + function rollback() { scope.toRollbackNamespace.rollbackBtnDisabled = true; ReleaseService.rollback(scope.env, @@ -70,6 +119,23 @@ function rollbackModalDirective($translate, AppUtil, EventManager, ReleaseServic }) } + function rollbackTo(toReleaseId) { + scope.toRollbackNamespace.rollbackBtnDisabled = true; + ReleaseService.rollbackTo(scope.env, + scope.toRollbackNamespace.firstRelease.id, + toReleaseId + ) + .then(function (result) { + toastr.success($translate.instant('Rollback.RollbackSuccessfully')); + scope.toRollbackNamespace.rollbackBtnDisabled = false; + AppUtil.hideModal('#rollbackModal'); + EventManager.emit(EventManager.EventType.REFRESH_RELEASE_HISTORY, {releaseId: toReleaseId}); + }, function (result) { + scope.toRollbackNamespace.rollbackBtnDisabled = false; + AppUtil.showErrorMsg(result, $translate.instant('Rollback.RollbackFailed')); + }) + } + function showRollbackAlertDialog() { AppUtil.hideModal("#rollbackModal"); AppUtil.showModal("#rollbackAlertDialog"); diff --git a/apollo-portal/src/main/resources/static/scripts/services/EventManager.js b/apollo-portal/src/main/resources/static/scripts/services/EventManager.js index e0eebec7627..bf294d2fcc1 100644 --- a/apollo-portal/src/main/resources/static/scripts/services/EventManager.js +++ b/apollo-portal/src/main/resources/static/scripts/services/EventManager.js @@ -99,6 +99,7 @@ appService.service('EventManager', [function () { EventType: { REFRESH_NAMESPACE: 'refresh_namespace', + REFRESH_RELEASE_HISTORY: 'refresh_release_history', PUBLISH_NAMESPACE: 'pre_public_namespace', MERGE_AND_PUBLISH_NAMESPACE: 'merge_and_publish_namespace', PRE_ROLLBACK_NAMESPACE: 'pre_rollback_namespace', diff --git a/apollo-portal/src/main/resources/static/scripts/services/ReleaseService.js b/apollo-portal/src/main/resources/static/scripts/services/ReleaseService.js index 56f524e5c9e..5fc6357ff09 100644 --- a/apollo-portal/src/main/resources/static/scripts/services/ReleaseService.js +++ b/apollo-portal/src/main/resources/static/scripts/services/ReleaseService.js @@ -1,5 +1,9 @@ appService.service('ReleaseService', ['$resource', '$q','AppUtil', function ($resource, $q,AppUtil) { var resource = $resource('', {}, { + get: { + method: 'GET', + url: AppUtil.prefixPath() + '/envs/:env/releases/:releaseId' + }, find_all_releases: { method: 'GET', url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/releases/all', @@ -24,7 +28,7 @@ appService.service('ReleaseService', ['$resource', '$q','AppUtil', function ($re }, rollback: { method: 'PUT', - url: "envs/:env/releases/:releaseId/rollback" + url: AppUtil.prefixPath() + "/envs/:env/releases/:releaseId/rollback" } }); @@ -67,6 +71,19 @@ appService.service('ReleaseService', ['$resource', '$q','AppUtil', function ($re return d.promise; } + function get(env, releaseId) { + var d = $q.defer(); + resource.get({ + env: env, + releaseId: releaseId + }, function (result) { + d.resolve(result); + }, function (result) { + d.reject(result); + }); + return d.promise; + } + function findAllReleases(appId, env, clusterName, namespaceName, page, size) { var d = $q.defer(); resource.find_all_releases({ @@ -153,13 +170,31 @@ appService.service('ReleaseService', ['$resource', '$q','AppUtil', function ($re } + function rollbackTo(env, releaseId, toReleaseId) { + var d = $q.defer(); + resource.rollback({ + env: env, + releaseId: releaseId, + toReleaseId: toReleaseId + }, {}, function (result) { + d.resolve(result); + }, function (result) { + d.reject(result); + } + ); + return d.promise; + + } + return { publish: createRelease, grayPublish: createGrayRelease, + get: get, findAllRelease: findAllReleases, findActiveReleases: findActiveReleases, findLatestActiveRelease: findLatestActiveRelease, compare: compare, - rollback: rollback + rollback: rollback, + rollbackTo: rollbackTo } }]); diff --git a/apollo-portal/src/main/resources/static/styles/common-style.css b/apollo-portal/src/main/resources/static/styles/common-style.css index bcb0b2cca01..fae50a183b2 100644 --- a/apollo-portal/src/main/resources/static/styles/common-style.css +++ b/apollo-portal/src/main/resources/static/styles/common-style.css @@ -679,6 +679,11 @@ table th { padding: 15px; } +.release-history .panel-heading button img { + width: 12px; + height: 12px; +} + .empty-container { padding: 15px; } diff --git a/apollo-portal/src/main/resources/static/views/component/rollback-modal.html b/apollo-portal/src/main/resources/static/views/component/rollback-modal.html index 7f1a709f77e..7da396317b2 100644 --- a/apollo-portal/src/main/resources/static/views/component/rollback-modal.html +++ b/apollo-portal/src/main/resources/static/views/component/rollback-modal.html @@ -11,11 +11,14 @@

-