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/11/02 19:01:46 UTC
[airavata-django-portal] branch develop updated (87fa4ea -> 7d0e285)
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 87fa4ea AIRAVATA-3380 Remove unused and poorly performing ExperimentViewSet.get_list()
add c11ebd9 Moving VS Code instructions up, suggesting they use that for terminal, file editing
add c67e7ec Drop "2019" from name of tutorial
add 1522d7b Merge branch 'AIRAVATA-3346-implement-remote-fs-abstraction-of-user-storage'
add b525003 AIRAVATA-3346 Updating tutorial instructions
add 561296d AIRAVATA-3346 Add authz_token to request in auth backend
add e97799d Merge branch 'AIRAVATA-3346-implement-remote-fs-abstraction-of-user-storage'
add deb7fda AIRAVATA-3346 AIRAVATA-3362 Doc how to access exp data dir in output view provider
add a0d9f50 Removing git url from setup.py, fixes 2020-resolver pip install issue
add 26f2f64 Fixing tutorial code
add 685506f Renaming gateways tutorial file
add 2f6c4ad Made prerequisites it's own subsection of tutorial
add 960ea74 Update Windows Home prereq guidance
add 97cfdbf Updating ids for tutorial submissions to jetstream cluster
add fed924d Changed to use Powershell on Windows, env variable set a little differently
add cf7243a Rename
add 8bd7018 Bug fix: apply compute resource default selection when switching GRP
add a539fa3 change npentane12diol to use 8 cores
add 0a743fb Wagtail: documentation on new default theme
new 64c1492 AIRAVATA-3381 switch base image for JS build stage
new 7d0e285 Merge branch 'airavata-3381' into develop
The 2 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:
Dockerfile | 5 +-
README.md | 4 +-
django_airavata/apps/api/authentication.py | 9 -
django_airavata/apps/auth/backends.py | 27 ++-
django_airavata/apps/auth/utils.py | 4 +-
.../ComputationalResourceSchedulingEditor.vue | 3 +-
docs/assets/cms_default_theme.pdf | Bin 0 -> 5036749 bytes
docs/dev/custom_django_app.md | 2 +-
docs/dev/custom_output_view_provider.md | 42 ++++-
docs/tutorial/data/npentane12diol.inp | 2 +-
...teways2019_tutorial.md => gateways_tutorial.md} | 202 ++++++++++-----------
mkdocs.yml | 3 +-
setup.py | 3 +-
13 files changed, 164 insertions(+), 142 deletions(-)
create mode 100644 docs/assets/cms_default_theme.pdf
rename docs/tutorial/{gateways2019_tutorial.md => gateways_tutorial.md} (91%)
[airavata-django-portal] 01/02: AIRAVATA-3381 switch base image for
JS build stage
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 64c1492331123883e9fcad8369ede5a04fea5367
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Nov 2 14:00:39 2020 -0500
AIRAVATA-3381 switch base image for JS build stage
---
Dockerfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ec421d5..3a5dbef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
-FROM node:lts-alpine as build-stage
-
-RUN apk add yarn
+# node:lts is based on Debian and includes necessary build tools
+FROM node:lts as build-stage
# build api javascript
# api must come first, then common, since the others depend on these
[airavata-django-portal] 02/02: Merge branch 'airavata-3381' 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 7d0e285339655a399d5928ceff98d8eb8c65bed8
Merge: 87fa4ea 64c1492
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Nov 2 14:01:02 2020 -0500
Merge branch 'airavata-3381' into develop
Dockerfile | 5 +-
README.md | 4 +-
django_airavata/apps/api/authentication.py | 9 -
django_airavata/apps/auth/backends.py | 27 ++-
django_airavata/apps/auth/utils.py | 4 +-
.../ComputationalResourceSchedulingEditor.vue | 3 +-
docs/assets/cms_default_theme.pdf | Bin 0 -> 5036749 bytes
docs/dev/custom_django_app.md | 2 +-
docs/dev/custom_output_view_provider.md | 42 ++++-
docs/tutorial/data/npentane12diol.inp | 2 +-
...teways2019_tutorial.md => gateways_tutorial.md} | 202 ++++++++++-----------
mkdocs.yml | 3 +-
setup.py | 3 +-
13 files changed, 164 insertions(+), 142 deletions(-)
diff --cc django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ComputationalResourceSchedulingEditor.vue
index f3611fa,777049e..cf5f313
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ComputationalResourceSchedulingEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ComputationalResourceSchedulingEditor.vue
@@@ -252,10 -252,9 +252,9 @@@ export default
// computeResourceOptions, reset it to null
if (
this.resourceHostId !== null &&
- !newOptions.find(opt => opt.value === this.resourceHostId)
+ !newOptions.find((opt) => opt.value === this.resourceHostId)
) {
this.resourceHostId = null;
- this.computeResourceChanged(null);
}
// Apply preferred (most recently used) compute resource
if (
@@@ -268,14 -267,16 +267,14 @@@
)
) {
this.resourceHostId = this.workspacePreferences.most_recent_compute_resource_id;
- this.computeResourceChanged(null);
}
// If none selected, just pick the first one
- if (
- this.resourceHostId === null && newOptions.length > 0
- ) {
+ if (this.resourceHostId === null && newOptions.length > 0) {
this.resourceHostId = newOptions[0].value;
}
+ this.computeResourceChanged(this.resourceHostId);
},
- groupResourceProfileId: function(newGroupResourceProfileId) {
+ groupResourceProfileId: function (newGroupResourceProfileId) {
this.loadApplicationDeployments(
this.appModuleId,
newGroupResourceProfileId