diff --git a/frontend/e2e/fixtures/create-new/board-data.csv b/frontend/e2e/fixtures/create-new/board-data.csv
index da5ffc9569..6cf9b22a98 100644
--- a/frontend/e2e/fixtures/create-new/board-data.csv
+++ b/frontend/e2e/fixtures/create-new/board-data.csv
@@ -1,24 +1,22 @@
-Issue key,Summary,Issue Type,Status,Status Date,Story Points,assignee,Reporter,Project Key,Project Name,Priority,Parent Summary,Sprint,Labels,Cycle Time,Story testing-1,Flagged,Fix versions,Partner,Time tracking,Story point estimate,QA,Feature/Operation,Story testing-2,Cycle Time / Story Points,Analysis Days,In Dev Days,Waiting Days,Testing Days,Block Days,Review Days,OriginCycleTime: TODO,OriginCycleTime: TESTING,OriginCycleTime: WAIT FOR TEST,OriginCycleTime: DOING,OriginCycleTime: REVIEW,OriginCycleTime: BLOCKED,Rework: total - In dev,Rework: from Block,Rework: from Review,Rework: from Waiting for testing,Rework: from Testing,Rework: from Done
-ADM-735,[backend]identify the source of the error when generate reports encounter exception,Task,Done,2024-01-19,1.0,Yunsong Yang,Yunsong Yang,ADM,Auto Dora Metrics,Medium,Precise on Metrics,Sprint 28,Stream2,7.70,1.0,"","","",None,1.0,"","","",7.70,0,2.02,1.81,0,0,3.87,3.03,0,1.81,2.02,3.87,0,0,0,0,0,0,0
-ADM-708,[Backend] Verify board and obtain board data with new API,Task,Done,2024-01-19,3.0,Weiran Sun,heartbeat user,ADM,Auto Dora Metrics,Medium,easy to use,Sprint 28,Stream1,9.95,1.0,"","","",None,3.0,"","","",3.32,0,4.00,0.93,1.04,0.98,3.00,7.10,1.04,0.93,4.00,3.00,0.98,2,2,0,0,0,0
-ADM-699,[Frontend] Optimize the 4xx&504 error display of report overview,Task,Done,2024-01-18,2.0,heartbeat user,heartbeat user,ADM,Auto Dora Metrics,Medium,Performance Improvement,Sprint 28,Stream2,10.93,1.0,"","","",None,2.0,"","","",5.46,0,5.14,0.04,0.78,2.01,2.96,10.75,0.78,0.04,5.14,2.96,2.01,2,2,0,0,0,0
-ADM-717,[Backend] Verify github and obtain github data with new API,Task,Done,2024-01-17,2.0,Junbo Dai,Yufan Wang,ADM,Auto Dora Metrics,Medium,easy to use,Sprint 28,Stream1,8.09,1.0,"","","",None,2.0,Weiran Sun,"","",4.04,0,2.83,2.72,0.05,2.14,0.35,6.00,0.05,2.72,2.83,0.35,2.14,3,3,0,0,0,0
-ADM-724,[Spike] redesign board verify API to meet business requirements,Spike,Done,2024-01-17,1.0,heartbeat user,Yufan Wang,ADM,Auto Dora Metrics,Medium,easy to use,Sprint 28,Stream1,12.94,"","","","",None,1.0,"","","",12.94,0,1.08,1.99,0,7.65,2.22,0.27,0,1.99,1.08,2.22,7.65,2,2,0,0,0,0
-ADM-652,[Frontend]Generate the separate modules detail report,Task,Done,2024-01-17,3.0,Xuebing Li,heartbeat user,ADM,Auto Dora Metrics,Medium,Performance Improvement,Sprint 28,Stream2,10.15,1.0,"","","",None,3.0,"","","",3.38,0,5.94,1.35,1.87,0.72,0.27,22.87,1.87,1.35,5.94,0.27,0.72,1,1,0,0,0,0
-ADM-683,[Frontend] UI refine for the date picker in report page,Task,Done,2024-01-17,1.0,heartbeat user,heartbeat user,ADM,Auto Dora Metrics,Medium,easy to use,Sprint 28,Stream2,8.92,1.0,"","","",None,1.0,"","","",8.92,0,3.00,0.10,1.84,3.00,0.98,15.05,1.84,0.10,3.00,0.98,3.00,1,1,0,0,0,0
-ADM-669,[Frontend] UI refine for notification pop up change in report page,Task,Done,2024-01-17,1.0,heartbeat user,heartbeat user,ADM,Auto Dora Metrics,Medium,easy to use,Sprint 28,Stream2,7.13,1.0,"","","",None,1.0,"","","",7.13,0,4.22,0.02,1.16,0,1.73,17.80,1.16,0.02,4.22,1.73,0,0,0,0,0,0,0
-ADM-709,[Backend] Verify buildkite and obtain buildkite data with new API,Task,Done,2024-01-15,3.0,Xinyi Wang,heartbeat user,ADM,Auto Dora Metrics,Medium,easy to use,Sprint 27,Stream1,6.85,1.0,"","","",None,3.0,"","","",2.28,0,2.81,0.07,0.78,0,3.19,8.03,0.78,0.07,2.81,3.19,0,,,,,,
+"Issue key","Summary","Issue Type","Status","Status Date","Story Points","assignee","Reporter","Project Key","Project Name","Priority","Parent Summary","Sprint","Labels","Cycle Time","Fix versions","Partner","Time tracking","Story testing-1","Flagged","Story point estimate","QA","Feature/Operation","Story testing-2","Cycle Time / Story Points","Analysis Days","In Dev Days","Waiting Days","Testing Days","Block Days","Review Days","OriginCycleTime: TODO","OriginCycleTime: TESTING","OriginCycleTime: WAIT FOR TEST","OriginCycleTime: DOING","OriginCycleTime: REVIEW","OriginCycleTime: BLOCKED","Rework: total - In dev","Rework: from Block","Rework: from Review","Rework: from Waiting for testing","Rework: from Testing","Rework: from Done"
+"ADM-735","[backend]identify the source of the error when generate reports encounter exception","Task","Done","2024-01-19","1.0","Yunsong Yang","Yunsong Yang","ADM","Auto Dora Metrics","Medium","Precise on Metrics","Sprint 28","Stream2","7.70","","","None","1.0","","1.0","","","","7.70","0","2.02","1.81","0","0","3.87","3.03","0","1.81","2.02","3.87","0","0","0","0","0","0","0"
+"ADM-708","[Backend] Verify board and obtain board data with new API","Task","Done","2024-01-19","3.0","Weiran Sun","heartbeat user","ADM","Auto Dora Metrics","Medium","easy to use","Sprint 28","Stream1","9.95","","","None","1.0","","3.0","","","","3.32","0","4.00","0.93","1.04","0.98","3.00","7.10","1.04","0.93","4.00","3.00","0.98","2","2","0","0","0","0"
+"ADM-699","[Frontend] Optimize the 4xx&504 error display of report overview","Task","Done","2024-01-18","2.0","heartbeat user","heartbeat user","ADM","Auto Dora Metrics","Medium","Performance Improvement","Sprint 28","Stream2","10.93","","","None","1.0","","2.0","","","","5.46","0","5.14","0.04","0.78","2.01","2.96","10.75","0.78","0.04","5.14","2.96","2.01","2","2","0","0","0","0"
+"ADM-717","[Backend] Verify github and obtain github data with new API","Task","Done","2024-01-17","2.0","Junbo Dai","Yufan Wang","ADM","Auto Dora Metrics","Medium","easy to use","Sprint 28","Stream1","8.09","","","None","1.0","","2.0","Weiran Sun","","","4.04","0","2.83","2.72","0.05","2.14","0.35","6.00","0.05","2.72","2.83","0.35","2.14","3","3","0","0","0","0"
+"ADM-724","[Spike] redesign board verify API to meet business requirements","Spike","Done","2024-01-17","1.0","heartbeat user","Yufan Wang","ADM","Auto Dora Metrics","Medium","easy to use","Sprint 28","Stream1","12.94","","","None","","","1.0","","","","12.94","0","1.08","1.99","0","7.65","2.22","0.27","0","1.99","1.08","2.22","7.65","2","2","0","0","0","0"
+"ADM-652","[Frontend]Generate the separate modules detail report","Task","Done","2024-01-17","3.0","Xuebing Li","heartbeat user","ADM","Auto Dora Metrics","Medium","Performance Improvement","Sprint 28","Stream2","10.15","","","None","1.0","","3.0","","","","3.38","0","5.94","1.35","1.87","0.72","0.27","22.87","1.87","1.35","5.94","0.27","0.72","1","1","0","0","0","0"
+"ADM-683","[Frontend] UI refine for the date picker in report page","Task","Done","2024-01-17","1.0","heartbeat user","heartbeat user","ADM","Auto Dora Metrics","Medium","easy to use","Sprint 28","Stream2","8.92","","","None","1.0","","1.0","","","","8.92","0","3.00","0.10","1.84","3.00","0.98","15.05","1.84","0.10","3.00","0.98","3.00","1","1","0","0","0","0"
+"ADM-669","[Frontend] UI refine for notification pop up change in report page","Task","Done","2024-01-17","1.0","heartbeat user","heartbeat user","ADM","Auto Dora Metrics","Medium","easy to use","Sprint 28","Stream2","7.13","","","None","1.0","","1.0","","","","7.13","0","4.22","0.02","1.16","0","1.73","17.80","1.16","0.02","4.22","1.73","0","0","0","0","0","0","0"
+"ADM-709","[Backend] Verify buildkite and obtain buildkite data with new API","Task","Done","2024-01-15","3.0","Xinyi Wang","heartbeat user","ADM","Auto Dora Metrics","Medium","easy to use","Sprint 27","Stream1","6.85","","","None","1.0","","3.0","","","","2.28","0","2.81","0.07","0.78","0","3.19","8.03","0.78","0.07","2.81","3.19","0","0","0","0","0","0","0"
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-ADM-806,[BE]no need to obtain pipeline data twice in backend,Bug,Review,2024-02-26,2.0,heartbeat user,Yufan Wang,ADM,Auto Dora Metrics,Medium,,Sprint 30,"Stream2,v1.1.5",0,"","","","",None,2.0,"","","",0,0,2.89,0,0,0,0.04,8.10,0,0,2.89,0.04,0,,,,,,
-ADM-813,[FE]add new field 'Advance' in metrics page,Task,Review,2024-02-26,2.0,heartbeat user,Yufan Wang,ADM,Auto Dora Metrics,Medium,,Sprint 30,"Stream2,v1.1.5",0,1.0,"","","",None,2.0,"","","",0,0,4.78,0,0,4.68,0.53,0.19,0,0,4.78,0.53,4.68,,,,,,
-ADM-677,[Spike]Investigate Github graphQL API about replacing existing REST API,Spike,Blocked,2024-02-21,2.0,Junbo Dai,Yichen Wang,ADM,Auto Dora Metrics,Medium,Performance Improvement,Sprint 30,Stream1,0,"","","","",None,2.0,"","","",0,0,1.05,0,0,10.17,0,38.43,0,0,1.05,0,10.17,,,,,,
-ADM-819,[BE]cache doesn't work in one case,Bug,Doing,2024-02-26,2.0,Shiqi Yuan,Yufan Wang,ADM,Auto Dora Metrics,Medium,,Sprint 30,"Stream2,v1.1.5",0,"","","","",None,2.0,"","","",0,0,3.14,0,0,1.05,0,0.84,0,0,3.14,0,1.05,,,,,,
-ADM-797,[BE]The add flag as block logic is not working,Bug,Doing,2024-02-26,2.0,heartbeat user,Wenting Yan,ADM,Auto Dora Metrics,High,,Sprint 30,"Stream2,v1.1.5",0,"","","","",None,2.0,"","","",0,0,7.13,0,0,5.00,0,2.03,0,0,7.38,0,5.80,,,,,,
-ADM-829,jump home page when user click next button in config page,Bug,Doing,2024-02-23,2.0,Junbo Dai,Yufan Wang,ADM,Auto Dora Metrics,High,,Sprint 30,"Stream1,v1.1.5",0,"","","","",None,2.0,"","","",0,0,1.03,0,0,0,0,1.17,0,0,1.03,0,0,,,,,,
-ADM-812,[FE]metrics page needs to retain the modified data,Bug,Doing,2024-02-23,2.0,heartbeat user,Yufan Wang,ADM,Auto Dora Metrics,Medium,,Sprint 30,Stream1,0,"","","","",None,2.0,"","","",0,0,3.04,0,0,1.03,0,6.67,0,0,3.04,0,1.03,,,,,,
-ADM-809,"[E2E] build ""import a new project"" scenario",Task,Doing,2024-02-22,2.0,heartbeat user,Xingmeng Tao,ADM,Auto Dora Metrics,High,,Sprint 30,"Stream1,v1.1.5",0,1.0,"","","",None,2.0,"","","",0,0,2.24,0,0,0,0,8.00,0,0,2.24,0,0,,,,,,
-ADM-808,"[E2E] build ""Create a new Project"" scenario",Task,Doing,2024-02-19,3.5,heartbeat user,Xingmeng Tao,ADM,Auto Dora Metrics,High,,Sprint 30,"Stream1,v1.1.5",0,1.0,"","","",None,3.5,"","","",0,0,8.04,0,0,1.99,0,0.95,0,0,8.04,0,1.99,,,,,,
-ADM-825,"[E2E] build ""page jumps"" scenario",Task,TODO,,2.0,,Yufan Wang,ADM,Auto Dora Metrics,High,,Sprint 30,"Stream1,v1.1.5",0,1.0,"","","",None,2.0,"","","",0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,
-ADM-820,user was misguided to home page when they want to enter metrics page,Bug,TODO,,0.0,heartbeat user,Yufan Wang,ADM,Auto Dora Metrics,Medium,,Sprint 30,Stream2,0,"","","","",None,"","","","","",0,0,0,0,0,0,0,0,0,0,0,0,,,,,,
-ADM-833,"[E2E] build ""unhappy path"" scenario",Task,TODO,,0.0,,heartbeat user,ADM,Auto Dora Metrics,Medium,,Sprint 30,Stream1,0,1.0,"","","",None,"","","","","",0,0,0,0,0,0,0,0,0,0,0,0,,,,,,
-ADM-789,refactor E2E-step2,Task,TODO,,1.0,,Yufan Wang,ADM,Auto Dora Metrics,High,,Sprint 30,Stream2,0,1.0,"","","",None,1.0,"","","",0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,
+"ADM-879","[FE]Generate data reports for multiple time ranges","Story","Testing","2024-05-10","3.0","heartbeat user","Yufan Wang","ADM","Auto Dora Metrics","Medium","Charting","Sprint 36","1.1.7","0","","","None","","","3.0","","","","0","0","12.04","4.04","3.75","1.00","0","19.82","3.75","4.04","12.04","0","1.00",,,,,,
+"ADM-924","[FE] Export data in report list page","Story","Review","2024-05-15","3.0","heartbeat user","Yufan Wang","ADM","Auto Dora Metrics","Medium","Charting","Sprint 36","1.1.7,Stream2","0","","","None","","","3.0","","","","0","0","12.77","0","0","3.25","3.97","1.15","0","0","12.77","3.97","3.25",,,,,,
+"ADM-937","[BE] Pipeline crew setting could filter out dependentbot pipeline","Bug","Blocked","2024-05-15","2.0","heartbeat user","Yichen Wang","ADM","Auto Dora Metrics","Medium","Precise on Metrics","Sprint 36","1.1.7","0","","","None","","","2.0","","","","0","0","2.83","4.02","0","3.05","0.90","2.25","0","4.02","2.83","0.90","3.05",,,,,,
+"ADM-881","[FE] Export data in report chart page","Story","Blocked","2024-05-11","1.0","heartbeat user","Yufan Wang","ADM","Auto Dora Metrics","Medium","Charting","Sprint 36","1.1.7","0","","","None","","","1.0","","","","0","0","3.63","0","0","4.18","0","32.84","0","0","3.63","0","4.18",,,,,,
+"ADM-907","[FE]update Readme about 'charting'","Task","Blocked","2024-04-28","1.0","Yufan Wang","Yufan Wang","ADM","Auto Dora Metrics","Medium","Charting","Sprint 36","1.1.7,Stream2","0","","","None","1.0","","1.0","","","","0","0","1.81","0","0","11.04","0","17.28","0","0","1.81","0","11.04",,,,,,
+"ADM-880","[FE] Generate chart - board metrics","Story","Doing","2024-05-15","3.0","heartbeat user","Yufan Wang","ADM","Auto Dora Metrics","Highest","Charting","Sprint 36","1.1.7","0","","","None","","","3.0","","","","0","0","8.26","0","0","0.74","0","31.66","0","0","8.26","0","0.74",,,,,,
+"ADM-744","[FE] add pop-up when board token & email are incorrect","Story","Doing","2024-05-14","1.0","Weiran Sun","Yufan Wang","ADM","Auto Dora Metrics","Medium","easy to use","Sprint 36","Stream1","0","","","None","","","1.0","","","","0","0","0.83","0","0","0","0","86.91","0","0","0.83","0","0",,,,,,
+"ADM-938","[FE] Add a mark to the failed time range in report page","Story","Doing","2024-05-14","1.0","heartbeat user","Yufan Wang","ADM","Auto Dora Metrics","Medium","Charting","Sprint 36","1.1.7","0","","","None","","","1.0","","","","0","0","3.01","0","0","1.02","0","4.95","0","0","3.01","0","1.02",,,,,,
+"ADM-906","[E2E] build 'charting' scenario-happy path","Task","Doing","2024-05-09","3.0","Chao Wang","Yufan Wang","ADM","Auto Dora Metrics","Medium","Charting","Sprint 36","1.1.7","0","","YinYuan Zhou","None","1.0","","3.0","","","","0","0","6.83","0","0","0","0","23.31","0","0","6.83","0","0",,,,,,
+"ADM-908","[FE] Generate chart - dora metrics","Story","Doing","2024-05-06","2.0","heartbeat user","Yufan Wang","ADM","Auto Dora Metrics","Medium","Charting","Sprint 36","1.1.7,Stream2","0","","","None","","","2.0","","","","0","0","14.61","0","0","4.16","0","11.36","0","0","14.61","0","4.16",,,,,,
+"ADM-945","[FE]optimize the time range settings","Bug","TODO",,"2.0",,"Yufan Wang","ADM","Auto Dora Metrics","Medium","easy to use","Sprint 36","","0","","","None","","","2.0","","","","0","0","0","0","0","0","0","0","0","0","0","0","0",,,,,,
diff --git a/frontend/e2e/fixtures/create-new/metric-data.csv b/frontend/e2e/fixtures/create-new/metric-data.csv
index 7402eda4b6..4fcc230604 100644
--- a/frontend/e2e/fixtures/create-new/metric-data.csv
+++ b/frontend/e2e/fixtures/create-new/metric-data.csv
@@ -26,17 +26,17 @@
 "Classifications","Story testing-2 / None","100.00"
 "Classifications","Story testing-1 / 1.0","88.89"
 "Classifications","Story testing-1 / None","11.11"
