Fix #99410: SocketIO Reconnect Web Interface #104235

Merged
Sybren A. Stüvel merged 8 commits from Evelinealy/flamenco:socketio-web-interface into main 2023-07-21 17:16:51 +02:00
Showing only changes of commit cd1011066f - Show all commits

View File

@ -39,7 +39,9 @@ import { useJobs } from '@/stores/jobs';
import { useTasks } from '@/stores/tasks'; import { useTasks } from '@/stores/tasks';
import { useNotifs } from '@/stores/notifications' import { useNotifs } from '@/stores/notifications'
import { useTaskLog } from '@/stores/tasklog' import { useTaskLog } from '@/stores/tasklog'
import { getAPIClient } from "@/api-client"; import { getAPIClient } from '@/api-client';
import { apiClient } from '@/stores/api-query-count';
import { MetaApi } from '@/manager-api';
import FooterPopup from '@/components/footer/FooterPopup.vue' import FooterPopup from '@/components/footer/FooterPopup.vue'
import GetTheAddon from '@/components/GetTheAddon.vue' import GetTheAddon from '@/components/GetTheAddon.vue'
@ -271,9 +273,28 @@ export default {
// SocketIO connection event handlers: // SocketIO connection event handlers:
onSIOReconnected() { onSIOReconnected() {
this.$refs.jobsTable.onReconnected(); this.$refs.jobsTable.onReconnected();
if (this.$refs.tasksTable) if (this.$refs.tasksTable)
this.$refs.tasksTable.onReconnected(); this.$refs.tasksTable.onReconnected();
/*Grab Flamenco version from backend
Compare with previous version
If different than before log a notification about the upgrade,
and actually refresh the entire page to ensure the new version is loaded properly. */
const metaAPI = new MetaApi(apiClient);
let currVersion;
metaAPI.getVersion()
.then((version) => {
this.flamencoName = version.name;
this.flamencoVersion = version.version;
currVersion = this.flamencoVersion
})
.catch((error) => {
console.log("Error getting the Flamenco version:", error);
})
}, },
onSIODisconnected(reason) { onSIODisconnected(reason) {
}, },