Skip to content

Commit

Permalink
Rename bx to bxApi
Browse files Browse the repository at this point in the history
  • Loading branch information
viktor44 committed May 9, 2024
1 parent b33e51d commit 7c56b1a
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { MultiInstanceConfigPreset as Preset } from '../../manifest-provider/typ
import NormalFlowForm from './components/NormalFlowForm';
import { getPresets } from '../../manifest-provider/helpers';

const requestGoogleSignin = () => window.bx.identities.requestLogin('google');
const requestGoogleSignin = () => window.bxApi.identities.requestLogin('google');

const {
Undefined: UndefinedPreset,
Expand Down Expand Up @@ -79,28 +79,28 @@ export default class MultiInstanceConfigurator extends React.Component<Props, St
}

submitSubdomainForm = (subdomain: string) => {
window.bx.applications.setConfigData(this.props.applicationId, { subdomain });
window.bxApi.applications.setConfigData(this.props.applicationId, { subdomain });
}

submitIdentityForm = (identityId: string) => {
window.bx.applications.setConfigData(this.props.applicationId, { identityId });
window.bxApi.applications.setConfigData(this.props.applicationId, { identityId });
}

submitOnPremiseForm = (customURL: string) => {
window.bx.applications.setConfigData(this.props.applicationId, { customURL });
window.bxApi.applications.setConfigData(this.props.applicationId, { customURL });
}

submitNormalForm = () => {
window.bx.applications.setConfigData(this.props.applicationId, {});
window.bxApi.applications.setConfigData(this.props.applicationId, {});
}

removeApplication = () => {
window.bx.applications.uninstall(this.props.applicationId);
window.bxApi.applications.uninstall(this.props.applicationId);
}

componentDidMount() {
const { manifestURL } = this.props;
window.bx.manifest.getManifest(manifestURL).then(({ body }) => {
window.bxApi.manifest.getManifest(manifestURL).then(({ body }) => {
const manifest = body;
const presets = this.getPresets(manifest);
const selectedPreset = isOnlyOnPremise(presets) ? UndefinedPreset : presets[0];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ export default class ChooseIdentityForm extends React.PureComponent<Props, State
}

UNSAFE_componentWillMount() {
window.bx.identities.addIdentitiesChangeListener(this.onIdentitiesChanged);
window.bxApi.identities.addIdentitiesChangeListener(this.onIdentitiesChanged);
}

componentWillUnmount() {
window.bx.identities.removeIdentitiesChangeListener(this.onIdentitiesChanged);
window.bxApi.identities.removeIdentitiesChangeListener(this.onIdentitiesChanged);
}

render() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const manifestURL = params.get('manifestURL')!;
const applicationId = params.get('applicationId')!;

const themeColorsObservable = new Subject<any>();
window.bx.theme.addThemeColorsChangeListener(
window.bxApi.theme.addThemeColorsChangeListener(
(_: any, result: any) => themeColorsObservable.next(result)
);

Expand Down
8 changes: 4 additions & 4 deletions packages/app/src/notification-center/webview-preload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class BxNotification extends EventTarget('click', 'error', 'close', 'show
});

this._registerIPC();
window.bx.notificationCenter.sendNotification(this.id, {
window.bxApi.notificationCenter.sendNotification(this.id, {
timestamp: this.timestamp,
title: this.title,
body: this.body,
Expand All @@ -87,17 +87,17 @@ export class BxNotification extends EventTarget('click', 'error', 'close', 'show
}

close() {
window.bx.notificationCenter.closeNotification(this.id);
window.bxApi.notificationCenter.closeNotification(this.id);
// ipcRenderer.send('notification-close', this.id);
}

_registerIPC() {
window.bx.notificationCenter.addNotificationClickListener(this._handleNotificationClickIPC);
window.bxApi.notificationCenter.addNotificationClickListener(this._handleNotificationClickIPC);
// ipcRenderer.on('trigger-notification-click', this._handleNotificationClickIPC);
}

_unregisterIPC() {
window.bx.notificationCenter.removeNotificationClickListener(this._handleNotificationClickIPC);
window.bxApi.notificationCenter.removeNotificationClickListener(this._handleNotificationClickIPC);
// ipcRenderer.removeListener('trigger-notification-click', this._handleNotificationClickIPC);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/plugins/bxapi.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,6 @@ interface Bx {

declare global {
interface Window {
bx: Bx;
bxApi: Bx;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const turnOffAudioVolumeObserver = target => {

let disconnectTurnOffAudioVolumeObserver;

window.bx.notificationCenter.addSnoozeDurationInMsChangeListener((_, duration) => {
window.bxApi.notificationCenter.addSnoozeDurationInMsChangeListener((_, duration) => {
if (duration && !document.location.pathname.includes('/videocall/incall/')) {
disconnectTurnOffAudioVolumeObserver = turnOffAudioVolumeObserver(document.body);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ Audio.prototype.play = function() {
return Promise.resolve();
};

window.bx.notificationCenter.addSnoozeDurationInMsChangeListener((_, duration) => {
window.bxApi.notificationCenter.addSnoozeDurationInMsChangeListener((_, duration) => {
snoozed = Boolean(duration);
});
2 changes: 1 addition & 1 deletion packages/app/src/plugins/webview-preload.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,6 @@
}
};

contextBridge.exposeInMainWorld('bx', bxApi);
contextBridge.exposeInMainWorld('bxApi', bxApi);

console.log('>>>> contextBridge done')
2 changes: 1 addition & 1 deletion packages/appstore/src/HOC/withCustomApplications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function withCustomApplications(Component: React.Component<any>)
});

React.useEffect(() => {
window.bx.applications.getPrivateApps().then(({ body }) => {
window.bxApi.applications.getPrivateApps().then(({ body }) => {
setData({
privateApps: body.map(app => {
return {
Expand Down
4 changes: 2 additions & 2 deletions packages/appstore/src/api.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const findApplicationByName = (applicationName: string) => {

if ('bx' in window) {
const bxApi = window.bx;
if ('bxApi' in window) {
const bxApi = window.bxApi;

return bxApi.applications.search(applicationName).then(({ body }) => {
return body || [];
Expand Down
2 changes: 1 addition & 1 deletion packages/appstore/src/app-request/sagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function* handleAppRequest(request: SubmitAppRequestAction): SagaIterator {
};

try {
const { body } = yield call(window.bx.applications.requestPrivate, applicationRecipe);
const { body } = yield call(window.bxApi.applications.requestPrivate, applicationRecipe);
yield put(setApiResponse(ApiResponse.Done));
yield put(setApplicationCreated({ id: body.id, bxAppManifestURL: body.bxAppManifestURL }));
} catch (e) {
Expand Down
4 changes: 2 additions & 2 deletions packages/appstore/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ class AppImpl extends React.Component<Props, IState> {

// tslint:disable-next-line function-name
async UNSAFE_componentWillMount() {
if ('bx' in window) {
if ('bxApi' in window) {
// @ts-ignore : bx attached to window
const bxApi = window.bx;
const bxApi = window.bxApi;

bxApi.theme.addThemeColorsChangeListener((_: any, themeColors: string[]) => {
this.setState({ themeColors })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class AppStoreMyCustomApps extends React.PureComponent<Props, AppStoreMyCustomAp
}

deleteApplication = (app: Application) => {
window.bx.applications.uninstallByManifest(app.bxAppManifestURL).then(() => {
window.bxApi.applications.uninstallByManifest(app.bxAppManifestURL).then(() => {
this.exitFlow(false);
location.reload();
}).catch((e) => {
Expand Down

0 comments on commit 7c56b1a

Please sign in to comment.