quickblox-react-ui-kit 0.2.1 → 0.2.3

package/src/Presentation/components/layouts/Desktop/QuickBloxUIKitDesktopLayout.tsx

@@ -8,23 +8,16 @@ import DesktopLayout from './DesktopLayout';
 import MessagesView from '../../UI/Dialogs/MessagesView/MessagesView';
 import useDialogsViewModel from '../../../Views/Dialogs/useDialogsViewModel';
 import { Pagination } from '../../../../Domain/repository/Pagination';
-// import { SubscribeToDialogEventsUseCase } from '../../../../Domain/use_cases/SubscribeToDialogEventsUseCase';
-// import useEventMessagesRepository from '../../providers/QuickBloxUIKitProvider/useEventMessagesRepository';
-// import EventMessageType from '../../../../Domain/entity/EventMessageType';
-// import { NotificationTypes } from '../../../../Domain/entity/NotificationTypes';
-// import { stringifyError } from '../../../../utils/parse';
-// import { DialogEventInfo } from '../../../../Domain/entity/DialogEventInfo';
 import UiKitTheme from '../../../assets/UiKitTheme';
 import BaseViewModel from '../../../Views/Base/BaseViewModel';
 import { AIMessageWidget } from '../../UI/Dialogs/MessagesView/AIWidgets/AIMessageWidget';
-import { QBConfig } from '../../../../QBconfig';
 import UseDefaultAIAssistAnswerWidget from '../../UI/Dialogs/MessagesView/AIWidgets/UseDefaultAIAssistAnswerWidget';
 import UseDefaultAITranslateWidget from '../../UI/Dialogs/MessagesView/AIWidgets/UseDefaultAITranslateWidget';
 import UseDefaultAIRephraseMessageWidget from '../../UI/Dialogs/MessagesView/AIWidgets/UseDefaultAIRephraseMessageWidget';
-import {
-  DefaultConfigurations,
-  ProxyConfig,
-} from '../../../../Data/DefaultConfigurations';
+import { DefaultConfigurations } from '../../../../Data/DefaultConfigurations';
+import UseDefaultAIAssistAnswerWidgetWithProxy from '../../UI/Dialogs/MessagesView/AIWidgets/UseDefaultAIAssistAnswerWidgetWithProxy';
+import UseDefaultAITranslateWidgetWithProxy from '../../UI/Dialogs/MessagesView/AIWidgets/UseDefaultAITranslateWidgetWithProxy';
+import UseDefaultAIRephraseMessageWidgetWithProxy from '../../UI/Dialogs/MessagesView/AIWidgets/UseDefaultAIRephraseMessageWidgetWithProxy';
 
 type AIWidgetPlaceHolder = {
   enabled: boolean;
@@ -55,6 +48,9 @@ const QuickBloxUIKitDesktopLayout: React.FC<
     React.useState<BaseViewModel<DialogEntity>>();
 
   const currentContext = useQbInitializedDataContext();
+  const QBConfig =
+    currentContext.InitParams.qbConfig ||
+    DefaultConfigurations.getDefaultQBConfig();
   // const eventMessaging = useEventMessagesRepository();
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
@@ -87,25 +83,28 @@ const QuickBloxUIKitDesktopLayout: React.FC<
       } else {
         const { apiKey } = QBConfig.configAIApi.AIAnswerAssistWidgetConfig;
         let token = '';
+        const proxyConfig: ProxyConfig =
+          QBConfig.configAIApi.AIAnswerAssistWidgetConfig.proxyConfig ||
+          DefaultConfigurations.getDefaultProxyConfig();
 
         if (apiKey) {
           token = apiKey;
+          defaultAIAnswerToMessageWidget = UseDefaultAIAssistAnswerWidget({
+            ...proxyConfig,
+            apiKeyOrSessionToken: token,
+          });
         } else {
           token =
             QBConfig.configAIApi.AIAnswerAssistWidgetConfig.proxyConfig
               .sessionToken ||
             sessionToken ||
             '';
+          defaultAIAnswerToMessageWidget =
+            UseDefaultAIAssistAnswerWidgetWithProxy({
+              ...proxyConfig,
+              apiKeyOrSessionToken: token,
+            });
         }
-        const proxyConfig: ProxyConfig =
-          QBConfig.configAIApi.AIAnswerAssistWidgetConfig.proxyConfig ||
-          DefaultConfigurations.getDefaultProxyConfig();
-
-        defaultAIAnswerToMessageWidget = UseDefaultAIAssistAnswerWidget({
-          ...proxyConfig,
-          sessionToken: token,
-          apiKey,
-        });
       }
     }
   };
@@ -124,25 +123,27 @@ const QuickBloxUIKitDesktopLayout: React.FC<
       } else {
         const { apiKey } = QBConfig.configAIApi.AITranslateWidgetConfig;
         let token = '';
+        const proxyConfig: ProxyConfig =
+          QBConfig.configAIApi.AITranslateWidgetConfig.proxyConfig ||
+          DefaultConfigurations.getDefaultProxyConfig();
 
         if (apiKey) {
           token = apiKey;
+          defaultAITranslateWidget = UseDefaultAITranslateWidget({
+            ...proxyConfig,
+            apiKeyOrSessionToken: token,
+          });
         } else {
           token =
             QBConfig.configAIApi.AITranslateWidgetConfig.proxyConfig
               .sessionToken ||
             sessionToken ||
             '';
+          defaultAITranslateWidget = UseDefaultAITranslateWidgetWithProxy({
+            ...proxyConfig,
+            apiKeyOrSessionToken: token,
+          });
         }
-        const proxyConfig: ProxyConfig =
-          QBConfig.configAIApi.AITranslateWidgetConfig.proxyConfig ||
-          DefaultConfigurations.getDefaultProxyConfig();
-
-        defaultAITranslateWidget = UseDefaultAITranslateWidget({
-          ...proxyConfig,
-          sessionToken: token,
-          apiKey,
-        });
       }
     }
   };
