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 2021/08/02 12:50:51 UTC

[airavata-django-portal] 01/01: Merge branch 'staging'

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit abcceab11d507fe4a67b5e918db0e4f9358ae85d
Merge: e6f8735 885578c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Aug 2 08:50:28 2021 -0400

    Merge branch 'staging'

 .dockerignore                                      |    1 +
 .gitignore                                         |    1 +
 Dockerfile                                         |   15 +-
 README.md                                          |   20 +-
 build_js.sh                                        |    1 +
 django_airavata/app_config.py                      |    3 +-
 django_airavata/apps/admin/apps.py                 |    8 +
 .../BatchQueueResourcePolicy.vue                   |    7 +
 .../ComputePreference.vue                          |   25 +-
 .../ComputeResourcePolicyEditor.vue                |    6 +
 .../ComputeResourceReservationList.vue             |    2 +-
 .../GroupComputeResourcePreference.vue             |   44 +-
 .../applications/ApplicationInputFieldEditor.vue   |    2 +-
 .../applications/ApplicationOutputFieldEditor.vue  |    2 +-
 .../ComputeResourcePreferenceDashboard.vue         |   14 +
 .../components/developers/DevelopersContainer.vue  |   18 +
 .../statistics/ExperimentStatisticsContainer.vue   |    5 +-
 .../static/django_airavata_admin/src/router.js     |    8 +-
 django_airavata/apps/admin/urls.py                 |    2 +
 django_airavata/apps/admin/views.py                |    6 +
 django_airavata/apps/admin/yarn.lock               |    5 +
 django_airavata/apps/api/admin.py                  |   24 +
 django_airavata/apps/api/helpers.py                |   23 +-
 ...template_applicationtemplatecontextprocessor.py |   39 +
 django_airavata/apps/api/models.py                 |   26 +
 django_airavata/apps/api/serializers.py            |   44 +-
 django_airavata/apps/api/signals.py                |    5 +
 .../api/static/django_airavata_api/js/index.js     |    9 +-
 .../django_airavata_api/js/models/DataProduct.js   |    1 +
 .../js/models/ExperimentSearchFields.js            |    1 +
 .../js/models/GroupComputeResourcePreference.js    |    1 +
 .../static/django_airavata_api/js/models/User.js   |    9 +
 .../js/models/validators/ValidatorFactory.js       |    2 +-
 .../django_airavata_api/js/service_config.js       |   24 +
 .../django_airavata_api/js/utils/FetchUtils.js     |    3 +-
 django_airavata/apps/api/views.py                  |   61 +-
 django_airavata/apps/auth/.prettierignore          |    2 +
 django_airavata/apps/auth/babel.config.js          |    3 +
 django_airavata/apps/auth/backends.py              |   91 +-
 .../auth/migrations/0007_auto_20200917_1610.py     |   43 +
 .../auth/migrations/0008_auto_20210422_1838.py     |   59 +
 django_airavata/apps/auth/models.py                |   41 +
 django_airavata/apps/auth/package.json             |   55 +
 django_airavata/apps/auth/serializers.py           |   78 +
 django_airavata/apps/auth/signals.py               |    7 +-
 .../js/components/UserProfileEditor.vue            |  100 +
 .../js/containers/UserProfileContainer.vue         |   89 +
 .../django_airavata_auth/js/entry-user-profile.js  |    8 +
 .../auth/templates/django_airavata_auth/base.html  |   23 +
 .../settings_local.py.template}                    |   62 +-
 django_airavata/apps/auth/urls.py                  |   10 +-
 django_airavata/apps/auth/utils.py                 |   39 +-
 django_airavata/apps/auth/views.py                 |  199 +-
 .../apps/{workspace => auth}/vue.config.js         |   54 +-
 django_airavata/apps/{groups => auth}/yarn.lock    | 3752 +++++++++-----------
 django_airavata/apps/dataparsers/yarn.lock         |    5 +
 django_airavata/apps/groups/yarn.lock              |    5 +
 .../js/input-editors/InputEditorMixin.js           |   32 +-
 django_airavata/apps/workspace/package.json        |   13 +-
 .../static/django_airavata_workspace/.gitignore    |    1 +
 .../storage/ExperimentStoragePathViewer.vue        |   21 +-
 .../storage/ExperimentStorageViewContainer.vue     |   16 +-
 .../components/storage/UserStoragePathViewer.vue   |   21 +-
 .../storage-edit/UserStorageDownloadButton.vue     |    2 +-
 .../storage/storage-edit/UserStorageEditViewer.vue |    2 +-
 .../storage-edit/UserStorageTextEditViewer.vue     |   85 +-
 .../js/containers/ExperimentListContainer.vue      |    1 +
 .../js/web-components/ComputeResourceSelector.vue  |   84 +
 .../js/web-components/ExperimentEditor.vue         |  164 +
 .../GroupResourceProfileSelector.vue               |  117 +
 .../js/web-components/ProjectSelector.vue          |   95 +
 .../js/web-components/QueueSettingsEditor.vue      |  261 ++
 .../js/web-components/ResourceSelectionEditor.vue  |  415 +++
 .../js/web-components/store.js                     |  121 +
 .../js/web-components/styles.css                   |    3 +
 .../django_airavata_workspace/wc-base.html         |   27 +
 django_airavata/apps/workspace/views.py            |   48 +-
 django_airavata/apps/workspace/vue.config.js       |   15 +-
 django_airavata/apps/workspace/yarn.lock           |   87 +-
 django_airavata/settings.py                        |   18 +
 django_airavata/settings_local.py.sample           |    7 +
 django_airavata/static/common/js/entry.js          |    2 +
 .../static/common/js/errors/vuelidateHelpers.js    |    4 +
 django_airavata/static/common/js/index.js          |    4 +-
 django_airavata/static/common/package.json         |    3 +-
 django_airavata/static/common/scss/main.scss       |   15 +-
 django_airavata/static/common/yarn.lock            |    5 +
 django_airavata/templates/base.html                |    8 +-
 django_airavata/urls.py                            |    2 +
 docs/dev/custom_output_view_provider.md            |    2 +-
 docs/dev/new_django_app.md                         |    6 +-
 lint_js.sh                                         |    1 +
 requirements.txt                                   |   11 +-
 93 files changed, 4635 insertions(+), 2276 deletions(-)