Merge branch 'development' of https://github.com/epam/ai-dial-chat in…

…to development
epam · Dec 15, 2024 · ae2825c · ae2825c
2 parents 96a239a + 8f0446a
commit ae2825c
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 59 deletions.
diff --git a/apps/chat-e2e/src/testData/expectedConstants.ts b/apps/chat-e2e/src/testData/expectedConstants.ts
@@ -296,13 +296,13 @@ export const Import = {
   v14AppBisonChatName: 'bison chat king',
   v14AppImportedFilename: 'ai_dial_chat_history_1-4_version.json',
   v19AppImportedFilename: 'ai_dial_chat_history_1-9_version.json',
-  importedAttachmentsFilename: 'ai_dial_chat_with_attachments.zip',
+  importedAttachmentsFilename: 'ai_dial_chat_with_attachments.dial',
   importedConversationWithAttachmentsName: `test`,
   importedGpt4VisionAttachmentName: 'SDRequestAttachment.png',
   importedStableDiffusionAttachmentName: 'SDResponseAttachment.png',
   v14AppFolderPromptName: 'Version 1.4 A*B',
   oldVersionAppGpt35Message: '11 * 12 =',
-  importAttachmentExtension: '.zip',
+  importAttachmentExtension: '.dial',
 };
 
 export const Attachment = {

diff --git a/.../import/ai_dial_chat_with_attachments.zip → ...import/ai_dial_chat_with_attachments.dial b/.../import/ai_dial_chat_with_attachments.zip → ...import/ai_dial_chat_with_attachments.dial
diff --git a/apps/chat-e2e/src/ui/pages/basePage.ts b/apps/chat-e2e/src/ui/pages/basePage.ts
@@ -249,6 +249,7 @@ export class BasePage {
       throw new Error(`Download failed:`);
     }
   }
