add validation

epam · Jan 20, 2025 · 4bccec0 · 4bccec0
1 parent f326bad
commit 4bccec0
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 26 deletions.
diff --git a/apps/chat/src/components/Marketplace/MarketplaceFilterbar.tsx b/apps/chat/src/components/Marketplace/MarketplaceFilterbar.tsx
@@ -11,7 +11,7 @@ import { useTranslation } from 'next-i18next';
 
 import classNames from 'classnames';
 
-import { EntityType } from '@/src/types/common';
+import { MarketplaceFilters } from '@/src/types/marketplace';
 import { Translation } from '@/src/types/translation';
 
 import { useAppDispatch, useAppSelector } from '@/src/store/hooks';
@@ -22,7 +22,11 @@ import {
 import { ModelsSelectors } from '@/src/store/models/models.reducers';
 import { UISelectors } from '@/src/store/ui/ui.reducers';
 
-import { FilterTypes, MarketplaceTabs } from '@/src/constants/marketplace';
+import {
+  ENTITY_TYPES,
+  FilterTypes,
+  MarketplaceTabs,
+} from '@/src/constants/marketplace';
 
 import Tooltip from '../Common/Tooltip';
 
@@ -68,10 +72,7 @@ const FilterItem = ({
 interface FilterSectionProps {
   sectionName: string;
   openedSections: Record<FilterTypes, boolean>;
-  selectedFilters: {
-    Type: string[];
-    Topics: string[];
-  };
+  selectedFilters: MarketplaceFilters;
   filterValues: string[];
   filterType: FilterTypes;
   onToggleFilterSection: (filterType: FilterTypes) => void;
@@ -129,12 +130,6 @@ const FilterSection = ({
   );
 };
 
-const entityTypes = [
-  EntityType.Model,
-  EntityType.Assistant,
-  EntityType.Application,
-];
-
 interface ActionButtonProps {
   isOpen: boolean;
   onClick: () => void;
@@ -262,7 +257,7 @@ export const MarketplaceFilterbar = () => {
         <>
           <FilterSection
             sectionName={t('Type')}
-            filterValues={entityTypes}
+            filterValues={ENTITY_TYPES}
             openedSections={openedSections}
             selectedFilters={selectedFilters}
             filterType={FilterTypes.ENTITY_TYPE}

diff --git a/apps/chat/src/constants/marketplace.ts b/apps/chat/src/constants/marketplace.ts
@@ -1,3 +1,5 @@
+import { EntityType } from '../types/common';
+
 export enum MarketplaceQueryParams {
   fromConversation = 'fromConversation',
   model = 'model',
@@ -23,3 +25,9 @@ export enum DeleteType {
   DELETE,
   REMOVE,
 }
+
+export const ENTITY_TYPES = [
+  EntityType.Model,
+  EntityType.Assistant,
+  EntityType.Application,
+];
diff --git a/apps/chat/src/store/marketplace/marketplace.epics.ts b/apps/chat/src/store/marketplace/marketplace.epics.ts
@@ -4,9 +4,11 @@ import { AnyAction } from '@reduxjs/toolkit';
 
 import { combineEpics } from 'redux-observable';
 
+import { EntityType } from '@/src/types/common';
 import { AppEpic } from '@/src/types/store';
 
 import {
+  ENTITY_TYPES,
   FilterTypes,
   MarketplaceQueryParams,
   MarketplaceTabs,
@@ -100,11 +102,12 @@ const initQueryParamsEpic: AppEpic = (action$, state$, { router }) =>
     filter(MarketplaceActions.initQueryParams.match),
     switchMap(() => {
       const query = router.query;
+      const state = state$.value;
 
       const actions: Observable<AnyAction>[] = [];
       // application link
       const modelReference = query[MarketplaceQueryParams.model];
-      const modelsMap = ModelsSelectors.selectModelsMap(state$.value);
+      const modelsMap = ModelsSelectors.selectModelsMap(state);
       const model =
         typeof modelReference === 'string'
           ? modelsMap[modelReference]
@@ -139,12 +142,15 @@ const initQueryParamsEpic: AppEpic = (action$, state$, { router }) =>
         ),
       );
       // filters
-      const types = ((query[MarketplaceQueryParams.types] as string) ?? '')
-        .split(',')
-        .filter(Boolean);
+      const existingTopics = ModelsSelectors.selectModelTopics(state);
       const topics = ((query[MarketplaceQueryParams.topics] as string) ?? '')
         .split(',')
-        .filter(Boolean);
+        .filter((topic) => topic && existingTopics.includes(topic));
+
+      const types = ((query[MarketplaceQueryParams.types] as string) ?? '')
+        .split(',')
+        .filter((type) => type && ENTITY_TYPES.includes(type as EntityType));
+
       actions.push(
         of(
           MarketplaceActions.setFilters({

diff --git a/apps/chat/src/store/marketplace/marketplace.reducers.ts b/apps/chat/src/store/marketplace/marketplace.reducers.ts
@@ -1,5 +1,7 @@
 import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 
+import { MarketplaceFilters } from '@/src/types/marketplace';
+
 import { FilterTypes, MarketplaceTabs } from '@/src/constants/marketplace';
 
 import * as MarketplaceSelectors from './marketplace.selectors';
@@ -9,14 +11,8 @@ import xor from 'lodash/xor';
 
 export { MarketplaceSelectors };
 
-interface Filters {
-  [FilterTypes.ENTITY_TYPE]: string[];
-  [FilterTypes.TOPICS]: string[];
-  // [FilterTypes.CAPABILITIES]: string[];
-  // [FilterTypes.ENVIRONMENT]: string[];
-}
 export interface MarketplaceState {
-  selectedFilters: Filters;
+  selectedFilters: MarketplaceFilters;
   searchTerm: string;
   selectedTab: MarketplaceTabs;
   applyModelStatus: UploadStatus;
@@ -43,7 +39,7 @@ export const marketplaceSlice = createSlice({
   initialState,
   reducers: {
     initQueryParams: (state) => state,
-    setFilters: (state, { payload }: PayloadAction<Filters>) => {
+    setFilters: (state, { payload }: PayloadAction<MarketplaceFilters>) => {
       state.selectedFilters = payload;
     },
     setSelectedFilters: (

diff --git a/apps/chat/src/types/marketplace.ts b/apps/chat/src/types/marketplace.ts
@@ -0,0 +1,8 @@
+import { FilterTypes } from '../constants/marketplace';
+
+export interface MarketplaceFilters {
+  [FilterTypes.ENTITY_TYPE]: string[];
+  [FilterTypes.TOPICS]: string[];
+  // [FilterTypes.CAPABILITIES]: string[];
+  // [FilterTypes.ENVIRONMENT]: string[];
+}