@@ -161,25 +162,28 @@ const QuickBloxUIKitDesktopLayout: React.FC<
       } else {
         const { apiKey } = QBConfig.configAIApi.AIRephraseWidgetConfig;
         let token = '';
+        const proxyConfig: ProxyConfig =
+          QBConfig.configAIApi.AIRephraseWidgetConfig.proxyConfig ||
+          DefaultConfigurations.getDefaultProxyConfig();
 
         if (apiKey) {
           token = apiKey;
+          defaultAIEditMessageWidget = UseDefaultAIRephraseMessageWidget({
+            ...proxyConfig,
+            apiKeyOrSessionToken: token,
+          });
         } else {
           token =
             QBConfig.configAIApi.AIRephraseWidgetConfig.proxyConfig
               .sessionToken ||
             sessionToken ||
             '';
+          defaultAIEditMessageWidget =
+            UseDefaultAIRephraseMessageWidgetWithProxy({
+              ...proxyConfig,
+              apiKeyOrSessionToken: token,
+            });
         }
-        const proxyConfig: ProxyConfig =
-          QBConfig.configAIApi.AIRephraseWidgetConfig.proxyConfig ||
-          DefaultConfigurations.getDefaultProxyConfig();
-
-        defaultAIEditMessageWidget = UseDefaultAIRephraseMessageWidget({
-          ...proxyConfig,
-          sessionToken: token,
-          apiKey,
-        });
       }
     }
   };

package/src/Presentation/components/providers/QuickBloxUIKitProvider/QuickBloxUIKitProvider.tsx

@@ -10,12 +10,10 @@ import {
 import DialogsRepository from '../../../../Data/repository/DialogsRepository';
 import { SyncDialogsUseCase } from '../../../../Domain/use_cases/SyncDialogsUseCase';
 import { BaseUseCase } from '../../../../Domain/use_cases/base/BaseUseCase';
-import { QBConfig } from '../../../../QBconfig';
 import ConnectionRepository from '../../../../Data/repository/ConnectionRepository';
 import EventMessagesRepository from '../../../../Data/repository/EventMessagesRepository';
 import { CallBackFunction } from '../../../../Domain/use_cases/base/IUseCase';
-
-// import packageInfo from '../../../../../package.json';
+import { DefaultConfigurations } from '../../../../Data/DefaultConfigurations';
 
 const initialValues = {
   LOCAL_DATA_SOURCE: new LocalDataSource(), // localstorage or session storage
@@ -57,7 +55,7 @@ type AccountData = {
 export type InitParams = {
   maxFileSize: number;
   accountData: AccountData;
-  qbConfig?: QBConfig;
+  qbConfig: QBConfig;
   loginData?: LoginData;
 };
 
@@ -106,8 +104,10 @@ const initDataContext: QBDataContextType = {
     // ),
   },
   InitParams: {
-    accountData: QBConfig.credentials,
-    maxFileSize: QBConfig.appConfig.maxFileSize,
+    accountData: DefaultConfigurations.getDefaultQBConfig().credentials,
+    maxFileSize:
+      DefaultConfigurations.getDefaultQBConfig().appConfig.maxFileSize,
+    qbConfig: DefaultConfigurations.getDefaultQBConfig(),
   },
   updateQBInitParams: (InitParams: InitParams) => {
     // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
@@ -240,6 +240,7 @@ function QuickBloxUIKitProvider({
       password: loginData?.password || '',
     },
     maxFileSize,
+    qbConfig,
   });
 
   console.log('have InitParams useState completed');
@@ -290,7 +291,7 @@ function QuickBloxUIKitProvider({
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   // storage.SYNC_DIALOGS_USE_CASE.execute(() => {});
 
-  // todo: MUST use sessionToken or login/pass to re-init
+  // todo: MUST use apiKeyOrSessionToken or login/pass to re-init
   // const remoteDataSourceMock: RemoteDataSource =
   //   storage.REMOTE_DATA_SOURCE as RemoteDataSource;
   // // remoteDataSourceMock

package/src/QBconfig.ts

@@ -13,7 +13,7 @@ export const QBConfig = {
       proxyConfig: {
         api: 'v1/chat/completions',
         servername: 'http://localhost',
-        port: '3001',
+        port: '3011',
         sessionToken: '',
       },
     },
@@ -32,17 +32,18 @@ export const QBConfig = {
       proxyConfig: {
         api: 'v1/chat/completions',
         servername: 'http://localhost',
-        port: '3001',
+        port: '3011',
         sessionToken: '',
       },
     },
     AIRephraseWidgetConfig: {
       apiKey: '',
       useDefault: true,
+      defaultTone: 'Professional',
       proxyConfig: {
         api: 'v1/chat/completions',
         servername: 'http://localhost',
-        port: '3001',
+        port: '3011',
         sessionToken: '',
       },
     },

package/src/utils/parse.ts

@@ -44,7 +44,7 @@ export function isQBError(error: unknown): error is QBError {
   return typeof error === 'object' && error !== null && 'message' in error;
 }
 
-export function stringifyError(error: unknown) {
+export function stringifyError(error: unknown): string {
   if (typeof error === 'string') return error;
 
   if (error && typeof error === 'object') {