Skip to content

feat: sort journeys in order #8608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
irenekim21 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feat: sort journeys in order #8608

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ac2188f
feat: sort journeys in order
irenekim21 Jan 19, 2026
c89ad51
Merge branch 'main' into irenekim/nes-465-sort-by-order-should-rememb…
irenekim21 Jan 19, 2026
762d59f
fix: lint issues
autofix-ci[bot] Jan 19, 2026
d707d55
Merge branch 'main' into irenekim/nes-465-sort-by-order-should-rememb…
irenekim21 Jan 21, 2026
059f52f
Merge branch 'main' into irenekim/nes-465-sort-by-order-should-rememb…
irenekim21 Jan 21, 2026
9cf27f3
Merge branch 'main' into irenekim/nes-465-sort-by-order-should-rememb…
irenekim21 Jan 21, 2026
304a8a5
Merge branch 'main' into irenekim/nes-465-sort-by-order-should-rememb…
irenekim21 Jan 21, 2026
c43b219
fix: lint issues
autofix-ci[bot] Jan 21, 2026
3ee92e2
Merge branch 'main' into irenekim/nes-465-sort-by-order-should-rememb…
irenekim21 Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion apps/journeys-admin/src/components/JourneyList/JourneyList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,46 @@ export function JourneyList({
})
const { navbar, sidePanel } = usePageWrapperStyles()

useEffect(() => {
if (!router.isReady) return
const sortByFromQuery = router.query.sortBy as string
const sortByFromStorage =
typeof window !== 'undefined'
? localStorage.getItem('journeyListSortBy')
: null
const sortBy = sortByFromQuery || sortByFromStorage
if (sortBy && Object.values(SortOrder).includes(sortBy as SortOrder)) {
setSortOrder((prev) => (prev !== sortBy ? (sortBy as SortOrder) : prev))
if (sortByFromQuery && typeof window !== 'undefined') {
localStorage.setItem('journeyListSortBy', sortByFromQuery)
} else if (sortByFromStorage && !sortByFromQuery) {
void router.replace(
{ query: { ...router.query, sortBy: sortByFromStorage } },
undefined,
{ shallow: true }
)
}
}
}, [router.isReady, router.query.sortBy, router])
Comment on lines +45 to +65
Copy link
Contributor

@coderabbitai coderabbitai bot Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Validate the query param before it overrides stored sort.

sortByFromQuery can be a string[] or an invalid value. Because it’s used with ||, an invalid query string (or array) blocks a valid localStorage fallback, leaving sortOrder unset. Consider validating the query first, and only falling back to storage when the query is absent/invalid.

🛠️ Suggested fix 
-    const sortByFromQuery = router.query.sortBy as string
+    const rawSortBy = router.query.sortBy
+    const sortByFromQuery = Array.isArray(rawSortBy) ? rawSortBy[0] : rawSortBy
     const sortByFromStorage =
       typeof window !== 'undefined'
         ? localStorage.getItem('journeyListSortBy')
         : null
-    const sortBy = sortByFromQuery || sortByFromStorage
-    if (sortBy && Object.values(SortOrder).includes(sortBy as SortOrder)) {
-      setSortOrder((prev) => (prev !== sortBy ? (sortBy as SortOrder) : prev))
+    const isValidSort = (value?: string | null): value is SortOrder =>
+      !!value && Object.values(SortOrder).includes(value as SortOrder)
+    const sortBy = isValidSort(sortByFromQuery)
+      ? sortByFromQuery
+      : isValidSort(sortByFromStorage)
+        ? sortByFromStorage
+        : undefined
+    if (sortBy) {
+      setSortOrder((prev) => (prev !== sortBy ? sortBy : prev))
       if (sortByFromQuery && typeof window !== 'undefined') {
         localStorage.setItem('journeyListSortBy', sortByFromQuery)
       } else if (sortByFromStorage && !sortByFromQuery) {
🤖 Prompt for AI Agents 
In `@apps/journeys-admin/src/components/JourneyList/JourneyList.tsx` around lines
45 - 65, The current useEffect uses router.query.sortBy with "||" which allows
an invalid value or string[] to override localStorage; change the logic in the
useEffect to first validate router.query.sortBy is a single string and a member
of SortOrder before using it, otherwise fall back to the localStorage value from
localStorage.getItem('journeyListSortBy'); then call setSortOrder only with a
validated SortOrder value, and only write to localStorage or call router.replace
when the validated source (query or storage) is used; reference
router.query.sortBy, SortOrder, setSortOrder,
localStorage.getItem('journeyListSortBy'), and router.replace to locate and
update the logic.


const handleSetSortOrder = (
order: SortOrder | ((prev: SortOrder | undefined) => SortOrder | undefined)
) => {
const newOrder = typeof order === 'function' ? order(sortOrder) : order
if (newOrder) {
setSortOrder(newOrder)
if (router.isReady) {
void router.push(
{ query: { ...router.query, sortBy: newOrder } },
undefined,
{ shallow: true }
)
}
if (typeof window !== 'undefined')
localStorage.setItem('journeyListSortBy', newOrder)
}
}

useEffect(() => {
const handleRouteChange = (url: string) => {
// for updating journey list cache for shallow loading
Expand Down Expand Up @@ -112,7 +152,7 @@ export function JourneyList({
<JourneyListView
renderList={renderList}
setActiveEvent={handleClick}
setSortOrder={setSortOrder}
setSortOrder={handleSetSortOrder}
sortOrder={sortOrder}
/>
</Box>
Expand Down
Loading