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
The following commit(s) were added to refs/heads/develop by this push:
new 2085b245 AIRAVATA-3616 Show the actual hostName for the compute
resource
2085b245 is described below
commit 2085b24529ddf2a36880babb85d6920e48d4e5c5
Author: Marcus Christie <[email protected]>
AuthorDate: Mon May 9 17:57:13 2022 -0400
AIRAVATA-3616 Show the actual hostName for the compute resource
---
.../GroupComputeResourcePreference.vue | 31 +++++++++++-----------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
index 4fcec67d..2c8b077e 100644
---
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
+++
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
@@ -53,6 +53,11 @@
:items="slotProps.items"
sort-by="computeResourceId"
>
+ <template slot="cell(computeResourceId)" slot-scope="row">
+ <compute-resource-name
+ :compute-resource-id="row.item.computeResourceId"
+ />
+ </template>
<template slot="cell(policy)" slot-scope="row">
<compute-resource-policy-summary
:compute-resource-id="row.item.computeResourceId"
@@ -116,9 +121,10 @@
>
Are you sure you want to remove the preferences for compute
resource
- <strong>{{
- getComputeResourceName(row.item.computeResourceId)
- }}</strong
+ <strong>
+ <compute-resource-name
+ :compute-resource-id="row.item.computeResourceId"
+ /> </strong
>?
</delete-link>
</template>
@@ -127,9 +133,9 @@
</list-layout>
<div class="fixed-footer">
<b-button
- variant="primary"
- :disabled="!userHasWriteAccess"
- @click="saveGroupResourceProfile"
+ variant="primary"
+ :disabled="!userHasWriteAccess"
+ @click="saveGroupResourceProfile"
>Save</b-button
>
<delete-button
@@ -182,7 +188,7 @@ export default {
(grp) => {
this.data = grp;
this.userHasWriteAccess = this.data.userHasWriteAccess;
- }
+ }
);
}
// Load information about the owner of this GroupResourceProfile
@@ -191,8 +197,7 @@ export default {
}).then((sharedEntity) => {
this.sharedEntity = sharedEntity;
});
- }
- else{
+ } else {
this.userHasWriteAccess = true;
}
},
@@ -208,7 +213,6 @@ export default {
label: "Name",
key: "computeResourceId",
sortable: true,
- formatter: (value) => this.getComputeResourceName(value),
},
{
label: "Username",
@@ -243,6 +247,7 @@ export default {
ComputeResourcesModal,
"ssh-credential-selector": SSHCredentialSelector,
ComputeResourceReservationsSummary,
+ "compute-resource-name": comps.ComputeResourceName,
},
computed: {
excludedComputeResourceIds() {
@@ -294,12 +299,6 @@ export default {
this.$router.push("/group-resource-profiles");
});
},
- getComputeResourceName: function (computeResourceId) {
- // TODO: load compute resources to get the real name
- return computeResourceId && computeResourceId.indexOf("_") > 0
- ? computeResourceId.split("_")[0]
- : computeResourceId;
- },
cancel: function () {
this.$router.push("/group-resource-profiles");
},
