From 5f0f758689542df4071dc1f515c4e91acf39d878 Mon Sep 17 00:00:00 2001 From: Omer Abubaker Date: Tue, 20 Jul 2021 16:06:55 -0400 Subject: [PATCH 1/3] Added teamsAppSampleQueries in model and extended ordering functionality --- GraphExplorerSamplesService/Models/SampleQueriesList.cs | 2 ++ GraphExplorerSamplesService/Services/SamplesService.cs | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/GraphExplorerSamplesService/Models/SampleQueriesList.cs b/GraphExplorerSamplesService/Models/SampleQueriesList.cs index b5a668373..18c707868 100644 --- a/GraphExplorerSamplesService/Models/SampleQueriesList.cs +++ b/GraphExplorerSamplesService/Models/SampleQueriesList.cs @@ -11,10 +11,12 @@ public class SampleQueriesList /// A list of objects /// public List SampleQueries { get; set; } + public List TeamsAppSampleQueries { get; set; } public SampleQueriesList() { SampleQueries = new List(); + TeamsAppSampleQueries = new List(); } } } diff --git a/GraphExplorerSamplesService/Services/SamplesService.cs b/GraphExplorerSamplesService/Services/SamplesService.cs index 959aef8ef..b670129a5 100644 --- a/GraphExplorerSamplesService/Services/SamplesService.cs +++ b/GraphExplorerSamplesService/Services/SamplesService.cs @@ -211,13 +211,20 @@ private static SampleQueriesList OrderSamplesQueries(SampleQueriesList sampleQue .Where(s => s.Category != "Getting Started") // skipped, as it should always be the top-most sample query in the list .ToList(); + List teamsAppSortedSampleQueries = sampleQueriesList.TeamsAppSampleQueries + .OrderBy(s => s.Category) + .Where(s => s.Category != "Getting Started") // skipped, as it should always be the top-most sample query in the list + .ToList(); + SampleQueriesList sortedSampleQueriesList = new SampleQueriesList(); // Add back 'Getting Started' to the top of the list sortedSampleQueriesList.SampleQueries.AddRange(sampleQueriesList.SampleQueries.FindAll(s => s.Category == "Getting Started")); + sortedSampleQueriesList.TeamsAppSampleQueries.AddRange(sampleQueriesList.SampleQueries.FindAll(s => s.Category == "Getting Started")); // Add the rest of the sample queries sortedSampleQueriesList.SampleQueries.AddRange(sortedSampleQueries); + sortedSampleQueriesList.SampleQueries.AddRange(teamsAppSortedSampleQueries); return sortedSampleQueriesList; } From d60609a825766c28e513cc878a9555b5399eca3d Mon Sep 17 00:00:00 2001 From: Omer Abubaker Date: Tue, 20 Jul 2021 16:30:38 -0400 Subject: [PATCH 2/3] Fixed small error --- GraphExplorerSamplesService/Services/SamplesService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GraphExplorerSamplesService/Services/SamplesService.cs b/GraphExplorerSamplesService/Services/SamplesService.cs index b670129a5..d767fe46d 100644 --- a/GraphExplorerSamplesService/Services/SamplesService.cs +++ b/GraphExplorerSamplesService/Services/SamplesService.cs @@ -220,7 +220,7 @@ private static SampleQueriesList OrderSamplesQueries(SampleQueriesList sampleQue // Add back 'Getting Started' to the top of the list sortedSampleQueriesList.SampleQueries.AddRange(sampleQueriesList.SampleQueries.FindAll(s => s.Category == "Getting Started")); - sortedSampleQueriesList.TeamsAppSampleQueries.AddRange(sampleQueriesList.SampleQueries.FindAll(s => s.Category == "Getting Started")); + sortedSampleQueriesList.TeamsAppSampleQueries.AddRange(sampleQueriesList.TeamsAppSampleQueries.FindAll(s => s.Category == "Getting Started")); // Add the rest of the sample queries sortedSampleQueriesList.SampleQueries.AddRange(sortedSampleQueries); From 44611b2ac432ac3eaffc81aa48a806fb7b872f0e Mon Sep 17 00:00:00 2001 From: Omer Abubaker Date: Wed, 21 Jul 2021 17:03:39 -0400 Subject: [PATCH 3/3] Fixed another small typo --- GraphExplorerSamplesService/Services/SamplesService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GraphExplorerSamplesService/Services/SamplesService.cs b/GraphExplorerSamplesService/Services/SamplesService.cs index d767fe46d..d8965b96a 100644 --- a/GraphExplorerSamplesService/Services/SamplesService.cs +++ b/GraphExplorerSamplesService/Services/SamplesService.cs @@ -224,7 +224,7 @@ private static SampleQueriesList OrderSamplesQueries(SampleQueriesList sampleQue // Add the rest of the sample queries sortedSampleQueriesList.SampleQueries.AddRange(sortedSampleQueries); - sortedSampleQueriesList.SampleQueries.AddRange(teamsAppSortedSampleQueries); + sortedSampleQueriesList.TeamsAppSampleQueries.AddRange(teamsAppSortedSampleQueries); return sortedSampleQueriesList; }