diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html
index f6eb24a60a8..575603a21b9 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html
+++ b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html
@@ -83,6 +83,20 @@
Pipeline Parameters
+
+
+
+
+ The following parameters are not accepted by the pipeline but are still set in the stage configuration:
+
+
+
+
+
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js
index a14eb11ac4f..90980a5cfa0 100644
--- a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js
+++ b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js
@@ -87,6 +87,14 @@ module.exports = angular
}
$scope.pipelineParameters = config.parameterConfig;
$scope.userSuppliedParameters = $scope.stage.pipelineParameters;
+
+ if ($scope.pipelineParameters) {
+ const acceptedPipelineParams = $scope.pipelineParameters.map(param => param.name);
+ $scope.invalidParameters = Object.keys($scope.userSuppliedParameters).filter(
+ paramName => !acceptedPipelineParams.includes(paramName),
+ );
+ }
+
$scope.useDefaultParameters = {};
_.each($scope.pipelineParameters, function(property) {
if (!(property.name in $scope.stage.pipelineParameters) && property.default !== null) {
@@ -119,6 +127,15 @@ module.exports = angular
}
};
+ this.removeInvalidParameters = function() {
+ $scope.invalidParameters.forEach(param => {
+ if ($scope.stage.pipelineParameters[param] !== 'undefined') {
+ delete $scope.stage.pipelineParameters[param];
+ }
+ });
+ $scope.invalidParameters = [];
+ };
+
$scope.$watch('stage.application', initializeMasters);
$scope.$watch('stage.pipeline', updatePipelineConfig);
},
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/triggerArtifactConstraintSelector.less b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/triggerArtifactConstraintSelector.less
index a9e13820128..a1f914761ea 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/triggerArtifactConstraintSelector.less
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/triggerArtifactConstraintSelector.less
@@ -12,7 +12,7 @@
}
.artifact-select .Select-arrow-zone {
- border-left: 1px solid rgb(204, 204, 204);
+ border-left: 1px solid var(--color-alto);
background-image: url('~Select2/select2x2.png');
background-size: 60px 40px;
width: 17px;