egutierrez/linkwarden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made sorting logic typesafe

Browse Source
This commit is contained in:
Daniel
2023-06-14 06:14:50 +03:30
parent d375f8f914
commit 8d094f320a
6 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/collections/[id].tsx
+11 -11
View File
@@ -2,7 +2,7 @@ import Dropdown from "@/components/Dropdown";
import LinkCard from "@/components/LinkCard";
import useCollectionStore from "@/store/collections";
import useLinkStore from "@/store/links";
import { CollectionIncludingMembers } from "@/types/global";
import { CollectionIncludingMembers, Sort } from "@/types/global";
import {
faEllipsis,
faFolder,
@@ -10,7 +10,7 @@ import {
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useRouter } from "next/router";
import { ChangeEvent, useEffect, useState } from "react";
import { useEffect, useState } from "react";
import MainLayout from "@/layouts/MainLayout";
import { useSession } from "next-auth/react";
import ProfilePhoto from "@/components/ProfilePhoto";
@@ -29,15 +29,15 @@ export default function Index() {
const [expandDropdown, setExpandDropdown] = useState(false);
const [sortDropdown, setSortDropdown] = useState(false);
const [sortBy, setSortBy] = useState("Name (A-Z)");
const [sortBy, setSortBy] = useState<Sort>(Sort.NameAZ);
const [activeCollection, setActiveCollection] =
useState<CollectionIncludingMembers>();
const [sortedLinks, setSortedLinks] = useState(links);
const handleSortChange = (event: ChangeEvent<HTMLInputElement>) => {
setSortBy(event.target.value);
const handleSortChange = (e: Sort) => {
setSortBy(e);
};
useEffect(() => {
@@ -51,15 +51,15 @@ export default function Index() {
...links.filter((e) => e.collection.id === Number(router.query.id)),
];
if (sortBy === "Name (A-Z)")
if (sortBy === Sort.NameAZ)
setSortedLinks(linksArray.sort((a, b) => a.name.localeCompare(b.name)));
else if (sortBy === "Title (A-Z)")
else if (sortBy === Sort.TitleAZ)
setSortedLinks(linksArray.sort((a, b) => a.title.localeCompare(b.title)));
else if (sortBy === "Name (Z-A)")
else if (sortBy === Sort.NameZA)
setSortedLinks(linksArray.sort((a, b) => b.name.localeCompare(a.name)));
else if (sortBy === "Title (Z-A)")
else if (sortBy === Sort.TitleZA)
setSortedLinks(linksArray.sort((a, b) => b.title.localeCompare(a.title)));
else if (sortBy === "Date (Newest First)")
else if (sortBy === Sort.DateNewestFirst)
setSortedLinks(
linksArray.sort(
(a, b) =>
@@ -67,7 +67,7 @@ export default function Index() {
new Date(a.createdAt as string).getTime()
)
);
else if (sortBy === "Date (Oldest First)")
else if (sortBy === Sort.DateOldestFirst)
setSortedLinks(
linksArray.sort(
(a, b) =>