Commit c644b471 by Jonathan Thomas

Merge branch 'export-freq' into 'develop'

Change Export Frequency updates - and update all npm packages

See merge request !11
parents 8d896585 036b2153
Pipeline #11248 passed with stage
in 55 seconds
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -16,23 +16,23 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@popperjs/core": "^2.11.0",
"@popperjs/core": "^2.11.7",
"axios": "^0.24.0",
"bootstrap": "^5.1.3",
"core-js": "^3.6.5",
"bootstrap": "^5.2.3",
"core-js": "^3.30.0",
"uuid": "^8.3.2",
"vue": "^3.0.0",
"vue": "^3.2.47",
"vue-gtag": "^2.0.1",
"vue-router": "^4.0.0-0",
"vuex": "^4.0.0-0"
"vue-router": "^4.1.6",
"vuex": "^4.1.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/compiler-sfc": "^3.0.0",
"@vue/cli-plugin-babel": "^4.5.19",
"@vue/cli-plugin-eslint": "^4.5.19",
"@vue/cli-plugin-router": "^4.5.19",
"@vue/cli-plugin-vuex": "^4.5.19",
"@vue/cli-service": "^4.5.19",
"@vue/compiler-sfc": "^3.2.47",
"babel-eslint": "^10.1.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^7.0.0"
......
......@@ -213,7 +213,10 @@ export default createStore({
return state.projects.filter(project => project.thumbnail).sort((a, b) => b.id - a.id)
},
activeExports: state => {
return state.exports.filter(e => e.status == "in-progress" || e.status == "pending").sort((a, b) => b.id - a.id)
return state.exports.filter(e => e.status == "preparing" ||
e.status == "pending" ||
e.status == "in-progress" ||
e.status == "finalizing").sort((a, b) => b.id - a.id)
}
},
actions: {
......
......@@ -63,7 +63,7 @@ export default {
this.addError(err.response.data)
await this.$router.push(`/`)
}
this.exportPollInterval = setInterval(this.pollForExports, 2500)
this.exportPollInterval = setInterval(this.pollForExports, 1000)
},
unmounted() {
// Update project thumbnail
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment