v0.2.2

Author: Artem-K-Koltunov

global.d.ts

@@ -17,14 +17,56 @@ interface DateRange {
   to: Date;
 }
 
+type ProxyConfig = {
+  api: string;
+  servername: string;
+  port: string;
+  sessionToken: string;
+};
+interface WidgetConfig {
+  apiKey: string;
+  useDefault: boolean;
+  proxyConfig: ProxyConfig;
+}
+
+interface AITranslateWidgetConfig extends WidgetConfig{
+  defaultLanguage: string; languages: string[];
+}
+
+interface AIRephraseWidgetConfig extends WidgetConfig {
+  defaultTone: string
+}
+
 interface QBConfig {
-  debug: boolean;
-  endpoints: {
-    chat?: string;
-    api?: string;
+  credentials: {
+    appId: number;
+    accountKey: string;
+    authKey: string;
+    authSecret: string;
+    sessionToken: string;
+  };
+  configAIApi: {
+    AIAnswerAssistWidgetConfig: WidgetConfig;
+    AITranslateWidgetConfig: AITranslateWidgetConfig;
+    AIRephraseWidgetConfig: AIRephraseWidgetConfig;
   };
-  webrtc?: {
-    iceServers?: RTCIceServer[];
+  appConfig: {
+    maxFileSize: number;
+    sessionTimeOut: number;
+    chatProtocol: {
+      active: number;
+    };
+    debug: boolean;
+    endpoints: {
+      api: string;
+      chat: string;
+    };
+    // on: {
+    //   sessionExpired: (handleResponse: any, retry: any) => Promise<void>;
+    // };
+    streamManagement: {
+      enable: boolean;
+    };
   };
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickblox-react-ui-kit",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "main": "dist/index-ui.js",
   "license": "MIT",
   "dependencies": {

src/App.tsx

@@ -1,7 +1,6 @@
 import React, { useEffect } from 'react';
 import './App.scss';
 import { Route, Routes, useNavigate } from 'react-router-dom';
-import { QBConfig } from './QBconfig';
 import useQBConnection from './Presentation/components/providers/QuickBloxUIKitProvider/useQBConnection';
 import { LocalDataSource } from './Data/source/local/LocalDataSource';
 import Login from './Presentation/components/layouts/TestStage/LoginView/Login';
@@ -15,6 +14,7 @@ import {
 import QuickBloxUIKitDesktopLayout from './Presentation/components/layouts/Desktop/QuickBloxUIKitDesktopLayout';
 import DefaultTheme from './Presentation/assets/DefaultThemes/DefaultTheme';
 import useQbUIKitDataContext from './Presentation/components/providers/QuickBloxUIKitProvider/useQbUIKitDataContext';
+import { QBConfig } from './QBconfig';
 
 function App() {
   // const currentContext = React.useContext(qbDataContext);
@@ -28,8 +28,8 @@ function App() {
   const { connectionRepository } = useQBConnection();
 
   const initLoginData: LoginData = {
-    login: '',
-    password: '',
+    login: 'artimed', // vit1
+    password: 'quickblox',
   };
 
   const [currentUser, setCurrentUser] = React.useState(initLoginData);
@@ -70,7 +70,7 @@ function App() {
           authKeyOrAppId: currentContext.InitParams.accountData.authKey,
           authSecret: currentContext.InitParams.accountData.authSecret,
           accountKey: currentContext.InitParams.accountData.accountKey,
-          config: QBConfig.appConfig,
+          config: QBConfig,
         },
         authData,
       );
@@ -175,7 +175,7 @@ function App() {
             authKeyOrAppId: currentContext.InitParams.accountData.authKey,
             authSecret: currentContext.InitParams.accountData.authSecret,
             accountKey: currentContext.InitParams.accountData.accountKey,
-            config: QBConfig.appConfig,
+            config: QBConfig,
           },
           data,
         );
@@ -206,14 +206,7 @@ function App() {
       maxFileSize={QBConfig.appConfig.maxFileSize}
       // SDK={QB} //init SDK
       accountData={{ ...QBConfig.credentials, sessionToken: '' }}
-      // qbConfig={{
-      //   debug: true,
-      //   endpoints: {
-      //     api: 'apilpsgdev.quickblox.com',
-      //     chat: 'chatlpsgdev.quickblox.com',
-      //   },
-      //   webrtc: {},
-      // }}
+      qbConfig={{ ...QBConfig }}
       loginData={{
         login: currentUser.login,
         password: currentUser.password,

src/CommonTypes/FunctionResult.ts

@@ -2,3 +2,57 @@ export type FunctionResult<T> = {
   result: T | T[] | boolean;
   error: any;
 };
+
+export type ProxyConfig = {
+  api: string;
+  servername: string;
+  port: string;
+  sessionToken: string;
+};
+export interface WidgetConfig {
+  apiKey: string;
+  useDefault: boolean;
+  proxyConfig: ProxyConfig;
+}
+
+export interface AITranslateWidgetConfig extends WidgetConfig {
+  defaultLanguage: string;
+  languages: string[];
+}
+
+export interface AIRephraseWidgetConfig extends WidgetConfig {
+  defaultTone: string;
+}
+
+export interface QBConfig {
+  credentials: {
+    appId: number;
+    accountKey: string;
+    authKey: string;
+    authSecret: string;
+    sessionToken: string;
+  };
+  configAIApi: {
+    AIAnswerAssistWidgetConfig: WidgetConfig;
+    AITranslateWidgetConfig: AITranslateWidgetConfig;
+    AIRephraseWidgetConfig: AIRephraseWidgetConfig;
+  };
+  appConfig: {
+    maxFileSize: number;
+    sessionTimeOut: number;
+    chatProtocol: {
+      active: number;
+    };
+    debug: boolean;
+    endpoints: {
+      api: string;
+      chat: string;
+    };
+    // on: {
+    //   sessionExpired: (handleResponse: any, retry: any) => Promise<void>;
+    // };
+    streamManagement: {
+      enable: boolean;
+    };
+  };
+}

src/Data/DefaultConfigurations.ts

@@ -1,4 +1,4 @@
-import { QBConfig } from '../QBconfig';
+import { ProxyConfig, QBConfig } from '../CommonTypes/FunctionResult';
 
 const supportedLanguagesForIATranslate: string[] = [
   'English',
@@ -74,13 +74,6 @@ const getDefaultSystemLanguage = () => {
   return language;
 };
 
-export type ProxyConfig = {
-  api: string;
-  servername: string;
-  port: string;
-  sessionToken: string;
-};
-
 export class DefaultConfigurations {
   static getDefaultProxyConfig(): ProxyConfig {
     return {
@@ -93,7 +86,9 @@ export class DefaultConfigurations {
 
   static getDefaultLanguageForAITranslate(): string {
     let languageForAITranslate = 'English';
-    const { defaultLanguage } = QBConfig.configAIApi.AITranslateWidgetConfig;
+    const { defaultLanguage } =
+      DefaultConfigurations.getDefaultQBConfig().configAIApi
+        .AITranslateWidgetConfig;
 
     if (
       defaultLanguage.length > 0 &&
@@ -113,7 +108,9 @@ export class DefaultConfigurations {
 
   static getAdditionalLanguagesForAITranslate(): string[] {
     const additionalLanguages: string[] = [];
-    const { languages } = QBConfig.configAIApi.AITranslateWidgetConfig;
+    const { languages } =
+      DefaultConfigurations.getDefaultQBConfig().configAIApi
+        .AITranslateWidgetConfig;
 
     languages.forEach((item) => {
       if (supportedLanguagesForIATranslate.includes(item)) {
@@ -125,4 +122,76 @@ export class DefaultConfigurations {
 
     return additionalLanguages;
   }
+
+  //
+  static getDefaultQBConfig(): QBConfig {
+    return {
+      credentials: {
+        appId: -1,
+        accountKey: '',
+        authKey: '',
+        authSecret: '',
+        sessionToken: '',
+      },
+      configAIApi: {
+        AIAnswerAssistWidgetConfig: {
+          apiKey: '',
+          useDefault: true,
+          proxyConfig: {
+            api: 'v1/chat/completions',
+            servername: 'https://api.openai.com/',
+            port: '',
+            sessionToken: '',
+          },
+        },
+        AITranslateWidgetConfig: {
+          apiKey: '',
+          useDefault: true,
+          defaultLanguage: 'English',
+          languages: [
+            'English',
+            'Spanish',
+            'French',
+            'Portuguese',
+            'German',
+            'Ukrainian',
+          ],
+          proxyConfig: {
+            api: 'v1/chat/completions',
+            servername: 'https://api.openai.com/',
+            port: '',
+            sessionToken: '',
+          },
+        },
+        AIRephraseWidgetConfig: {
+          apiKey: '',
+          useDefault: true,
+          defaultTone: 'Professional',
+          proxyConfig: {
+            api: 'v1/chat/completions',
+            servername: 'https://api.openai.com/',
+            port: '',
+            sessionToken: '',
+          },
+        },
+      },
+      appConfig: {
+        maxFileSize: 10 * 1024 * 1024,
+        sessionTimeOut: 122,
+        chatProtocol: {
+          active: 2,
+        },
+        debug: true,
+        endpoints: {
+          api: 'api.quickblox.com',
+          chat: 'chat.quickblox.com',
+        },
+        streamManagement: {
+          enable: true,
+        },
+      },
+    };
+  }
+
+  //
 }

src/Data/source/AISource.ts

@@ -45,7 +45,7 @@ export class AISource {
 
       return outputMessage;
     } catch (err) {
-      const outputMessage = stringifyError(err);
+      const outputMessage: string = stringifyError(err);
 
       throw new RepositoryException(outputMessage, -1);
     }
@@ -85,7 +85,7 @@ export class AISource {
 
       return outputMessage;
     } catch (err) {
-      const outputMessage = stringifyError(err);
+      const outputMessage: string = stringifyError(err);
 
       throw new RepositoryException(outputMessage, -1);
     }
@@ -125,7 +125,7 @@ export class AISource {
 
       return outputMessage;
     } catch (err) {
-      const outputMessage = stringifyError(err);
+      const outputMessage: string = stringifyError(err);
 
       throw new RepositoryException(outputMessage, -1);
     }

src/Data/source/remote/Mapper/MessageDTOMapper.ts

@@ -47,14 +47,14 @@ export class MessageDTOMapper implements IDTOMapper {
         size: item.size,
         type: item.type,
         uid: item.uid,
-        url: item.id.toString() && QB.content.privateUrl(item.id.toString()),
+        url: item.uid && QB.content.privateUrl(item.uid),
         file: {
           id: item.id,
           name: item.name,
           size: item.size,
           type: item.type,
           uid: item.uid || '',
-          url: item.id.toString() && QB.content.privateUrl(item.id.toString()),
+          url: item.uid && QB.content.privateUrl(item.uid),
         },
       };
 

src/Presentation/components/UI/Dialogs/MessagesView/InComingMessage/InComingMessage.scss

@@ -31,7 +31,7 @@
   box-sizing: border-box;
 }
 .incoming-text-message {
-  background: var(--primary-primary-a-100, #ffffff);
+  background: var(--secondary-background);
   padding: 0px 16px 8px 8px;
   display: flex;
   flex-direction: row;
@@ -241,7 +241,7 @@
   position: relative;
 }
 .chat-bubble-background {
-  background: var(--secondary-secondary-50, #e4e6e8);
+  background: var(--incoming-background);
   border-radius: 22px 22px 22px 0px;
   padding: 8px 12px 8px 12px;
   display: flex;