Fix : View(list/card/board) retention for encounters/resource/users pages #10039
+94
−27
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 |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| const getKey = (name: string) => { | ||
| return `${name}`; | ||
| }; | ||
|
|
||
| /** | ||
| * Clears the view preference. | ||
| */ | ||
| const invalidate = (name: string) => { | ||
| localStorage.removeItem(getKey(name)); | ||
| }; | ||
|
|
||
| /** | ||
| * Clears all the view preferences. | ||
| */ | ||
| const invalidateAll = () => { | ||
| const viewKeys = ["users", "resource", "appointments"]; | ||
| viewKeys.forEach(invalidate); | ||
| }; | ||
|
|
||
| export default { | ||
| invalidate, | ||
| invalidateAll, | ||
| }; |
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,26 @@ | ||
| import { useEffect, useState } from "react"; | ||
|
|
||
| export function useView( | ||
| name: string, | ||
| defaultView: string, | ||
| ): [string, (view: string) => void] { | ||
| const [view, setView] = useState(() => { | ||
| return localStorage.getItem(name) || defaultView; | ||
| }); | ||
| const updateView = (newView: string) => { | ||
| localStorage.setItem(name, newView); | ||
| setView(newView); | ||
| }; | ||
| useEffect(() => { | ||
| const interval = setInterval(() => { | ||
| const storedView = localStorage.getItem(name); | ||
| if (storedView !== view) { | ||
| setView(storedView || defaultView); | ||
| } | ||
| }, 100); | ||
| return () => { | ||
| clearInterval(interval); | ||
| }; | ||
| }, [name, view]); | ||
| return [view, updateView]; | ||
| } | ||
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
|
There was a problem hiding this comment. This wont be needed once #9768 gets merged |
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,24 @@ | ||
| import React, { ComponentType } from "react"; | ||
|
|
||
| import { useView } from "@/Utils/useView"; | ||
|
|
||
| export default function View({ | ||
| name, | ||
| board, | ||
| list, | ||
| }: { | ||
| name: "resource"; | ||
| board: ComponentType; | ||
| list: ComponentType; | ||
| }) { | ||
Mahendar0701 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const [view] = useView(name, "board"); | ||
|
|
||
| const views: Record<"board" | "list", ComponentType> = { | ||
| board, | ||
| list, | ||
| }; | ||
|
|
||
| const SelectedView = views[view as keyof typeof views] || board; | ||
|
|
||
| return <SelectedView />; | ||
| } | ||
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
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
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.
🛠️ Refactor suggestion
Replace polling with storage event listener.
The current implementation uses polling with a 100ms interval, which is inefficient. Consider using the storage event listener instead.
useEffect(() => { - const interval = setInterval(() => { + const handleStorageChange = (e: StorageEvent) => { + if (e.key === name) { + const storedView = e.newValue; + if (storedView !== view) { + setView(storedView || defaultView); + } + } + }; + + window.addEventListener('storage', handleStorageChange); + return () => { + window.removeEventListener('storage', handleStorageChange); + }; - const storedView = localStorage.getItem(name); - if (storedView !== view) { - setView(storedView || defaultView); - } - }, 100); - return () => { - clearInterval(interval); - }; }, [name, view]);📝 Committable suggestion