opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-31 02:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moving data of saved rules to a separate component from the template view

Browse Source
This commit is contained in:
Assunta DeSanto
2020-11-06 09:57:59 +01:00
committed by mvdbeek
parent 1095e8ac2e
commit 12cbdd54c8
3 changed files with 61 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/RuleBuilder/SaveRules.vue
+54
View File
@@ -0,0 +1,54 @@
<script>
import { getGalaxyInstance } from "app";
export default {
data: function () {
return {
savedRules: [],
};
},
created() {
let counter = 0;
if (this.user == null) {
return;
} else {
for (let i = 0; i < localStorage.length; i++) {
if (localStorage.key(i).startsWith(this.prefix + this.user)) {
var savedSession = localStorage.getItem(localStorage.key(i));
if (savedSession) {
var key = localStorage.key(i);
this.savedRules.push({
dateTime: key.substring(this.prefix.length + this.user.length),
rule: savedSession,
});
}
counter++;
if (counter == 10) {
break;
}
}
}
}
},
props: {
prefix: {
type: String,
default: "galaxy_rules_",
},
user: {
type: String,
default: getGalaxyInstance() ? getGalaxyInstance().user.id : "",
},
},
methods: {
saveSession(jsonRulesString) {
var dateTimeString = new Date().toISOString();
var key = this.prefix + this.user + dateTimeString;
localStorage.setItem(key, jsonRulesString);
this.savedRules.push({
dateTime: dateTimeString,
rule: jsonRulesString,
});
},
},
};
</script>
client/src/components/RuleBuilder/SavedRulesSelector.vue
+3 -40
View File
@@ -32,40 +32,12 @@ export default {
data: function () {
return {
savedRulesMenu: _l("Recently used rules"),
savedRules: [],
};
},
created() {
let counter = 0;
if (this.user == null) {
return;
} else {
for (let i = 0; i < localStorage.length; i++) {
if (localStorage.key(i).startsWith(this.prefix + this.user)) {
var savedSession = localStorage.getItem(localStorage.key(i));
if (savedSession) {
var key = localStorage.key(i);
this.savedRules.push({
dateTime: key.substring(this.prefix.length + this.user.length),
rule: savedSession,
});
}
counter++;
if (counter == 10) {
break;
}
}
}
}
},
props: {
prefix: {
type: String,
default: "galaxy_rules_",
},
user: {
type: String,
default: getGalaxyInstance() ? getGalaxyInstance().user.id : "",
savedRules: {
type: Array,
required: true,
},
},
computed: {
@@ -77,15 +49,6 @@ export default {
formatDate(dateTime) {
return moment.utc(dateTime).from(moment().utc());
},
saveSession(jsonRulesString) {
var dateTimeString = new Date().toISOString();
var key = this.prefix + this.user + dateTimeString;
localStorage.setItem(key, jsonRulesString);
this.savedRules.push({
dateTime: dateTimeString,
rule: jsonRulesString,
});
},
},
};
</script>
client/src/components/RuleCollectionBuilder.vue
+4 -2
View File
@@ -347,7 +347,7 @@
:title="titleViewSource"
@click="viewSource"
></span>
<saved-rules-selector ref="savedRulesSelector" @update-rules="restoreRules" />
<saved-rules-selector ref="savedRulesSelector" @update-rules="restoreRules" :savedRules="this.savedRules"/>
</span>
<div v-if="jaggedData" class="rule-warning">
Rows contain differing numbers of columns, there was likely a problem parsing your data.
@@ -608,6 +608,7 @@ import RuleModalMiddle from "components/RuleBuilder/RuleModalMiddle";
import RuleModalFooter from "components/RuleBuilder/RuleModalFooter";
import StateDiv from "components/RuleBuilder/StateDiv";
import SavedRulesSelector from "components/RuleBuilder/SavedRulesSelector";
import SaveRules from "components/RuleBuilder/SaveRules";
Vue.use(BootstrapVue);
@@ -1071,6 +1072,7 @@ export default {
return this.hotData.colHeadersPerRule;
},
},
mixins: [SaveRules],
methods: {
restoreRules(event) {
const json = JSON.parse(event);
@@ -1275,7 +1277,7 @@ export default {
this.state = "error";
return;
}
this.$refs.savedRulesSelector.saveSession(JSON.stringify(asJson));
this.saveSession(JSON.stringify(asJson));
this.state = "wait";
const name = this.collectionName;
const collectionType = this.collectionType;