Merge branch 'epam:development' into feature/refactor-chat-component

Author: sergesha

apps/chat/src/components/Header/CreateNewChatMobile.tsx

@@ -21,7 +21,7 @@ interface Props {
 }
 
 export const CreateNewChatMobile = ({ iconSize }: Props) => {
-  const { t } = useTranslation(Translation.SideBar);
+  const { t } = useTranslation(Translation.Header);
   const dispatch = useAppDispatch();
 
   const isConversationsLoaded = useAppSelector(

apps/chat/src/components/Header/Header.tsx

@@ -59,7 +59,7 @@ const Header = () => {
 
   const dispatch = useAppDispatch();
 
-  const { t } = useTranslation(Translation.SideBar);
+  const { t } = useTranslation(Translation.Header);
   const enabledFeatures = useAppSelector(
     SettingsSelectors.selectEnabledFeatures,
   );

apps/chat/src/components/Header/User/ProfileButton.tsx

@@ -21,7 +21,7 @@ export const ProfileButton = () => {
 
   const dispatch = useAppDispatch();
 
-  const { t } = useTranslation(Translation.SideBar);
+  const { t } = useTranslation(Translation.Header);
   const { data: session } = useSession();
 
   const onClick = useCallback(() => {

apps/chat/src/components/Header/User/UserMobile.tsx

@@ -20,7 +20,7 @@ import LogOutIcon from '@/public/images/icons/log-out.svg';
 import UserIcon from '@/public/images/icons/user.svg';
 
 const UserInfo = () => {
-  const { t } = useTranslation(Translation.SideBar);
+  const { t } = useTranslation(Translation.Header);
 
   const { data: session } = useSession();
 
@@ -47,7 +47,7 @@ const UserInfo = () => {
 
 const UserSettings = () => {
   const dispatch = useAppDispatch();
-  const { t } = useTranslation(Translation.SideBar);
+  const { t } = useTranslation(Translation.Header);
 
   const onClick = useCallback(() => {
     dispatch(UIActions.setIsUserSettingsOpen(true));
@@ -66,7 +66,7 @@ const UserSettings = () => {
 
 const Logout = () => {
   const { data: session } = useSession();
-  const { t } = useTranslation(Translation.SideBar);
+  const { t } = useTranslation(Translation.Header);
   const [isLogoutConfirmationOpened, setIsLogoutConfirmationOpened] =
     useState(false);
 

apps/chat/src/store/import-export/importExport.epics.ts

@@ -76,6 +76,7 @@ import { Conversation, Message } from '@/src/types/chat';
 import { FeatureType, UploadStatus } from '@/src/types/common';
 import { DialFile } from '@/src/types/files';
 import { FolderType } from '@/src/types/folder';
+import { HTTPMethod } from '@/src/types/http';
 import { LatestExportFormat, ReplaceOptions } from '@/src/types/import-export';
 import { Prompt } from '@/src/types/prompt';
 import { AppEpic } from '@/src/types/store';
@@ -1185,10 +1186,17 @@ const uploadConversationAttachmentsEpic: AppEpic = (action$, state$) =>
               attachment.name,
             );
 
+            const httpMethod =
+              attachmentsToReplace?.length &&
+              attachmentsToReplace.includes(attachment)
+                ? HTTPMethod.PUT
+                : undefined;
+
             return FileService.sendFile(
               formData,
               attachment.relativePath,
               attachment.name,
+              httpMethod,
             ).pipe(
               filter(
                 ({ percent, result }) =>

apps/chat/src/types/models.ts

@@ -36,7 +36,7 @@ export interface CoreAIEntity<T = EntityType.Model> {
     system_prompt?: boolean;
     url_attachments?: boolean;
     folder_attachments?: boolean;
-    allowResume?: boolean;
+    allow_resume?: boolean;
   };
   tokenizer_model?: TokenizerModel;
 }

apps/chat/src/utils/app/data/file-service.ts

@@ -19,14 +19,15 @@ export class FileService {
     formData: FormData,
     relativePath: string | undefined,
     fileName: string,
+    httpMethod?: HTTPMethod,
   ): Observable<{ percent?: number; result?: DialFile }> {
     const resultPath = ApiUtils.encodeApiUrl(
       constructPath(getFileRootId(), relativePath, fileName),
     );
 
     return ApiUtils.requestOld({
       url: `api/${resultPath}`,
-      method: HTTPMethod.POST,
+      method: httpMethod ? httpMethod : HTTPMethod.POST,
       async: true,
       body: formData,
     }).pipe(

apps/chat/src/utils/server/get-sorted-entities.ts

@@ -170,7 +170,7 @@ export const getSortedEntities = async (token: JWT | null) => {
         truncatePrompt: entity.features.truncate_prompt ?? false,
         urlAttachments: entity.features.url_attachments ?? false,
         folderAttachments: entity.features.folder_attachments ?? false,
-        allowResume: entity.features.allowResume ?? true,
+        allowResume: entity.features.allow_resume ?? true,
       },
       inputAttachmentTypes: entity.input_attachment_types,
       maxInputAttachments: entity.max_input_attachments,