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 2018/01/05 15:27:01 UTC
[airavata-django-portal] branch master updated (10a40e4 -> b9ca984)
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 10a40e4 AIRAVATA-2598 Toggle for queue settings
new 32aca46 AIRAVATA-2598 Cloning experiment prop; save and launch buttons
new b9ca984 AIRAVATA-2598 Document BaseModel.clone method
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_api/js/models/BaseModel.js | 3 ++
.../js/components/experiment/ExperimentEditor.vue | 51 +++++++++++++++++++---
2 files changed, 49 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@airavata.apache.org" <co...@airavata.apache.org>'].
[airavata-django-portal] 02/02: AIRAVATA-2598 Document
BaseModel.clone method
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 b9ca984b8a43249791ca6751183b6fff4d7bd843
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Jan 5 10:26:28 2018 -0500
AIRAVATA-2598 Document BaseModel.clone method
---
.../apps/api/static/django_airavata_api/js/models/BaseModel.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/django_airavata/apps/api/static/django_airavata_api/js/models/BaseModel.js b/django_airavata/apps/api/static/django_airavata_api/js/models/BaseModel.js
index c5ef43a..9745c90 100644
--- a/django_airavata/apps/api/static/django_airavata_api/js/models/BaseModel.js
+++ b/django_airavata/apps/api/static/django_airavata_api/js/models/BaseModel.js
@@ -75,6 +75,9 @@ export default class BaseModel {
return null;
}
+ /**
+ * Return a fully deep cloned instance of this instance.
+ */
clone() {
return new this.constructor(this);
}
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.
[airavata-django-portal] 01/02: AIRAVATA-2598 Cloning experiment
prop; save and launch buttons
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 32aca469000d8c1abf8c9860bf8b1c1fa37586a2
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Jan 5 10:26:10 2018 -0500
AIRAVATA-2598 Cloning experiment prop; save and launch buttons
---
.../js/components/experiment/ExperimentEditor.vue | 51 +++++++++++++++++++---
1 file changed, 46 insertions(+), 5 deletions(-)
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ExperimentEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ExperimentEditor.vue
index 2852745..5e18b38 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ExperimentEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ExperimentEditor.vue
@@ -15,12 +15,12 @@
<b-form novalidate>
<b-form-group label="Experiment Name" label-for="experiment-name">
<b-form-input id="experiment-name"
- type="text" v-model="experiment.experimentName" required
+ type="text" v-model="localExperiment.experimentName" required
placeholder="Experiment name"></b-form-input>
</b-form-group>
<b-form-group label="Project" label-for="project">
<b-form-select id="project"
- v-model="experiment.projectId" :options="projectOptions" required>
+ v-model="localExperiment.projectId" :options="projectOptions" required>
<template slot="first">
<option :value="null" disabled>Select a Project</option>
</template>
@@ -46,7 +46,7 @@
Application Inputs
</h2>
<b-form novalidate>
- <b-form-group v-for="experimentInput in experiment.experimentInputs"
+ <b-form-group v-for="experimentInput in localExperiment.experimentInputs"
:label="experimentInput.name" :label-for="experimentInput.name" :key="experimentInput.name">
<b-form-input :id="experimentInput.name" type="text" v-model="experimentInput.value" required
:placeholder="experimentInput.userFriendlyDescription"></b-form-input>
@@ -56,7 +56,7 @@
Resource Selection
</h2>
<computational-resource-scheduling-editor
- v-model="experiment.userConfigurationData.computationalResourceScheduling"
+ v-model="localExperiment.userConfigurationData.computationalResourceScheduling"
:app-module-id="appModule.appModuleId"
:app-interface-id="appInterface.applicationInterfaceId">
</computational-resource-scheduling-editor>
@@ -64,6 +64,16 @@
</div>
</div>
</div>
+ <div class="row">
+ <div id="col-exp-buttons" class="col">
+ <b-button variant="success" @click="saveAndLaunchExperiment">
+ Save and Launch
+ </b-button>
+ <b-button variant="primary" @click="saveExperiment">
+ Save
+ </b-button>
+ </div>
+ </div>
</div>
</template>
@@ -75,10 +85,24 @@ import {models, services} from 'django-airavata-api'
export default {
name: 'edit-experiment',
// TODO: clone experiment instead of editing it directly
- props: ['experiment', 'appModule', 'appInterface'],
+ props: {
+ experiment: {
+ type: models.ExperimentModel,
+ required: true
+ },
+ appModule: {
+ type: models.ApplicationModule,
+ required: true
+ },
+ appInterface: {
+ type: models.ApplicationInterface,
+ required: true
+ }
+ },
data () {
return {
projects: [],
+ localExperiment: this.experiment.clone(),
}
},
components: {
@@ -98,6 +122,20 @@ export default {
},
},
methods: {
+ saveExperiment: function() {
+ console.log(JSON.stringify(this.localExperiment));
+ // TODO: validate experiment
+ // TODO: save experiment
+ // TODO: set the experiment ID on the new experiment
+ // TODO: dispatch save event with updated experiment
+ },
+ saveAndLaunchExperiment: function() {
+ console.log(JSON.stringify(this.localExperiment));
+ // TODO: validate experiment
+ // TODO: save experiment
+ // TODO: set the experiment ID on the new experiment
+ // TODO: dispatch save event with updated experiment
+ }
},
watch: {
}
@@ -108,4 +146,7 @@ export default {
.application-name {
font-size: 12px;
}
+#col-exp-buttons {
+ text-align: right;
+}
</style>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.