From b22ca0f7f54e7edd4e9fefd9ed892ffd9c7eeeda Mon Sep 17 00:00:00 2001 From: Pruthwiraj Nanda Date: Tue, 4 May 2021 20:01:44 +0530 Subject: [PATCH 1/2] Add Sorting for tags and filters --- .../src/components/IssueDashboard/CreateIssue.js | 4 ++++ .../src/components/Navigation/SidebarData.js | 14 ++++++++++++++ 2 files changed, 18 insertions(+) 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..b3f8a27 100644 --- a/imap-frontend/src/components/Navigation/SidebarData.js +++ b/imap-frontend/src/components/Navigation/SidebarData.js @@ -46,6 +46,20 @@ export const getFilterNames = (dbfilters) => { filter_i.filterDetails.push(fil); } filtersName.push(filter_i); + 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; }; From 26a6b8ae787834b641987a8f52f510ce2525e01f Mon Sep 17 00:00:00 2001 From: Pruthwiraj Nanda Date: Wed, 5 May 2021 12:18:43 +0530 Subject: [PATCH 2/2] Add sorting --- imap-frontend/src/components/Navigation/SidebarData.js | 1 + 1 file changed, 1 insertion(+) diff --git a/imap-frontend/src/components/Navigation/SidebarData.js b/imap-frontend/src/components/Navigation/SidebarData.js index b3f8a27..82b899d 100644 --- a/imap-frontend/src/components/Navigation/SidebarData.js +++ b/imap-frontend/src/components/Navigation/SidebarData.js @@ -46,6 +46,7 @@ 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()