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/09/24 20:41:45 UTC
[airavata-django-portal] branch merge-pr67 updated (e37a60c ->
1dee350)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch merge-pr67
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from e37a60c Merge branch 'master' into develop
add 2c03c27 Side by side group view with bootstrap-vue update
add f4a8f4d Adding GroupMembersEditor.vue
add 3ac6666 Adding GroupMembersDetailsContainer.vue and updating yarn.lock and package.json files
add 8749fd0 adding fixes
add c8af530 fixing package.json
add 013a2c4 Fixing 'add/remove all members' bug
new 257a1b0 Merge branch 'AIRAVATA-2809-GROUP-VIEW' of https://github.com/akbranam/airavata-django-portal into akbranam-AIRAVATA-2809-GROUP-VIEW
new 1dee350 Merge branch 'akbranam-AIRAVATA-2809-GROUP-VIEW' into merge-pr67
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:
django_airavata/apps/admin/package.json | 2 +-
.../ComputeResourceReservationList.vue | 6 +-
.../GroupComputeResourcePreference.vue | 6 +-
.../applications/ApplicationDeploymentsList.vue | 2 +-
.../ComputeResourcePreferenceDashboard.vue | 4 +-
.../dashboards/CredentialStoreDashboard.vue | 10 +-
.../gatewayprofile/StoragePreferenceList.vue | 6 +-
.../notices/NoticesManagementContainer.vue | 6 +-
.../statistics/ExperimentStatisticsContainer.vue | 10 +-
.../IdentityServiceUserManagementContainer.vue | 6 +-
.../UnverifiedEmailUserManagementContainer.vue | 2 +-
django_airavata/apps/admin/yarn.lock | 74 +-
django_airavata/apps/groups/package.json | 4 +-
.../js/group_components/GroupEditor.vue | 9 +-
.../GroupMembersDetailsContainer.vue | 72 +
.../js/group_components/GroupMembersEditor.vue | 471 ++-
django_airavata/apps/groups/yarn.lock | 4389 ++++++++++----------
django_airavata/apps/workspace/package.json | 2 +-
.../components/storage/UserStoragePathViewer.vue | 6 +-
django_airavata/apps/workspace/yarn.lock | 74 +-
django_airavata/static/common/package.json | 2 +-
django_airavata/static/common/yarn.lock | 74 +-
22 files changed, 2839 insertions(+), 2398 deletions(-)
create mode 100644 django_airavata/apps/groups/static/django_airavata_groups/js/group_components/GroupMembersDetailsContainer.vue
[airavata-django-portal] 01/02: Merge branch
'AIRAVATA-2809-GROUP-VIEW' of
https://github.com/akbranam/airavata-django-portal into
akbranam-AIRAVATA-2809-GROUP-VIEW
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch merge-pr67
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 257a1b0db62f9fd12eae8cb6adee9e98b6c5e1fd
Merge: e37a60c 013a2c4
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Sep 24 16:40:41 2021 -0400
Merge branch 'AIRAVATA-2809-GROUP-VIEW' of https://github.com/akbranam/airavata-django-portal into akbranam-AIRAVATA-2809-GROUP-VIEW
django_airavata/apps/admin/package.json | 2 +-
.../ComputeResourceReservationList.vue | 6 +-
.../GroupComputeResourcePreference.vue | 6 +-
.../applications/ApplicationDeploymentsList.vue | 2 +-
.../ComputeResourcePreferenceDashboard.vue | 4 +-
.../dashboards/CredentialStoreDashboard.vue | 10 +-
.../gatewayprofile/StoragePreferenceList.vue | 6 +-
.../notices/NoticesManagementContainer.vue | 6 +-
.../statistics/ExperimentStatisticsContainer.vue | 10 +-
.../IdentityServiceUserManagementContainer.vue | 6 +-
.../UnverifiedEmailUserManagementContainer.vue | 2 +-
django_airavata/apps/admin/yarn.lock | 74 +-
django_airavata/apps/groups/package.json | 4 +-
.../js/group_components/GroupEditor.vue | 9 +-
.../GroupMembersDetailsContainer.vue | 72 +
.../js/group_components/GroupMembersEditor.vue | 471 ++-
django_airavata/apps/groups/yarn.lock | 4389 ++++++++++----------
django_airavata/apps/workspace/package.json | 2 +-
.../components/storage/UserStoragePathViewer.vue | 6 +-
django_airavata/apps/workspace/yarn.lock | 74 +-
django_airavata/static/common/package.json | 2 +-
django_airavata/static/common/yarn.lock | 74 +-
22 files changed, 2839 insertions(+), 2398 deletions(-)
diff --cc django_airavata/apps/admin/package.json
index fd6338f,ba820f5..670f5f5
--- a/django_airavata/apps/admin/package.json
+++ b/django_airavata/apps/admin/package.json
@@@ -13,8 -13,7 +13,8 @@@
},
"dependencies": {
"bootstrap": "^4.3.1",
- "bootstrap-vue": "2.0.0-rc.26",
+ "bootstrap-vue": "^2.21.2",
+ "browserslist": "^4.16.7",
"django-airavata-api": "link:../api",
"django-airavata-common-ui": "link:../../static/common/",
"luxon": "^1.16.0",
diff --cc django_airavata/apps/groups/package.json
index 479ba14,cd4dc07..ead0321
--- a/django_airavata/apps/groups/package.json
+++ b/django_airavata/apps/groups/package.json
@@@ -13,8 -13,6 +13,7 @@@
},
"dependencies": {
"bootstrap": "^4.0.0-beta.2",
- "bootstrap-vue": "2.0.0-rc.26",
+ "browserslist": "^4.16.7",
"django-airavata-api": "link:../api",
"django-airavata-common-ui": "link:../../static/common",
"moment": "^2.18.1",
diff --cc django_airavata/apps/groups/yarn.lock
index a510055,81cbc03..7b2b284
--- a/django_airavata/apps/groups/yarn.lock
+++ b/django_airavata/apps/groups/yarn.lock
@@@ -1811,26 -1913,17 +1913,28 @@@ browserify-zlib@^0.2.0
dependencies:
pako "~1.0.5"
- browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.7.3:
- version "4.7.3"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.3.tgz#02341f162b6bcc1e1028e30624815d4924442dc3"
- integrity sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==
+ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.3.4, browserslist@^4.5.4:
+ version "4.16.6"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+ integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
dependencies:
- caniuse-lite "^1.0.30001010"
- electron-to-chromium "^1.3.306"
- node-releases "^1.1.40"
+ caniuse-lite "^1.0.30001219"
+ colorette "^1.2.2"
+ electron-to-chromium "^1.3.723"
+ escalade "^3.1.1"
+ node-releases "^1.1.71"
+browserslist@^4.16.7:
+ version "4.16.7"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.7.tgz#108b0d1ef33c4af1b587c54f390e7041178e4335"
+ integrity sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==
+ dependencies:
+ caniuse-lite "^1.0.30001248"
+ colorette "^1.2.2"
+ electron-to-chromium "^1.3.793"
+ escalade "^3.1.1"
+ node-releases "^1.1.73"
+
buffer-from@^0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0"
@@@ -2005,15 -2106,15 +2117,20 @@@ caniuse-api@^3.0.0
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
- caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001010, caniuse-lite@^1.0.30001248:
+ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
+ version "1.0.30001243"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz#d9250155c91e872186671c523f3ae50cfc94a3aa"
+ integrity sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==
+
++caniuse-lite@^1.0.30001248:
+ version "1.0.30001248"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz#26ab45e340f155ea5da2920dadb76a533cb8ebce"
+ integrity sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==
+
case-sensitive-paths-webpack-plugin@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"
- integrity sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g==
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
+ integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
caseless@~0.12.0:
version "0.12.0"
@@@ -3080,32 -3182,27 +3198,32 @@@ ee-first@1.1.1
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
ejs@^2.6.1:
- version "2.7.3"
- resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.3.tgz#4f437b3992ea0e0757f0ab8d7f29e42593498927"
- integrity sha512-NtMNsdpaCF23gvHItgT37gzrpzckzs7KB7mg+YH1GMSG/5iZRq1BeWzAhEAJVagfM7nCQDnh/C51j/L2qjZmnA==
+ version "2.7.4"
+ resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
+ integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
- electron-to-chromium@^1.3.306:
- version "1.3.306"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz#e8265301d053d5f74e36cb876486830261fbe946"
- integrity sha512-frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A==
+ electron-to-chromium@^1.3.723:
+ version "1.3.772"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.772.tgz#fd1ed39f9f3149f62f581734e4f026e600369479"
+ integrity sha512-X/6VRCXWALzdX+RjCtBU6cyg8WZgoxm9YA02COmDOiNJEZ59WkQggDbWZ4t/giHi/3GS+cvdrP6gbLISANAGYA==
+electron-to-chromium@^1.3.793:
+ version "1.3.795"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz#91f09b4c77f8dab562dd592ce929b009201c24ff"
+ integrity sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==
+
- elliptic@^6.0.0:
- version "6.5.1"
- resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"
- integrity sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==
+ elliptic@^6.5.3:
+ version "6.5.4"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+ integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
dependencies:
- bn.js "^4.4.0"
- brorand "^1.0.1"
+ bn.js "^4.11.9"
+ brorand "^1.1.0"
hash.js "^1.0.0"
- hmac-drbg "^1.0.0"
- inherits "^2.0.1"
- minimalistic-assert "^1.0.0"
- minimalistic-crypto-utils "^1.0.0"
+ hmac-drbg "^1.0.1"
+ inherits "^2.0.4"
+ minimalistic-assert "^1.0.1"
+ minimalistic-crypto-utils "^1.0.1"
emoji-regex@^7.0.1:
version "7.0.3"
@@@ -5666,30 -5770,7 +5791,7 @@@ node-libs-browser@^2.2.1
util "^0.11.0"
vm-browserify "^1.0.1"
- node-pre-gyp@^0.12.0:
- version "0.12.0"
- resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
- integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
- dependencies:
- detect-libc "^1.0.2"
- mkdirp "^0.5.1"
- needle "^2.2.1"
- nopt "^4.0.1"
- npm-packlist "^1.1.6"
- npmlog "^4.0.2"
- rc "^1.2.7"
- rimraf "^2.6.1"
- semver "^5.3.0"
- tar "^4"
-
- node-releases@^1.1.40:
- version "1.1.40"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.40.tgz#a94facfa8e2d612302601ca1361741d529c4515a"
- integrity sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==
- dependencies:
- semver "^6.3.0"
-
- node-releases@^1.1.73:
-node-releases@^1.1.71:
++node-releases@^1.1.71, node-releases@^1.1.73:
version "1.1.73"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
diff --cc django_airavata/apps/workspace/package.json
index efccaa9,6019043..0e61e88
--- a/django_airavata/apps/workspace/package.json
+++ b/django_airavata/apps/workspace/package.json
@@@ -22,8 -22,7 +22,8 @@@
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/vue-fontawesome": "^2.0.2",
"bootstrap": "^4.3.1",
- "bootstrap-vue": "2.0.0-rc.26",
+ "bootstrap-vue": "^2.21.2",
+ "browserslist": "^4.16.7",
"codemirror": "5.52.2",
"django-airavata-api": "link:../api",
"django-airavata-common-ui": "link:../../static/common",
diff --cc django_airavata/static/common/package.json
index 042afed,12d59c3..07b90c0
--- a/django_airavata/static/common/package.json
+++ b/django_airavata/static/common/package.json
@@@ -23,8 -23,7 +23,8 @@@
"@uppy/tus": "^1.3.0",
"@uppy/xhr-upload": "^1.2.0",
"bootstrap": "^4.3.1",
- "bootstrap-vue": "2.0.0-rc.26",
+ "bootstrap-vue": "^2.21.2",
+ "browserslist": "^4.16.7",
"clipboard": "^2.0.4",
"django-airavata-api": "link:../../apps/api",
"jquery": "^3.3.1",
[airavata-django-portal] 02/02: Merge branch
'akbranam-AIRAVATA-2809-GROUP-VIEW' into merge-pr67
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch merge-pr67
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 1dee350f8346e3ca7e607af5a9f9a6689eb350ba
Merge: e37a60c 257a1b0
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Sep 24 16:41:07 2021 -0400
Merge branch 'akbranam-AIRAVATA-2809-GROUP-VIEW' into merge-pr67
django_airavata/apps/admin/package.json | 2 +-
.../ComputeResourceReservationList.vue | 6 +-
.../GroupComputeResourcePreference.vue | 6 +-
.../applications/ApplicationDeploymentsList.vue | 2 +-
.../ComputeResourcePreferenceDashboard.vue | 4 +-
.../dashboards/CredentialStoreDashboard.vue | 10 +-
.../gatewayprofile/StoragePreferenceList.vue | 6 +-
.../notices/NoticesManagementContainer.vue | 6 +-
.../statistics/ExperimentStatisticsContainer.vue | 10 +-
.../IdentityServiceUserManagementContainer.vue | 6 +-
.../UnverifiedEmailUserManagementContainer.vue | 2 +-
django_airavata/apps/admin/yarn.lock | 74 +-
django_airavata/apps/groups/package.json | 4 +-
.../js/group_components/GroupEditor.vue | 9 +-
.../GroupMembersDetailsContainer.vue | 72 +
.../js/group_components/GroupMembersEditor.vue | 471 ++-
django_airavata/apps/groups/yarn.lock | 4389 ++++++++++----------
django_airavata/apps/workspace/package.json | 2 +-
.../components/storage/UserStoragePathViewer.vue | 6 +-
django_airavata/apps/workspace/yarn.lock | 74 +-
django_airavata/static/common/package.json | 2 +-
django_airavata/static/common/yarn.lock | 74 +-
22 files changed, 2839 insertions(+), 2398 deletions(-)