Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(widgets): try alert box settings embed #5223

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/components-react/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import MultistreamChatInfo from './windows/MultistreamChatInfo';
import Blank from './windows/Blank';
import PlatformMerge from './pages/PlatformMerge';
import AlertboxLibrary from './pages/AlertboxLibrary';
import AlertBoxPropertiesEmbed from './widgets/AlertBoxPropertiesEmbed';
import PlatformAppStore from './pages/PlatformAppStore';
import BrowseOverlays from './pages/BrowseOverlays';
import PlatformAppMainPage from './pages/PlatformAppMainPage';
Expand Down Expand Up @@ -103,6 +104,7 @@ export const components = {
ThemeAudit,
StudioEditor,
WidgetWindow: createRoot(WidgetWindow),
AlertBoxPropertiesEmbed: createRoot(AlertBoxPropertiesEmbed),
CustomCodeWindow: createRoot(CustomCodeWindow),
SafeMode,
AdvancedAudio: createRoot(AdvancedAudio),
Expand Down
54 changes: 54 additions & 0 deletions app/components-react/widgets/AlertBoxPropertiesEmbed.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import React, { useState, useEffect, useMemo } from 'react';
import { Services } from 'components-react/service-provider';
import BrowserView from 'components-react/shared/BrowserView';
import { ModalLayout } from '../shared/ModalLayout';
import { Alert } from 'antd';
import { $t } from 'services/i18n';

export default function AlertBoxPropertiesEmbed() {
const onBrowserViewReady = (_view: Electron.BrowserView) => {
//view.webContents.on('did-finish-load', () => {
// view.webContents.openDevTools();
//});
};
const { HostsService, MagicLinkService } = Services;
const alertBoxPropertiesUrl = `https://${HostsService.streamlabs}/dashboard/alertbox?desktop=true`;
const [url, setUrl] = useState('');
const [loading, setIsLoading] = useState(true);

useEffect(() => {
console.log('on effect');
MagicLinkService.actions.return
.getMagicSessionUrl(alertBoxPropertiesUrl)
.then(url => {
console.log('setting url to ', url);
if (url) {
setUrl(url);
}
})
.finally(() => setIsLoading(false));
}, []);

const Component = useMemo(() => {
if (loading) {
// Rely on child window loader
return <></>;
}
return url ? (
<BrowserView
onReady={onBrowserViewReady}
src={url}
style={{ position: 'absolute', top: 0, right: 0, bottom: 0, left: 0 }}
setLocale
/>
) : (
<Alert message={$t('Error loading AlertBox properties')} type="error" />
);
}, [loading, url]);

return (
<ModalLayout bodyStyle={{ padding: '0px' }} hideFooter={true}>
{Component}
</ModalLayout>
);
}
8 changes: 8 additions & 0 deletions app/components/shared/ReactComponentList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ export class AdvancedStatistics extends ReactComponent {}
})
export class AlertboxLibrary extends ReactComponent {}

@Component({
props: {
name: { default: 'AlertBoxPropertiesEmbed' },
wrapperStyles: { default: () => ({ height: '100%' }) },
},
})
export class AlertBoxPropertiesEmbed extends ReactComponent {}

@Component({ props: { name: { default: 'Blank' } } })
export class Blank extends ReactComponent {}

Expand Down
3 changes: 2 additions & 1 deletion app/i18n/en-US/widget-alertbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,5 +154,6 @@
"This applies to all alerts. If enabled all alerts need to be approved manually.": "This applies to all alerts. If enabled all alerts need to be approved manually.",
"Use unlimited delay": "Use unlimited delay",
"When enabled new alerts will interrupt the on screen alert": "When enabled new alerts will interrupt the on screen alert",
"Text Highlight Color": "Text Highlight Color"
"Text Highlight Color": "Text Highlight Color",
"Error loading AlertBox properties": "Error loading AlertBox properties"
}
7 changes: 6 additions & 1 deletion app/services/sources/sources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,12 @@ export class SourcesService extends StatefulService<ISourcesState> {
const isReactComponent =
this.incrementalRolloutService.views.featureIsEnabled(EAvailableFeatures.reactWidgets) &&
reactWidgets.includes(componentName);
const windowComponentName = isReactComponent ? 'WidgetWindow' : componentName;

// We're embedding alertbox properties from dashboard, change component if so
const reactComponentName =
componentName === 'AlertBox' ? 'AlertBoxPropertiesEmbed' : 'WidgetWindow';

const windowComponentName = isReactComponent ? reactComponentName : componentName;

const defaultVueWindowSize = { width: 920, height: 1024 };
const defaultReactWindowSize = { width: 600, height: 800 };
Expand Down
2 changes: 2 additions & 0 deletions app/services/windows.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import {
EditTransform,
Blank,
MultistreamChatInfo,
AlertBoxPropertiesEmbed,
} from 'components/shared/ReactComponentList';

import SourcePropertiesDeprecated from 'components/windows/SourceProperties.vue';
Expand Down Expand Up @@ -145,6 +146,7 @@ export function getComponents() {
CustomCodeWindow,
SourceShowcase,
RecordingHistory,
AlertBoxPropertiesEmbed,
};
}

Expand Down
Loading