refactoring

epam · Jan 21, 2025 · 625f6d0 · 625f6d0
1 parent 4bccec0
commit 625f6d0
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 24 deletions.
diff --git a/apps/chat/src/components/Marketplace/MarketplaceBanner.tsx b/apps/chat/src/components/Marketplace/MarketplaceBanner.tsx
@@ -16,24 +16,24 @@ import lightBanner from '@/public/images/banners/welcome-light.jpg';
 const bannerText = {
   title: {
     [MarketplaceTabs.HOME]: 'Welcome to DIAL Marketplace',
-    [MarketplaceTabs.MY_APPLICATIONS]: 'My workspace',
+    [MarketplaceTabs.MY_WORKSPACE]: 'My workspace',
   },
   subtitle: {
     [MarketplaceTabs.HOME]:
       'Explore our AI offerings with your data and see how they boost your productivity!',
-    [MarketplaceTabs.MY_APPLICATIONS]:
+    [MarketplaceTabs.MY_WORKSPACE]:
       'Here you can manage the AI agents used in your daily work',
   },
 };
 
 const getBannerSrc = (theme: string, tab: MarketplaceTabs) => {
   if (theme === 'dark') {
-    return tab === MarketplaceTabs.MY_APPLICATIONS
+    return tab === MarketplaceTabs.MY_WORKSPACE
       ? darkMyAppsBanner.src
       : darkBanner.src;
   }
 
-  return tab === MarketplaceTabs.MY_APPLICATIONS
+  return tab === MarketplaceTabs.MY_WORKSPACE
     ? lightMyAppsBanner.src
     : lightBanner.src;
 };

diff --git a/apps/chat/src/components/Marketplace/MarketplaceFilterbar.tsx b/apps/chat/src/components/Marketplace/MarketplaceFilterbar.tsx
@@ -215,7 +215,7 @@ export const MarketplaceFilterbar = () => {
   );
 
   const handleMyAppsClick = useCallback(
-    () => handleChangeTab(MarketplaceTabs.MY_APPLICATIONS),
+    () => handleChangeTab(MarketplaceTabs.MY_WORKSPACE),
     [handleChangeTab],
   );
 
