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 2018/01/31 17:28:39 UTC
[airavata-django-portal] branch master updated (9c4d83b -> e0a2d31)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 9c4d83b AIRAVATA-2614 Experiment list view
add cdd2a9c Initial commit with bootstraped vue components
add b1c3c41 Decomposed vue components
add dd1eb43 Groups Manage UI Page Completed
add b9df8b7 Reverting changes
add cfc0a70 UI for Groups Manage Completed
add 1a9e3f7 Groups Manage Scripts done (No Pagination)
add 918337e Added Models, Services for GroupMembers and GroupOwners Also added revised UI, template layouts for groupOwners, groupMembers
add 86b5893 Added Models and Serializers for groups, Added Group Creation Interface Modal The Invalid/missing API Endpoints needs to be implemented
add 184b2e2 Added Group Creation Pages and Minor API View Changes
add dba8637 Added Autocomplete feature to the groups
add ca01aea Little modification to autocomplete component
add f78f7b7 Slight Modifications to Group Models and Services
new 610d333 Merge branch 'groups_ui_enchacement' of https://github.com/stephenpaul2727/airavata-django-portal into stephenpaul2727-groups_ui_enchacement
new e0a2d31 Merge branch 'stephenpaul2727-groups_ui_enchacement'
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:
.gitignore | 1 +
django_airavata/apps/api/serializers.py | 36 +
.../api/static/django_airavata_api/js/index.js | 4 +
.../static/django_airavata_api/js/models/Group.js | 33 +
.../js/services/GroupService.js | 48 +
django_airavata/apps/api/urls.py | 1 +
django_airavata/apps/api/views.py | 26 +
django_airavata/apps/groups/__init__.py | 0
django_airavata/apps/groups/admin.py | 0
django_airavata/apps/groups/apps.py | 0
django_airavata/apps/groups/forms.py | 0
django_airavata/apps/groups/migrations/__init__.py | 0
django_airavata/apps/groups/models.py | 0
.../common => apps/groups}/package-lock.json | 1947 ++++++++------------
.../apps/{workspace => groups}/package.json | 4 +-
.../js/group-create-entry-point.js} | 11 +-
.../js/group-listing-entry-point.js | 30 +
.../js/groups_components/Autocomplete.vue | 104 ++
.../js/groups_components/GroupCreate.vue | 87 +
.../js/groups_components/GroupListItem.vue | 35 +
.../js/groups_components/GroupMemberList.vue} | 15 +-
.../js/groups_components/GroupOwnerList.vue} | 15 +-
.../js/groups_components/GroupsManageContainer.vue | 94 +
.../js/groups_components/GroupsMember.vue | 43 +
.../js/groups_components/GroupsOwned.vue | 40 +
.../templates/django_airavata_groups/base.html | 19 +
.../django_airavata_groups/group_details.html | 0
.../django_airavata_groups/group_edit.html | 0
.../django_airavata_groups/groups_create.html | 16 +-
.../django_airavata_groups/groups_list.html | 14 +
.../django_airavata_groups/groups_manage.html | 103 +-
django_airavata/apps/groups/tests.py | 0
django_airavata/apps/groups/urls.py | 0
django_airavata/apps/groups/views.py | 37 +-
.../apps/{workspace => groups}/webpack.config.js | 19 +-
35 files changed, 1406 insertions(+), 1376 deletions(-)
create mode 100644 django_airavata/apps/api/static/django_airavata_api/js/models/Group.js
create mode 100644 django_airavata/apps/api/static/django_airavata_api/js/services/GroupService.js
mode change 100644 => 100755 django_airavata/apps/groups/__init__.py
mode change 100644 => 100755 django_airavata/apps/groups/admin.py
mode change 100644 => 100755 django_airavata/apps/groups/apps.py
mode change 100644 => 100755 django_airavata/apps/groups/forms.py
mode change 100644 => 100755 django_airavata/apps/groups/migrations/__init__.py
mode change 100644 => 100755 django_airavata/apps/groups/models.py
copy django_airavata/{static/common => apps/groups}/package-lock.json (86%)
mode change 100644 => 100755
copy django_airavata/apps/{workspace => groups}/package.json (92%)
mode change 100644 => 100755
copy django_airavata/apps/{workspace/static/django_airavata_workspace/js/entry-dashboard.js => groups/static/django_airavata_groups/js/group-create-entry-point.js} (61%)
create mode 100755 django_airavata/apps/groups/static/django_airavata_groups/js/group-listing-entry-point.js
create mode 100644 django_airavata/apps/groups/static/django_airavata_groups/js/groups_components/Autocomplete.vue
create mode 100644 django_airavata/apps/groups/static/django_airavata_groups/js/groups_components/GroupCreate.vue
create mode 100644 django_airavata/apps/groups/static/django_airavata_groups/js/groups_components/GroupListItem.vue
copy django_airavata/apps/{workspace/static/django_airavata_workspace/js/components/project/ProjectList.vue => groups/static/django_airavata_groups/js/groups_components/GroupMemberList.vue} (51%)
copy django_airavata/apps/{workspace/static/django_airavata_workspace/js/components/project/ProjectList.vue => groups/static/django_airavata_groups/js/groups_components/GroupOwnerList.vue} (52%)
create mode 100755 django_airavata/apps/groups/static/django_airavata_groups/js/groups_components/GroupsManageContainer.vue
create mode 100755 django_airavata/apps/groups/static/django_airavata_groups/js/groups_components/GroupsMember.vue
create mode 100755 django_airavata/apps/groups/static/django_airavata_groups/js/groups_components/GroupsOwned.vue
create mode 100755 django_airavata/apps/groups/templates/django_airavata_groups/base.html
mode change 100644 => 100755 django_airavata/apps/groups/templates/django_airavata_groups/group_details.html
mode change 100644 => 100755 django_airavata/apps/groups/templates/django_airavata_groups/group_edit.html
mode change 100644 => 100755 django_airavata/apps/groups/templates/django_airavata_groups/groups_create.html
create mode 100755 django_airavata/apps/groups/templates/django_airavata_groups/groups_list.html
mode change 100644 => 100755 django_airavata/apps/groups/templates/django_airavata_groups/groups_manage.html
mode change 100644 => 100755 django_airavata/apps/groups/tests.py
mode change 100644 => 100755 django_airavata/apps/groups/urls.py
mode change 100644 => 100755 django_airavata/apps/groups/views.py
copy django_airavata/apps/{workspace => groups}/webpack.config.js (67%)
mode change 100644 => 100755
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata-django-portal] 01/02: Merge branch
'groups_ui_enchacement' of
https://github.com/stephenpaul2727/airavata-django-portal into
stephenpaul2727-groups_ui_enchacement
Posted by ma...@apache.org.
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 610d333faefc58fb638967c0a55594c0cf53fbb3
Merge: 9c4d83b f78f7b7
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Jan 31 12:28:07 2018 -0500
Merge branch 'groups_ui_enchacement' of https://github.com/stephenpaul2727/airavata-django-portal into stephenpaul2727-groups_ui_enchacement
.gitignore | 1 +
django_airavata/apps/api/serializers.py | 36 +
.../api/static/django_airavata_api/js/index.js | 4 +
.../static/django_airavata_api/js/models/Group.js | 33 +
.../js/services/GroupService.js | 48 +
django_airavata/apps/api/urls.py | 1 +
django_airavata/apps/api/views.py | 26 +
django_airavata/apps/groups/__init__.py | 0
django_airavata/apps/groups/admin.py | 0
django_airavata/apps/groups/apps.py | 0
django_airavata/apps/groups/forms.py | 0
django_airavata/apps/groups/migrations/__init__.py | 0
django_airavata/apps/groups/models.py | 0
django_airavata/apps/groups/package-lock.json | 7364 ++++++++++++++++++++
django_airavata/apps/groups/package.json | 35 +
.../js/group-create-entry-point.js | 16 +
.../js/group-listing-entry-point.js | 30 +
.../js/groups_components/Autocomplete.vue | 104 +
.../js/groups_components/GroupCreate.vue | 87 +
.../js/groups_components/GroupListItem.vue | 35 +
.../js/groups_components/GroupMemberList.vue | 33 +
.../js/groups_components/GroupOwnerList.vue | 33 +
.../js/groups_components/GroupsManageContainer.vue | 94 +
.../js/groups_components/GroupsMember.vue | 43 +
.../js/groups_components/GroupsOwned.vue | 40 +
.../templates/django_airavata_groups/base.html | 19 +
.../django_airavata_groups/group_details.html | 0
.../django_airavata_groups/group_edit.html | 0
.../django_airavata_groups/groups_create.html | 16 +-
.../django_airavata_groups/groups_list.html | 14 +
.../django_airavata_groups/groups_manage.html | 103 +-
django_airavata/apps/groups/tests.py | 0
django_airavata/apps/groups/urls.py | 0
django_airavata/apps/groups/views.py | 37 +-
django_airavata/apps/groups/webpack.config.js | 87 +
35 files changed, 8228 insertions(+), 111 deletions(-)
diff --cc django_airavata/apps/api/serializers.py
index cb6b413,4ae6db2..7c3ab02
--- a/django_airavata/apps/api/serializers.py
+++ b/django_airavata/apps/api/serializers.py
@@@ -1,30 -1,25 +1,31 @@@
-from airavata.model.experiment.ttypes import ExperimentModel
-from airavata.model.workspace.ttypes import Project
-from airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule, ApplicationDeploymentDescription,CommandObject,SetEnvPaths
-from airavata.model.appcatalog.appinterface.ttypes import ApplicationInterfaceDescription
-from airavata.model.application.io.ttypes import InputDataObjectType, OutputDataObjectType
-from airavata.model.experiment.ttypes import ExperimentModel
-from airavata.model.workspace.ttypes import Project
-from airavata.model.group.ttypes import GroupModel
-from airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule
-from airavata.model.appcatalog.computeresource.ttypes import BatchQueue
-from . import thrift_utils
+import copy
+import datetime
+import logging
+from urllib.parse import quote
from django.conf import settings
-
from rest_framework import serializers
-import datetime
-import copy
-from urllib.parse import quote
-import logging
+from airavata.model.appcatalog.appdeployment.ttypes import (ApplicationDeploymentDescription,
+ ApplicationModule,
+ CommandObject,
+ SetEnvPaths)
+from airavata.model.appcatalog.appinterface.ttypes import \
+ ApplicationInterfaceDescription
+from airavata.model.appcatalog.computeresource.ttypes import BatchQueue
+from airavata.model.application.io.ttypes import (InputDataObjectType,
+ OutputDataObjectType)
+from airavata.model.data.replica.ttypes import (DataProductModel,
+ DataReplicaLocationModel)
+from airavata.model.experiment.ttypes import (ExperimentModel,
+ ExperimentSummaryModel)
++from airavata.model.group.ttypes import GroupModel
+from airavata.model.job.ttypes import JobModel
+from airavata.model.status.ttypes import ExperimentStatus
+from airavata.model.workspace.ttypes import Project
+from . import thrift_utils
log = logging.getLogger(__name__)
diff --cc django_airavata/apps/api/static/django_airavata_api/js/index.js
index 0c7f867,fa96e65..c3015df
--- a/django_airavata/apps/api/static/django_airavata_api/js/index.js
+++ b/django_airavata/apps/api/static/django_airavata_api/js/index.js
@@@ -5,15 -5,18 +5,17 @@@ import Experiment from './models/Experi
import InputDataObjectType from './models/InputDataObjectType'
import OutputDataObjectType from './models/OutputDataObjectType'
import Project from './models/Project'
-import GroupMember from './models/GroupMember'
-import GroupOwner from './models/GroupOwner'
+import FullExperiment from './models/FullExperiment'
+ import Group from './models/Group'
import ApplicationDeploymentService from './services/ApplicationDeploymentService'
import ApplicationInterfaceService from './services/ApplicationInterfaceService'
import ApplicationModuleService from './services/ApplicationModuleService'
import ExperimentService from './services/ExperimentService'
+import ExperimentSearchService from './services/ExperimentSearchService'
+import FullExperimentService from './services/FullExperimentService'
import ProjectService from './services/ProjectService'
-import GroupMemberService from './services/GroupMemberService'
-import GroupOwnerService from './services/GroupOwnerService'
+ import GroupService from './services/GroupService'
import FetchUtils from './utils/FetchUtils'
import PaginationIterator from './utils/PaginationIterator'
@@@ -26,6 -28,9 +28,7 @@@ exports.models =
InputDataObjectType,
OutputDataObjectType,
Project,
- GroupMember,
- GroupOwner,
+ Group,
}
exports.services = {
@@@ -33,9 -38,10 +36,10 @@@
ApplicationInterfaceService,
ApplicationModuleService,
ExperimentService,
+ ExperimentSearchService,
+ FullExperimentService,
ProjectService,
- GroupMemberService,
- GroupOwnerService,
+ GroupService,
}
exports.utils = {
diff --cc django_airavata/apps/api/urls.py
index 345f85d,67bd46c..4a1e5ad
--- a/django_airavata/apps/api/urls.py
+++ b/django_airavata/apps/api/urls.py
@@@ -11,8 -11,7 +11,9 @@@ logger = logging.getLogger(__name__
router = routers.DefaultRouter()
router.register(r'projects', views.ProjectViewSet, base_name='project')
router.register(r'experiments', views.ExperimentViewSet, base_name='experiment')
+router.register(r'full-experiments', views.FullExperimentViewSet, base_name='full-experiment')
+router.register(r'experiment-search', views.ExperimentSearchViewSet, base_name='experiment-search')
+ router.register(r'groups', views.GroupViewSet, base_name='group')
router.register(r'new/application/module', views.RegisterApplicationModule, base_name='register_app_module')
router.register(r'application-interfaces', views.ApplicationInterfaceViewSet, base_name='application-interface')
router.register(r'applications', views.ApplicationModuleViewSet, base_name='application')
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata-django-portal] 02/02: Merge branch
'stephenpaul2727-groups_ui_enchacement'
Posted by ma...@apache.org.
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 e0a2d311dc3c287f89262de039b906853927810f
Merge: 9c4d83b 610d333
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Jan 31 12:28:26 2018 -0500
Merge branch 'stephenpaul2727-groups_ui_enchacement'
.gitignore | 1 +
django_airavata/apps/api/serializers.py | 36 +
.../api/static/django_airavata_api/js/index.js | 4 +
.../static/django_airavata_api/js/models/Group.js | 33 +
.../js/services/GroupService.js | 48 +
django_airavata/apps/api/urls.py | 1 +
django_airavata/apps/api/views.py | 26 +
django_airavata/apps/groups/__init__.py | 0
django_airavata/apps/groups/admin.py | 0
django_airavata/apps/groups/apps.py | 0
django_airavata/apps/groups/forms.py | 0
django_airavata/apps/groups/migrations/__init__.py | 0
django_airavata/apps/groups/models.py | 0
django_airavata/apps/groups/package-lock.json | 7364 ++++++++++++++++++++
django_airavata/apps/groups/package.json | 35 +
.../js/group-create-entry-point.js | 16 +
.../js/group-listing-entry-point.js | 30 +
.../js/groups_components/Autocomplete.vue | 104 +
.../js/groups_components/GroupCreate.vue | 87 +
.../js/groups_components/GroupListItem.vue | 35 +
.../js/groups_components/GroupMemberList.vue | 33 +
.../js/groups_components/GroupOwnerList.vue | 33 +
.../js/groups_components/GroupsManageContainer.vue | 94 +
.../js/groups_components/GroupsMember.vue | 43 +
.../js/groups_components/GroupsOwned.vue | 40 +
.../templates/django_airavata_groups/base.html | 19 +
.../django_airavata_groups/group_details.html | 0
.../django_airavata_groups/group_edit.html | 0
.../django_airavata_groups/groups_create.html | 16 +-
.../django_airavata_groups/groups_list.html | 14 +
.../django_airavata_groups/groups_manage.html | 103 +-
django_airavata/apps/groups/tests.py | 0
django_airavata/apps/groups/urls.py | 0
django_airavata/apps/groups/views.py | 37 +-
django_airavata/apps/groups/webpack.config.js | 87 +
35 files changed, 8228 insertions(+), 111 deletions(-)
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.