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..d8965b96a 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.TeamsAppSampleQueries.FindAll(s => s.Category == "Getting Started")); // Add the rest of the sample queries sortedSampleQueriesList.SampleQueries.AddRange(sortedSampleQueries); + sortedSampleQueriesList.TeamsAppSampleQueries.AddRange(teamsAppSortedSampleQueries); return sortedSampleQueriesList; }