@@ -12980,26 +12980,26 @@ templateUrl:"views/overview/_builds.html"
1298012980function a ( a , b , c , d , e , f , g , h ) {
1298112981var i = this ;
1298212982_ . extend ( i , f . ui ) ;
12983- var j = a ( "canI" ) , k = a ( "deploymentIsInProgress" ) , l = a ( "isBinaryBuild" ) , m = function ( a ) {
12983+ var j = a ( "canI" ) , k = a ( "deploymentIsInProgress" ) , l = a ( "isBinaryBuild" ) , m = a ( "enableTechPreviewFeature" ) , n = function ( a ) {
1298412984var b = _ . get ( a , "spec.triggers" ) ;
1298512985_ . isEmpty ( b ) || ( i . imageChangeTriggers = _ . filter ( b , function ( a ) {
1298612986return "ImageChange" === a . type && _ . get ( a , "imageChangeParams.automatic" ) ;
1298712987} ) ) ;
12988- } , n = function ( a ) {
12989- a && ! i . current && "DeploymentConfig" !== a . kind && "Deployment" !== a . kind && ( i . current = a ) ;
1299012988} , o = function ( a ) {
12991- i . rgv = c . objectToResourceGroupVersion ( a ) , n ( a ) , m ( a ) ;
12989+ a && ! i . current && "DeploymentConfig" !== a . kind && "Deployment" !== a . kind && ( i . current = a ) ;
12990+ } , p = function ( a ) {
12991+ i . rgv = c . objectToResourceGroupVersion ( a ) , o ( a ) , n ( a ) ;
1299212992} ;
1299312993i . $onChanges = function ( a ) {
12994- a . apiObject && o ( a . apiObject . currentValue ) ;
12994+ a . apiObject && p ( a . apiObject . currentValue ) ;
1299512995} ;
12996- var p = [ ] , q = function ( a ) {
12996+ var q = [ ] , r = function ( a ) {
1299712997if ( ! i . state . hpaByResource ) return null ;
1299812998var b = _ . get ( a , "kind" ) , c = _ . get ( a , "metadata.name" ) ;
12999- return _ . get ( i . state . hpaByResource , [ b , c ] , p ) ;
12999+ return _ . get ( i . state . hpaByResource , [ b , c ] , q ) ;
1300013000} ;
1300113001i . $doCheck = function ( ) {
13002- i . notifications = f . getNotifications ( i . apiObject , i . state ) , i . hpa = q ( i . apiObject ) , i . current && _ . isEmpty ( i . hpa ) && ( i . hpa = q ( i . current ) ) ;
13002+ i . notifications = f . getNotifications ( i . apiObject , i . state ) , i . hpa = r ( i . apiObject ) , i . current && _ . isEmpty ( i . hpa ) && ( i . hpa = r ( i . current ) ) ;
1300313003var a = _ . get ( i , "apiObject.metadata.uid" ) ;
1300413004a && ( i . services = _ . get ( i , [ "state" , "servicesByObjectUID" , a ] ) , i . buildConfigs = _ . get ( i , [ "state" , "buildConfigsByObjectUID" , a ] ) , i . bindings = _ . get ( i , [ "state" , "bindingsByApplicationUID" , a ] ) ) ;
1300513005var b , c = _ . get ( i , "apiObject.kind" ) ;
@@ -13015,16 +13015,28 @@ return !!_.isEmpty(i.hpa) && !i.isDeploymentInProgress();
1301513015} , i . isDeploymentInProgress = function ( ) {
1301613016return ! ( ! i . current || ! i . previous ) || k ( i . current ) ;
1301713017} , i . canIDoAny = function ( ) {
13018- var a = _ . get ( i , "apiObject.kind" ) ;
13018+ var a = _ . get ( i , "apiObject.kind" ) , b = _ . get ( i , "apiObject.metadata.uid" ) , c = _ . get ( i . state . deleteableBindingsByApplicationUID , b ) ;
1301913019switch ( a ) {
1302013020case "DeploymentConfig" :
13021- return ! ! j ( "deploymentconfigs/instantiate" , "create" ) || ( ! ! j ( "deploymentconfigs" , "update" ) || ( ! ( ! i . current || ! j ( "deploymentconfigs/log" , "get" ) ) || ( i . showStartPipelineAction ( ) || i . showStartBuildAction ( ) ) ) ) ;
13021+ return ! ! j ( "deploymentconfigs/instantiate" , "create" ) || ( ! ! j ( "deploymentconfigs" , "update" ) || ( ! ( ! i . current || ! j ( "deploymentconfigs/log" , "get" ) ) || ( ! ( ! m ( "pod_presets" ) || _ . isEmpty ( i . state . bindableServiceInstances ) || ! j ( {
13022+ resource :"bindings" ,
13023+ group :"servicecatalog.k8s.io"
13024+ } , "create" ) ) || ( ! ( ! m ( "pod_presets" ) || _ . isEmpty ( c ) || ! j ( {
13025+ resource :"bindings" ,
13026+ group :"servicecatalog.k8s.io"
13027+ } , "delete" ) ) || ( i . showStartPipelineAction ( ) || i . showStartBuildAction ( ) ) ) ) ) ) ;
1302213028
1302313029case "Pod" :
1302413030return ! ! j ( "pods/log" , "get" ) || ! ! j ( "pods" , "update" ) ;
1302513031
1302613032default :
13027- return ! ( ! i . firstPod ( i . current ) || ! j ( "pods/log" , "get" ) ) || ! ! j ( i . rgv , "update" ) ;
13033+ return ! ( ! i . firstPod ( i . current ) || ! j ( "pods/log" , "get" ) ) || ( ! ! j ( i . rgv , "update" ) || ( ! ( ! m ( "pod_presets" ) || _ . isEmpty ( i . state . bindableServiceInstances ) || ! j ( {
13034+ resource :"bindings" ,
13035+ group :"servicecatalog.k8s.io"
13036+ } , "create" ) ) || ! ( ! m ( "pod_presets" ) || _ . isEmpty ( c ) || ! j ( {
13037+ resource :"bindings" ,
13038+ group :"servicecatalog.k8s.io"
13039+ } , "delete" ) ) ) ) ;
1302813040}
1302913041} , i . showStartBuildAction = function ( ) {
1303013042if ( ! _ . isEmpty ( i . pipelines ) ) return ! 1 ;
@@ -13100,29 +13112,40 @@ hidePipelines:"<"
1310013112templateUrl :"views/overview/_list-row.html"
1310113113} ) ;
1310213114} ( ) , function ( ) {
13103- function a ( a , b , c , d , e , f ) {
13104- var g = this ;
13105- _ . extend ( g , e . ui ) ;
13106- var h = a ( "getErrorDetails" ) , i = a ( "serviceInstanceDisplayName" ) , j = function ( ) {
13107- var a = g . apiObject . spec . serviceClassName ;
13108- return _ . get ( g , [ "state" , "serviceClasses" , a , "description" ] ) ;
13109- } ;
13110- g . $doCheck = function ( ) {
13111- g . notifications = e . getNotifications ( g . apiObject , g . state ) , g . displayName = i ( g . apiObject , g . serviceClasses ) , g . description = j ( ) ;
13112- } , g . $onChanges = function ( a ) {
13113- a . bindings && ( g . deleteableBindings = _ . reject ( g . bindings , "metadata.deletionTimestamp" ) ) ;
13114- } , g . getSecretForBinding = function ( a ) {
13115- return a && _ . get ( g , [ "state" , "secrets" , a . spec . secretName ] ) ;
13116- } , g . isBindable = d . isServiceBindable ( g . apiObject , g . state . serviceClasses ) , g . closeOverlayPanel = function ( ) {
13117- _ . set ( g , "overlay.panelVisible" , ! 1 ) ;
13118- } , g . showOverlayPanel = function ( a , b ) {
13119- _ . set ( g , "overlay.panelVisible" , ! 0 ) , _ . set ( g , "overlay.panelName" , a ) , _ . set ( g , "overlay.state" , b ) ;
13120- } , g . deprovision = function ( ) {
13115+ function a ( a , b , c , d , e , f , g ) {
13116+ var h = this ;
13117+ _ . extend ( h , e . ui ) ;
13118+ var i = a ( "getErrorDetails" ) , j = a ( "serviceInstanceDisplayName" ) , k = function ( ) {
13119+ var a = h . apiObject . spec . serviceClassName ;
13120+ return _ . get ( h , [ "state" , "serviceClasses" , a , "description" ] ) ;
13121+ } ;
13122+ h . $doCheck = function ( ) {
13123+ h . notifications = e . getNotifications ( h . apiObject , h . state ) , h . displayName = j ( h . apiObject , h . serviceClasses ) , h . description = k ( ) ;
13124+ } , h . $onChanges = function ( a ) {
13125+ a . bindings && ( h . deleteableBindings = _ . reject ( h . bindings , "metadata.deletionTimestamp" ) ) ;
13126+ } , h . getSecretForBinding = function ( a ) {
13127+ return a && _ . get ( h , [ "state" , "secrets" , a . spec . secretName ] ) ;
13128+ } , h . isBindable = d . isServiceBindable ( h . apiObject , h . state . serviceClasses ) , h . actionsDropdownVisible = function ( ) {
13129+ return ! ( ! h . isBindable || ! g . canI ( {
13130+ resource :"bindings" ,
13131+ group :"servicecatalog.k8s.io"
13132+ } , "create" ) ) || ( ! ( _ . isEmpty ( h . deleteableBindings ) || ! g . canI ( {
13133+ resource :"bindings" ,
13134+ group :"servicecatalog.k8s.io"
13135+ } , "delete" ) ) || ! ! g . canI ( {
13136+ resource :"instances" ,
13137+ group :"servicecatalog.k8s.io"
13138+ } , "delete" ) ) ;
13139+ } , h . closeOverlayPanel = function ( ) {
13140+ _ . set ( h , "overlay.panelVisible" , ! 1 ) ;
13141+ } , h . showOverlayPanel = function ( a , b ) {
13142+ _ . set ( h , "overlay.panelVisible" , ! 0 ) , _ . set ( h , "overlay.panelName" , a ) , _ . set ( h , "overlay.state" , b ) ;
13143+ } , h . deprovision = function ( ) {
1312113144var a = {
1312213145alerts :{
1312313146deprovision :{
1312413147type :"error" ,
13125- message :"Service '" + g . apiObject . spec . serviceClassName + "' will be deleted and no longer available."
13148+ message :"Service '" + h . apiObject . spec . serviceClassName + "' will be deleted and no longer available."
1312613149}
1312713150} ,
1312813151detailsMarkup :"Delete Service?" ,
@@ -13143,28 +13166,28 @@ return a;
1314313166f . hideNotification ( "deprovision-service-error" ) , c [ "delete" ] ( {
1314413167group :"servicecatalog.k8s.io" ,
1314513168resource :"instances"
13146- } , g . apiObject . metadata . name , {
13147- namespace :g . apiObject . metadata . namespace
13169+ } , h . apiObject . metadata . name , {
13170+ namespace :h . apiObject . metadata . namespace
1314813171} , {
1314913172propagationPolicy :null
1315013173} ) . then ( function ( ) {
1315113174f . addNotification ( {
1315213175type :"success" ,
13153- message :"Successfully deleted " + g . apiObject . metadata . name + "."
13176+ message :"Successfully deleted " + h . apiObject . metadata . name + "."
1315413177} ) ;
1315513178} , function ( a ) {
1315613179f . addNotification ( {
1315713180id :"deprovision-service-error" ,
1315813181type :"error" ,
13159- message :"An error occurred while deleting " + g . apiObject . metadata . name + "." ,
13160- details :h ( a )
13182+ message :"An error occurred while deleting " + h . apiObject . metadata . name + "." ,
13183+ details :i ( a )
1316113184} ) ;
1316213185} ) ;
1316313186} ) ;
1316413187} ;
1316513188}
1316613189angular . module ( "openshiftConsole" ) . component ( "serviceInstanceRow" , {
13167- controller :[ "$filter" , "$uibModal" , "DataService" , "BindingService" , "ListRowUtils" , "NotificationsService" , a ] ,
13190+ controller :[ "$filter" , "$uibModal" , "DataService" , "BindingService" , "ListRowUtils" , "NotificationsService" , "AuthorizationService" , a ] ,
1316813191controllerAs :"row" ,
1316913192bindings :{
1317013193apiObject :"<" ,
0 commit comments