diff --git a/packages/web/components/templates/homeFeed/MultiSelectControls.tsx b/packages/web/components/templates/homeFeed/MultiSelectControls.tsx index cba922d4a..9a2e88630 100644 --- a/packages/web/components/templates/homeFeed/MultiSelectControls.tsx +++ b/packages/web/components/templates/homeFeed/MultiSelectControls.tsx @@ -20,7 +20,7 @@ import { MoveToInboxIcon } from '../../elements/icons/MoveToInboxIcon' export type MultiSelectProps = { viewer: UserBasicData | undefined - folder: string + folder: string | undefined searchTerm: string | undefined applySearchQuery: (searchQuery: string) => void diff --git a/packages/web/components/templates/library/LibraryContainer.tsx b/packages/web/components/templates/library/LibraryContainer.tsx index 32de315d4..9143dfb7c 100644 --- a/packages/web/components/templates/library/LibraryContainer.tsx +++ b/packages/web/components/templates/library/LibraryContainer.tsx @@ -80,7 +80,7 @@ const debouncedFetchSearchResults = debounce((query, cb) => { const TIMEOUT_DELAYS = [2000, 3500, 5000] type LibraryContainerProps = { - folder: string + folder: string | undefined filterFunc: (item: LibraryItemNode) => boolean showNavigationMenu: boolean @@ -101,13 +101,11 @@ export function LibraryContainer(props: LibraryContainerProps): JSX.Element { const gridContainerRef = useRef(null) - const [labelsTarget, setLabelsTarget] = useState( - undefined - ) + const [labelsTarget, setLabelsTarget] = + useState(undefined) - const [notebookTarget, setNotebookTarget] = useState( - undefined - ) + const [notebookTarget, setNotebookTarget] = + useState(undefined) const [showAddLinkModal, setShowAddLinkModal] = useState(false) const [showEditTitleModal, setShowEditTitleModal] = useState(false) @@ -928,7 +926,7 @@ export function LibraryContainer(props: LibraryContainerProps): JSX.Element { } export type HomeFeedContentProps = { - folder: string + folder: string | undefined items: LibraryItem[] searchTerm?: string gridContainerRef: React.RefObject @@ -1067,7 +1065,7 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element { } type LibraryItemsLayoutProps = { - folder: string + folder: string | undefined layout: LayoutType viewer?: UserBasicData @@ -1305,7 +1303,7 @@ export function LibraryItemsLayout( } type LibraryItemsProps = { - folder: string + folder: string | undefined items: LibraryItem[] layout: LayoutType viewer: UserBasicData | undefined diff --git a/packages/web/components/templates/library/LibraryHeader.tsx b/packages/web/components/templates/library/LibraryHeader.tsx index bbed9c467..d9559ce53 100644 --- a/packages/web/components/templates/library/LibraryHeader.tsx +++ b/packages/web/components/templates/library/LibraryHeader.tsx @@ -26,7 +26,7 @@ export type LibraryHeaderProps = { layout: LayoutType updateLayout: (layout: LayoutType) => void - folder: string + folder: string | undefined searchTerm: string | undefined applySearchQuery: (searchQuery: string) => void diff --git a/packages/web/lib/networking/library_items/useLibraryItems.tsx b/packages/web/lib/networking/library_items/useLibraryItems.tsx index 75b6c5078..6dc365dd5 100644 --- a/packages/web/lib/networking/library_items/useLibraryItems.tsx +++ b/packages/web/lib/networking/library_items/useLibraryItems.tsx @@ -170,6 +170,7 @@ export function useGetLibraryItems( { limit, searchQuery }: LibraryItemsQueryInput, enabled = true ) { + console.log('folder: ', folder) const fullQuery = folder ? (`in:${folder} use:folders ` + (searchQuery ?? '')).trim() : searchQuery ?? '' diff --git a/packages/web/pages/l/[section].tsx b/packages/web/pages/l/[section].tsx index a85ca2caf..b439568a4 100644 --- a/packages/web/pages/l/[section].tsx +++ b/packages/web/pages/l/[section].tsx @@ -9,7 +9,6 @@ import { LibraryContainer } from '../../components/templates/library/LibraryCont import { useMemo } from 'react' import { HighlightsContainer } from '../../components/nav-containers/HighlightsContainer' import { usePersistedState } from '../../lib/hooks/usePersistedState' -import { isTouchScreenDevice } from '../../lib/deviceType' import { State } from '../../lib/networking/fragments/articleFragment' export default function Home(): JSX.Element { @@ -43,7 +42,18 @@ export default function Home(): JSX.Element { } switch (name) { case 'home': - return + // return + return ( + { + return ( + item.state !== State.ARCHIVED && item.state !== State.DELETED + ) + }} + showNavigationMenu={showNavigationMenu} + /> + ) case 'highlights': return case 'library':