misc: combined into one list

This commit is contained in:
Sheen Capadngan
2024-07-01 18:23:38 +08:00
parent 758a9211ab
commit f570b3b2ee
+6 -8
View File
@@ -129,13 +129,11 @@ export const AppLayout = ({ children }: LayoutProps) => {
const { data: projectFavorites } = useGetUserProjectFavorites(currentOrg?.id!); const { data: projectFavorites } = useGetUserProjectFavorites(currentOrg?.id!);
const { mutateAsync: updateUserProjectFavorites } = useUpdateUserProjectFavorites(); const { mutateAsync: updateUserProjectFavorites } = useUpdateUserProjectFavorites();
const nonFavoriteWorkspaces = useMemo( const workspaceList = useMemo(
() => workspaces.filter((w) => !projectFavorites?.includes(w.id)), () => [
[workspaces, projectFavorites] ...workspaces.filter((w) => projectFavorites?.includes(w.id)),
); ...workspaces.filter((w) => !projectFavorites?.includes(w.id))
],
const favoriteWorkspaces = useMemo(
() => workspaces.filter((w) => projectFavorites?.includes(w.id)),
[workspaces, projectFavorites] [workspaces, projectFavorites]
); );
@@ -500,7 +498,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
dropdownContainerClassName="text-bunker-200 bg-mineshaft-800 border border-mineshaft-600 z-50 max-h-96 border-gray-700" dropdownContainerClassName="text-bunker-200 bg-mineshaft-800 border border-mineshaft-600 z-50 max-h-96 border-gray-700"
> >
<div className="no-scrollbar::-webkit-scrollbar h-full no-scrollbar"> <div className="no-scrollbar::-webkit-scrollbar h-full no-scrollbar">
{[...favoriteWorkspaces, ...nonFavoriteWorkspaces] {workspaceList
.filter((ws) => ws.orgId === currentOrg?.id) .filter((ws) => ws.orgId === currentOrg?.id)
.map(({ id, name }) => ( .map(({ id, name }) => (
<div <div