Merge branch 'development' into fix/2048-apps-files-approval

epam · Jan 28, 2025 · 23b039e · 23b039e
2 parents 001ee28 + b2f78e0
commit 23b039e
Show file tree

Hide file tree

Showing 29 changed files with 497 additions and 346 deletions.
diff --git a/apps/chat/.env.development b/apps/chat/.env.development
@@ -101,6 +101,9 @@ RECENT_MODELS_IDS="gpt-35-turbo,gpt-4,epam10k-semantic-search,gpt-world,mirror"
 RECENT_ADDONS_IDS="addon-epam10k-golden-qna,addon-epam10k-semantic-search"
 PUBLICATION_FILTERS="title,job title,role,dial_roles"
 
+# Default header size limit aligned with Docker's default value for consistency
+NODE_OPTIONS="--max-http-header-size=32768"
+
 # Themes
 # THEMES_CONFIG_HOST=""
 

diff --git a/apps/chat/src/components/Chat/ModelList.tsx b/apps/chat/src/components/Chat/ModelList.tsx
@@ -354,7 +354,7 @@ export const ModelList = ({
 
   const handleEdit = useCallback(
     (currentEntity: DialAIEntityModel) => {
-      dispatch(ApplicationActions.get(currentEntity.id));
+      dispatch(ApplicationActions.get({ applicationId: currentEntity.id }));
       handleOpenApplicationModal(getApplicationType(currentEntity));
     },
     [dispatch, handleOpenApplicationModal],

diff --git a/apps/chat/src/components/Chat/Publish/PublicationChatControls.tsx b/apps/chat/src/components/Chat/Publish/PublicationChatControls.tsx
@@ -133,9 +133,9 @@ export function PublicationControlsView<
         unselectConversation();
         unselectPrompt();
         dispatch(
-          ApplicationActions.get(
-            resourcesToReview[publicationIdx + offset].reviewUrl,
-          ),
+          ApplicationActions.get({
+            applicationId: resourcesToReview[publicationIdx + offset].reviewUrl,
+          }),
         );
         dispatch(PublicationActions.setIsApplicationReview(true));
       }

diff --git a/apps/chat/src/components/Chat/Publish/PublicationHandler.tsx b/apps/chat/src/components/Chat/Publish/PublicationHandler.tsx
@@ -284,13 +284,10 @@ export function PublicationHandler({ publication }: Props) {
     };
 
     const startApplicationsReview = () => {
-      dispatch(
-        ApplicationActions.get(
-          applicationsToReviewIds.length
-            ? applicationsToReviewIds[0].reviewUrl
-            : reviewedApplicationsIds[0].reviewUrl,
-        ),
-      );
+      const applicationId = applicationsToReviewIds.length
+        ? applicationsToReviewIds[0].reviewUrl
+        : reviewedApplicationsIds[0].reviewUrl;
+      dispatch(ApplicationActions.get({ applicationId }));
       dispatch(PublicationActions.setIsApplicationReview(true));
     };
 

diff --git a/apps/chat/src/components/Chat/TalkTo/TalkToModal.tsx b/apps/chat/src/components/Chat/TalkTo/TalkToModal.tsx
@@ -229,7 +229,7 @@ const TalkToModalView = ({
 
   const handleEditApplication = useCallback(
     (entity: DialAIEntityModel) => {
-      dispatch(ApplicationActions.get(entity.id));
+      dispatch(ApplicationActions.get({ applicationId: entity.id }));
       setEditModel(entity);
     },
     [dispatch],

diff --git a/apps/chat/src/components/Common/ApplicationWizard/CodeAppView/CodeAppView.tsx b/apps/chat/src/components/Common/ApplicationWizard/CodeAppView/CodeAppView.tsx
@@ -342,6 +342,10 @@ export const CodeAppView: FC<ViewProps> = ({
             label={t('Select folder with source files')}
             rules={validators['sources']}
             error={errors.sources?.message || errors.sourceFiles?.message}
+            disabled={isSharedWithMe}
+            tooltip={
+              isSharedWithMe ? getSharedTooltip('folder with source files') : ''
+            }
           />
 
           {sources && <CodeEditor sourcesFolderId={sources} />}

diff --git a/apps/chat/src/components/Common/ApplicationWizard/CodeAppView/CodeEditor.tsx b/apps/chat/src/components/Common/ApplicationWizard/CodeAppView/CodeEditor.tsx
@@ -20,6 +20,7 @@ import { constructPath } from '@/src/utils/app/file';
 import {
   getChildAndCurrentFoldersIdsById,
   getNextDefaultName,
+  splitEntityId,
 } from '@/src/utils/app/folders';
 import { getIdWithoutRootPathSegments } from '@/src/utils/app/id';
 
@@ -394,6 +395,7 @@ export const CodeEditor = ({ sourcesFolderId }: Props) => {
   const handleUploadEmptyFile = useCallback(
     (fileName: string) => {
       if (fileName && sourcesFolderId) {
+        const { bucket } = splitEntityId(sourcesFolderId);
         dispatch(
           FilesActions.uploadFile({
             fileContent: new File([''], fileName, {
@@ -402,6 +404,7 @@ export const CodeEditor = ({ sourcesFolderId }: Props) => {
             relativePath: getIdWithoutRootPathSegments(sourcesFolderId),
             id: constructPath(sourcesFolderId, fileName),
             name: fileName,
+            bucket,
           }),
         );
         setNewFileFolder(undefined);

diff --git a/apps/chat/src/components/Common/ApplicationWizard/CodeAppView/SourceFilesEditor.tsx b/apps/chat/src/components/Common/ApplicationWizard/CodeAppView/SourceFilesEditor.tsx
@@ -24,12 +24,16 @@ interface SourceFilesEditorProps {
   value?: string;
   onChange?: (v: string) => void;
   error?: string;
+  tooltip?: string;
+  disabled?: boolean;
 }
 
 const _SourceFilesEditor: FC<SourceFilesEditorProps> = ({
   value,
   onChange,
   error,
+  tooltip,
+  disabled,
 }) => {
   const { t } = useTranslation(Translation.Marketplace);
 
@@ -77,26 +81,31 @@ const _SourceFilesEditor: FC<SourceFilesEditorProps> = ({
           >
             {value ? getIdWithoutRootPathSegments(value) : t('No folder')}
           </Tooltip>
-          <div className="flex items-center gap-3">
-            <span
-              className="h-full cursor-pointer text-accent-primary"
-              data-qa="change-button"
-              onClick={handleToggleFileManager}
-            >
-              {value ? t('Change') : t('Add')}
-            </span>
-            {value && (
+          <Tooltip tooltip={tooltip}>
+            <div className="flex items-center gap-3">
               <button
-                onClick={() => {
-                  onChange?.('');
-                }}
+                className="h-full cursor-pointer text-accent-primary disabled:cursor-not-allowed disabled:text-controls-disable"
+                data-qa="change-button"
                 type="button"
-                className="text-secondary hover:text-accent-primary"
+                disabled={disabled}
+                onClick={handleToggleFileManager}
               >
-                <IconX size={18} />
+                {value ? t('Change') : t('Add')}
               </button>
-            )}
-          </div>
+              {value && (
+                <button
+                  onClick={() => {
+                    onChange?.('');
+                  }}
+                  type="button"
+                  disabled={disabled}
+                  className="text-secondary hover:text-accent-primary disabled:cursor-not-allowed disabled:text-controls-disable"
+                >
+                  <IconX size={18} />
+                </button>
+              )}
+            </div>
+          </Tooltip>
         </div>
       </div>
 

diff --git a/apps/chat/src/components/Files/FileItemContextMenu.tsx b/apps/chat/src/components/Files/FileItemContextMenu.tsx
@@ -9,6 +9,7 @@ import { MouseEvent, MouseEventHandler, useMemo } from 'react';
 
 import { useTranslation } from 'next-i18next';
 
+import { isCurrentFolderOrParentSharedWithMeAndCanEdit } from '@/src/utils/app/folders';
 import { isMyEntity } from '@/src/utils/app/id';
 
 import { FeatureType } from '@/src/types/common';
@@ -17,6 +18,7 @@ import { DisplayMenuItemProps } from '@/src/types/menu';
 import { Translation } from '@/src/types/translation';
 
 import { CodeEditorSelectors } from '@/src/store/codeEditor/codeEditor.reducer';
+import { FilesSelectors } from '@/src/store/files/files.reducers';
 import { useAppSelector } from '@/src/store/hooks';
 import { SettingsSelectors } from '@/src/store/settings/settings.reducers';
 
@@ -61,6 +63,8 @@ export function FileItemContextMenu({
   );
   const isCodeEditorFile = !!useAppSelector(selectFileContentSelector);
 
+  const folders = useAppSelector(FilesSelectors.selectFolders);
+
   const menuItems: DisplayMenuItemProps[] = useMemo(
     () => [
       {
@@ -111,7 +115,11 @@ export function FileItemContextMenu({
       {
         name: t('Delete'),
         dataQa: 'delete',
-        display: isMyEntity(file, FeatureType.File) || !!file.sharedWithMe,
+        display:
+          isMyEntity(file, FeatureType.File) ||
+          !!file.sharedWithMe ||
+          isCurrentFolderOrParentSharedWithMeAndCanEdit(folders, file.folderId),
+
         Icon: IconTrashX,
         onClick: onDelete,
       },
@@ -125,6 +133,7 @@ export function FileItemContextMenu({
       onUnshare,
       isPublishingConversationEnabled,
       onUnpublish,
+      folders,
       onDelete,
       onOpenChange,
     ],

diff --git a/apps/chat/src/components/Marketplace/ApplicationCard.tsx b/apps/chat/src/components/Marketplace/ApplicationCard.tsx
@@ -339,7 +339,7 @@ export const ApplicationCard = ({
               triggerIconSize={18}
               className="m-0 xl:invisible group-hover:xl:visible"
             />
-            {!isMyApp && (
+            {!isMyApp && !entity.sharedWithMe && (
               <Tooltip
                 tooltip={
                   installedModelIds.has(entity.reference)

diff --git a/apps/chat/src/components/Marketplace/ApplicationDetails/ApplicationFooter.tsx b/apps/chat/src/components/Marketplace/ApplicationDetails/ApplicationFooter.tsx
@@ -200,35 +200,36 @@ export const ApplicationDetailsFooter = ({
               </button>
             </Tooltip>
           )}
-          {isMyApp ? (
-            <Tooltip tooltip={t(getDisabledTooltip(entity, 'Delete'))}>
-              <button
-                disabled={isModifyDisabled}
-                onClick={() => onDelete(entity)}
-                className="icon-button"
-                data-qa="application-delete"
-              >
-                <IconTrashX size={24} />
-              </button>
-            </Tooltip>
-          ) : (
-            <Tooltip
-              tooltip={
-                installedModelIds.has(entity.reference)
-                  ? t('Remove from My workspace')
-                  : t('Add to My workspace')
-              }
-              isTriggerClickable
-            >
-              <button
-                onClick={() => onBookmarkClick(entity)}
-                className="icon-button"
-                data-qa="application-bookmark"
+          {!entity.sharedWithMe &&
+            (isMyApp ? (
+              <Tooltip tooltip={t(getDisabledTooltip(entity, 'Delete'))}>
+                <button
+                  disabled={isModifyDisabled}
+                  onClick={() => onDelete(entity)}
+                  className="icon-button"
+                  data-qa="application-delete"
+                >
+                  <IconTrashX size={24} />
+                </button>
+              </Tooltip>
+            ) : (
+              <Tooltip
+                tooltip={
+                  installedModelIds.has(entity.reference)
+                    ? t('Remove from My workspace')
+                    : t('Add to My workspace')
+                }
+                isTriggerClickable
               >
-                <Bookmark size={24} />
-              </button>
-            </Tooltip>
-          )}
+                <button
+                  onClick={() => onBookmarkClick(entity)}
+                  className="icon-button"
+                  data-qa="application-bookmark"
+                >
+                  <Bookmark size={24} />
+                </button>
+              </Tooltip>
+            ))}
 
           {isApplicationId(entity.id) && (isMyApp || isPublicApp) && (
             <Tooltip tooltip={isPublicApp ? t('Unpublish') : t('Publish')}>

diff --git a/apps/chat/src/components/Marketplace/ApplicationDetails/ApplicationHeader.tsx b/apps/chat/src/components/Marketplace/ApplicationDetails/ApplicationHeader.tsx
@@ -59,34 +59,6 @@ export const ApplicationDetailsHeader = ({ entity }: Props) => {
   const isApplicationsSharingEnabled = useAppSelector((state) =>
     SettingsSelectors.isFeatureEnabled(state, Feature.ApplicationsSharing),
   );
-  // const dispatch = useAppDispatch();
-
-  // const contextMenuItems = useMemo(
-  //   () => [
-  //     {
-  //       BrandIcon: IconLink,
-  //       text: t('Copy link'),
-  //       onClick: () => {
-  //         dispatch(UIActions.showInfoToast(t('Link copied')));
-  //       },
-  //     },
-  //     {
-  //       BrandIcon: IconBrandFacebook,
-  //       text: t('Share via Facebook'),
-  //       onClick: () => {
-  //         return 'Share via Facebook';
-  //       },
-  //     },
-  //     {
-  //       BrandIcon: IconBrandX,
-  //       text: t('Share via X'),
-  //       onClick: () => {
-  //         return 'Share via X';
-  //       },
-  //     },
-  //   ],
-  //   [dispatch, t],
-  // );
 
   return (
     <header className="flex items-start justify-between px-3 py-4 md:p-6">
@@ -130,57 +102,7 @@ export const ApplicationDetailsHeader = ({ entity }: Props) => {
                 <FunctionStatusIndicator entity={entity} />
               </div>
             </div>
-            {/* <div className="flex items-center gap-5">
-              <Menu
-                listClassName="bg-layer-1 !z-[60] w-[290px]"
-                placement="bottom-end"
-                type="contextMenu"
-                data-qa="application-share-type-select"
-                trigger={
-                  <button className="hidden items-center gap-3 text-accent-primary md:flex">
-                    <IconShare className="[&_path]:fill-current" size={18} />
-                    <span className="font-semibold">{t('Share')}</span>
-                  </button>
-                }
-              >
-                <div className="divide-y divide-primary">
-                  <div className="flex items-center gap-2 px-3 py-4">
-                    <ModelIcon
-                      isCustomTooltip
-                      entity={entity}
-                      entityId={entity.id}
-                      size={24}
-                    />
-                    <h5 className="text-xl">{entity.name}</h5>
-                  </div>
-                  <div>
-                    {contextMenuItems.map(({ BrandIcon, text, ...props }) => (
-                      <MenuItem
-                        key={text}
-                        item={
-                          <>
-                            <BrandIcon size={18} className="text-secondary" />
-                            <span>{text}</span>
-                          </>
-                        }
-                        className="flex w-full items-center gap-3 px-3 py-2 hover:bg-accent-primary-alpha"
-                        {...props}
-                      />
-                    ))}
-                  </div>
-                </div>
-              </Menu>
-              <button
-                className="text-secondary hover:text-accent-primary"
-                onClick={onClose}
-              >
-                <IconX size={24} />
-              </button>
-            </div> */}
           </div>
-          {/* <h2 className="text-lg font-semibold leading-[18px] md:text-xl md:leading-6">
-            {application.title}
-          </h2> */}
         </div>
       </div>
       {isMyApp && isApplicationsSharingEnabled && (

diff --git a/apps/chat/src/components/Marketplace/TabRenderer.tsx b/apps/chat/src/components/Marketplace/TabRenderer.tsx
@@ -313,7 +313,7 @@ export const TabRenderer = ({ screenState }: TabRendererProps) => {
 
   const handleEditApplication = useCallback(
     (entity: DialAIEntityModel) => {
-      dispatch(ApplicationActions.get(entity.id));
+      dispatch(ApplicationActions.get({ applicationId: entity.id }));
       setApplicationModel({
         entity,
         action: ApplicationActionType.EDIT,