Skip to content
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

Jump to bottom

Searc #193

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Searc #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcd146a
fix(Search): improve search logic
jakeaturner Feb 8, 2024
d5b4f9d
fix(Support): closed ticket view
jakeaturner Feb 8, 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
37 changes: 15 additions & 22 deletions client/src/components/commons/AdvancedSearchDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import CatalogBookFilters from "./CommonsCatalog/CatalogBookFilters";

interface AdvancedSearchDrawerProps
extends React.HTMLAttributes<HTMLDivElement> {
activeIndex: number;
setActiveIndex: (index: number) => void;
searchString: string;
setSearchString: (searchString: string) => void;
resourceType: "books" | "assets" | "projects";
setResourceType: (resourceType: "books" | "assets" | "projects") => void;
submitSearch: () => void;
assetFilters: AssetFilters;
setAssetFilters: (filters: AssetFilters) => void;
Expand All @@ -30,10 +30,10 @@ interface AdvancedSearchDrawerProps
}

const AdvancedSearchDrawer: React.FC<AdvancedSearchDrawerProps> = ({
activeIndex,
setActiveIndex,
searchString,
setSearchString,
resourceType,
setResourceType,
submitSearch,
assetFilters,
setAssetFilters,
Expand All @@ -54,20 +54,17 @@ const AdvancedSearchDrawer: React.FC<AdvancedSearchDrawerProps> = ({
setStrictMode(false);
}

function handleChangeResourceType(type: "books" | "assets" | "projects") {
setResourceType(type);
function handleChangeResourceType(idx: number) {
setActiveIndex(idx);
setBookFilters({});
setAssetFilters({});
setStrictMode(false);
}

return (
<div className="flex flex-row justify-center" {...rest}>
<div className="border-2 rounded-md shadow-md p-4 w-1/2">
<div className="border-2 rounded-md shadow-md p-4 w-2/3">
<Form onSubmit={(e) => e.preventDefault()}>
<p className="text-center text-lg font-bold !-mt-1 !-mb-1">
Advanced Search Options
</p>
<div className="flex flex-row mt-2">
<label className="font-bold">Resource Type:</label>
<div className="flex flex-row">
Expand All @@ -76,8 +73,8 @@ const AdvancedSearchDrawer: React.FC<AdvancedSearchDrawerProps> = ({
name="resource-type"
id="books"
className="!ml-4"
checked={resourceType === "books"}
onChange={() => handleChangeResourceType("books")}
checked={activeIndex === 0}
onChange={() => handleChangeResourceType(0)}
/>
<label htmlFor="books" className="ml-1">
Books
Expand All @@ -89,8 +86,8 @@ const AdvancedSearchDrawer: React.FC<AdvancedSearchDrawerProps> = ({
name="resource-type"
id="assets"
className="!ml-4"
checked={resourceType === "assets"}
onChange={() => handleChangeResourceType("assets")}
checked={activeIndex === 1}
onChange={() => handleChangeResourceType(1)}
/>
<label htmlFor="assets" className="ml-1">
Assets
Expand All @@ -102,8 +99,8 @@ const AdvancedSearchDrawer: React.FC<AdvancedSearchDrawerProps> = ({
name="resource-type"
id="projects"
className="!ml-4"
checked={resourceType === "projects"}
onChange={() => handleChangeResourceType("projects")}
checked={activeIndex === 2}
onChange={() => handleChangeResourceType(2)}
/>
<label htmlFor="projects" className="ml-1">
Projects
Expand All @@ -115,12 +112,12 @@ const AdvancedSearchDrawer: React.FC<AdvancedSearchDrawerProps> = ({
<label htmlFor="" className="font-bold">
Additional Filters
</label>
{resourceType === "books" ? (
{activeIndex === 0 ? (
<CatalogBookFilters
selectedFilters={bookFilters}
setSelectedFilters={(filters) => setBookFilters(filters)}
/>
) : resourceType === "assets" ? (
) : activeIndex === 1 ? (
<CatalogAssetFilters
selectedFilters={assetFilters}
setSelectedFilters={(filters) => setAssetFilters(filters)}
Expand Down Expand Up @@ -151,10 +148,6 @@ const AdvancedSearchDrawer: React.FC<AdvancedSearchDrawerProps> = ({
}
/>
</div>
<Button color="blue" onClick={submitSearch}>
<Icon name="search" />
Search
</Button>
</div>
</Form>
</div>
Expand Down
7 changes: 2 additions & 5 deletions client/src/components/commons/CommonsCatalog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ const CommonsCatalog = () => {

const [searchString, setSearchString] = useState<string>("");
const [showAdvanced, setShowAdvanced] = useState<boolean>(false);
const [searchResourceType, setSearchResourceType] = useState<
"books" | "assets" | "projects"
>("books");

const [activeIndex, setActiveIndex] = useState<number>(0);
const [activePage, setActivePage] = useState(1);
Expand Down Expand Up @@ -492,8 +489,8 @@ const CommonsCatalog = () => {
<AdvancedSearchDrawer
searchString={searchString}
setSearchString={setSearchString}
resourceType={searchResourceType}
setResourceType={setSearchResourceType}
activeIndex={activeIndex}
setActiveIndex={setActiveIndex}
submitSearch={updateSearchParam}
bookFilters={bookFilters}
setBookFilters={setBookFilters}
Expand Down
6 changes: 3 additions & 3 deletions client/src/screens/conductor/support/closed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const SupportDashboard = () => {

useEffect(() => {
getClosedTickets();
}, [activePage, itemsPerPage, activeSort])
}, [activePage, itemsPerPage, activeSort]);

async function getClosedTickets() {
try {
Expand All @@ -58,8 +58,8 @@ const SupportDashboard = () => {
}

setTotalItems(res.data.total);
setTotalPages(Math.ceil(res.data.total / totalItems));
return (res.data.tickets as SupportTicket[]) ?? [];
setTotalPages(Math.ceil(res.data.total / itemsPerPage));
setClosedTickets(res.data.tickets);
} catch (err) {
handleGlobalError(err);
return [];
Expand Down
36 changes: 20 additions & 16 deletions server/api/books.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,14 +785,15 @@ async function getCommonsCatalog(
libreCoverID: 1,
};

const projResults = await Project.aggregate([
{
$match: projectWithAssociatedBookQuery,
},
{
$project: projectWithAssociatedBookProjection,
},
]) ?? [];
const projResults =
(await Project.aggregate([
{
$match: projectWithAssociatedBookQuery,
},
{
$project: projectWithAssociatedBookProjection,
},
])) ?? [];

const projBookIDs = projResults.map(
(proj) => `${proj.libreLibrary}-${proj.libreCoverID}`
Expand Down Expand Up @@ -879,19 +880,22 @@ async function getCommonsCatalog(
}, []);

// Ensure no duplicates
const resultBookIDs = [...new Set(aggResults.map((book) => book.bookID))];
const resultBooks = [
...aggResults.filter((book) => resultBookIDs.includes(book.bookID)),
]

const resultBookIDs = new Set();
const resultBooks = aggResults.filter((book) => {
if (!resultBookIDs.has(book.bookID)) {
resultBookIDs.add(book.bookID);
return true;
}
return false;
});

const totalNumBooks = resultBooks.length;
const offset = getRandomOffset(totalNumBooks)
const offset = getRandomOffset(totalNumBooks);

const randomized = resultBooks.slice(offset, offset + limit)
const randomized = resultBooks.slice(offset, offset + limit);

return res.send({
err: false,
numFound: resultBooks.length,
numTotal: totalNumBooks,
books: randomized,
});
Expand Down
13 changes: 8 additions & 5 deletions server/api/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,14 +1347,17 @@ async function getPublicProjects(req, res) {
visibility: "public",
}).select({
notes: 0, leads: 0 , liaisons: 0, members: 0, auditors: 0, a11yReview: 0, flag: 0, flagDescrip: 0
}).lean().exec();
}).skip(offset).limit(limit).lean().exec();

const totalCount = await Project.estimatedDocumentCount({
orgID: process.env.ORG_ID,
visibility: "public",
});

const totalCount = projects.length;
const paginatedProjects = projects.slice(offset, offset + limit);
return res.send({
err: false,
projects: paginatedProjects,
totalCount,
projects: projects || [],
totalCount: totalCount || 0,
});
} catch (e) {
debugError(e);
Expand Down
Loading
Loading