From dae00c87adc5e69ac232a2145d35e73072cf5766 Mon Sep 17 00:00:00 2001 From: Alan Quach Date: Mon, 28 Oct 2019 15:00:48 -0700 Subject: [PATCH] feat(rosco): Allow optional roscoDetailUrl for roscoMode bakes (#7575) --- .../pipeline/stages/bake/bakeExecutionDetails.controller.js | 4 +++- .../pipeline/stages/bake/bakeExecutionDetails.controller.js | 4 +++- .../pipeline/stages/bake/bakeExecutionDetails.controller.js | 4 +++- .../pipeline/stages/bake/bakeExecutionDetails.controller.js | 4 +++- .../pipeline/stages/bake/bakeExecutionDetails.controller.js | 4 +++- .../pipeline/stages/bake/bakeExecutionDetails.controller.js | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index 15c361611c0..85d784ac13b 100644 --- a/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -22,7 +22,9 @@ module.exports = angular SETTINGS.feature.roscoMode || (typeof SETTINGS.feature.roscoSelector === 'function' && SETTINGS.feature.roscoSelector($scope.stage.context)); - $scope.bakeryDetailUrl = $interpolate(SETTINGS.bakeryDetailUrl); + $scope.bakeryDetailUrl = $interpolate( + $scope.roscoMode && SETTINGS.roscoDetailUrl ? SETTINGS.roscoDetailUrl : SETTINGS.bakeryDetailUrl, + ); $scope.bakeFailedNoError = get($scope.stage, 'context.status.result') === 'FAILURE' && !$scope.stage.failureMessage; }; diff --git a/app/scripts/modules/azure/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/azure/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index 72e489781c1..f169e8bf39a 100644 --- a/app/scripts/modules/azure/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/azure/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -21,7 +21,9 @@ module.exports = angular SETTINGS.feature.roscoMode || (typeof SETTINGS.feature.roscoSelector === 'function' && SETTINGS.feature.roscoSelector($scope.stage.context)); - $scope.bakeryDetailUrl = $interpolate(SETTINGS.bakeryDetailUrl); + $scope.bakeryDetailUrl = $interpolate( + $scope.roscoMode && SETTINGS.roscoDetailUrl ? SETTINGS.roscoDetailUrl : SETTINGS.bakeryDetailUrl, + ); }; let initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized); diff --git a/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index bb21f4a1b2d..09be71398dc 100644 --- a/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/docker/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -17,7 +17,9 @@ module.exports = angular let initialized = () => { $scope.detailsSection = $stateParams.details; $scope.provider = $scope.stage.context.cloudProviderType || 'docker'; - $scope.bakeryDetailUrl = $interpolate(SETTINGS.bakeryDetailUrl); + $scope.bakeryDetailUrl = $interpolate( + $scope.roscoMode && SETTINGS.roscoDetailUrl ? SETTINGS.roscoDetailUrl : SETTINGS.bakeryDetailUrl, + ); }; let initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized); diff --git a/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index f322cc2d0ef..33b3c82a7b8 100644 --- a/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/google/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -21,7 +21,9 @@ module.exports = angular SETTINGS.feature.roscoMode || (typeof SETTINGS.feature.roscoSelector === 'function' && SETTINGS.feature.roscoSelector($scope.stage.context)); - $scope.bakeryDetailUrl = $interpolate(SETTINGS.bakeryDetailUrl); + $scope.bakeryDetailUrl = $interpolate( + $scope.roscoMode && SETTINGS.roscoDetailUrl ? SETTINGS.roscoDetailUrl : SETTINGS.bakeryDetailUrl, + ); }; const initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized); diff --git a/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index 616a2964151..bdc8d97e0a8 100644 --- a/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/oracle/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -22,7 +22,9 @@ module.exports = angular $scope.detailsSection = $stateParams.details; $scope.provider = $scope.stage.context.cloudProviderType || 'oracle'; $scope.roscoMode = SETTINGS.feature.roscoMode; - $scope.bakeryDetailUrl = $interpolate(SETTINGS.bakeryDetailUrl); + $scope.bakeryDetailUrl = $interpolate( + $scope.roscoMode && SETTINGS.roscoDetailUrl ? SETTINGS.roscoDetailUrl : SETTINGS.bakeryDetailUrl, + ); }; let initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized); diff --git a/app/scripts/modules/titus/src/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/titus/src/pipeline/stages/bake/bakeExecutionDetails.controller.js index 08da221e532..f57aee064d3 100644 --- a/app/scripts/modules/titus/src/pipeline/stages/bake/bakeExecutionDetails.controller.js +++ b/app/scripts/modules/titus/src/pipeline/stages/bake/bakeExecutionDetails.controller.js @@ -17,7 +17,9 @@ module.exports = angular let initialized = () => { $scope.detailsSection = $stateParams.details; $scope.provider = $scope.stage.context.cloudProviderType || 'titus'; - $scope.bakeryDetailUrl = $interpolate(SETTINGS.bakeryDetailUrl); + $scope.bakeryDetailUrl = $interpolate( + $scope.roscoMode && SETTINGS.roscoDetailUrl ? SETTINGS.roscoDetailUrl : SETTINGS.bakeryDetailUrl, + ); }; let initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized);