Skip to content

fix: Fix locale problem when having multiple plugins #178

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.

Sign up for GitHub

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

Merged
TiagoJacobs merged 1 commit into from
Apr 29, 2025
Merged

fix: Fix locale problem when having multiple plugins #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/core/api/BbbPluginSdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,11 @@ export abstract class BbbPluginSdk {
* @returns The PluginApi object
*
*/
public static getPluginApi(uuid: string, pluginName?: string): PluginApi {
public static getPluginApi(
uuid: string,
pluginName?: string,
localesBaseUrl?: string,
): PluginApi {
if (!window.bbb_plugins) window.bbb_plugins = {};
if (Object.keys(window.bbb_plugins).indexOf(uuid) === -1) {
window.bbb_plugins[uuid] = {
Expand All @@ -186,6 +190,7 @@ export abstract class BbbPluginSdk {
},
getSessionToken: () => getSessionToken(),
pluginName,
localesBaseUrl,
};
}

Expand Down
1 change: 1 addition & 0 deletions src/core/api/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export type SetGenericContentItems = (
*/
export interface PluginApi {
pluginName?: string;
localesBaseUrl?: string;
// --- Extensible Areas Setters ---
setPresentationToolbarItems: SetPresentationToolbarItems;
setUserListDropdownItems: SetUserListDropdownItems;
Expand Down
12 changes: 0 additions & 12 deletions src/core/auxiliary/plugin-information/locale-messages/subscriptions.ts
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/core/auxiliary/plugin-information/locale-messages/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ interface PluginInformationResult {
localesBaseUrl: string;
}

interface GraphqlResponseWrapper {
plugin: PluginInformationResult[];
}

interface IntlMessages {
loading: boolean;
messages: Record<string, string>;
Expand All @@ -26,7 +22,6 @@ type UseLocaleMessagesFunction = (fetchConfigs?: RequestInit) => IntlMessages;
export {
UseLocaleMessagesProps,
PluginInformationResult,
GraphqlResponseWrapper,
IntlMessages,
UseLocaleMessagesFunction,
};
13 changes: 4 additions & 9 deletions src/core/auxiliary/plugin-information/locale-messages/useLocaleMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import * as React from 'react';
import { IntlLocaleUiDataNames } from '../../../../ui-data-hooks';
import { pluginLogger } from '../../../../utils';
import { GraphqlResponseWrapper, IntlMessages, UseLocaleMessagesProps } from './types';
import { GET_PLUGIN_INFORMATION } from './subscriptions';
import { IntlMessages, UseLocaleMessagesProps } from './types';

function useLocaleMessagesAuxiliary(
{ pluginApi, fetchConfigs }: UseLocaleMessagesProps,
Expand All @@ -15,13 +14,9 @@ function useLocaleMessagesAuxiliary(
const [loading, setLoading] = React.useState(true);
const [messages, setMessages] = React.useState<Record<string, string>>({});

const { data: pluginInformation } = pluginApi.useCustomSubscription!<GraphqlResponseWrapper>(
GET_PLUGIN_INFORMATION,
);

React.useEffect(() => {
if (pluginInformation && pluginInformation.plugin && currentLocale.locale) {
const { localesBaseUrl } = pluginInformation.plugin[0];
if (pluginApi?.localesBaseUrl && currentLocale.locale) {
const { localesBaseUrl } = pluginApi;
const { locale } = currentLocale;
const localeUrl = `${localesBaseUrl}/${locale}.json`;
fetch(localeUrl, fetchConfigs).then((result) => result.json()).then((localeMessages) => {
Expand All @@ -32,7 +27,7 @@ function useLocaleMessagesAuxiliary(
pluginLogger.error(`Something went wrong while trying to fetch ${localeUrl}: `, err);
});
}
}, [pluginInformation, currentLocale]);
}, [currentLocale]);
return {
messages,
loading,
Expand Down