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 b21eede520aa2d8fd76d70ba0ea7ce5329611001 Author: Marcus Christie <[email protected]> AuthorDate: Mon Aug 29 10:05:13 2022 -0400 AIRAVATA-3649 Make queue settings readonly when calculator is configured --- .../components/experiment/QueueSettingsEditor.vue | 72 ++++++++++++++++++---- 1 file changed, 60 insertions(+), 12 deletions(-) diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue index da86e071..12aa9ef1 100644 --- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue +++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue @@ -2,10 +2,14 @@ <div v-if="showQueueSettings"> <div class="row"> <div class="col"> - <div class="card border-default" :class="{ 'border-danger': !valid }"> + <div + class="card border-default" + :class="{ 'border-danger': !valid, 'is-disabled': disabled }" + > <b-link @click="showConfiguration = !showConfiguration" class="card-link text-dark" + :disabled="disabled" > <div class="card-body"> <h5 class="card-title mb-4"> @@ -106,7 +110,8 @@ Max Allowed Cores = {{ maxCPUCount }}<template v-if=" - selectedQueueDefault && selectedQueueDefault.cpuPerNode > 0 + selectedQueueDefault && + selectedQueueDefault.cpuPerNode > 0 " >. There are {{ selectedQueueDefault.cpuPerNode }} cores per node. @@ -114,16 +119,47 @@ </div> </b-form-group> </div> - <div class="d-flex flex-column" v-if="selectedQueueDefault && selectedQueueDefault.cpuPerNode > 0"> - <div class="flex-fill" - style="border: 1px solid #6c757d;border-top-right-radius: 10px;margin-top: 51px;border-left-width: 0px;border-bottom-width: 0px;margin-right: 15px;"></div> - <b-button size="sm" pill variant="outline-secondary" - v-on:click="enableNodeCountToCpuCheck = !enableNodeCountToCpuCheck"> - <i v-if="enableNodeCountToCpuCheck" class="fa fa-lock" aria-hidden="true"></i> + <div + class="d-flex flex-column" + v-if="selectedQueueDefault && selectedQueueDefault.cpuPerNode > 0" + > + <div + class="flex-fill" + style=" + border: 1px solid #6c757d; + border-top-right-radius: 10px; + margin-top: 51px; + border-left-width: 0px; + border-bottom-width: 0px; + margin-right: 15px; + " + ></div> + <b-button + size="sm" + pill + variant="outline-secondary" + v-on:click=" + enableNodeCountToCpuCheck = !enableNodeCountToCpuCheck + " + > + <i + v-if="enableNodeCountToCpuCheck" + class="fa fa-lock" + aria-hidden="true" + ></i> <i v-else class="fa fa-unlock" aria-hidden="true"></i> </b-button> - <div class="flex-fill" - style="border: 1px solid #6c757d;border-bottom-right-radius: 10px;margin-bottom: 57px;border-left-width: 0px;border-top-width: 0px;margin-right: 15px;"></div> + <div + class="flex-fill" + style=" + border: 1px solid #6c757d; + border-bottom-right-radius: 10px; + margin-bottom: 57px; + border-left-width: 0px; + border-top-width: 0px; + margin-right: 15px; + " + ></div> </div> </div> <b-form-group @@ -337,6 +373,12 @@ export default { ? this.applicationInterface.showQueueSettings : false; }, + disabled() { + return ( + this.applicationInterface && + !!this.applicationInterface.queueSettingsCalculatorId + ); + }, }, methods: { queueChanged: function (queueName) { @@ -449,7 +491,10 @@ export default { } }, nodeCountChanged() { - if (this.enableNodeCountToCpuCheck && this.selectedQueueDefault.cpuPerNode > 0) { + if ( + this.enableNodeCountToCpuCheck && + this.selectedQueueDefault.cpuPerNode > 0 + ) { const nodeCount = parseInt(this.data.nodeCount); this.data.totalCPUCount = Math.min( nodeCount * this.selectedQueueDefault.cpuPerNode, @@ -458,7 +503,10 @@ export default { } }, cpuCountChanged() { - if (this.enableNodeCountToCpuCheck && this.selectedQueueDefault.cpuPerNode > 0) { + if ( + this.enableNodeCountToCpuCheck && + this.selectedQueueDefault.cpuPerNode > 0 + ) { const cpuCount = parseInt(this.data.totalCPUCount); if (cpuCount > 0) { this.data.nodeCount = Math.min(
