feat(chat): refactoring source filters (Issue #2994, #3009)

apps/chat/src/components/Chat/ChatSettings/ConversationSettings.tsx

@@ -99,7 +99,11 @@ export const ConversationSettings = Inversify.register(
     const isPlayback = !!conversation.playback?.isPlayback;
 
     if (!model) {
-      return <SettingContainer>{t('Agent is not available')}</SettingContainer>;
+      return (
+        <SettingContainer>
+          <FieldContainer>{t('Agent is not available')}</FieldContainer>
+        </SettingContainer>
+      );
     }
 
     if (!doesModelHaveSettings(model)) {

apps/chat/src/constants/marketplace.ts

@@ -1,3 +1,4 @@
+import { ApplicationType } from '../types/applications';
 import { EntityType } from '../types/common';
 
 export enum MarketplaceQueryParams {
@@ -40,12 +41,21 @@ export enum SourceType {
   MyCustomApps = 'My Custom Apps',
   MyQuickApps = 'My Quick Apps',
   MyCodeApps = 'My Code Apps',
+  MyMindMaps = 'My Mindmaps',
 }
 
-export const SourceTypeOrder = {
+export const SourceTypeFilterOrder = {
   [SourceType.Public]: 1,
   [SourceType.SharedWithMe]: 2,
   [SourceType.MyCustomApps]: 3,
   [SourceType.MyQuickApps]: 4,
   [SourceType.MyCodeApps]: 5,
+  [SourceType.MyMindMaps]: 6,
+};
+
+export const ApplicationTypeToSourceType = {
+  [ApplicationType.CODE_APP]: SourceType.MyCodeApps,
+  [ApplicationType.QUICK_APP]: SourceType.MyQuickApps,
+  [ApplicationType.CUSTOM_APP]: SourceType.MyCustomApps,
+  [ApplicationType.MINDMAP]: SourceType.MyMindMaps,
 };

apps/chat/src/store/marketplace/marketplace.selectors.ts

@@ -1,15 +1,18 @@
 import { createSelector } from '@reduxjs/toolkit';
 
 import {
+  getApplicationType,
   isApplicationPublic,
-  isExecutableApp,
-  isQuickApp,
 } from '@/src/utils/app/application';
 import { isMyApplication } from '@/src/utils/app/id';
 
 import { DialAIEntityModel } from '@/src/types/models';
 
-import { SourceType, SourceTypeOrder } from '@/src/constants/marketplace';
+import {
+  ApplicationTypeToSourceType,
+  SourceType,
+  SourceTypeFilterOrder,
+} from '@/src/constants/marketplace';
 
 import { RootState } from '../index';
 import { ModelsSelectors } from '../models/models.reducers';
@@ -63,20 +66,15 @@ export const selectSourceTypes = createSelector(
 
     models.forEach((model) => {
       if (isMyApplication(model)) {
-        if (isQuickApp(model)) {
-          sourceTypes.add(SourceType.MyQuickApps);
-        } else if (isExecutableApp(model)) {
-          sourceTypes.add(SourceType.MyCodeApps);
-        } else {
-          sourceTypes.add(SourceType.MyCustomApps);
-        }
+        const applicationType = getApplicationType(model);
+        sourceTypes.add(ApplicationTypeToSourceType[applicationType]);
       } else if (!isApplicationPublic(model)) {
         sourceTypes.add(SourceType.SharedWithMe);
       }
     });
 
     return Array.from(sourceTypes).sort(
-      (a, b) => SourceTypeOrder[a] - SourceTypeOrder[b],
+      (a, b) => SourceTypeFilterOrder[a] - SourceTypeFilterOrder[b],
     );
   },
 );

apps/chat/src/types/applications.ts

@@ -125,4 +125,5 @@ export enum ApplicationType {
   CUSTOM_APP = 'application',
   QUICK_APP = 'quick app',
   CODE_APP = 'code app',
+  MINDMAP = 'mindmap',
 }

apps/chat/src/utils/app/application.ts

@@ -181,7 +181,7 @@ export const isExecutableApp = (entity: DialAIEntityModel) =>
 export const getApplicationType = (entity: DialAIEntityModel) => {
   if (isQuickApp(entity)) return ApplicationType.QUICK_APP;
   if (isExecutableApp(entity)) return ApplicationType.CODE_APP;
-
+  // TODO: Add mindmap type check in future
   return ApplicationType.CUSTOM_APP;
 };
 

apps/chat/src/utils/marketplace.ts

@@ -1,15 +1,18 @@
 import {
+  getApplicationType,
   isApplicationPublic,
-  isExecutableApp,
-  isQuickApp,
 } from '@/src/utils/app/application';
 import { isMyApplication } from '@/src/utils/app/id';
 import { doesEntityContainSearchTerm } from '@/src/utils/app/search';
 
 import { MarketplaceFilters } from '@/src/types/marketplace';
 import { DialAIEntityModel } from '@/src/types/models';
 
-import { FilterTypes, SourceType } from '@/src/constants/marketplace';
+import {
+  ApplicationTypeToSourceType,
+  FilterTypes,
+  SourceType,
+} from '@/src/constants/marketplace';
 
 import intersection from 'lodash-es/intersection';
 
@@ -44,19 +47,12 @@ export const doesApplicationMatchFilters = (
 
   if (selectedFilters[FilterTypes.SOURCES].length) {
     const sources = selectedFilters[FilterTypes.SOURCES];
+    const applicationType = getApplicationType(model);
     if (
       (sources.includes(SourceType.Public) && isApplicationPublic(model)) ||
       (sources.includes(SourceType.SharedWithMe) && model.sharedWithMe) ||
-      (sources.includes(SourceType.MyQuickApps) &&
-        isMyApplication(model) &&
-        isQuickApp(model)) ||
-      (sources.includes(SourceType.MyCodeApps) &&
-        isMyApplication(model) &&
-        isExecutableApp(model)) ||
-      (sources.includes(SourceType.MyCustomApps) &&
-        isMyApplication(model) &&
-        !isExecutableApp(model) &&
-        !isQuickApp(model))
+      (isMyApplication(model) &&
+        sources.includes(ApplicationTypeToSourceType[applicationType]))
     ) {
       return true;
     }