diff --git a/imap-frontend/src/components/IssueDashboard/CreateIssue.js b/imap-frontend/src/components/IssueDashboard/CreateIssue.js index 8dd65a8..e05c4a0 100644 --- a/imap-frontend/src/components/IssueDashboard/CreateIssue.js +++ b/imap-frontend/src/components/IssueDashboard/CreateIssue.js @@ -114,6 +114,10 @@ const CreateIssue = ({ page }) => { administration.forEach((element) => administration_.push(element)); const programs_ = []; programs.forEach((element) => programs_.push(element)); + batch_.sort(); + department_.sort(); + administration_.sort(); + programs_.sort(); const isPublic_ = isPublic; setIsPopup(false); diff --git a/imap-frontend/src/components/Navigation/SidebarData.js b/imap-frontend/src/components/Navigation/SidebarData.js index 991c98c..82b899d 100644 --- a/imap-frontend/src/components/Navigation/SidebarData.js +++ b/imap-frontend/src/components/Navigation/SidebarData.js @@ -46,6 +46,21 @@ export const getFilterNames = (dbfilters) => { filter_i.filterDetails.push(fil); } filtersName.push(filter_i); + // sorting for correct order of filters + filter_i.filterDetails.sort( + function(a,b){ + const obj1 = a.title.toUpperCase() + const obj2 = b.title.toUpperCase() + + if (obj1 < obj2) { + return -1 + } + if (obj1 > obj2) { + return 1 + } + return 0 + } + ); } return filtersName; };