[MM-56920] Allow passing SiteURL override for jobs (#640)

* Allow passing SiteURL override for jobs * Move store initialization request to standalone widget app * Use store.dispatch properly
mattermost · Mar 1, 2024 · 376e684 · 376e684
1 parent 437639c
commit 376e684
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/server/job_service.go b/server/job_service.go
@@ -301,6 +301,10 @@ func (s *jobService) RunJob(jobType job.Type, callID, postID, jobID, authToken s
 	case job.TypeRecording:
 		baseRecorderCfg := recorderBaseConfigs[cfg.RecordingQuality]
 		baseRecorderCfg.SiteURL = siteURL
+		if siteURLOverride := os.Getenv("MM_CALLS_RECORDER_SITE_URL"); siteURLOverride != "" {
+			s.ctx.LogInfo("using SiteURL override for recorder job", "siteURL", siteURL, "siteURLOverride", siteURLOverride)
+			baseRecorderCfg.SiteURL = siteURLOverride
+		}
 		baseRecorderCfg.CallID = callID
 		baseRecorderCfg.PostID = postID
 		baseRecorderCfg.RecordingID = jobID
@@ -312,6 +316,10 @@ func (s *jobService) RunJob(jobType job.Type, callID, postID, jobID, authToken s
 	case job.TypeTranscribing:
 		var transcriberConfig transcriber.CallTranscriberConfig
 		transcriberConfig.SiteURL = siteURL
+		if siteURLOverride := os.Getenv("MM_CALLS_TRANSCRIBER_SITE_URL"); siteURLOverride != "" {
+			s.ctx.LogInfo("using SiteURL override for transcriber job", "siteURL", siteURL, "siteURLOverride", siteURLOverride)
+			transcriberConfig.SiteURL = siteURLOverride
+		}
 		transcriberConfig.CallID = callID
 		transcriberConfig.PostID = postID
 		transcriberConfig.TranscriptionID = jobID

diff --git a/standalone/src/init.ts b/standalone/src/init.ts
@@ -28,9 +28,6 @@ import {
 import {WebSocketMessage} from '@mattermost/client/websocket';
 import type {DesktopAPI} from '@mattermost/desktop-api';
 import {setServerVersion} from 'mattermost-redux/actions/general';
-import {getMyPreferences} from 'mattermost-redux/actions/preferences';
-import {getMyTeamMembers, getMyTeams} from 'mattermost-redux/actions/teams';
-import {getMe} from 'mattermost-redux/actions/users';
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {getTheme, Theme} from 'mattermost-redux/selectors/entities/preferences';
@@ -169,14 +166,6 @@ export default async function init(cfg: InitConfig) {
     }
     RestClient.setToken(getToken());
 
-    // initialize some basic state.
-    await Promise.all([
-        getMe()(store.dispatch, store.getState),
-        getMyPreferences()(store.dispatch, store.getState),
-        getMyTeams()(store.dispatch, store.getState),
-        getMyTeamMembers()(store.dispatch, store.getState),
-    ]);
-
     if (cfg.initStore) {
         await cfg.initStore(store, channelID);
     }

diff --git a/standalone/src/widget/index.tsx b/standalone/src/widget/index.tsx
@@ -1,5 +1,7 @@
 import {getChannel as getChannelAction, getChannelMembers} from 'mattermost-redux/actions/channels';
-import {getTeam as getTeamAction, selectTeam} from 'mattermost-redux/actions/teams';
+import {getMyPreferences} from 'mattermost-redux/actions/preferences';
+import {getMyTeamMembers, getMyTeams, getTeam as getTeamAction, selectTeam} from 'mattermost-redux/actions/teams';
+import {getMe} from 'mattermost-redux/actions/users';
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentUserLocale} from 'mattermost-redux/selectors/entities/i18n';
 import {getTeams} from 'mattermost-redux/selectors/entities/teams';
@@ -73,17 +75,24 @@ async function initWidget(store: Store) {
 }
 
 async function initStoreWidget(store: Store, channelID: string) {
-    await store.dispatch(getChannelAction(channelID));
+    // initialize some basic state.
+    await Promise.all([
+        store.dispatch(getMe()),
+        store.dispatch(getMyPreferences()),
+        store.dispatch(getMyTeams()),
+        store.dispatch(getMyTeamMembers()),
+        store.dispatch(getChannelAction(channelID)),
+    ]);
 
     const channel = getChannel(store.getState(), channelID);
     if (!channel) {
         return;
     }
 
     if (isOpenChannel(channel) || isPrivateChannel(channel)) {
-        await getTeamAction(channel.team_id)(store.dispatch, store.getState);
+        await store.dispatch(getTeamAction(channel.team_id));
     } else {
-        await getChannelMembers(channel.id)(store.dispatch, store.getState);
+        await store.dispatch(getChannelMembers(channel.id));
         const teams = getTeams(store.getState());
         store.dispatch(selectTeam(Object.values(teams)[0]));
     }