@spinnaker/docker
Advanced tools
Comparing version 0.0.33 to 0.0.34
{ | ||
"name": "@spinnaker/docker", | ||
"version": "0.0.33", | ||
"version": "0.0.34", | ||
"main": "lib/lib.js", | ||
@@ -5,0 +5,0 @@ "typings": "lib/index.d.ts", |
@@ -36,3 +36,3 @@ import { IPromise } from 'angular'; | ||
public static findTags(params: IFindTagsParams): IPromise<string[]> { | ||
return RetryService.buildRetrySequence<String[]>( | ||
return RetryService.buildRetrySequence<string[]>( | ||
() => API.all('images/tags').getList(params), | ||
@@ -39,0 +39,0 @@ (results: string[]) => results.length > 0, |
@@ -9,21 +9,22 @@ 'use strict'; | ||
.module('spinnaker.docker.pipeline.stage.bake.executionDetails.controller', [require('@uirouter/angularjs').default]) | ||
.controller('dockerBakeExecutionDetailsCtrl', function( | ||
$scope, | ||
$stateParams, | ||
executionDetailsSectionService, | ||
$interpolate, | ||
) { | ||
$scope.configSections = ['bakeConfig', 'taskStatus']; | ||
.controller('dockerBakeExecutionDetailsCtrl', [ | ||
'$scope', | ||
'$stateParams', | ||
'executionDetailsSectionService', | ||
'$interpolate', | ||
function($scope, $stateParams, executionDetailsSectionService, $interpolate) { | ||
$scope.configSections = ['bakeConfig', 'taskStatus']; | ||
let initialized = () => { | ||
$scope.detailsSection = $stateParams.details; | ||
$scope.provider = $scope.stage.context.cloudProviderType || 'docker'; | ||
$scope.bakeryDetailUrl = $interpolate(SETTINGS.bakeryDetailUrl); | ||
}; | ||
let initialized = () => { | ||
$scope.detailsSection = $stateParams.details; | ||
$scope.provider = $scope.stage.context.cloudProviderType || 'docker'; | ||
$scope.bakeryDetailUrl = $interpolate(SETTINGS.bakeryDetailUrl); | ||
}; | ||
let initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized); | ||
let initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized); | ||
initialize(); | ||
initialize(); | ||
$scope.$on('$stateChangeSuccess', initialize); | ||
}); | ||
$scope.$on('$stateChangeSuccess', initialize); | ||
}, | ||
]); |
@@ -32,45 +32,49 @@ 'use strict'; | ||
}) | ||
.controller('dockerBakeStageCtrl', function($scope, $q) { | ||
var stage = $scope.stage; | ||
.controller('dockerBakeStageCtrl', [ | ||
'$scope', | ||
'$q', | ||
function($scope, $q) { | ||
var stage = $scope.stage; | ||
stage.region = 'global'; | ||
stage.region = 'global'; | ||
if (!$scope.stage.user) { | ||
$scope.stage.user = AuthenticationService.getAuthenticatedUser().name; | ||
} | ||
if (!$scope.stage.user) { | ||
$scope.stage.user = AuthenticationService.getAuthenticatedUser().name; | ||
} | ||
$scope.viewState = { | ||
loading: true, | ||
}; | ||
$scope.viewState = { | ||
loading: true, | ||
}; | ||
function initialize() { | ||
$scope.viewState.providerSelected = true; | ||
$q.all({ | ||
baseOsOptions: BakeryReader.getBaseOsOptions('docker'), | ||
baseLabelOptions: BakeryReader.getBaseLabelOptions(), | ||
}).then(function(results) { | ||
$scope.baseOsOptions = results.baseOsOptions.baseImages; | ||
$scope.baseLabelOptions = results.baseLabelOptions; | ||
function initialize() { | ||
$scope.viewState.providerSelected = true; | ||
$q.all({ | ||
baseOsOptions: BakeryReader.getBaseOsOptions('docker'), | ||
baseLabelOptions: BakeryReader.getBaseLabelOptions(), | ||
}).then(function(results) { | ||
$scope.baseOsOptions = results.baseOsOptions.baseImages; | ||
$scope.baseLabelOptions = results.baseLabelOptions; | ||
if (!$scope.stage.baseOs && $scope.baseOsOptions && $scope.baseOsOptions.length) { | ||
$scope.stage.baseOs = $scope.baseOsOptions[0].id; | ||
} | ||
if (!$scope.stage.baseLabel && $scope.baseLabelOptions && $scope.baseLabelOptions.length) { | ||
$scope.stage.baseLabel = $scope.baseLabelOptions[0]; | ||
} | ||
$scope.viewState.loading = false; | ||
}); | ||
} | ||
if (!$scope.stage.baseOs && $scope.baseOsOptions && $scope.baseOsOptions.length) { | ||
$scope.stage.baseOs = $scope.baseOsOptions[0].id; | ||
} | ||
if (!$scope.stage.baseLabel && $scope.baseLabelOptions && $scope.baseLabelOptions.length) { | ||
$scope.stage.baseLabel = $scope.baseLabelOptions[0]; | ||
} | ||
$scope.viewState.loading = false; | ||
}); | ||
} | ||
function deleteEmptyProperties() { | ||
_.forOwn($scope.stage, function(val, key) { | ||
if (val === '') { | ||
delete $scope.stage[key]; | ||
} | ||
}); | ||
} | ||
function deleteEmptyProperties() { | ||
_.forOwn($scope.stage, function(val, key) { | ||
if (val === '') { | ||
delete $scope.stage[key]; | ||
} | ||
}); | ||
} | ||
$scope.$watch('stage', deleteEmptyProperties, true); | ||
$scope.$watch('stage', deleteEmptyProperties, true); | ||
initialize(); | ||
}); | ||
initialize(); | ||
}, | ||
]); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
260501
2066