-
Notifications
You must be signed in to change notification settings - Fork 670
Revert "DYN-9702 templates to home screen (#16932)" #17013
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,6 @@ | |
| using System.Runtime.InteropServices; | ||
| using System.Text.Json; | ||
| using System.Text.Json.Serialization; | ||
| using System.Threading.Tasks; | ||
| using System.Windows; | ||
| using System.Windows.Controls; | ||
| using Autodesk.DesignScript.Runtime; | ||
|
|
@@ -273,25 +272,24 @@ internal void LoadingDone() | |
| if (startPage == null) { return; } | ||
|
|
||
| SendGuidesData(); | ||
| _ = SendSamplesData(); | ||
| _ = SendTemplateData(); | ||
| _ = SendRecentGraphsData(); | ||
| SendSamplesData(); | ||
| SendRecentGraphsData(); | ||
| SendVideoData(); | ||
| SetLocale(); | ||
| } | ||
|
|
||
| private void RecentFiles_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) | ||
| { | ||
| var recentFiles = startPage.RecentFiles?.DistinctBy(x => x.ContextData).ToList(); | ||
| _ = LoadGraphs(recentFiles); | ||
| LoadGraphs(recentFiles); | ||
| } | ||
|
|
||
| #region FrontEnd Initialization Calls | ||
| /// <summary> | ||
| /// Sends graph data to react app | ||
| /// </summary> | ||
| /// <param name="data"></param> | ||
| private async Task LoadGraphs(List<StartPageListItem> data) | ||
| private async void LoadGraphs(List<StartPageListItem> data) | ||
| { | ||
| if (data == null) { return; } | ||
| string jsonData = JsonSerializer.Serialize(data); | ||
|
|
@@ -302,26 +300,10 @@ private async Task LoadGraphs(List<StartPageListItem> data) | |
| } | ||
|
Comment on lines
292
to
300
|
||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// Sends graph data to react app | ||
| /// </summary> | ||
| /// <param name="data"></param> | ||
| private async Task LoadTemplates(List<StartPageListItem> data) | ||
| { | ||
| if (data == null) { return; } | ||
| string jsonData = JsonSerializer.Serialize(data); | ||
|
|
||
| if (dynWebView?.CoreWebView2 != null) | ||
| { | ||
| await dynWebView.CoreWebView2.ExecuteScriptAsync(@$"window.receiveTemplatesDataFromDotNet({jsonData})"); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Sends samples data to react app | ||
| /// </summary> | ||
| private async Task SendSamplesData() | ||
| private async void SendSamplesData() | ||
| { | ||
| if (!this.startPage.SampleFiles.Any()) return; | ||
|
|
||
|
|
@@ -333,21 +315,9 @@ private async Task SendSamplesData() | |
| } | ||
|
Comment on lines
306
to
315
|
||
| } | ||
|
|
||
| /// <summary> | ||
| /// Sends samples data to react app | ||
| /// </summary> | ||
| private async Task SendTemplateData() | ||
| { | ||
| var items = startPage.TemplateFiles?.DistinctBy(x => x.ContextData).ToList(); | ||
| if (items != null && items.Any()) | ||
| { | ||
| await LoadTemplates(items); | ||
| } | ||
| } | ||
|
|
||
| private async Task SendRecentGraphsData() | ||
| private async void SendRecentGraphsData() | ||
| { | ||
| // Send user preferences (could be split to a separate call later instead of coupling with recent files). | ||
| // Send user preferences | ||
| if (dynWebView?.CoreWebView2 != null) | ||
| { | ||
| if (startPage.DynamoViewModel.PreferenceSettings.HomePageSettings != null) | ||
|
|
@@ -364,7 +334,7 @@ private async Task SendRecentGraphsData() | |
| var recentFiles = startPage.RecentFiles?.DistinctBy(x => x.ContextData).ToList(); | ||
| if (recentFiles != null && recentFiles.Any()) | ||
| { | ||
| await LoadGraphs(recentFiles); | ||
| LoadGraphs(recentFiles); | ||
| } | ||
|
|
||
| if (startPage.DynamoViewModel != null && startPage.DynamoViewModel.RecentFiles != null) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HomePage.xaml.csandPackageManagerWizard.xaml.csare now included twice in the project (also present later with<DependentUpon>). Duplicate<Compile Include=...>items typically cause MSBuild errors (duplicate items) and should be removed—keep only the existing entries that includeDependentUpon.