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 2020/06/22 15:04:31 UTC
[airavata-django-portal] branch develop updated (aec5cdf -> 53ccaa0)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from aec5cdf Merge branch 'AIRAVATA-3344-add-total-physical-memory-to-queue-settings' into develop
add 202b23b AIRAVATA-3285 InteractiveParametersPanel for all display types
add f387e4e AIRAVATA-3285 Add dropdown selection widget
add 54a8358 AIRAVATA-3285 text input for string values
add 5bbf1f9 AIRAVATA-3285 range and stepper numeric interactive parameter widgets
add f6a8865 AIRAVATA-3285 Validation for interactive parameters
add 0404668 AIRAVATA-3285 Add support for integer parameter type
add ccfddae AIRAVATA-3285 Add support for specifying a label and help text
add ed01dd2 AIRAVATA-3285 In range widget, round displayed current value
add 4a719ae AIRAVATA-3285 Add _meta query parameter for passing type information to backend
add 2a3933d AIRAVATA-3285 Fix bug inferring type of boolean parameter
add c8fe65b AIRAVATA-3285 Interactive parameter documentation
new 53ccaa0 Merge branch 'AIRAVATA-3285--Interactive-output-view-providers' into develop
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:
django_airavata/apps/api/output_views.py | 93 +++++-
django_airavata/apps/api/urls.py | 2 +
django_airavata/apps/api/views.py | 37 ++-
.../output-displays/DefaultOutputDisplay.vue | 9 +-
.../output-displays/HtmlOutputDisplay.vue | 60 ++--
.../output-displays/ImageOutputDisplay.vue | 40 +--
.../experiment/output-displays/LinkDisplay.vue | 26 --
.../output-displays/LinkOutputDisplay.vue | 15 +
.../output-displays/OutputDisplayContainer.vue | 126 ++++++--
.../output-displays/OutputViewDataLoader.js | 46 +++
.../InteractiveParameterCheckboxWidget.vue | 15 +
.../InteractiveParameterRangeWidget.vue | 62 ++++
.../InteractiveParameterSelectWidget.vue | 28 ++
.../InteractiveParameterStepperWidget.vue | 74 +++++
.../InteractiveParameterTextInputWidget.vue | 48 ++++
.../InteractiveParameterWidgetContainer.vue | 67 +++++
.../InteractiveParametersPanel.vue | 67 +++++
.../static/common/js/components/ValidatedForm.vue | 83 ++++++
.../common/js/components/ValidatedFormGroup.vue | 43 +++
django_airavata/static/common/js/index.js | 6 +-
docs/dev/custom_output_view_provider.md | 317 +++++++++++++++++++++
docs/tutorial/gateways2019_tutorial.md | 114 ++++++--
.../gateways19/gaussian-eigenvalues-show_grid.png | Bin 0 -> 149262 bytes
mkdocs.yml | 7 +-
24 files changed, 1200 insertions(+), 185 deletions(-)
delete mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/LinkDisplay.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/LinkOutputDisplay.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputViewDataLoader.js
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParameterCheckboxWidget.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParameterRangeWidget.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParameterSelectWidget.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParameterStepperWidget.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParameterTextInputWidget.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParameterWidgetContainer.vue
create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParametersPanel.vue
create mode 100644 django_airavata/static/common/js/components/ValidatedForm.vue
create mode 100644 django_airavata/static/common/js/components/ValidatedFormGroup.vue
create mode 100644 docs/dev/custom_output_view_provider.md
create mode 100644 docs/tutorial/screenshots/gateways19/gaussian-eigenvalues-show_grid.png
[airavata-django-portal] 01/01: Merge branch
'AIRAVATA-3285--Interactive-output-view-providers' into develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 53ccaa022dd8403e11260b72fc22b9a493deb340
Merge: aec5cdf c8fe65b
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 22 11:03:56 2020 -0400
Merge branch 'AIRAVATA-3285--Interactive-output-view-providers' into develop
django_airavata/apps/api/output_views.py | 93 +++++-
django_airavata/apps/api/urls.py | 2 +
django_airavata/apps/api/views.py | 37 ++-
.../output-displays/DefaultOutputDisplay.vue | 9 +-
.../output-displays/HtmlOutputDisplay.vue | 60 ++--
.../output-displays/ImageOutputDisplay.vue | 40 +--
.../experiment/output-displays/LinkDisplay.vue | 26 --
.../output-displays/LinkOutputDisplay.vue | 15 +
.../output-displays/OutputDisplayContainer.vue | 126 ++++++--
.../output-displays/OutputViewDataLoader.js | 46 +++
.../InteractiveParameterCheckboxWidget.vue | 15 +
.../InteractiveParameterRangeWidget.vue | 62 ++++
.../InteractiveParameterSelectWidget.vue | 28 ++
.../InteractiveParameterStepperWidget.vue | 74 +++++
.../InteractiveParameterTextInputWidget.vue | 48 ++++
.../InteractiveParameterWidgetContainer.vue | 67 +++++
.../InteractiveParametersPanel.vue | 67 +++++
.../static/common/js/components/ValidatedForm.vue | 83 ++++++
.../common/js/components/ValidatedFormGroup.vue | 43 +++
django_airavata/static/common/js/index.js | 6 +-
docs/dev/custom_output_view_provider.md | 317 +++++++++++++++++++++
docs/tutorial/gateways2019_tutorial.md | 114 ++++++--
.../gateways19/gaussian-eigenvalues-show_grid.png | Bin 0 -> 149262 bytes
mkdocs.yml | 7 +-
24 files changed, 1200 insertions(+), 185 deletions(-)
diff --cc django_airavata/apps/api/views.py
index 01cb1ab,6b8ee27..36e5e2a
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@@ -1847,27 -1847,31 +1848,33 @@@ def notebook_output_view(request)
return HttpResponse(data['output'])
+@login_required
def html_output_view(request):
- provider_id = request.GET['provider-id']
- experiment_id = request.GET['experiment-id']
- experiment_output_name = request.GET['experiment-output-name']
- data = output_views.generate_data(request,
- provider_id,
- experiment_output_name,
- experiment_id)
+ data = _generate_output_view_data(request)
return JsonResponse(data)
+@login_required
def image_output_view(request):
- provider_id = request.GET['provider-id']
- experiment_id = request.GET['experiment-id']
- experiment_output_name = request.GET['experiment-output-name']
- data = output_views.generate_data(request,
- provider_id,
- experiment_output_name,
- experiment_id)
+ data = _generate_output_view_data(request)
# data should contain 'image' as a file-like object or raw bytes with the
# file data and 'mime-type' with the images mimetype
- return HttpResponse(data['image'], content_type=data['mime-type'])
+ data['image'] = base64.b64encode(data['image']).decode('utf-8')
+ return JsonResponse(data)
+
+
+ def link_output_view(request):
+ data = _generate_output_view_data(request)
+ return JsonResponse(data)
+
+
+ def _generate_output_view_data(request):
+ params = request.GET.copy()
+ provider_id = params.pop('provider-id')[0]
+ experiment_id = params.pop('experiment-id')[0]
+ experiment_output_name = params.pop('experiment-output-name')[0]
+ return output_views.generate_data(request,
+ provider_id,
+ experiment_output_name,
+ experiment_id,
+ **params.dict())