[airavata-mft] branch master updated: adding git ignore
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git The following commit(s) were added to refs/heads/master by this push: new a6ec115 adding git ignore a6ec115 is described below commit a6ec1155d3fe02a1a0206990316017715d7cd7a4 Author: Suresh Marru AuthorDate: Tue Jan 24 23:42:43 2023 -0500 adding git ignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d43a85d..9729373 100644 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,7 @@ dkms.conf ### Code ### .vscode/* -!.vscode/settings.json +.vscode/settings.json !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json
[airavata-django-portal] branch develop updated (d14fd001 -> 75ed8451)
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 d14fd001 Merge pull request #165 from apache:AIRAVATA-3680 add 304b3d84 AIRAVATA-3681 Disable Ext. User Profile editor form for read-only admins new 75ed8451 Merge pull request #166 from apache:AIRAVATA-3681 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: .../users/ExtendedUserProfileContainer.vue | 15 +- .../ExtendedUserProfileFieldEditor.vue | 53 +++--- .../js/models/ExtendedUserProfileField.js | 1 + django_airavata/apps/auth/serializers.py | 7 ++- 4 files changed, 57 insertions(+), 19 deletions(-)
[airavata-django-portal] 01/01: Merge pull request #166 from apache:AIRAVATA-3681
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 75ed8451af90e76e52dbe9dcb45a5e8343be596c Merge: d14fd001 304b3d84 Author: Marcus Christie AuthorDate: Wed Jan 25 18:16:45 2023 -0500 Merge pull request #166 from apache:AIRAVATA-3681 AIRAVATA-3681 Disable Ext. User Profile editor form for read-only admins .../users/ExtendedUserProfileContainer.vue | 15 +- .../ExtendedUserProfileFieldEditor.vue | 53 +++--- .../js/models/ExtendedUserProfileField.js | 1 + django_airavata/apps/auth/serializers.py | 7 ++- 4 files changed, 57 insertions(+), 19 deletions(-)
[airavata-django-portal] 01/01: AIRAVATA-3681 Disable Ext. User Profile editor form for read-only admins
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch AIRAVATA-3681
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 304b3d848f23d30d62a0d482c958234337cfca4f
Author: Marcus Christie
AuthorDate: Wed Jan 25 18:15:06 2023 -0500
AIRAVATA-3681 Disable Ext. User Profile editor form for read-only admins
---
.../users/ExtendedUserProfileContainer.vue | 15 +-
.../ExtendedUserProfileFieldEditor.vue | 53 +++---
.../js/models/ExtendedUserProfileField.js | 1 +
django_airavata/apps/auth/serializers.py | 7 ++-
4 files changed, 57 insertions(+), 19 deletions(-)
diff --git
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ExtendedUserProfileContainer.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ExtendedUserProfileContainer.vue
index f2ff36a0..e5ac3a59 100644
---
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ExtendedUserProfileContainer.vue
+++
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ExtendedUserProfileContainer.vue
@@ -19,6 +19,7 @@
@@ -28,7 +29,7 @@
-
+
Text
Single ChoiceUser Agreement
-Save
+Save
Return to Manage Users
@@ -53,6 +60,7 @@
import { mapActions, mapGetters } from "vuex";
import ExtendedUserProfileFieldEditor from
"./field-editors/ExtendedUserProfileFieldEditor.vue";
import { mixins } from "django-airavata-common-ui";
+import { session } from "django-airavata-api";
export default {
mixins: [mixins.ValidationParent],
components: { ExtendedUserProfileFieldEditor },
@@ -123,6 +131,9 @@ export default {
valid() {
return this.childComponentsAreValid;
},
+isGatewayAdmin() {
+ return session.Session.isGatewayAdmin;
+},
},
};
diff --git
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/field-editors/ExtendedUserProfileFieldEditor.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/field-editors/ExtendedUserProfileFieldEditor.vue
index 0d2d5944..19438a76 100644
---
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/field-editors/ExtendedUserProfileFieldEditor.vue
+++
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/field-editors/ExtendedUserProfileFieldEditor.vue
@@ -3,7 +3,7 @@
:title="title"
:border-variant="$v.$anyDirty && $v.$invalid ? 'danger' : null"
>
-
+
This field is required.
This field is required.
-
+
Help text
(Optional)
-
+
Required
@@ -39,7 +40,7 @@
v-for="({ $model: choice, display_text: $v_display_text },
index) in $v.choices.$each.$iter"
>
-
+
-
+
-
+
Add Option
-
+
Allow user to type in an "Other" option
@@ -134,7 +139,7 @@
.$each.$iter"
:key="link.key"
>
-
+
This field is required.
-
+
-
+
-
+
-
+
Delete Link
-Add Link
Move Down
-Delete
+Delete
@@ -215,7 +236,7 @@ import { required, requiredIf } from
"vuelidate/lib/validators";
import { errors } from "django-airavata-common-ui";
export default {
mixins: [validationMixin],
- props: ["extendedUserProfileField"],
+ props: ["extendedUserProfileField", "disabled"],
computed: {
...mapGetters("extendedUserProfile", ["extendedUserProfileFields"]),
name: {
diff --git
a/django_airavata/apps/api/static/django_airavata_api/js/models/ExtendedUserProfileField.js
b/django_airavata/apps/api/static/django_airavata_api/js/models/ExtendedUserProfileField.js
index 04938ca5..44076bc2 100644
---
a/django_airavata/apps/api/static/django_airavata_api/js/models/ExtendedUserProfileField.js
+++
b/django_airavata/apps/api/static/django_airavata_api/js/models/ExtendedUserProfileField.js
@@ -32,6 +32,7 @@ const FIELDS = [
},
"other",
"required",
+ "userHasWriteAccess",
];
export default class ExtendedUserProfileField extends BaseModel {
diff --git a/django_airavata/apps/auth/serializers.py
b/django_airavata/apps/auth/serializers.py
index 06d8def8..4b35c111 100644
--- a/django_airavata/apps/auth/serializers.py
+++
[airavata-django-portal] branch AIRAVATA-3681 created (now 304b3d84)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3681 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git at 304b3d84 AIRAVATA-3681 Disable Ext. User Profile editor form for read-only admins This branch includes the following new commits: new 304b3d84 AIRAVATA-3681 Disable Ext. User Profile editor form for read-only admins 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.
[airavata] branch develop updated: Reming travis file as we move to github actions
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git The following commit(s) were added to refs/heads/develop by this push: new 2feb3e2485 Reming travis file as we move to github actions 2feb3e2485 is described below commit 2feb3e2485857e9833682227ebc342f7d36536b5 Author: Suresh Marru AuthorDate: Wed Jan 25 17:08:11 2023 -0500 Reming travis file as we move to github actions --- .travis.yml | 37 - 1 file changed, 37 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 21894a577f..00 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -language: java - -sudo: false - -notifications: - email: -on_success: change -on_failure: always - -jdk: - - oraclejdk11 - -script: mvn clean install - -# Git-describe Maven plugin needs the full history -git: - depth: false
[airavata-django-portal] branch develop updated (4f7ef315 -> d14fd001)
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 4f7ef315 Adding license
add 405fdbed AIRAVATA-3680 Search for experiments by job id
add a925344e AIRAVATA-3680 Basic unit test for loading experiment details
by job id
new d14fd001 Merge pull request #165 from apache:AIRAVATA-3680
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/admin/jest.config.js |9 +
django_airavata/apps/admin/package.json| 28 +-
.../statistics/ExperimentStatisticsContainer.vue | 143 +-
.../tests/__mocks__/styleMock.js |0
.../ExperimentStatisticsContainer.spec.js | 145 ++
django_airavata/apps/admin/yarn.lock | 2652 +++-
test_js.sh |1 +
7 files changed, 2867 insertions(+), 111 deletions(-)
create mode 100644 django_airavata/apps/admin/jest.config.js
copy django_airavata/apps/{workspace/static/django_airavata_workspace =>
admin/static/django_airavata_admin}/tests/__mocks__/styleMock.js (100%)
create mode 100644
django_airavata/apps/admin/static/django_airavata_admin/tests/unit/components/statistics/ExperimentStatisticsContainer.spec.js
[airavata-django-portal] 01/01: Merge pull request #165 from apache:AIRAVATA-3680
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 d14fd00180751b6d2fca09c3a18d851bc8a534e4 Merge: 4f7ef315 a925344e Author: Marcus Christie AuthorDate: Wed Jan 25 11:28:21 2023 -0500 Merge pull request #165 from apache:AIRAVATA-3680 AIRAVATA-3680 Add search by job id to Experiment Statistics in Django portal django_airavata/apps/admin/jest.config.js |9 + django_airavata/apps/admin/package.json| 28 +- .../statistics/ExperimentStatisticsContainer.vue | 143 +- .../tests/__mocks__/styleMock.js |1 + .../ExperimentStatisticsContainer.spec.js | 145 ++ django_airavata/apps/admin/yarn.lock | 2652 +++- test_js.sh |1 + 7 files changed, 2868 insertions(+), 111 deletions(-)
[airavata-django-portal] branch AIRAVATA-3680 created (now a925344e)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3680 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git at a925344e AIRAVATA-3680 Basic unit test for loading experiment details by job id This branch includes the following new commits: new 405fdbed AIRAVATA-3680 Search for experiments by job id new a925344e AIRAVATA-3680 Basic unit test for loading experiment details by job id 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.
[airavata-django-portal] 01/02: AIRAVATA-3680 Search for experiments by job id
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch AIRAVATA-3680
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 405fdbedbb30ea9ca61e95ca38b120c0ffc0f22c
Author: Marcus Christie
AuthorDate: Mon Jan 23 18:13:59 2023 -0500
AIRAVATA-3680 Search for experiments by job id
---
.../statistics/ExperimentStatisticsContainer.vue | 143 +++--
1 file changed, 105 insertions(+), 38 deletions(-)
diff --git
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/statistics/ExperimentStatisticsContainer.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/statistics/ExperimentStatisticsContainer.vue
index 6f6a4b63..618e0b18 100644
---
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/statistics/ExperimentStatisticsContainer.vue
+++
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/statistics/ExperimentStatisticsContainer.vue
@@ -5,26 +5,55 @@
Experiment Statistics
-
-
-
-
-
-Load
-
-
-
+
+
+
+
+
+
+
+
+ Load
+
+
+
+
+
+
+
+
+
+
+
+ Load
+
+
+
+
+
+
@@ -250,20 +279,22 @@
-{{ experimentDetail.experimentName }}
+{{ experimentTab.tabTitle }}
Close experiment tab
-
+
@@ -271,7 +302,7 @@
