This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch delta-topology-workshop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit b094fbf93b1e48bf05ce2cc3e717f0e4d59d56f0 Merge: 49695af0 d273a786 Author: Marcus Christie <[email protected]> AuthorDate: Wed Sep 14 10:21:09 2022 -0400 Merge branch 'master' into delta-topology-workshop README.md | 5 +- django_airavata/apps/admin/apps.py | 2 +- .../applications/ApplicationInputFieldEditor.vue | 63 +-- .../applications/ApplicationInterfaceEditor.vue | 51 +- .../users/ExtendedUserProfileContainer.vue | 120 +++++ .../components/users/ExtendedUserProfilePanel.vue | 82 ++++ .../src/components/users/UserDetailsContainer.vue | 3 + .../components/users/UserManagementContainer.vue | 5 + .../ExtendedUserProfileFieldEditor.vue | 366 ++++++++++++++ .../admin/static/django_airavata_admin/src/main.js | 4 + .../static/django_airavata_admin/src/router.js | 6 + .../django_airavata_admin/src/store/index.js | 16 + .../src/store/modules/extendedUserProfile.js | 190 +++++++ django_airavata/apps/admin/urls.py | 1 + django_airavata/apps/admin/views.py | 6 + ...icationsettings_queue_settings_calculator_id.py | 18 + django_airavata/apps/api/models.py | 1 + django_airavata/apps/api/serializers.py | 46 +- .../api/static/django_airavata_api/js/index.js | 15 + .../js/models/ApplicationInterfaceDefinition.js | 5 + .../js/models/ExtendedUserProfileField.js | 76 +++ .../js/models/ExtendedUserProfileFieldChoice.js | 24 + .../js/models/ExtendedUserProfileFieldLink.js | 31 ++ .../js/models/ExtendedUserProfileValue.js | 46 ++ .../js/models/InputDataObjectType.js | 4 +- .../django_airavata_api/js/models/Notification.js | 6 +- .../js/models/QueueSettingsCalculator.js | 9 + .../static/django_airavata_api/js/models/User.js | 3 +- .../js/models/UserStorageDirectory.js | 1 + .../js/models/UserStorageFile.js | 1 + .../dependencies/BooleanExpressionEvaluator.js | 2 + .../django_airavata_api/js/service_config.js | 38 ++ .../js/services/ServiceFactory.js | 3 + .../BooleanExpressionEvaluator.test.js | 22 + django_airavata/apps/api/urls.py | 2 + django_airavata/apps/api/view_utils.py | 5 + django_airavata/apps/api/views.py | 31 +- django_airavata/apps/auth/middleware.py | 10 +- ...ld_extendeduserprofilefieldlink_extendeduser.py | 107 ++++ .../auth/migrations/0015_auto_20220329_1708.py | 72 +++ .../0016_extendeduserprofilefield_required.py | 18 + .../auth/migrations/0017_auto_20220616_1831.py | 55 +++ ...4_auto_20220217_2255_0017_auto_20220616_1831.py | 14 + django_airavata/apps/auth/models.py | 242 +++++++++ django_airavata/apps/auth/package.json | 3 +- django_airavata/apps/auth/serializers.py | 271 +++++++++- .../js/components/ExtendedUserProfileEditor.vue | 57 +++ .../ExtendedUserProfileMultiChoiceValueEditor.vue | 157 ++++++ .../ExtendedUserProfileSingleChoiceValueEditor.vue | 159 ++++++ .../ExtendedUserProfileTextValueEditor.vue | 63 +++ ...ExtendedUserProfileUserAgreementValueEditor.vue | 81 +++ .../components/ExtendedUserProfileValueEditor.vue | 47 ++ .../js/components/UserProfileEditor.vue | 104 ++-- .../js/containers/UserProfileContainer.vue | 138 +++--- .../django_airavata_auth/js/entry-user-profile.js | 11 +- .../static/django_airavata_auth/js/store/index.js | 18 + .../js/store/modules/extendedUserProfile.js | 188 +++++++ .../js/store/modules/userProfile.js | 64 +++ django_airavata/apps/auth/tests/test_middleware.py | 123 +++++ django_airavata/apps/auth/tests/test_models.py | 383 +++++++++++++++ django_airavata/apps/auth/urls.py | 2 + django_airavata/apps/auth/utils.py | 36 +- django_airavata/apps/auth/views.py | 70 ++- django_airavata/apps/auth/yarn.lock | 5 + django_airavata/apps/workspace/package.json | 2 +- .../js/components/experiment/ExperimentEditor.vue | 58 ++- .../components/experiment/QueueSettingsEditor.vue | 81 ++- .../experiment/input-editors/SliderInputEditor.vue | 2 +- .../storage/ExperimentStoragePathViewer.vue | 16 +- .../components/storage/UserStoragePathViewer.vue | 16 +- .../js/containers/UserStorageContainer.vue | 1 + .../js/web-components/ExperimentEditor.vue | 25 +- .../js/web-components/store.js | 2 +- .../tests/unit/web-components/store.spec.js | 60 ++- django_airavata/apps/workspace/vue.config.js | 6 + django_airavata/apps/workspace/yarn.lock | 544 +++++---------------- .../static/common/js/errors/vuelidateHelpers.js | 14 + django_airavata/static/common/js/index.js | 2 + .../static/common/js/mixins/ValidationParent.js | 30 ++ django_airavata/static/common/package.json | 2 +- django_airavata/static/common/scss/main.scss | 5 + django_airavata/static/common/yarn.lock | 513 +++++-------------- docs/admin/app_inputs.md | 4 + docs/dev/developing_frontend.md | 7 +- docs/dev/queue_settings_calculator.md | 104 ++++ docs/tutorial/custom_ui_tutorial.md | 57 +-- mkdocs.yml | 1 + requirements.txt | 4 +- 88 files changed, 4283 insertions(+), 1080 deletions(-)
