Resolve infinite scroll issue in Resource page #9267
+184
−109
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import { navigate } from "raviger"; | ||
| import React, { Suspense, lazy, useState } from "react"; | ||
| import { useTranslation } from "react-i18next"; | ||
|
|
||
| import CareIcon from "@/CAREUI/icons/CareIcon"; | ||
|
|
@@ -12,7 +12,7 @@ import PageTitle from "@/components/Common/PageTitle"; | |
| import Tabs from "@/components/Common/Tabs"; | ||
| import { ResourceModel } from "@/components/Facility/models"; | ||
| import SearchInput from "@/components/Form/SearchInput"; | ||
| import type { KanbanBoardProps } from "@/components/Kanban/Board"; | ||
| import BadgesList from "@/components/Resource/ResourceBadges"; | ||
| import ResourceBlock from "@/components/Resource/ResourceBlock"; | ||
| import { formatFilter } from "@/components/Resource/ResourceCommons"; | ||
|
|
@@ -25,9 +25,17 @@ import { RESOURCE_CHOICES } from "@/common/constants"; | |
| import routes from "@/Utils/request/api"; | ||
| import request from "@/Utils/request/request"; | ||
|
|
||
| // Helper function to type lazy-loaded components | ||
| function lazyWithProps<T>( | ||
| factory: () => Promise<{ default: React.ComponentType<T> }>, | ||
| ) { | ||
| return lazy(factory) as React.LazyExoticComponent<React.ComponentType<T>>; | ||
| } | ||
|
Comment on lines
+30
to
+34
There was a problem hiding this comment. 🛠️ Refactor suggestion Consider moving the The Create a new file import { lazy } from 'react';
export function lazyWithProps<T>(
factory: () => Promise<{ default: React.ComponentType<T> }>,
) {
return lazy(factory) as React.LazyExoticComponent<React.ComponentType<T>>;
} |
||
|
|
||
| // Correctly lazy-load KanbanBoard with its props | ||
| const KanbanBoard = lazyWithProps<KanbanBoardProps<ResourceModel>>( | ||
| () => import("@/components/Kanban/Board"), | ||
| ); | ||
|
|
||
| const resourceStatusOptions = RESOURCE_CHOICES.map((obj) => obj.text); | ||
|
|
||
|
|
@@ -39,8 +47,7 @@ export default function BoardView() { | |
| limit: -1, | ||
| cacheBlacklist: ["title"], | ||
| }); | ||
| const [boardFilter, setBoardFilter] = useState(resourceStatusOptions); | ||
| const appliedFilters = formatFilter(qParams); | ||
| const { t } = useTranslation(); | ||
|
|
||
|
|
@@ -103,7 +110,7 @@ export default function BoardView() { | |
| </div> | ||
| </div> | ||
| <Suspense fallback={<Loading />}> | ||
| <KanbanBoard | ||
| title={<BadgesList {...{ appliedFilters, FilterBadges }} />} | ||
| sections={boardFilter.map((board) => ({ | ||
| id: board, | ||
|
|
@@ -127,7 +134,7 @@ export default function BoardView() { | |
| /> | ||
| </h3> | ||
| ), | ||
| fetchOptions: (id: string) => ({ | ||
NikhilA8606 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| route: routes.listResourceRequests, | ||
| options: { | ||
| query: formatFilter({ | ||
|
|
@@ -143,7 +150,9 @@ export default function BoardView() { | |
| `/resource/${result.draggableId}/update?status=${result.destination?.droppableId}`, | ||
| ); | ||
| }} | ||
| itemRender={(resource: ResourceModel) => ( | ||
| <ResourceBlock resource={resource} /> | ||
| )} | ||
| /> | ||
| </Suspense> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| import careConfig from "@careConfig"; | ||
| import { DropResult } from "@hello-pangea/dnd"; | ||
| import { navigate } from "raviger"; | ||
| import { Suspense, lazy, useState } from "react"; | ||
| import { useTranslation } from "react-i18next"; | ||
|
|
@@ -14,7 +15,7 @@ import PageTitle from "@/components/Common/PageTitle"; | |
| import Tabs from "@/components/Common/Tabs"; | ||
| import { ShiftingModel } from "@/components/Facility/models"; | ||
| import SearchInput from "@/components/Form/SearchInput"; | ||
| import type { KanbanBoardProps } from "@/components/Kanban/Board"; | ||
| import BadgesList from "@/components/Shifting/ShiftingBadges"; | ||
| import ShiftingBlock from "@/components/Shifting/ShiftingBlock"; | ||
| import { formatFilter } from "@/components/Shifting/ShiftingCommons"; | ||
|
|
@@ -30,9 +31,15 @@ import { | |
| import routes from "@/Utils/request/api"; | ||
| import request from "@/Utils/request/request"; | ||
|
|
||
| function lazyWithProps<T>( | ||
| factory: () => Promise<{ default: React.ComponentType<T> }>, | ||
| ) { | ||
| return lazy(factory) as React.LazyExoticComponent<React.ComponentType<T>>; | ||
| } | ||
|
|
||
| const KanbanBoard = lazyWithProps<KanbanBoardProps<ShiftingModel>>( | ||
| () => import("@/components/Kanban/Board"), | ||
| ); | ||
|
|
||
| export default function BoardView() { | ||
| const { qParams, updateQuery, FilterBadges, advancedFilter } = useFilters({ | ||
|
|
@@ -133,7 +140,7 @@ export default function BoardView() { | |
| </div> | ||
| </div> | ||
| <Suspense fallback={<Loading />}> | ||
| <KanbanBoard | ||
| title={<BadgesList {...{ qParams, FilterBadges }} />} | ||
| sections={boardFilter.map((board) => ({ | ||
| id: board.text, | ||
|
|
@@ -157,7 +164,7 @@ export default function BoardView() { | |
| /> | ||
| </h3> | ||
| ), | ||
| fetchOptions: (id: string) => ({ | ||
| route: routes.listShiftRequests, | ||
| options: { | ||
| query: formatFilter({ | ||
|
|
@@ -167,13 +174,18 @@ export default function BoardView() { | |
| }, | ||
| }), | ||
| }))} | ||
| onDragEnd={(result: DropResult) => { | ||
| // Ensure destination is not null | ||
| if ( | ||
| result.destination && | ||
| result.source.droppableId !== result.destination.droppableId | ||
| ) { | ||
| navigate( | ||
| `/shifting/${result.draggableId}/update?status=${result.destination.droppableId}`, | ||
| ); | ||
| } | ||
| }} | ||
| itemRender={(shift: ShiftingModel) => ( | ||
| <ShiftingBlock | ||
| onTransfer={() => setModalFor(shift)} | ||
| shift={shift} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { useEffect, useRef } from "react"; | ||
|
|
||
| export default function useDebounce<T extends any[]>( | ||
| callback: (...args: T) => void, | ||
| delay: number, | ||
| ) { | ||
| const callbackRef = useRef(callback); | ||
| const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null); | ||
|
|
||
| useEffect(() => { | ||
| callbackRef.current = callback; | ||
| }, [callback]); | ||
|
|
||
| useEffect(() => { | ||
| return () => { | ||
| if (timeoutRef.current) clearTimeout(timeoutRef.current); | ||
| }; | ||
| }, []); | ||
|
|
||
| const debouncedCallback = (...args: T) => { | ||
| if (timeoutRef.current) { | ||
| clearTimeout(timeoutRef.current); | ||
| } | ||
| timeoutRef.current = setTimeout(() => { | ||
| callbackRef.current(...args); | ||
| }, delay); | ||
| }; | ||
| return debouncedCallback; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if it's going to be exactly same as
KanbanBoardProps, why not just re-use it?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the suggestion. You're absolutely right that KanbanBoardType is redundant since it's exactly the same as KanbanBoardProps. I'll remove KanbanBoardType and directly reuse KanbanBoardProps to keep the code clean and consistent.