Selaa lähdekoodia

fix(feedback): don't wait for feedback submission on leave meeting

master
hmuresan 3 vuotta sitten
vanhempi
commit
bb5f589fa1
2 muutettua tiedostoa jossa 13 lisäystä ja 12 poistoa
  1. 12
    11
      conference.js
  2. 1
    1
      react/features/feedback/actions.js

+ 12
- 11
conference.js Näytä tiedosto

1972
 
1972
 
1973
         room.on(
1973
         room.on(
1974
             JitsiConferenceEvents.CONFERENCE_UNIQUE_ID_SET,
1974
             JitsiConferenceEvents.CONFERENCE_UNIQUE_ID_SET,
1975
-            (...args) => APP.store.dispatch(conferenceUniqueIdSet(room, ...args)));
1975
+            (...args) => {
1976
+                // Preserve the sessionId so that the value is accessible even after room
1977
+                // is disconnected.
1978
+                room.sessionId = room.getMeetingUniqueId();
1979
+                APP.store.dispatch(conferenceUniqueIdSet(room, ...args));
1980
+            });
1976
 
1981
 
1977
         room.on(
1982
         room.on(
1978
             JitsiConferenceEvents.AUTH_STATUS_CHANGED,
1983
             JitsiConferenceEvents.AUTH_STATUS_CHANGED,
2792
             requestFeedbackPromise = Promise.resolve(true);
2797
             requestFeedbackPromise = Promise.resolve(true);
2793
         }
2798
         }
2794
 
2799
 
2795
-        let feedbackResult;
2796
-
2797
-        requestFeedbackPromise
2798
-        .then(res => {
2799
-            feedbackResult = res;
2800
-
2801
-            return this.leaveRoomAndDisconnect();
2802
-        })
2803
-        .then(() => {
2800
+        Promise.all([
2801
+            requestFeedbackPromise,
2802
+            this.leaveRoomAndDisconnect()
2803
+        ])
2804
+        .then(values => {
2804
             this._room = undefined;
2805
             this._room = undefined;
2805
             room = undefined;
2806
             room = undefined;
2806
 
2807
 
2812
             if (!interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) {
2813
             if (!interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) {
2813
                 APP.API.notifyReadyToClose();
2814
                 APP.API.notifyReadyToClose();
2814
             }
2815
             }
2815
-            APP.store.dispatch(maybeRedirectToWelcomePage(feedbackResult));
2816
+            APP.store.dispatch(maybeRedirectToWelcomePage(values[0]));
2816
         });
2817
         });
2817
     },
2818
     },
2818
 
2819
 

+ 1
- 1
react/features/feedback/actions.js Näytä tiedosto

134
         const meetingFqn = extractFqnFromPath(state['features/base/connection'].locationURL.pathname);
134
         const meetingFqn = extractFqnFromPath(state['features/base/connection'].locationURL.pathname);
135
         const feedbackData = {
135
         const feedbackData = {
136
             ...feedback,
136
             ...feedback,
137
-            sessionId: conference.getMeetingUniqueId(),
137
+            sessionId: conference.sessionId,
138
             userId: user.id,
138
             userId: user.id,
139
             meetingFqn,
139
             meetingFqn,
140
             jwt,
140
             jwt,

Loading…
Peruuta
Tallenna