Skip to content

Improve queue page UX with query parameter #245

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
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Improve queue page UX with query parameter #245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abdb21e
Improve queue page UX with query parameter
Parthiv-M May 28, 2024
0261c92
Merge branch 'coderwassananmol:develop' into queue-page-persistance
Parthiv-M Jun 9, 2024
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
109 changes: 66 additions & 43 deletions pages/queue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,28 @@ import QueueSection from "../components/QueueSection";
import QueueTable from "../components/QueueTable";
import { host, queue_data_endpoint } from "../utils/constants";
import { useEffect, useState } from "react";
import { library } from "../utils/constants";

const Queue = ({ data }) => {
const router = useRouter();
const [queueName, setQueueName] = useState("gb");
// queueTypeFromQuery can be "gb" || "pdl" || "trove"
let queueTypeFromQuery = router.query["queue"] || "";
// get valid library codes used in the application
let libraryKeys = Object.keys(library);
// check and assign if the queue is valid
const [isValidQueue, _] = useState(libraryKeys.includes(queueTypeFromQuery));
const [queueName, setQueueName] = useState(
isValidQueue ? queueTypeFromQuery : "gb"
);
const [tableDataArchive, setTableDataArchive] = useState([]);
const [searchResult, setSearchResult] = useState([]);
const [isSearch, setIsSearch] = useState(false);
// initially, the page itself is refreshed every 15 seconds (according to GB queue)
const [refreshSSPropsInterval, setSSPropsInterval] = useState(15000);
const onChange = (event) => {
setQueueName(event.target.value);
// refresh server side props on queue change
router.replace(router.asPath);
// update query parameter on queue change; also refreshes server side props
router.replace(router.pathname + ("?queue=" + event.target.value));
// This time interval has been chosed based on speed of upload
// For GB Queue, refresh server side props every 15 seconds
// For PDL, refresh server side props every 50 seconds
Expand Down Expand Up @@ -81,7 +90,8 @@ const Queue = ({ data }) => {
// Condition: only when queueName changes
useEffect(() => {
const intervalId = setInterval(() => {
router.replace(router.asPath);
// update query parameter on queue change
router.replace(router.pathname + ("?queue=" + queueName));
}, refreshSSPropsInterval);
// clear the setInterval
return () => clearInterval(intervalId);
Expand Down Expand Up @@ -116,51 +126,64 @@ const Queue = ({ data }) => {
<Header page="queue" />
<div className="container p-0">
<div className="main-content">
<h4>Select a Queue</h4>
<select className="cdx-select" onChange={onChange}>
<option value="gb" selected>
Google Books
</option>
<option value="pdl">Panjab Digital Library</option>
<option value="trove">Trove Digital Library</option>
</select>
<QueueSection
active={data[`${queueName}-queue`]["active"]}
waiting={data[`${queueName}-queue`]["waiting"]}
/>
{isValidQueue || queueName !== "" ? (
<>
<h4>Select a Queue</h4>
<select
className="cdx-select"
onChange={onChange}
defaultValue={queueName}
>
<option value="gb">Google Books</option>
<option value="pdl">Panjab Digital Library</option>
<option value="trove">Trove Digital Library</option>
</select>
<QueueSection
active={data[`${queueName}-queue`]["active"]}
waiting={data[`${queueName}-queue`]["waiting"]}
/>

<div className="queue-container">
<div
className="search-container"
style={{
marginTop: "2em",
}}
>
<div className="cdx-search-input cdx-search-input--has-end-button">
<div className="queue-container">
<div
className="cdx-text-input cdx-text-input--has-start-icon"
style={{ width: "100%" }}
className="search-container"
style={{
marginTop: "2em",
}}
>
<input
onChange={(e) => onSearch(e)}
className="cdx-text-input__input"
type="search"
placeholder="Search by Job ID, Title, Username or Status"
style={{
height: "48px",
width: "100%",
}}
/>
<span className="cdx-text-input__icon cdx-text-input__start-icon"></span>
<div className="cdx-search-input cdx-search-input--has-end-button">
<div
className="cdx-text-input cdx-text-input--has-start-icon"
style={{ width: "100%" }}
>
<input
onChange={(e) => onSearch(e)}
className="cdx-text-input__input"
type="search"
placeholder="Search by Job ID, Title, Username or Status"
style={{
height: "48px",
width: "100%",
}}
/>
<span className="cdx-text-input__icon cdx-text-input__start-icon"></span>
</div>
</div>
</div>
</div>
<QueueTable
isSearch={isSearch}
queue_name={queueName}
tableData={searchResult}
/>
</>
) : (
<div className="text-center">
<h3>No such queue was found</h3>
<h4>
Go back to the <a href="/queue?queue=gb">queues page</a>
</h4>
</div>
</div>
<QueueTable
isSearch={isSearch}
queue_name={queueName}
tableData={searchResult}
/>
)}
</div>
</div>
</div>
Expand Down