resolve conflicts

epam · Jan 30, 2025 · 4c0b8e2 · 4c0b8e2
1 parent 6a7cb58
commit 4c0b8e2
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 31 deletions.
diff --git a/apps/chat/src/components/Chat/TalkTo/TalkToCard.tsx b/apps/chat/src/components/Chat/TalkTo/TalkToCard.tsx
@@ -44,7 +44,10 @@ import { SettingsSelectors } from '@/src/store/settings/settings.reducers';
 import { ShareActions } from '@/src/store/share/share.reducers';
 
 import { REPLAY_AS_IS_MODEL } from '@/src/constants/chat';
-import { CardIconSizes } from '@/src/constants/marketplace';
+import {
+  CardIconSizes,
+  PlayerContextIconClasses,
+} from '@/src/constants/marketplace';
 
 import { ModelVersionSelect } from '@/src/components/Chat/ModelVersionSelect';
 import { PlaybackIcon } from '@/src/components/Chat/Playback/PlaybackIcon';
@@ -203,13 +206,7 @@ export const TalkToCard = ({
           !!entity.functionStatus &&
           isCodeAppsEnabled,
         Icon: PlayerIcon,
-        iconClassName: classNames({
-          ['text-error']: playerStatus === SimpleApplicationStatus.UNDEPLOY,
-          ['text-accent-secondary']:
-            playerStatus === SimpleApplicationStatus.DEPLOY,
-          ['animate-spin-steps']:
-            playerStatus === SimpleApplicationStatus.UPDATING,
-        }),
+        iconClassName: PlayerContextIconClasses[playerStatus],
         onClick: (e: React.MouseEvent) => {
           e.stopPropagation();
           handleUpdateFunctionStatus();

diff --git a/apps/chat/src/components/Marketplace/ApplicationCard.tsx b/apps/chat/src/components/Marketplace/ApplicationCard.tsx
@@ -43,7 +43,10 @@ import { ModelsSelectors } from '@/src/store/models/models.reducers';
 import { SettingsSelectors } from '@/src/store/settings/settings.reducers';
 import { ShareActions } from '@/src/store/share/share.reducers';
 
-import { CardIconSizes } from '@/src/constants/marketplace';
+import {
+  CardIconSizes,
+  PlayerContextIconClasses,
+} from '@/src/constants/marketplace';
 
 import { ModelIcon } from '@/src/components/Chatbar/ModelIcon';
 import ContextMenu from '@/src/components/Common/ContextMenu';
@@ -196,13 +199,7 @@ export const ApplicationCard = ({
         display:
           (isAdmin || isMyApp) && !!entity.functionStatus && isCodeAppsEnabled,
         Icon: PlayerIcon,
-        iconClassName: classNames({
-          ['text-error']: playerStatus === SimpleApplicationStatus.UNDEPLOY,
-          ['text-accent-secondary']:
-            playerStatus === SimpleApplicationStatus.DEPLOY,
-          ['animate-spin-steps']:
-            playerStatus === SimpleApplicationStatus.UPDATING,
-        }),
+        iconClassName: PlayerContextIconClasses[playerStatus],
         onClick: (e: React.MouseEvent) => {
           e.stopPropagation();
           handleUpdateFunctionStatus();

diff --git a/apps/chat/src/components/Marketplace/ApplicationDetails/ApplicationFooter.tsx b/apps/chat/src/components/Marketplace/ApplicationDetails/ApplicationFooter.tsx
@@ -46,7 +46,11 @@ import { SettingsSelectors } from '@/src/store/settings/settings.reducers';
 import { ShareActions } from '@/src/store/share/share.reducers';
 import { UIActions } from '@/src/store/ui/ui.reducers';
 
-import { MarketplaceQueryParams } from '@/src/constants/marketplace';
+import {
+  MarketplaceQueryParams,
+  PlayerContextButtonClasses,
+  PlayerContextIconClasses,
+} from '@/src/constants/marketplace';
 
 import { ModelVersionSelect } from '../../Chat/ModelVersionSelect';
 import ContextMenu from '../../Common/ContextMenu';
@@ -228,13 +232,7 @@ export const ApplicationDetailsFooter = ({
         display: isExecutable && isCodeAppsEnabled,
         disabled: playerStatus === SimpleApplicationStatus.UPDATING,
         Icon: PlayerContextIcon,
-        iconClassName: classNames({
-          ['text-error']: playerStatus === SimpleApplicationStatus.UNDEPLOY,
-          ['text-accent-secondary']:
-            playerStatus === SimpleApplicationStatus.DEPLOY,
-          ['animate-spin-steps']:
-            playerStatus === SimpleApplicationStatus.UPDATING,
-        }),
+        iconClassName: PlayerContextIconClasses[playerStatus],
         onClick: (e: React.MouseEvent) => {
           e.stopPropagation();
           handleUpdateFunctionStatus();
@@ -373,12 +371,10 @@ export const ApplicationDetailsFooter = ({
                   <button
                     disabled={playerStatus === SimpleApplicationStatus.UPDATING}
                     onClick={handleUpdateFunctionStatus}
-                    className={classNames('icon-button', {
-                      ['button-error']:
-                        playerStatus === SimpleApplicationStatus.UNDEPLOY,
-                      ['button-accent-secondary']:
-                        playerStatus === SimpleApplicationStatus.DEPLOY,
-                    })}
+                    className={classNames(
+                      'icon-button',
+                      PlayerContextButtonClasses[playerStatus],
+                    )}
                     data-qa="application-status-toggler"
                   >
                     <PlayerIcon size={24} />

diff --git a/apps/chat/src/constants/marketplace.ts b/apps/chat/src/constants/marketplace.ts
@@ -1,4 +1,7 @@
-import { ApplicationType } from '../types/applications';
+import {
+  ApplicationType,
+  SimpleApplicationStatus,
+} from '../types/applications';
 import { EntityType, ScreenState } from '../types/common';
 
 export enum MarketplaceQueryParams {
@@ -76,3 +79,15 @@ export const HeaderIconSizes: Record<ScreenState, IconSize> = {
   [ScreenState.TABLET]: { iconSize: 96, shareIconSize: 30 },
   [ScreenState.MOBILE]: { iconSize: 48, shareIconSize: 20 },
 };
+
+export const PlayerContextIconClasses = {
+  [SimpleApplicationStatus.DEPLOY]: 'text-accent-secondary',
+  [SimpleApplicationStatus.UNDEPLOY]: 'text-error',
+  [SimpleApplicationStatus.UPDATING]: 'animate-spin-steps',
+};
+
+export const PlayerContextButtonClasses = {
+  [SimpleApplicationStatus.DEPLOY]: 'button-accent-secondary',
+  [SimpleApplicationStatus.UNDEPLOY]: 'button-error',
+  [SimpleApplicationStatus.UPDATING]: '',
+};