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 2019/10/22 21:10:39 UTC
[airavata-django-portal] branch master updated (25ca863 -> 4384aaf)
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 25ca863 AIRAVATA-3232 Only move input files into experiment data dir when they exist
new 929b6e8 AIRAVATA-3228 bug fix: show ssh cred description
new 4384aaf AIRAVATA-3226 Allow "activating" user who is enabled in Keycloak but for some reason doesn't have an Airavata User Profile
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:
.../credentials/SSHCredentialSelector.vue | 2 +-
.../src/components/users/ActivateUserPanel.vue | 27 ++++++++++++++++++++++
.../src/components/users/UserDetailsContainer.vue | 9 +++++++-
3 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ActivateUserPanel.vue
[airavata-django-portal] 02/02: AIRAVATA-3226 Allow "activating"
user who is enabled in Keycloak but for some reason doesn't have an
Airavata User Profile
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 4384aaf382f3cb82833fe5485594134db62ebb6e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Oct 22 17:05:21 2019 -0400
AIRAVATA-3226 Allow "activating" user who is enabled in Keycloak but for some reason doesn't have an Airavata User Profile
---
.../src/components/users/ActivateUserPanel.vue | 27 ++++++++++++++++++++++
.../src/components/users/UserDetailsContainer.vue | 9 +++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ActivateUserPanel.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ActivateUserPanel.vue
new file mode 100644
index 0000000..40b7385
--- /dev/null
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/ActivateUserPanel.vue
@@ -0,0 +1,27 @@
+<template>
+ <b-card header="Activate User">
+ <p class="card-text">
+ User {{ username }} has verified their login, but doesn't yet have an Airavata User Profile. Click <b>Activate</b>
+ to create an Airavata User Profile for this user. This will allow the user to be assigned to groups.
+ </p>
+ <b-button @click="activate">Activate</b-button>
+ </b-card>
+</template>
+
+<script>
+export default {
+ name: "activate-user-panel",
+ props: {
+ username: {
+ type: String,
+ required: true
+ }
+ },
+ methods: {
+ activate() {
+ this.$emit("activate-user", this.username);
+ }
+ }
+};
+</script>
+
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserDetailsContainer.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserDetailsContainer.vue
index 6f6e5a8..9bd2eba 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserDetailsContainer.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserDetailsContainer.vue
@@ -7,6 +7,11 @@
:airavata-internal-user-id="iamUserProfile.airavataInternalUserId"
@input="groupsUpdated"
/>
+ <activate-user-panel
+ v-if="iamUserProfile.enabled && iamUserProfile.emailVerified && !iamUserProfile.airavataUserProfileExists"
+ :username="iamUserProfile.userId"
+ @activate-user="$emit('enable-user', $event)"
+ />
<enable-user-panel
v-if="!iamUserProfile.enabled && !iamUserProfile.emailVerified"
:username="iamUserProfile.userId"
@@ -23,6 +28,7 @@
<script>
import { models } from "django-airavata-api";
import UserGroupMembershipEditor from "./UserGroupMembershipEditor";
+import ActivateUserPanel from "./ActivateUserPanel";
import EnableUserPanel from "./EnableUserPanel";
import DeleteUserPanel from "./DeleteUserPanel";
@@ -41,7 +47,8 @@ export default {
components: {
UserGroupMembershipEditor,
EnableUserPanel,
- DeleteUserPanel
+ DeleteUserPanel,
+ ActivateUserPanel
},
data() {
return {
[airavata-django-portal] 01/02: AIRAVATA-3228 bug fix: show ssh
cred description
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 929b6e8ceb329c433f2c5daf5d0528170a0bb080
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Oct 22 16:39:18 2019 -0400
AIRAVATA-3228 bug fix: show ssh cred description
---
.../src/components/credentials/SSHCredentialSelector.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/credentials/SSHCredentialSelector.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/credentials/SSHCredentialSelector.vue
index a58c007..f4b9ca0 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/credentials/SSHCredentialSelector.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/credentials/SSHCredentialSelector.vue
@@ -69,7 +69,7 @@ export default {
? this.credentials.map(summary => {
return {
value: summary.token,
- text: !summary.description ? summary.description : `No description (${summary.token})`
+ text: summary.description ? summary.description : `No description (${summary.token})`
};
})
: [];