@@ -249,7 +249,7 @@ export const MarketplaceFilterbar = () => {
           onClick={handleMyAppsClick}
           caption={t('My workspace')}
           Icon={IconHome2}
-          selected={selectedTab === MarketplaceTabs.MY_APPLICATIONS}
+          selected={selectedTab === MarketplaceTabs.MY_WORKSPACE}
           dataQa="my-applications"
         />
       </div>

diff --git a/apps/chat/src/components/Marketplace/SearchHeader.tsx b/apps/chat/src/components/Marketplace/SearchHeader.tsx
@@ -167,7 +167,7 @@ export const SearchHeader = ({
             className="w-full rounded border border-primary bg-transparent py-2.5 pl-[38px] pr-3 leading-4 outline-none placeholder:text-secondary focus-visible:border-accent-primary"
           />
         </div>
-        {selectedTab === MarketplaceTabs.MY_APPLICATIONS && (
+        {selectedTab === MarketplaceTabs.MY_WORKSPACE && (
           <AddAppButton menuItems={menuItems} />
         )}
       </div>

diff --git a/apps/chat/src/components/Marketplace/TabRenderer.tsx b/apps/chat/src/components/Marketplace/TabRenderer.tsx
@@ -278,12 +278,12 @@ export const TabRenderer = ({ screenState }: TabRendererProps) => {
       installedModelIds.has(entity.reference);
 
     const entitiesForTab =
-      selectedTab === MarketplaceTabs.MY_APPLICATIONS
+      selectedTab === MarketplaceTabs.MY_WORKSPACE
         ? filteredEntities.filter(isInstalledModel)
         : filteredEntities;
 
     const shouldSuggest =
-      selectedTab === MarketplaceTabs.MY_APPLICATIONS && isSomeFilterNotEmpty;
+      selectedTab === MarketplaceTabs.MY_WORKSPACE && isSomeFilterNotEmpty;
 
     const groupedEntities = groupModelsAndSaveOrder(
       entitiesForTab.concat(shouldSuggest ? filteredEntities : []),
@@ -481,7 +481,7 @@ export const TabRenderer = ({ screenState }: TabRendererProps) => {
           onEdit={handleEditApplication}
           onBookmarkClick={handleBookmarkClick}
           allEntities={allModels}
-          isMyAppsTab={selectedTab === MarketplaceTabs.MY_APPLICATIONS}
+          isMyAppsTab={selectedTab === MarketplaceTabs.MY_WORKSPACE}
           isSuggested={detailsModel.isSuggested}
         />
       )}

diff --git a/apps/chat/src/constants/marketplace.ts b/apps/chat/src/constants/marketplace.ts
@@ -3,7 +3,7 @@ import { EntityType } from '../types/common';
 export enum MarketplaceQueryParams {
   fromConversation = 'fromConversation',
   model = 'model',
-  workspace = 'workspace',
+  tab = 'tab',
   types = 'types',
   topics = 'topics',
   search = 'search',
@@ -17,8 +17,8 @@ export enum FilterTypes {
 }
 
 export enum MarketplaceTabs {
-  HOME = 'HOME',
-  MY_APPLICATIONS = 'MY_APPLICATIONS',
+  HOME = 'marketplace',
+  MY_WORKSPACE = 'workspace',
 }
 
 export enum DeleteType {

diff --git a/apps/chat/src/store/marketplace/marketplace.epics.ts b/apps/chat/src/store/marketplace/marketplace.epics.ts
@@ -24,8 +24,7 @@ import {
   selectSelectedTab,
 } from './marketplace.selectors';
 
-import isNil from 'lodash/isNil';
-import { ParsedUrlQueryInput } from 'querystring';
+import { ParsedUrlQueryInput, parse } from 'querystring';
 
 const addToQuery = (
   query: ParsedUrlQueryInput,
@@ -51,13 +50,15 @@ const setQueryParamsEpic: AppEpic = (action$, state$, { router }) =>
     ),
     switchMap(() => {
       const state = state$.value;
-      const query = router.query;
+      const query = parse(window.location.search.slice(1));
       // workspace tab
       const selectedTab = selectSelectedTab(state);
       addToQuery(
         query,
-        MarketplaceQueryParams.workspace,
-        selectedTab === MarketplaceTabs.MY_APPLICATIONS ? '1' : undefined,
+        MarketplaceQueryParams.tab,
+        selectedTab === MarketplaceTabs.MY_WORKSPACE
+          ? MarketplaceTabs.MY_WORKSPACE
+          : undefined,
       );
       // application link
       const reference = selectDetailsModel(state)?.reference;
@@ -97,11 +98,11 @@ const setQueryParamsEpic: AppEpic = (action$, state$, { router }) =>
     }),
   );
 
-const initQueryParamsEpic: AppEpic = (action$, state$, { router }) =>
+const initQueryParamsEpic: AppEpic = (action$, state$) =>
   action$.pipe(
     filter(MarketplaceActions.initQueryParams.match),
     switchMap(() => {
-      const query = router.query;
+      const query = parse(window.location.search.slice(1));
       const state = state$.value;
 
       const actions: Observable<AnyAction>[] = [];
@@ -131,13 +132,11 @@ const initQueryParamsEpic: AppEpic = (action$, state$, { router }) =>
       // workspace tab
       const workSpaceTab =
         query[MarketplaceQueryParams.fromConversation] ||
-        !isNil(query[MarketplaceQueryParams.workspace]);
+        query[MarketplaceQueryParams.tab] === MarketplaceTabs.MY_WORKSPACE;
       actions.push(
         of(
           MarketplaceActions.setSelectedTab(
-            workSpaceTab
-              ? MarketplaceTabs.MY_APPLICATIONS
-              : MarketplaceTabs.HOME,
+            workSpaceTab ? MarketplaceTabs.MY_WORKSPACE : MarketplaceTabs.HOME,
           ),
         ),
       );

diff --git a/apps/chat/src/store/marketplace/marketplace.reducers.ts b/apps/chat/src/store/marketplace/marketplace.reducers.ts
@@ -16,6 +16,7 @@ export interface MarketplaceState {
   searchTerm: string;
   selectedTab: MarketplaceTabs;
   applyModelStatus: UploadStatus;
+  applyModelId?: string;
   detailsModel: { reference: string; isSuggested: boolean } | undefined;
 }
 
@@ -64,6 +65,9 @@ export const marketplaceSlice = createSlice({
     setApplyModelStatus: (state, { payload }: PayloadAction<UploadStatus>) => {
       state.applyModelStatus = payload;
     },
+    setApplyModelId: (state, { payload }: PayloadAction<string>) => {
+      state.applyModelId = payload;
+    },
     setDetailsModel: (
       state,
       {