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

TASK :#0000 Filters not working properly on contentList page #491

Merged
merged 1 commit into from
Aug 14, 2024
Merged

TASK :#0000 Filters not working properly on contentList page #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
123 changes: 63 additions & 60 deletions packages/nulp_elite/src/components/drawerFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ import * as util from "../services/utilService";

// const DrawerFilter = ({ SelectedFilters, renderedPage }) => {
const DrawerFilter = ({ SelectedFilters, renderedPage, domain,domainName,domainCode }) => {
const contentTypeList = [
"Course",
"Manuals and SOPs",
"Reports",
"Good Practices",
];
const contentTypeList = [
{ key: 'Course', value: 'Course' },
{ key: 'Manuals/SOPs', value: 'Manuals and SOPs' },
{ key: 'Reports', value: 'Reports' },
{ key: 'Good Practices', value: 'Good Practices' },
];


const [subCategory, setSubCategory] = useState([]);
const [selectedContentType, setSelectedContentType] = useState([]);
const [selectedSubDomain, setSelectedSubDomain] = useState([]);
Expand Down Expand Up @@ -188,10 +190,10 @@ const fetchDataFramework = async () => {
}
} else if (filterType === "subCategory") {
if (event.target.checked) {
setSelectedSubDomain((prev) => [...prev, item.item.code]);
setSelectedSubDomain((prev) => [...prev, item.item.name]);
} else {
setSelectedSubDomain((prev) =>
prev.filter((i) => i !== item.item.code)
prev.filter((i) => i !== item.item.name)
);
}
} else if (filterType === "eventSearch") {
Expand Down Expand Up @@ -357,28 +359,29 @@ const fetchDataFramework = async () => {
</div>
)}

{renderedPage === "contentlist" && (
<div>
<Box className="filter-text mt-15">{t("CONTENT_TYPE")}e</Box>
<List>
{contentTypeList.map((contentType) => (
<ListItem className="filter-ul-text" key={contentType}>
<FormControlLabel
control={
<Checkbox
checked={selectedContentType.includes(contentType)}
onChange={(event) =>
handleCheckboxChange(event, contentType, "contentType")
}
/>
}
label={contentType}
/>
</ListItem>
))}
</List>
</div>
)}
{renderedPage === "contentlist" && (
<div>
<Box className="filter-text mt-15">{t("CONTENT_TYPE")}</Box>
<List>
{contentTypeList.map((contentType) => (
<ListItem className="filter-ul-text" key={contentType.key}>
<FormControlLabel
control={
<Checkbox
checked={selectedContentType.includes(contentType.key)}
onChange={(event) =>
handleCheckboxChange(event, contentType.key, "contentType")
}
/>
}
label={contentType.value}
/>
</ListItem>
))}
</List>
</div>
)}


<Box className="filter-text mt-15">{t("SUB_DOMAIN")}</Box>
<FormControl sx={{ m: 1, width: "25ch" }} variant="outlined" className="w-100">
Expand All @@ -402,11 +405,11 @@ const fetchDataFramework = async () => {
</FormControl>
<List>
{filteredSubCategories.map((item) => (
<ListItem className="filter-ul-text" key={item.code}>
<ListItem className="filter-ul-text" key={item.name}>
<FormControlLabel
control={
<Checkbox
checked={selectedSubDomain.includes(item.code)}
checked={selectedSubDomain.includes(item.name)}
onChange={(event) =>
handleCheckboxChange(event, { item }, "subCategory")
}
Expand Down Expand Up @@ -526,32 +529,32 @@ const fetchDataFramework = async () => {
)}

{renderedPage == "contentlist" && (
<div>
<Box className="filter-text mt-15">{t("CONTENT_TYPE")}</Box>
<List>
{contentTypeList &&
contentTypeList.map((contentType) => (
<ListItem className="filter-ul-text" key={contentType}>
<FormControlLabel
control={
<Checkbox
checked={selectedContentType.includes(contentType)}
onChange={(event) =>
handleCheckboxChange(
event,
contentType,
"contentType"
)
}
/>
}
label={contentType}
/>
</ListItem>
))}
</List>
</div>
)}
<div>
<Box className="filter-text mt-15">{t("CONTENT_TYPE")}</Box>
<List>
{contentTypeList &&
contentTypeList.map((contentType) => (
<ListItem className="filter-ul-text" key={contentType.key}>
<FormControlLabel
control={
<Checkbox
checked={selectedContentType.includes(contentType.key)}
onChange={(event) =>
handleCheckboxChange(
event,
contentType.key,
"contentType"
)
}
/>
}
label={contentType.value}
/>
</ListItem>
))}
</List>
</div>
)}
<Box className="filter-text lg-mt-12 mb-20">{t("SUB_DOMAIN")}</Box>
<FormControl>
<InputLabel htmlFor="outlined-adornment-password">
Expand Down Expand Up @@ -581,11 +584,11 @@ const fetchDataFramework = async () => {
/> */}
<List>
{filteredSubCategories.map((item) => (
<ListItem className="filter-ul-text" key={item.code}>
<ListItem className="filter-ul-text" key={item.name}>
<FormControlLabel
control={
<Checkbox
checked={selectedSubDomain.includes(item.code)}
checked={selectedSubDomain.includes(item.name)}
onChange={(event) =>
handleCheckboxChange(event, { item }, "subCategory")
}
Expand Down
56 changes: 28 additions & 28 deletions packages/nulp_elite/src/pages/search/ContentList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,41 +156,41 @@ sessionStorage.setItem('previousRoutes', newPath)
setIsLoading(true);
setError(null);

let requestData = {
request: {
let requestData = {
request: {
filters: {
status: ["Live"],
contentType:
contentTypeFilter && contentTypeFilter.length > 0
? contentTypeFilter
: [
"Collection",
"TextBook",
"Course",
"LessonPlan",
"Resource",
"SelfAssess",
"PracticeResource",
"LearningOutcomeDefinition",
"ExplanationResource",
"ExperientialResource",
"eTextBook",
"TVLesson",
],
se_boards: domainfilter.se_board || [domainName],
se_gradeLevels:
subDomainFilter && subDomainFilter.length > 0
? subDomainFilter
: [],
status: ["Live"],
...(contentTypeFilter.length > 0
? { primaryCategory: contentTypeFilter }
: { contentType: [
"Collection",
"TextBook",
"Course",
"LessonPlan",
"Resource",
"SelfAssess",
"PracticeResource",
"LearningOutcomeDefinition",
"ExplanationResource",
"ExperientialResource",
"eTextBook",
"TVLesson",
]}),
se_boards: domainfilter.se_board || [domainName],
se_gradeLevels:
subDomainFilter && subDomainFilter.length > 0
? subDomainFilter
: [],
},
limit: 20,
query: search.query || globalSearchQuery,
offset: 20 * (currentPage - 1),
sort_by: {
lastUpdatedOn: "desc",
lastUpdatedOn: "desc",
},
},
};
},
};


let req = JSON.stringify(requestData);

Expand Down
Loading