quickblox-react-ui-kit 0.4.6-beta.4 → 0.4.7-beta.1

package/global.d.ts

@@ -1,204 +1,5 @@
-// interface Tone {
-//   name: string;
-//   description: string;
-//   iconEmoji: string;
-// }
-//
-// type Primitive = string | number | boolean | undefined | null | Date | File;
-
-// type SetTails<T, R extends Primitive> = T extends Array<unknown>
-//   ? Array<T[number] extends Primitive ? R : SetTails<T[number], R>>
-//   : {
-//       [K in keyof T]: T[K] extends Primitive ? R : SetTails<T[K], R>;
-//     };
-
-// type ProxyConfig = {
-//   api: string;
-//   servername: string;
-//   port: string;
-// };
-// interface WidgetConfig {
-//   apiKey: string;
-//   useDefault: boolean;
-//   maxTokens: number;
-//   proxyConfig: ProxyConfig;
-// }
-//
-// interface AITranslateWidgetConfig extends WidgetConfig {
-//   defaultLanguage: string;
-//   languages: string[];
-// }
-//
-// interface AIRephraseWidgetConfig extends WidgetConfig {
-//   defaultTone: string;
-//   Tones: Tone[];
-// }
-
-// interface QBConfig {
-//   credentials: {
-//     appId: number;
-//     accountKey: string;
-//     authKey: string;
-//     authSecret: string;
-//     sessionToken: string; // ??? ui-kit
-//   };
-//   configAIApi: {
-//     // ui-kit
-//     AIAnswerAssistWidgetConfig: WidgetConfig;
-//     AITranslateWidgetConfig: AITranslateWidgetConfig;
-//     AIRephraseWidgetConfig: AIRephraseWidgetConfig;
-//   };
-//   appConfig: {
-//     maxFileSize: number; // ui-kit
-//     sessionTimeOut: number; // ?? webRTc -> ui-kit
-//     chatProtocol: {
-//       active: number;
-//     };
-//     debug: boolean;
-//     enableForwarding: boolean; // ui-kit
-//     enableReplying: boolean; // ui-kit
-//     regexUserName?: string; // ui-kit
-//     endpoints: {
-//       api: string;
-//       chat: string;
-//     };
-//     // on: {
-//     //   sessionExpired: (handleResponse: any, retry: any) => Promise<void>;
-//     // };
-//     streamManagement: {
-//       enable: boolean;
-//     };
-//   };
-// }
-
-/*
-    * QuickBlox Types - start
-
- */
-
 type Dictionary<T> = Record<string, T>;
-//
-// type RequiredProps<T, K extends keyof T> = T & Required<Pick<T, K>>;
-
-// declare enum QBChatProtocol {
-//   BOSH = 1,
-//   WebSockets = 2,
-// }
-//
-// interface ICEServer {
-//   urls: string;
-//   username: string;
-//   credential: string;
-// }
-
-// declare enum QBChatDialogType {
-//   PUBLIC_GROUP = 1,
-//   GROUP = 2,
-//   PRIVATE = 3,
-// }
-
-// declare interface QBChatDialog {
-//   /** ID of the dialog. Generated automatically by the server after dialog creation. */
-//   _id: string;
-//   /** ID of dialog's owner. */
-//   user_id: QBUser['id'];
-//   /** Date & time when a record was created, filled automatically. */
-//   created_at: string;
-//   /** Date & time when a record was created, filled automatically. */
-//   updated_at: string;
-//   /**
-//    * Type of dialog. Possible values are:
-//    * - type=1 (`PUBLIC_GROUP`)
-//    * - type=2 (`GROUP`)
-//    * - type=3 (`PRIVATE`)
-//    */
-//   type: QBChatDialogType;
-//   /**
-//    * Name of a group chat. Makes sense if type=1 (`PUBLIC_GROUP`) or type=2 (`GROUP`).
-//    * The maximum length for the dialog name is 200 symbols.
-//    */
-//   name: string;
-//   /**
-//    * Photo of a group chat. Makes sense if type=1 (`PUBLIC_GROUP`) or type=2 (`GROUP`).
-//    * Can contain a link to a file in Content module, Custom Objects module or just a web link.
-//    */
-//   photo: null | string;
-//   /**
-//    * JID of XMPP room for group chat to connect. Nil if type=3 (PRIVATE).
-//    * Generated automatically by the server after dialog creation.
-//    */
-//   xmpp_room_jid: string | null;
-//   /** Array of users' IDs - dialog occupants. Does not make sense if type=1 (PUBLIC_GROUP). */
-//   occupants_ids: number[];
-//   /** Last sent message in this dialog. */
-//   last_message: string | null;
-//   /** Timestamp of last sent message in this dialog. */
-//   last_message_date_sent: number | null | string; // todo: switch type to number
-//   /** ID of the user who sent last message in this dialog. */
-//   last_message_user_id: QBUser['id'] | null;
-//   /** ID of last message in this dialog. */
-//   last_message_id: string | null;
-//   /** Number of unread messages in this dialog for a current user. */
-//   unread_messages_count: number | null;
-//   /**
-//    * - Information about class and fields in Custom Objects.
-//    * - Any dialog can be extended using Custom Objects to store additional parameters.
-//    */
-//   data?: {
-//     /** Class name in Custom Objects. */
-//     class_name: string;
-//     /** Field name of class in Custom Objects. Can be many: 1..N. */
-//     [field_name_N: string]: QBCustomField;
-//   };
-//   new_occupants_ids?: number[]; // TODO: EXTENDS TYPE AND SWITCH TO THIS NEW TYPE
-//   joined?: boolean; // TODO: EXTENDS TYPE AND SWITCH TO THIS NEW TYPE
-// }
-
-// declare interface QBChatNewMessage {
-//   type: 'chat' | 'groupchat';
-//   body: string;
-//   notification_type?: string; // TODO: NED ADD TO TYPE
-//   dialog_id: QBChatDialog['_id']; // TODO: NED ADD TO TYPE
-//   extension: {
-//     attachments?: ChatMessageAttachment[];
-//     save_to_history: 0 | 1;
-//     dialog_id: QBChatDialog['_id'];
-//     notification_type?: string; // TODO: NED ADD TO TYPE
-//     sender_id?: QBUser['id']; // TODO: NED ADD TO TYPE
-//     qb_message_action?: 'forward' | 'reply'; // TODO: NED ADD TO TYPE
-//     origin_sender_name?: string; // TODO: NED ADD TO TYPE
-//     qb_original_messages?: string; // TODO: NED ADD TO TYPE
-//   };
-//   markable: 0 | 1;
-// }
 
