diff --git a/src/components/App/Helper/index.tsx b/src/components/App/Helper/index.tsx index ec565df55..e1b37e746 100644 --- a/src/components/App/Helper/index.tsx +++ b/src/components/App/Helper/index.tsx @@ -1,6 +1,4 @@ import { useMemo, useState } from 'react' -import { HelperContent } from './HelperContent' -import { OpenHelperBtn } from './OpenHelperBtn' import { HelperContext } from './context' export const Helper = () => { @@ -10,8 +8,8 @@ export const Helper = () => { return ( - - + {/* */} + {/* */} ) } diff --git a/src/components/App/SideBar/index.tsx b/src/components/App/SideBar/index.tsx index 5a3e82d88..84099d03e 100644 --- a/src/components/App/SideBar/index.tsx +++ b/src/components/App/SideBar/index.tsx @@ -14,7 +14,6 @@ import { FetchLoaderText } from '~/components/common/Loader' import { useAppStore } from '~/stores/useAppStore' import { useDataStore, useFilteredNodes, useSelectedNode } from '~/stores/useDataStore' import { colors } from '~/utils/colors' -import { TeachMe } from '../Helper/TeachMe' import { LatestView } from './Latest' import { EpisodeSkeleton } from './Relevance/EpisodeSkeleton' import { SideBarSubView } from './SidebarSubView' @@ -104,7 +103,7 @@ const Content = forwardRef(({ onSubmit, subViewOpen results
- + {/* */}
diff --git a/src/components/SourcesTableModal/SourcesView/Topics/Table/index.tsx b/src/components/SourcesTableModal/SourcesView/Topics/Table/index.tsx index 8e2f7d187..6e8538ce7 100644 --- a/src/components/SourcesTableModal/SourcesView/Topics/Table/index.tsx +++ b/src/components/SourcesTableModal/SourcesView/Topics/Table/index.tsx @@ -42,42 +42,51 @@ export const Table: React.FC = ({ showMuted, onTopicEdit }) => ) : ( <> - - - - - Type - Edge Count - Edge list - Date - {showMuted ? 'Unmute' : 'Mute'} - - - - {data && ( - - {ids?.map((i: string) => ( - - ))} - - )} - - {selectedRefId ? ( - - handlePopoverAction('editTopic')}>Rename - {!data[selectedRefId].edgeList.includes(IS_ALIAS) ? ( - handlePopoverAction('mergeTopic')}>Merge + {!Object.keys(data).length ? ( + + There is not any results for selected filters + + + ) : ( + <> + + + + + Type + Edge Count + Edge list + Date + {showMuted ? 'Unmute' : 'Mute'} + + + + {data && ( + + {ids?.map((i: string) => ( + + ))} + + )} + + {selectedRefId ? ( + + handlePopoverAction('editTopic')}>Rename + {!data[selectedRefId].edgeList.includes(IS_ALIAS) ? ( + handlePopoverAction('mergeTopic')}>Merge + ) : null} + handlePopoverAction('addEdge')}>Add edge + ) : null} - handlePopoverAction('addEdge')}>Add edge - - ) : null} + + )} ) } diff --git a/src/components/SourcesTableModal/SourcesView/Topics/index.tsx b/src/components/SourcesTableModal/SourcesView/Topics/index.tsx index 1c1152b6b..6cb6fdedf 100644 --- a/src/components/SourcesTableModal/SourcesView/Topics/index.tsx +++ b/src/components/SourcesTableModal/SourcesView/Topics/index.tsx @@ -118,7 +118,7 @@ export const TopicSources = () => { - + {loading && !data ? ( ) : ( diff --git a/src/stores/useTopicsStore/index.ts b/src/stores/useTopicsStore/index.ts index ecc43e6ef..1c68c9ab6 100644 --- a/src/stores/useTopicsStore/index.ts +++ b/src/stores/useTopicsStore/index.ts @@ -32,15 +32,15 @@ export const useTopicsStore = create((set, get) => ({ const payload = prepareTopicFilters(filters) - if (filters.page < 1) { + if (filters.page === 0) { set({ data: null, ids: [], total: 0 }) } const responseData: FetchTopicResponse = await getTopicsData(payload) // Instead of replacing the data, append new data to existing data - const newData: Record = { ...(data || {}) } - const newIds: string[] = [...ids] + const newData: Record = filters.page === 0 ? {} : { ...(data || {}) } + const newIds: string[] = filters.page === 0 ? [] : [...ids] responseData.data.forEach((topic) => { newData[topic.ref_id] = topic