From dd5fb98387576089bc45c87a90db3262057fdf26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Gl=C3=B6ggler?= Date: Mon, 14 Aug 2023 15:17:36 +0200 Subject: [PATCH] reload images after succesfull LTI call --- vueapp/components/Videos/VideoCard.vue | 19 ++++++++---- vueapp/components/Videos/VideosList.vue | 39 ++++++++++++++++++++----- vueapp/store/opencast.module.js | 36 ++++++++++++++++++++++- 3 files changed, 81 insertions(+), 13 deletions(-) diff --git a/vueapp/components/Videos/VideoCard.vue b/vueapp/components/Videos/VideoCard.vue index b3ec6be02..27704fc23 100644 --- a/vueapp/components/Videos/VideoCard.vue +++ b/vueapp/components/Videos/VideoCard.vue @@ -11,8 +11,8 @@ > @@ -181,8 +181,8 @@ export default { this.$emit('redirectAction', action); }, - setDefaultImage(event) { - let image = this.$refs[event.id]; + setDefaultImage() { + let image = this.$refs[this.event.id]; image.src = window.OpencastPlugin.PLUGIN_ASSET_URL + '/images/default-preview.png'; } }, @@ -192,9 +192,18 @@ export default { 'playlist', 'playlists', 'downloadSetting', - "videoSortMode", + 'videoSortMode', + 'isLTIAuthenticated' ]), + getImageSrc() { + if (this.isLTIAuthenticated[this.event.config_id]) { + return this.event.preview.player ? this.event.preview.player : this.event.preview.search; + } else { + return window.OpencastPlugin.PLUGIN_ASSET_URL + '/images/default-preview.png'; + } + }, + downloadAllowed() { if (this.downloadSetting !== 'never') { if (this.canEdit) { diff --git a/vueapp/components/Videos/VideosList.vue b/vueapp/components/Videos/VideosList.vue index 46254f1e4..e44386619 100644 --- a/vueapp/components/Videos/VideosList.vue +++ b/vueapp/components/Videos/VideosList.vue @@ -131,21 +131,25 @@ export default { actionComponent: null, showActionDialog: false, selectedEvent: null, - filters: [] + filters: [], + interval: null, + interval_counter: 0 } }, computed: { ...mapGetters([ - "videos", - "paging", - "axios_running", - "playlistForVideos", - "cid", + 'videos', + 'paging', + 'axios_running', + 'playlistForVideos', + 'cid', 'courseVideosToCopy', 'playlists', 'playlist', - 'course_config' + 'course_config', + 'isLTIAuthenticated', + 'simple_config_list' ]), isCourse() { @@ -336,7 +340,28 @@ export default { .then(() => { this.videos_loading = false }); } }) + this.$store.dispatch('loadUserCourses'); + + // periodically check, if lti is authenticated + let view = this; + + this.$store.dispatch('simpleConfigListRead').then(() => { + view.interval = setInterval(() => { + for (let id in view.simple_config_list['server']) { + if (!view.isLTIAuthenticated[id]) { + view.$store.dispatch('checkLTIAuthentication', view.simple_config_list['server'][id]); + } + } + + view.interval_counter++; + + // prevent spamming of oc server + if (view.interval_counter > 10) { + clearInterval(view.interval); + } + }, 2000); + }); }, watch: { diff --git a/vueapp/store/opencast.module.js b/vueapp/store/opencast.module.js index 795bd2296..2f480fffb 100644 --- a/vueapp/store/opencast.module.js +++ b/vueapp/store/opencast.module.js @@ -1,4 +1,5 @@ import ApiService from "@/common/api.service"; +import axios from "@/common/axios.service"; const state = { series: [], @@ -10,7 +11,8 @@ const state = { site: null, axios_running: false, userCourses: [], - userList: [] + userList: [], + isLTIAuthenticated: {} } const getters = { @@ -43,6 +45,9 @@ const getters = { }, userList(state) { return state.userList; + }, + isLTIAuthenticated(state) { + return state.isLTIAuthenticated; } } @@ -126,6 +131,31 @@ const actions = { setUpload({ commit }, data) { return ApiService.put('courses/' + data.cid + '/upload/' + data.upload); + }, + + checkLTIAuthentication({ commit }, server) + { + axios({ + method: 'GET', + url: server.name + "/lti/info.json", + crossDomain: true, + withCredentials: true, + headers: { + "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8" + } + }).then((response) => { + if (response.status == 200) { + commit('setLTIStatus', { + server: server.id, + authenticated: true + }); + } else { + commit('setLTIStatus', { + server: server.id, + authenticated: false + }); + } + }); } } @@ -169,6 +199,10 @@ const mutations = { setUserList(state, data) { state.userList = data; }, + + setLTIStatus(state, params) { + state.isLTIAuthenticated[params.server] = params.authenticated; + } }