Repository: airavata-php-gateway Updated Branches: refs/heads/develop 2f9088df4 -> acda62e31
AIRAVATA-2304 Only compute preferences in app deployment creation Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/acda62e3 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/acda62e3 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/acda62e3 Branch: refs/heads/develop Commit: acda62e3119f3979bfc632956d900c38ce86bd3e Parents: 2f9088d Author: Marcus Christie <[email protected]> Authored: Fri Jun 30 16:27:33 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Fri Jun 30 16:31:20 2017 -0400 ---------------------------------------------------------------------- app/libraries/AppUtilities.php | 10 +++++++++- app/views/application/deployment.blade.php | 17 +++++++++++++---- app/views/partials/deployment-block.blade.php | 10 ++++++---- 3 files changed, 28 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/acda62e3/app/libraries/AppUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/AppUtilities.php b/app/libraries/AppUtilities.php index e770776..46a1888 100644 --- a/app/libraries/AppUtilities.php +++ b/app/libraries/AppUtilities.php @@ -137,14 +137,22 @@ class AppUtilities //var_dump( $appDeployments); exit; $computeResources = Airavata::getAllComputeResourceNames(Session::get('authz-token')); $computeResourceFullObjects = CRUtilities::getAllCRObjects(); + $gatewayResourceProfile = Airavata::getGatewayResourceProfile(Session::get('authz-token'), Session::get("gateway_id")); + $computeResourcePreferences = $gatewayResourceProfile->computeResourcePreferences; + foreach ($computeResourcePreferences as $computeResourcePreference) { + $computeResourcePreference->crName = $computeResources[$computeResourcePreference->computeResourceId]; + } + // Sort compute resource preferences by crName + usort($computeResourcePreferences, CommonUtilities::arrSortObjsByKey('crName', 'ASC')); $modules = AppUtilities::getAllModules(); + usort($modules, CommonUtilities::arrSortObjsByKey('appModuleName', 'ASC')); $apt = new ApplicationParallelismType(); return array( "appDeployments" => $appDeployments, "applicationParallelismTypes" => $apt::$__names, - "computeResources" => $computeResources, + "computeResourcePreferences" => $computeResourcePreferences, "modules" => $modules, "computeResourceFullObjects" => $computeResourceFullObjects ); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/acda62e3/app/views/application/deployment.blade.php ---------------------------------------------------------------------- diff --git a/app/views/application/deployment.blade.php b/app/views/application/deployment.blade.php index df3c6a9..da6db32 100644 --- a/app/views/application/deployment.blade.php +++ b/app/views/application/deployment.blade.php @@ -26,7 +26,16 @@ @endif @if(Session::has("admin")) <div class="row"> - <button class="btn btn-default create-app-deployment">Create a new Application Deployment</button> + @if(empty($computeResourcePreferences)) + <div class="alert alert-warning" role="alert"> + You cannot create any application deployments until you <a + href="{{ URL::to("admin/dashboard/gateway") }}">create at least one + compute resource preference</a>. + </div> + @endif + <button class="btn btn-default create-app-deployment" + @if(empty($computeResourcePreferences)) disabled="disabled"@endif + >Create a new Application Deployment</button> </div> @endif @if( count( $appDeployments) ) @@ -63,7 +72,7 @@ <div class="panel-body"> <div class="app-deployment-block"> @include('partials/deployment-block', array( 'deploymentObject' => $deployment, - 'computeResources' => $computeResources, 'modules' => $modules, 'computeResourceFullObjects' => $computeResourceFullObjects) ) + 'computeResourcePreferences' => $computeResourcePreferences, 'modules' => $modules, 'computeResourceFullObjects' => $computeResourceFullObjects) ) </div> </div> </div> @@ -146,8 +155,8 @@ <div class="modal-body row"> <div class="col-md-12"> <div class="create-app-deployment-block"> - @include('partials/deployment-block', array( 'computeResources' => - $computeResources, 'modules' => $modules) ) + @include('partials/deployment-block', array( 'computeResourcePreferences' => + $computeResourcePreferences, 'modules' => $modules) ) </div> </div> </div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/acda62e3/app/views/partials/deployment-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/deployment-block.blade.php b/app/views/partials/deployment-block.blade.php index e85a996..20a7e81 100644 --- a/app/views/partials/deployment-block.blade.php +++ b/app/views/partials/deployment-block.blade.php @@ -21,10 +21,12 @@ <div class="form-group required"> <label class="control-label">Application Compute Host</label> <select name="computeHostId" class="form-control computeHostId" required readonly> - @foreach( $computeResources as $id => $crName) - <option value="{{ $id }}" - @if( isset( $deploymentObject) ) @if( $id == $deploymentObject->computeHostId) selected @endif @endif>{{ $crName - }}</option> + @foreach( $computeResourcePreferences as $computeResourcePreference) + <option value="{{{ $computeResourcePreference->computeResourceId }}}" + @if( isset($deploymentObject) && $computeResourcePreference->computeResourceId == $deploymentObject->computeHostId) selected @endif + > + {{{ $computeResourcePreference->crName }}} + </option> @endforeach </select> </div>
