Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions src/components/projectList/OwnProjectFilters.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,15 @@ function OwnProjectFilters({ filters, ...props }) {
//State need to be up to date if changing other filters,
//pressing clear buton only removes value from hds input but does not change it otherwise
//control is not reachable for buttons clear property
let val = filter

if(val[0] !== "" && value === ""){
val[0] = value
setFilter(val)
onSubmit(value)
const previousValue = filter[0];
if (previousValue === value) {
return;
}
else{
val[0] = value
setFilter(val)
const newFilter = [...filter];
newFilter[0] = value
setFilter(newFilter);
if (value === "") {
onSubmit(value)
}
}

Expand Down
14 changes: 6 additions & 8 deletions src/sagas/projectSaga.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,27 +326,25 @@ function* getProject({ payload: projectId }) {
}

function getQueryValues(page_size,page,searchQuery,sortField,sortDir,status){
let query

query = {
const query = {
page: page + 1,
ordering: sortDir === 1 ? sortField : '-'+sortField,
status: status,
page_size: page_size ? page_size : 10
}
};

if (searchQuery.length > 0) {
if(searchQuery[0] !== ""){
query.search = searchQuery[0]
query.search = encodeURIComponent(searchQuery[0]);
}
if(searchQuery[1] !== ""){
query.department = searchQuery[1]
query.department = encodeURIComponent(searchQuery[1]);
}
if(searchQuery[2].length > 0){
query.includes_users = searchQuery[2]
query.includes_users = searchQuery[2].map(user => encodeURIComponent(user));
}
}
return query
return query;
}

function* fetchOnholdProjects({ payload }) {
Expand Down