-// TODO: add export to SDK
-// type ChatConnectParams =
-//   | {
-//       /** Connect to the chat by user id */
-//       userId: QBUser['id'];
-//       /** The user's password or session token */
-//       password: string;
-//     }
-//   | {
-//       /** Connect to the chat by user jid */
-//       jid: string;
-//       /** The user's password or session token */
-//       password: string;
-//     }
-//   | {
-//       /** Connect to the chat by user's email */
-//       email: string;
-//       /** The user's password or session token */
-//       password: string;
-//     };
-//
-// type QBCustomField =
-//   | string
-//   | string[]
-//   | number
-//   | number[]
-//   | boolean
-//   | boolean[]
-//   | null
-//   | undefined;
+interface Window {
+  webkitAudioContext: typeof AudioContext;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickblox-react-ui-kit",
-  "version": "0.4.6-beta.4",
+  "version": "0.4.7-beta.1",
   "main": "dist/index-ui.js",
   "license": "MIT",
   "dependencies": {
@@ -12,7 +12,7 @@
     "qb-ai-core": "^0.1.3",
     "qb-ai-rephrase": "^0.1.2",
     "qb-ai-translate": "^0.1.2",
-    "quickblox": "^2.19.2",
+    "quickblox": "^2.20.0",
     "media-recorder-js": "^2.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

package/src/App.scss

@@ -1,3 +1,8 @@
 body {
   font-family: 'Roboto';
 }
+
+.btn-group {
+  display: flex;
+  flex-flow: row;
+}

package/src/App.tsx

@@ -15,6 +15,9 @@ import QuickBloxUIKitDesktopLayout from './Presentation/layouts/Desktop/QuickBlo
 import DefaultTheme from './Presentation/themes/DefaultThemes/DefaultTheme';
 import useQbUIKitDataContext from './Presentation/providers/QuickBloxUIKitProvider/useQbUIKitDataContext';
 import { QBConfig } from './QBconfig';
+import MainButton, {
+  TypeButton,
+} from './Presentation/components/UI/Buttons/MainButton/MainButton';
 
 function App() {
   if ((window as any).QB === undefined) {
@@ -178,6 +181,11 @@ function App() {
           data,
         );
         await prepareContent().catch();
+        currentContext.setSubscribeOnSessionExpiredListener(() => {
+          console.timeLog('call OnSessionExpiredListener ... start');
+          // logoutHandler();
+          console.log('OnSessionExpiredListener ... end');
+        });
         navigate('/desktop-test-mock');
       }
     }
@@ -201,40 +209,57 @@ function App() {
   // });
 
   return (
-    <QuickBloxUIKitProvider
-      maxFileSize={QBConfig.appConfig.maxFileSize}
-      // SDK={QB} //init SDK
-      accountData={{ ...QBConfig.credentials, sessionToken: '' }}
-      qbConfig={{ ...QBConfig }}
-      loginData={{
-        login: currentUser.login,
-        password: currentUser.password,
-      }}
-    >
-      <div className="App">
-        <Routes>
-          {/* eslint-disable-next-line @typescript-eslint/no-misused-promises */}
-          <Route path="/" element={<Login loginHandler={loginHandler} />} />
-          <Route
-            path="/desktop-test-mock"
-            element={
-              <div>
-                <div style={{ height: '56px' }}>Q-communicate</div>
-                <QuickBloxUIKitDesktopLayout
-                  theme={new DefaultTheme()}
-                  uikitHeightOffset="56px"
-                  // AIAssist={{
-                  //   enabled: true,
-                  //   default: true,
-                  //   AIWidget: defaultAIAnswer,
-                  // }}
-                />
-              </div>
-            }
-          />
-        </Routes>
+    <>
+      <div className="btn-group">
+        <MainButton
+          typeButton={TypeButton.outlined}
+          title="Light Theme"
+          clickHandler={() => {
+            document.documentElement.setAttribute('data-theme', 'light');
+          }}
+        />
+        <MainButton
+          typeButton={TypeButton.defaultDisabled}
+          title="Dark Theme"
+          clickHandler={() => {
+            document.documentElement.setAttribute('data-theme', 'dark');
+          }}
+        />
       </div>
-    </QuickBloxUIKitProvider>
+      <QuickBloxUIKitProvider
+        maxFileSize={QBConfig.appConfig.maxFileSize}
+        // SDK={QB} //init SDK
+        accountData={{ ...QBConfig.credentials, sessionToken: '' }}
+        qbConfig={{ ...QBConfig }}
+        loginData={{
+          login: currentUser.login,
+          password: currentUser.password,
+        }}
+      >
+        <div className="App">
+          <Routes>
+            {/* eslint-disable-next-line @typescript-eslint/no-misused-promises */}
+            <Route path="/" element={<Login loginHandler={loginHandler} />} />
+            <Route
+              path="/desktop-test-mock"
+              element={
+                <div>
+                  <QuickBloxUIKitDesktopLayout
+                    theme={new DefaultTheme()}
+                    uikitHeightOffset="56px"
+                    // AIAssist={{
+                    //   enabled: true,
+                    //   default: true,
+                    //   AIWidget: defaultAIAnswer,
+                    // }}
+                  />
+                </div>
+              }
+            />
+          </Routes>
+        </div>
+      </QuickBloxUIKitProvider>
+    </>
   );
 }
 

package/src/CommonTypes/CommonTypes.ts

@@ -85,10 +85,23 @@ export interface QBUIKitConfig extends QBConfig {
     chatProtocol: {
       active: number;
     };
+    pingLocalhostTimeInterval: number;
+    chatReconnectionTimeInterval: number;
     debug: boolean;
     enableForwarding: boolean;
     enableReplying: boolean;
     regexUserName?: string;
+    /**
+     * Whether public dialogs should be shown in the dialogs list.
+     * Defaults to false if not provided.
+     */
+    showPublicDialogsInList?: boolean;
+
+    /**
+     * Whether creating public dialogs is allowed.
+     * Defaults to false if not provided.
+     */
+    allowPublicDialogCreation?: boolean;
     endpoints: {
       api: string;
       chat: string;
@@ -176,6 +189,7 @@ export interface QBUIKitChatDialog extends QBChatDialog {
   };
   new_occupants_ids?: number[]; // TODO: EXTENDS TYPE AND SWITCH TO THIS NEW TYPE
   joined?: boolean; // TODO: EXTENDS TYPE AND SWITCH TO THIS NEW TYPE
+  is_join_required: number | undefined | null;
 }
 
 export interface QBUIKitChatNewMessage extends QBChatNewMessage {

package/src/Data/DefaultConfigurations.ts

@@ -260,10 +260,14 @@ export class DefaultConfigurations {
         chatProtocol: {
           active: 2,
         },
+        pingLocalhostTimeInterval: 0,
+        chatReconnectionTimeInterval: 3,
         debug: true,
         enableForwarding: true,
         enableReplying: true,
         regexUserName: '', // '/^(?=[a-zA-Z])[-a-zA-Z_ ]{3,49}(?<! )$/',
+        showPublicDialogsInList: false,
+        allowPublicDialogCreation: false,
         endpoints: {
           api: 'api.quickblox.com',
           chat: 'chat.quickblox.com',

package/src/Data/Stubs.ts

@@ -607,6 +607,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '2',
@@ -622,6 +623,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '3',
@@ -637,6 +639,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '4',
@@ -652,6 +655,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '5',
@@ -667,6 +671,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '6',
@@ -682,6 +687,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
       {
         id: '7',
@@ -697,6 +703,7 @@ export class Stubs {
         lastMessageId: '',
         unreadMessageCount: 0,
         updatedAt: '',
+        is_join_required: undefined,
       },
     ];
 
@@ -720,6 +727,7 @@ export class Stubs {
       updated_at: '02.03.2023',
       user_id: 0,
       xmpp_room_jid: null,
+      is_join_required: undefined,
     };
 
     return qbDialog;
@@ -742,6 +750,7 @@ export class Stubs {
       updated_at: '02.03.2023',
       user_id: 0,
       xmpp_room_jid: null,
+      is_join_required: undefined,
     };
 
     return qbDialog;
@@ -764,6 +773,7 @@ export class Stubs {
       updated_at: '02.03.2023',
       user_id: 0,
       xmpp_room_jid: null,
+      is_join_required: undefined,
     };
 
     return qbDialog;

package/src/Data/dto/dialog/RemoteDialogDTO.ts

@@ -29,6 +29,8 @@ export class RemoteDialogDTO {
 
   public photo: string;
 
+  public is_join_required: number | undefined | null;
+
   constructor() {
     this.id = '';
     this.type = 0;
@@ -54,5 +56,7 @@ export class RemoteDialogDTO {
     this.name = '';
 
     this.photo = '';
+
+    this.is_join_required = undefined;
   }
 }

package/src/Data/dto/file/LocalFileDTO.ts

@@ -7,7 +7,7 @@ export class LocalFileDTO {
 
   public name: string;
 
-  public size: number;
+  public size: number | string;
 
   public type?: string;
 

package/src/Data/dto/file/RemoteFileDTO.ts

@@ -7,7 +7,7 @@ export class RemoteFileDTO {
 
   public name: string;
 
-  public size: number;
+  public size: number | string;
 
   public type: string;
 

package/src/Data/mapper/DialogRemoteDTOMapper.ts

@@ -667,6 +667,12 @@ export class DialogRemoteDTOMapper implements IMapper {
 
         return updatedAt !== undefined;
       },
+      is_join_required(v: unknown): v is RemoteDialogDTO['is_join_required'] {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { is_join_required } = v as RemoteDialogDTO;
+
+        return true;
+      },
     };
 
     if (!dtoValidator.id(data))

package/src/Data/source/remote/Mapper/DialogDTOMapper.ts

@@ -51,6 +51,7 @@ export class DialogDTOMapper implements IDTOMapper {
       updated_at: dialogDTO.updatedAt,
       user_id: parseInt(dialogDTO.ownerId, 10),
       xmpp_room_jid: null,
+      is_join_required: dialogDTO.is_join_required,
     };
 
     return Promise.resolve(dialog as TResult);
@@ -272,6 +273,12 @@ export class DialogDTOMapper implements IDTOMapper {
 
         return updatedAt !== undefined && updatedAt !== null;
       },
+      is_join_required(v: unknown): v is RemoteDialogDTO['is_join_required'] {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { is_join_required } = v as RemoteDialogDTO;
+
+        return true;
+      },
     };
 
     if (!dialogDTOValidator.id(dto))
@@ -429,6 +436,12 @@ export class DialogDTOMapper implements IDTOMapper {
 
         return xmpp_room_jid !== undefined && xmpp_room_jid !== null;
       },
+      is_join_required(v: unknown): v is RemoteDialogDTO['is_join_required'] {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { is_join_required } = v as RemoteDialogDTO;
+
+        return true;
+      },
     };
 
     if (!qbDialogValidator._id(qbDialog))

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

@@ -192,12 +192,12 @@ export class MessageDTOMapper implements IDTOMapper {
   ): ChatMessageAttachment {
     return {
       id: attachment.id.toString(),
-      uid: attachment.uid || '',
+      uid: attachment.uid?.toString() || '',
       type: attachment.type.toString(),
-      url: attachment.url || '',
-      name: attachment.name || '',
-      size: attachment.size || 0,
-    };
+      url: attachment.url?.toString() || '',
+      name: attachment.name?.toString() || '',
+      size: attachment.size?.toString() || '',
+    } as ChatMessageAttachment;
   }
 
   public static convertToQBChatNewMessage(