Skip to content

AB#39171 Added teamsAppSampleQueries in model and extended ordering functionality #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
omersayshi merged 4 commits into from
Jul 27, 2021
Merged

AB#39171 Added teamsAppSampleQueries in model and extended ordering functionality #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f0f758
omersayshi Jul 20, 2021
d60609a
Fixed small error
omersayshi Jul 20, 2021
e99db79
Merge branch 'interns/dev' into interns/omersayshi/39171-app-mode-sam…
omersayshi Jul 20, 2021
44611b2
Fixed another small typo
omersayshi Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions GraphExplorerSamplesService/Models/SampleQueriesList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ public class SampleQueriesList
/// A list of <see cref="SampleQueryModel"/> objects
/// </summary>
public List<SampleQueryModel> SampleQueries { get; set; }
public List<SampleQueryModel> TeamsAppSampleQueries { get; set; }

public SampleQueriesList()
{
SampleQueries = new List<SampleQueryModel>();
TeamsAppSampleQueries = new List<SampleQueryModel>();
}
}
}
7 changes: 7 additions & 0 deletions GraphExplorerSamplesService/Services/SamplesService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<SampleQueryModel> 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;
}
Expand Down