You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/11/03 23:36:54 UTC
[airavata-php-gateway] branch tus-integration updated (15b7a76 ->
b06ad4b)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch tus-integration
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git.
from 15b7a76 Merge branch 'master' into tus-integration
add e445b79 Merge branch 'master' into staging
add be72a45 API login endpoint
add fdaa72c Merge branch 'api-auth-endpoint' into develop
add 9069b81 Merge branch 'AIRAVATA-2508' into develop
add 5a4a9c3 Merge branch 'set-CAINFO-everywhere' into develop
add 4adeaa7 Merge branch 'AIRAVATA-2520-bugfix' into develop
add fa1c1ee Merge branch 'gateway-level-max-queue-values' into develop
add d2dda20 Merge branch 'AIRAVATA-2508' into develop
add 5276a78 Merge branch 'AIRAVATA-2508' into develop
add f48ea90 [JIRA-ISSUE: 2444] Added User list with username, email, firstname, lastname fields Issue Resolved
add 702abd7 Merge branch 'user_list_enhancement' of https://github.com/stephenpaul2727/airavata-php-gateway into develop
add 6264506 AIRAVATA-2444 Fix searchUsers to return user fields
add e7e0c19 testing ssh based 2fa github commmit
add 4b91745 Merge branch 'AIRAVATA-2502' into develop
add c785654 Merge branch 'AIRAVATA-2502' into develop
add b658574 Merge branch 'AIRAVATA-2502' into develop
add 4c52d38 [AIRAVATA-2279 & 2280] fixed. UI for gateway credential store is changed description for tokens is validated on client side password credential description is also validated copy for the public key is implemented. default ssh key is automatically generated if user loads gateway credential store view if there is no default ssh key in the first place. description is provided in drop-down instead of token value inside the compute resource preferences and storage resource pr [...]
add 954f717 Merge branch 'Airavata-2279,2280' into develop
add fb11773 Merge branch 'AIRAVATA-2571' of https://github.com/neeraj-lad/airavata-php-gateway into develop
add 28de925 Merge branch 'neeraj-lad-AIRAVATA-2509' into develop
add 766ff97 Merge branch 'AIRAVATA-2571-email-verified' into develop
add 44bd55e AIRAVATA-2571 User enabled instead of email verified
add efa2735 AIRAVATA-2279 Credential store fixes
add 8bd1a35 Merge branch 'stephenpaul2727-AIRAVATA-2675' into develop
add 5e4d96e Merge branch 'password-ampersand-validation' into develop
add 8ed0846 Regenerate Thrift stubs
add ecf6de2 AIRAVATA-2797 using isUserResourceProfileExists API method
add 8358e6b AIRAVATA-2781 Using userHasAccess to test migration script
add 0988d03 Merge branch 'handle-deleted-files' into develop
add 1cd8859 Merge branch 'check-if-user-enabled' into develop
add a0cc90f Merge branch 'AIRAVATA-2382-parameterize-max-upload' into develop
add 8dc639e Merge branch 'AIRAVATA-2509-account-confirmation-emails-not-making-it-to-users' into develop
add 863d308 AIRAVATA-2840 Regenerated Thrift stubs
add 774a9cf AIRAVATA-2840 Updates for cred store API changes
add fdf158d AIRAVATA-2840 Regenerate Thrift stubs
add 6157005 AIRAVATA-2840 Updates for API changes
add 4fa37a3 AIRAVATA-2840 Fix CredentialSummary typo
add 6e9f81a Merge branch 'iu-ldap-cybergateway-group' into develop
add 60b4c19 Merge branch 'iu-ldap-cybergateway-group' into develop
add a6a124a Merge branch 'iu-ldap-cybergateway-group' into develop
add b669bd6 resource type parameter dropped from sharing API, removing from method call
add f93eb57 Merge branch 'airavata-2992' into develop
add 5f7253a Merge branch 'airavata-2992' into develop
add 5660f40 Changed user enabled to map to ACTIVE state
add 6a26f91 AIRAVATA-3085 Specify group-resource-profile-id in pga_config.php
add 167dbc5 AIRAVATA-3087 Remove the ResourceType parameter from sharing api calls
add 3e85b64 Merge branch 'develop' into staging
add 0e35e22 Regenerated thrift stubs
add ea03e19 AIRAVATA-3089 Use last status in array since it is the most recent one
add 9112b31 Removede extra spaces - Add a re-route page to automatically re route to the Django portal
add a0d3459 Merge pull request #88 from shivamriky/re_route_admin
add 3f21925 AIRAVATA-3086 Facade for accessing GroupManagerService
add e103b63 AIRAVATA-3086 Use group membership instead of roles
add bc6131f AIRAVATA-3093 Fix setting group-res-profile when cloning exp
add 80aea84 AIRAVATA-3086 Fixing registering GroupManagerServiceProvider
add 9bf770f AIRAVATA-3210 Bug fix: fix typo when setting group res profile id when editing exp
add 278c934 AIRAVATA-3222 Display URI_COLLECTION in exp summary
add 8e432ab AIRAVATA-3249 Always initialize user profile on login
add f2cc6e5 AIRAVATA-3245 Adding debug logging
add bb1ab43 AIRAVATA-3234 Ignore inputs of type URI_COLLECTION
add 0ea794f AIRAVATA-3234 Only display URI_COLLECTION if it has a value
add fd243bd Merge remote-tracking branch 'origin/staging'
new b06ad4b Merge remote-tracking branch 'origin/master' into tus-integration
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README | 4 +
app/config/app.php | 1 +
app/config/pga_config.php.template | 21 +-
app/controllers/AccountController.php | 57 +-
app/controllers/AdminController.php | 29 +-
app/controllers/ExperimentController.php | 34 +-
app/controllers/ProjectController.php | 19 +-
app/libraries/AdminUtilities.php | 33 +-
app/libraries/Airavata/API/Airavata.php | 26792 ++++++++++++-------
.../API/Sharing/SharingRegistryService.php | 961 +-
app/libraries/Airavata/API/Sharing/Types.php | 8 +
app/libraries/Airavata/API/Types.php | 2 +-
app/libraries/Airavata/Base/API/BaseAPI.php | 218 +
.../Airavata/{API/Sharing => Base/API}/Types.php | 2 +-
.../{Airavata.php => GroupManagerServices.php} | 6 +-
...rovider.php => GroupManagerServiceProvider.php} | 20 +-
.../Model/AppCatalog/GatewayGroups/Types.php | 164 +
.../AppCatalog/GroupResourceProfile/Types.php | 1405 +
.../Airavata/Model/AppCatalog/Parser/Types.php | 1407 +
.../Model/AppCatalog/StorageResource/Types.php | 46 +
.../Model/AppCatalog/UserResourceProfile/Types.php | 26 -
.../Airavata/Model/Application/Io/Types.php | 23 +
.../Airavata/Model/Credential/Store/Types.php | 35 +-
.../Airavata/Model/Data/Movement/Types.php | 69 +
app/libraries/Airavata/Model/Experiment/Types.php | 55 +
app/libraries/Airavata/Model/Group/Types.php | 65 +-
app/libraries/Airavata/Model/Process/Types.php | 242 +-
app/libraries/Airavata/Model/Sharing/Types.php | 52 +
app/libraries/Airavata/Model/Status/Types.php | 92 +
app/libraries/Airavata/Model/Task/Types.php | 46 +
app/libraries/Airavata/Model/Types.php | 1111 -
app/libraries/Airavata/Model/Workflow/Types.php | 2176 ++
.../Iam/Admin/Services/CPI/IamAdminServices.php | 1804 +-
.../Service/Iam/Admin/Services/CPI/Types.php | 2 +-
.../Groupmanager/CPI/GroupManagerService.php | 1559 +-
.../Service/Profile/Groupmanager/CPI/Types.php | 2 +-
.../Profile/Tenant/CPI/TenantProfileService.php | 281 +-
.../Airavata/Service/Profile/Tenant/CPI/Types.php | 2 +-
.../Airavata/Service/Profile/User/CPI/Types.php | 2 +-
.../Profile/User/CPI/UserProfileService.php | 493 +-
app/libraries/ExperimentUtilities.php | 106 +-
app/libraries/GrouperUtilities.php | 16 +-
app/libraries/IamAdminServicesUtilities.php | 4 +-
app/libraries/ProjectUtilities.php | 13 +-
app/libraries/SharingUtilities.php | 76 +-
app/libraries/URPUtilities.php | 21 +-
app/libraries/UserProfileUtilities.php | 4 +
app/routes.php | 11 +-
app/views/admin/manage-credentials.blade.php | 370 +-
app/views/admin/redirect-django.blade.php | 39 +
app/views/experiment/summary.blade.php | 6 +-
.../compute-resource-preferences.blade.php | 10 +-
app/views/partials/experiment-info.blade.php | 16 +-
.../partials/gateway-preferences-block.blade.php | 22 +-
.../storage-resource-preferences.blade.php | 10 +-
55 files changed, 28551 insertions(+), 11539 deletions(-)
create mode 100644 README
create mode 100644 app/libraries/Airavata/Base/API/BaseAPI.php
copy app/libraries/Airavata/{API/Sharing => Base/API}/Types.php (92%)
copy app/libraries/Airavata/Facades/{Airavata.php => GroupManagerServices.php} (56%)
mode change 100755 => 100644
copy app/libraries/Airavata/{UserProfileServiceProvider.php => GroupManagerServiceProvider.php} (76%)
create mode 100644 app/libraries/Airavata/Model/AppCatalog/GatewayGroups/Types.php
create mode 100644 app/libraries/Airavata/Model/AppCatalog/GroupResourceProfile/Types.php
create mode 100644 app/libraries/Airavata/Model/AppCatalog/Parser/Types.php
create mode 100644 app/libraries/Airavata/Model/Workflow/Types.php
create mode 100644 app/views/admin/redirect-django.blade.php
[airavata-php-gateway] 01/01: Merge remote-tracking branch
'origin/master' into tus-integration
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch tus-integration
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
commit b06ad4bdd46f686846731c8e3e2d9fea89be3a4f
Merge: 15b7a76 fd243bd
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Sun Nov 3 18:36:37 2019 -0500
Merge remote-tracking branch 'origin/master' into tus-integration
README | 4 +
app/config/app.php | 1 +
app/config/pga_config.php.template | 21 +-
app/controllers/AccountController.php | 57 +-
app/controllers/AdminController.php | 29 +-
app/controllers/ExperimentController.php | 34 +-
app/controllers/ProjectController.php | 19 +-
app/libraries/AdminUtilities.php | 33 +-
app/libraries/Airavata/API/Airavata.php | 26792 ++++++++++++-------
.../API/Sharing/SharingRegistryService.php | 961 +-
app/libraries/Airavata/API/Sharing/Types.php | 8 +
app/libraries/Airavata/API/Types.php | 2 +-
app/libraries/Airavata/Base/API/BaseAPI.php | 218 +
.../Airavata/{API/Sharing => Base/API}/Types.php | 2 +-
.../Airavata/Facades/GroupManagerServices.php | 16 +
.../Airavata/GroupManagerServiceProvider.php | 83 +
.../Model/AppCatalog/GatewayGroups/Types.php | 164 +
.../AppCatalog/GroupResourceProfile/Types.php | 1405 +
.../Airavata/Model/AppCatalog/Parser/Types.php | 1407 +
.../Model/AppCatalog/StorageResource/Types.php | 46 +
.../Model/AppCatalog/UserResourceProfile/Types.php | 26 -
.../Airavata/Model/Application/Io/Types.php | 23 +
.../Airavata/Model/Credential/Store/Types.php | 35 +-
.../Airavata/Model/Data/Movement/Types.php | 69 +
app/libraries/Airavata/Model/Experiment/Types.php | 55 +
app/libraries/Airavata/Model/Group/Types.php | 65 +-
app/libraries/Airavata/Model/Process/Types.php | 242 +-
app/libraries/Airavata/Model/Sharing/Types.php | 52 +
app/libraries/Airavata/Model/Status/Types.php | 92 +
app/libraries/Airavata/Model/Task/Types.php | 46 +
app/libraries/Airavata/Model/Types.php | 1111 -
app/libraries/Airavata/Model/Workflow/Types.php | 2176 ++
.../Iam/Admin/Services/CPI/IamAdminServices.php | 1804 +-
.../Service/Iam/Admin/Services/CPI/Types.php | 2 +-
.../Groupmanager/CPI/GroupManagerService.php | 1559 +-
.../Service/Profile/Groupmanager/CPI/Types.php | 2 +-
.../Profile/Tenant/CPI/TenantProfileService.php | 281 +-
.../Airavata/Service/Profile/Tenant/CPI/Types.php | 2 +-
.../Airavata/Service/Profile/User/CPI/Types.php | 2 +-
.../Profile/User/CPI/UserProfileService.php | 493 +-
app/libraries/ExperimentUtilities.php | 106 +-
app/libraries/GrouperUtilities.php | 16 +-
app/libraries/IamAdminServicesUtilities.php | 4 +-
app/libraries/ProjectUtilities.php | 13 +-
app/libraries/SharingUtilities.php | 76 +-
app/libraries/URPUtilities.php | 21 +-
app/libraries/UserProfileUtilities.php | 4 +
app/routes.php | 11 +-
app/views/admin/manage-credentials.blade.php | 370 +-
app/views/admin/redirect-django.blade.php | 39 +
app/views/experiment/summary.blade.php | 6 +-
.../compute-resource-preferences.blade.php | 10 +-
app/views/partials/experiment-info.blade.php | 16 +-
.../partials/gateway-preferences-block.blade.php | 22 +-
.../storage-resource-preferences.blade.php | 10 +-
55 files changed, 28637 insertions(+), 11526 deletions(-)
diff --cc app/libraries/ExperimentUtilities.php
index 997a824,dde5f97..253a3d8
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@@ -923,34 -921,12 +938,36 @@@ class ExperimentUtilitie
<div class="file-upload-max-size">Max Upload Size: ' . $allowedFileSize .'M</div>
</div>
<p class="help-block">' . $input->userFriendlyDescription . '</p>
- </div>';
+ </div>';*/
+ echo '
+ <label for="experiment-input">' . $input->name . '</label>
+ <div class="grid">
+ <div class="column-full">
+ <input type="hidden" name="' . $input->sanitizedFormName . '" id="' . $input->sanitizedFormName . '"/>
+ <div class="UppyInput" id="input-' . $input->sanitizedFormName . '"></div>
+ <div class="UppyInput-Progress" id="progress-'. $input->sanitizedFormName .'"></div>
+ </div>
+ </div>';
+ echo '<script>
+ var uppy = Uppy.Core({debug: true, autoProceed: true})
+ .use(Uppy.FileInput, { target: "#input-' . $input->sanitizedFormName . '", pretty: false })
+ .use(Uppy.StatusBar, {
+ target: "#progress-' . $input->sanitizedFormName . '",
+ hideUploadButton: true,
+ hideAfterFinish: false
+ })
+ .use(Uppy.Tus, {endpoint: "https://tus.scigap.org/files/"})
+
+ uppy.on("complete", (result) => {
+ console.log("Upload complete! We’ve uploaded these files:", result.successful)
+ document.getElementById("'. $input->sanitizedFormName .'").value = result.successful[0].response.uploadURL;
+ })
+ </script>';
break;
}
-
+ case DataType::URI_COLLECTION:
+ // Support for URI_COLLECTION is not implemented in PGA, just ignore
+ break;
default:
CommonUtilities::print_error_message('Input data type not supported!
Please file a bug report using the link in the Help menu.');