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:55 UTC
[airavata-php-gateway] 01/01: Merge remote-tracking branch
'origin/master' into tus-integration
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.');