imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5596 from matrix-org/jryans/hybrid-from-config

Browse source 
Support managed hybrid widgets from config
This commit is contained in:
J. Ryan Stinnett 2021-01-29 16:40:36 +00:00 • committed by GitHub
commit b39fdaae45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/widgets/ManagedHybrid.ts
View file

@ -21,6 +21,7 @@ import WidgetUtils from "../utils/WidgetUtils";
import { IStoredLayout, WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore"; import { IStoredLayout, WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
import WidgetEchoStore from "../stores/WidgetEchoStore"; import WidgetEchoStore from "../stores/WidgetEchoStore";
import WidgetStore from "../stores/WidgetStore"; import WidgetStore from "../stores/WidgetStore";
import SdkConfig from "../SdkConfig";
/* eslint-disable camelcase */ /* eslint-disable camelcase */
interface IManagedHybridWidgetData { interface IManagedHybridWidgetData {
@ -30,10 +31,16 @@ interface IManagedHybridWidgetData {
} }
/* eslint-enable camelcase */ /* eslint-enable camelcase */
export function isManagedHybridWidgetEnabled(): boolean { function getWidgetBuildUrl(): string {
const callBehaviour = getCallBehaviourWellKnown(); if (SdkConfig.get().widget_build_url) {
return SdkConfig.get().widget_build_url;
}
/* eslint-disable-next-line camelcase */ /* eslint-disable-next-line camelcase */
return !!callBehaviour?.widget_build_url; return getCallBehaviourWellKnown()?.widget_build_url
}
export function isManagedHybridWidgetEnabled(): boolean {
return !!getWidgetBuildUrl();
} }
export async function addManagedHybridWidget(roomId: string) { export async function addManagedHybridWidget(roomId: string) {
@ -51,7 +58,7 @@ export async function addManagedHybridWidget(roomId: string) {
// Get widget data // Get widget data
/* eslint-disable-next-line camelcase */ /* eslint-disable-next-line camelcase */
const widgetBuildUrl = getCallBehaviourWellKnown()?.widget_build_url; const widgetBuildUrl = getWidgetBuildUrl();
if (!widgetBuildUrl) { if (!widgetBuildUrl) {
return; return;
} }