+
   public async uploadData<T>(
     uploadData: UploadDownloadData,
     method: () => Promise<T>,

diff --git a/apps/chat/.env.development b/apps/chat/.env.development
@@ -91,7 +91,7 @@ DIAL_ROLES_FIELD="dial_roles"
 
 
 # Application UI settings
-ENABLED_FEATURES="conversations-section,prompts-section,top-settings,top-clear-conversation,top-chat-info,top-chat-model-settings,hide-top-context-menu,empty-chat-settings,hide-empty-chat-change-agent,header,footer,request-api-key,report-an-issue,likes,conversations-sharing,prompts-sharing,input-files,attachments-manager,conversations-publishing,prompts-publishing,custom-logo,input-links,custom-applications,message-templates,marketplace,quick-apps,code-apps,disallow-change-agent"
+ENABLED_FEATURES="conversations-section,prompts-section,top-settings,top-clear-conversation,top-chat-info,top-chat-model-settings,empty-chat-settings,header,footer,request-api-key,report-an-issue,likes,conversations-sharing,prompts-sharing,input-files,attachments-manager,conversations-publishing,prompts-publishing,custom-logo,input-links,custom-applications,message-templates,marketplace,quick-apps,code-apps"
 NEXT_PUBLIC_APP_NAME="Local Development APP Name"
 NEXT_PUBLIC_DEFAULT_SYSTEM_PROMPT=""
 NEXT_PUBLIC_DEFAULT_TEMPERATURE="1"

diff --git a/apps/chat/src/components/Chat/ChatHeader/Header.tsx b/apps/chat/src/components/Chat/ChatHeader/Header.tsx
@@ -186,28 +186,50 @@ export const ChatHeader = ({
         data-qa="chat-header"
       >
         {isShowChatInfo && (
-          <Tooltip
-            tooltip={conversation.name}
-            triggerClassName={classNames(
-              'truncate text-center',
-              isChatFullWidth &&
-                'flex h-full max-w-full items-center justify-center lg:max-w-[90%]',
-              conversation.publicationInfo?.action === PublishActions.DELETE &&
-                'text-error',
-            )}
-          >
-            <span
-              className={classNames(
-                'truncate whitespace-pre text-center',
-                !isChatFullWidth &&
-                  'block max-w-full md:max-w-[330px] lg:max-w-[425px]',
-                isConversationInvalid && 'text-secondary',
+          <>
+            <Tooltip
+              tooltip={conversation.name}
+              triggerClassName={classNames(
+                'truncate text-center',
+                isChatFullWidth &&
+                  'flex h-full max-w-full items-center justify-center lg:max-w-[90%]',
+                conversation.publicationInfo?.action ===
+                  PublishActions.DELETE && 'text-error',
               )}
-              data-qa="chat-title"
             >
-              {conversation.name}
-            </span>
-          </Tooltip>
+              <span
+                className={classNames(
+                  'truncate whitespace-pre text-center',
+                  !isChatFullWidth &&
+                    'block max-w-full md:max-w-[330px] lg:max-w-[425px]',
+                  isConversationInvalid && 'text-secondary',
+                )}
+                data-qa="chat-title"
+              >
+                {conversation.name}
+              </span>
+            </Tooltip>
+            {publicVersionGroupId && (
+              <span className="h-[18px] border-l border-l-primary pl-2">
+                {!isReviewEntity ? (
+                  <PublicVersionSelector
+                    publicVersionGroupId={publicVersionGroupId}
+                    onChangeSelectedVersion={handleChangeSelectedVersion}
+                  />
+                ) : (
+                  <p
+                    className={classNames(
+                      conversation.publicationInfo?.action ===
+                        PublishActions.DELETE && 'text-error',
+                    )}
+                    data-qa="version"
+                  >
+                    {t('v.')} {conversation.publicationInfo?.version}
+                  </p>
+                )}
+              </span>
+            )}
+          </>
         )}
         <div className="flex lg:[&>*:first-child]:border-l lg:[&>*:not(:first-child)]:pl-2 [&>*:not(:last-child)]:border-r [&>*:not(:last-child)]:pr-2 [&>*]:border-x-primary [&>*]:pl-2">
           {isShowChatInfo && (
@@ -365,34 +387,6 @@ export const ChatHeader = ({
                   </button>
                 </Tooltip>
               )}
-            {isPlayback && !isExternal && (
-              <button
-                className="cursor-pointer text-accent-primary"
-                onClick={onCancelPlaybackMode}
-                data-qa="cancel-playback-mode"
-              >
-                {screenState === ScreenState.MOBILE
-                  ? t('Stop')
-                  : t('Stop playback')}
-              </button>
-            )}
-            {publicVersionGroupId &&
-              (!isReviewEntity ? (
-                <PublicVersionSelector
-                  publicVersionGroupId={publicVersionGroupId}
-                  onChangeSelectedVersion={handleChangeSelectedVersion}
-                />
-              ) : (
-                <p
-                  className={classNames(
-                    conversation.publicationInfo?.action ===
-                      PublishActions.DELETE && 'text-error',
-                  )}
-                  data-qa="version"
-                >
-                  {t('v.')} {conversation.publicationInfo?.version}
-                </p>
-              ))}
 
             {isContextMenuVisible && (
               <ConversationContextMenu
@@ -406,6 +400,18 @@ export const ChatHeader = ({
               />
             )}
 
+            {isPlayback && !isExternal && (
+              <button
+                className="cursor-pointer text-accent-primary"
+                onClick={onCancelPlaybackMode}
+                data-qa="cancel-playback-mode"
+              >
+                {screenState === ScreenState.MOBILE
+                  ? t('Stop')
+                  : t('Stop playback')}
+              </button>
+            )}
+
             {isCompareMode && selectedConversationIds.length > 1 && (
               <Tooltip
                 isTriggerClickable

diff --git a/apps/chat/src/components/Chat/ModelVersionSelect.tsx b/apps/chat/src/components/Chat/ModelVersionSelect.tsx
@@ -19,7 +19,7 @@ const VersionPrefix = () => {
   const { t } = useTranslation(Translation.Chat);
 
   return (
-    <div className="flex items-center gap-2">
+    <div className="mr-2 flex items-center">
       <span className="hidden md:block">{t('Version: ')}</span>
       <span className="md:hidden">{t('v. ')}</span>
     </div>
@@ -52,7 +52,7 @@ export const ModelVersionSelect = ({
     if (entities.length && entities[0].version) {
       return (
         <div
-          className={classNames('flex gap-2 truncate', className)}
+          className={classNames('flex truncate', className)}
           data-qa="version"
         >
           {showVersionPrefix && <VersionPrefix />}

diff --git a/apps/chat/src/components/Chat/TalkTo/TalkToCard.tsx b/apps/chat/src/components/Chat/TalkTo/TalkToCard.tsx
@@ -292,7 +292,7 @@ export const TalkToCard = ({
               <ModelIcon entityId={entity.id} entity={entity} size={iconSize} />
             )}
         </div>
-        <div className="flex grow flex-col justify-center gap-2 overflow-hidden leading-4">
+        <div className="flex grow flex-col justify-center overflow-hidden leading-4">
           {!!versionsToSelect.length && (
             <div className="flex items-center">
               <p className="mr-1 text-xs text-secondary">{t('Version')}: </p>

diff --git a/apps/chat/src/components/Settings/Import.tsx b/apps/chat/src/components/Settings/Import.tsx
@@ -30,15 +30,16 @@ export const Import: FC<CustomTriggerMenuRendererProps> = ({
         className="sr-only"
         tabIndex={-1}
         type="file"
-        accept="application/json, application/x-zip-compressed, application/zip"
+        accept=".json, .zip, .dial"
         onClick={onClickHandler}
         onChange={(e) => {
           if (!e.target.files?.length) return;
           const file = e.target.files[0];
 
           if (
             file.type === 'application/zip' ||
-            file.type === 'application/x-zip-compressed'
+            file.type === 'application/x-zip-compressed' ||
+            file.name.endsWith('.dial')
           ) {
             typedImportHandler?.({ content: file, zip: true });
             return;

diff --git a/apps/chat/src/store/models/models.reducers.ts b/apps/chat/src/store/models/models.reducers.ts
@@ -143,9 +143,10 @@ export const modelsSlice = createSlice({
       const isDefaultModelAvailable = state.models.some(
         ({ id }) => id === payload.defaultModelId,
       );
-      if (payload.localStorageRecentModelsIds) {
+
+      if (payload.localStorageRecentModelsIds?.length) {
         state.recentModelsIds = payload.localStorageRecentModelsIds;
-      } else if (payload.defaultRecentModelsIds.length !== 0) {
+      } else if (payload.defaultRecentModelsIds.length) {
         state.recentModelsIds = payload.defaultRecentModelsIds;
       } else if (payload.defaultModelId && isDefaultModelAvailable) {
         state.recentModelsIds = [payload.defaultModelId];

diff --git a/apps/chat/src/utils/app/zip-import-export.ts b/apps/chat/src/utils/app/zip-import-export.ts
@@ -66,7 +66,7 @@ export const downloadExportZip = (content: string, fileName?: string) => {
   const downloadName = getDownloadFileName(fileName);
   triggerDownload(
     `data:application/zip;base64,${content}`,
-    `${downloadName}_chat_with_attachments_${currentDate()}.zip`,
+    `${downloadName}_chat_with_attachments_${currentDate()}.dial`,
   );
 };
 

diff --git a/apps/chat/src/utils/server/get-common-page-props.ts b/apps/chat/src/utils/server/get-common-page-props.ts
@@ -35,6 +35,7 @@ import { URL, URLSearchParams } from 'url';
 const disabledFeaturesForIsolatedView = new Set([
   Feature.ConversationsSection,
   Feature.PromptsSection,
+  Feature.MessageTemplates,
 ]);
 
 const hiddenFeaturesForIsolatedView = [