+"Classifications","Project / Auto Dora Metrics","100.00"
 "Classifications","Sprint / Sprint 26","11.11"
 "Classifications","Sprint / Sprint 27","100.00"
 "Classifications","Sprint / Sprint 28","88.89"
-"Classifications","Project / Auto Dora Metrics","100.00"
 "Classifications","Flagged / None","100.00"
 "Classifications","Fix versions / None","100.00"
 "Classifications","Priority / Medium","100.00"
 "Classifications","Partner / None","100.00"
+"Classifications","Time tracking / None","100.00"
 "Classifications","Labels / Stream1","44.44"
 "Classifications","Labels / Stream2","55.56"
-"Classifications","Time tracking / None","100.00"
 "Classifications","Story point estimate / 1.0","44.44"
 "Classifications","Story point estimate / 2.0","22.22"
 "Classifications","Story point estimate / 3.0","33.33"
diff --git a/frontend/e2e/pages/metrics/report-step.ts b/frontend/e2e/pages/metrics/report-step.ts
index 043b22c92e..936e0963d8 100644
--- a/frontend/e2e/pages/metrics/report-step.ts
+++ b/frontend/e2e/pages/metrics/report-step.ts
@@ -229,17 +229,17 @@ export class ReportStep {
     await expect(this.classificationRows.nth(8)).toContainText(this.combineStrings(['None', '100.00%']));
     await expect(this.classificationRows.nth(10)).toContainText(this.combineStrings(['1.0', '88.89%']));
     await expect(this.classificationRows.nth(11)).toContainText(this.combineStrings(['None', '11.11%']));
-    await expect(this.classificationRows.nth(13)).toContainText(this.combineStrings(['Sprint 26', '11.11%']));
-    await expect(this.classificationRows.nth(14)).toContainText(this.combineStrings(['Sprint 27', '100.00%']));
-    await expect(this.classificationRows.nth(15)).toContainText(this.combineStrings(['Sprint 28', '88.89%']));
-    await expect(this.classificationRows.nth(17)).toContainText(this.combineStrings(['Auto Dora Metrics', '100.00%']));
+    await expect(this.classificationRows.nth(13)).toContainText(this.combineStrings(['Auto Dora Metrics', '100.00%']));
+    await expect(this.classificationRows.nth(15)).toContainText(this.combineStrings(['Sprint 26', '11.11%']));
+    await expect(this.classificationRows.nth(16)).toContainText(this.combineStrings(['Sprint 27', '100.00%']));
+    await expect(this.classificationRows.nth(17)).toContainText(this.combineStrings(['Sprint 28', '88.89%']));
     await expect(this.classificationRows.nth(19)).toContainText(this.combineStrings(['None', '100.00%']));
     await expect(this.classificationRows.nth(21)).toContainText(this.combineStrings(['None', '100.00%']));
     await expect(this.classificationRows.nth(23)).toContainText(this.combineStrings(['Medium', '100.00%']));
     await expect(this.classificationRows.nth(25)).toContainText(this.combineStrings(['None', '100.00%']));
-    await expect(this.classificationRows.nth(27)).toContainText(this.combineStrings(['Stream1', '44.44%']));
-    await expect(this.classificationRows.nth(28)).toContainText(this.combineStrings(['Stream2', '55.56%']));
-    await expect(this.classificationRows.nth(30)).toContainText(this.combineStrings(['None', '100.00%']));
+    await expect(this.classificationRows.nth(27)).toContainText(this.combineStrings(['None', '100.00%']));
+    await expect(this.classificationRows.nth(29)).toContainText(this.combineStrings(['Stream1', '44.44%']));
+    await expect(this.classificationRows.nth(30)).toContainText(this.combineStrings(['Stream2', '55.56%']));
     await expect(this.classificationRows.nth(32)).toContainText(this.combineStrings(['1.0', '44.44%']));
     await expect(this.classificationRows.nth(33)).toContainText(this.combineStrings(['2.0', '22.22%']));
     await expect(this.classificationRows.nth(34)).toContainText(this.combineStrings(['3.0', '33.33%']));