Skip to content
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

Jump to bottom

Fix sorting for number keys in List.SortByKey #11241

Merged
merged 2 commits into from
Nov 12, 2020
Merged

Fix sorting for number keys in List.SortByKey #11241

merged 2 commits into from
Nov 12, 2020

Conversation

aparajit-pratap
Copy link
Contributor

@aparajit-pratap aparajit-pratap commented Nov 11, 2020 •
edited
Loading

Purpose

https://autodesk.slack.com/archives/C0W60575Z/p1604848871192600

After fix:
image

Previously the integer keys were not sorted along with the doubles as they didn't pass the number key check in line 468 and the result in the watch node was: [1.2, 4.8, 1, 2, 3], which was incorrect.

Declarations

Check these if you believe they are true

  • The codebase is in a better state after this PR
  • Is documented according to the standards
  • The level of testing this PR includes is appropriate
  • User facing strings, if any, are extracted into *.resx files
  • All tests pass using the self-service CI.
  • Snapshot of UI changes, if any.
  • Changes to the API follow Semantic Versioning and are documented in the API Changes document.
  • This PR modifies some build requirements and the readme is updated

Reviewers

(FILL ME IN) Reviewer 1 (If possible, assign the Reviewer for the PR)

(FILL ME IN, optional) Any additional notes to reviewers or testers.

FYIs

(FILL ME IN, Optional) Names of anyone else you wish to be notified of

@aparajit-pratap aparajit-pratap added PTAL Please Take A Look 👀 and removed WIP labels Nov 11, 2020
@aparajit-pratap aparajit-pratap changed the title fix sorting for number keys in List.SortByKey Fix sorting for number keys in List.SortByKey Nov 11, 2020
@aparajit-pratap aparajit-pratap merged commit 3f46686 into DynamoDS:master Nov 12, 2020
@aparajit-pratap aparajit-pratap deleted the fixSortByKey branch November 12, 2020 14:53
mjkkirschner added a commit to SHKnudsen/Dynamo that referenced this pull request Nov 23, 2020
@sm6srw @aparajit-pratap
@pinzart90 @SHKnudsen @QilongTang @mjkkirschner @mmisol @zeusongit @reddyashish
Merge master (#12)
389d6c0 
* Fix sorting for number keys in List.SortByKey (DynamoDS#11241)

* fix sorting for number keys in List.SortByKey

* add unit test

* Crash when accessing static hidden methods from zero touch nodes (DynamoDS#11238)

* handle hidden static methods from zero touch nodes

* add images (DynamoDS#11243)

* Revert "Adding copy of missing file from LibG nuget package (DynamoDS#11218)" (DynamoDS#11254)

This reverts commit a71b5c8.

* Revert "Revert "Adding copy of missing file from LibG nuget package (DynamoDS#11218)" (DynamoDS#11254)" (DynamoDS#11255)

This reverts commit 257ac14.

* Undock/redock extension tabs to windows (DynamoDS#11246)

* Somewhat working version

* Pretty much working version

* Finishing touches and test

* Cleanup

* Prevent both window and tab

* Improve method name and comment

* Forgot to include this in last commit

* add analytics to extensions load event (DynamoDS#11258)

* Revert Project Reference Changes (DynamoDS#11256)

* Initial Commit

* fix mono build

* Update to latest libG nuget version

* Cleanup entries VS Studio failed to update

* Fix Mono build

* Add the private flag back (modified by VS Studio)

* Regressions

* Add back missing resource

* Change DefaultValue setter to public (DynamoDS#11251)

* update load asm binaries from registry logic (DynamoDS#11261)

* update load asm binaries from registry

* Add coverage for docking (DynamoDS#11262)

* Adding a public API on the View extension that gets triggered when the view extension is closed. (DynamoDS#11260)

* Adding a public API on the View extension that gets triggered when the view extension is closed.

* Update variable name

* changing the name to ViewExtensionBaseClass

* Addressing some comments.

* Adding unit test.

* Changing the name to Closed()

* Some more comments.

* Adding an additional test

* Adding checks for the Menu items before setting its value.

* Update Style (DynamoDS#11263)

* CustomNodes that replicate do not access trace correctly. (DynamoDS#11244)

* add failing test

* this works, but seems like cheating.
more tests

* new tests, one failing, needs discussion

* fix test - still fails but as expected

* tests all pass with this change - but looking for better alternatives

* add test
use new field - cant find a better way currently
add comments

* revert internal
update test

* reset guid map before each test

* failing test

* reset

* whitespace

* Localize buttons (DynamoDS#11265)

* update version num and tt file (DynamoDS#11269)

* Fix merge error

* Fix merge error

* Revert "Fix merge error"

This reverts commit 0a21ca4.

Co-authored-by: aparajit-pratap <[email protected]>
Co-authored-by: pinzart90 <[email protected]>
Co-authored-by: Sylvester Knudsen <[email protected]>
Co-authored-by: Aaron (Qilong) <[email protected]>
Co-authored-by: Michael Kirschner <[email protected]>
Co-authored-by: Martin Misol Monzo <[email protected]>
Co-authored-by: Ashish Aggarwal <[email protected]>
Co-authored-by: reddyashish <[email protected]>
sm6srw added a commit that referenced this pull request Dec 2, 2020
@SHKnudsen @radumg
@sm6srw @aparajit-pratap @pinzart90 @QilongTang @mjkkirschner @mmisol @zeusongit @reddyashish @StudioLE @pinzart
Node annotations in DocumentationBrowser (#11153)
418a670 
* add packageDocManager to handle package documentation links

* new viewModelEventArgs to send node annotation data to doc browser

* Handle node annotation in doc browser

* support custom NodeModels + fix watcher event bug

* Update NodeAnnotationNotFound.md

* Update NodeAnnotationNotFound.md

* Comment updates

* Update AssemblySharedInfo.cs

* Update src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEventArgs.cs

* addtional comment updates + clean up

* clean up packageDocManager

* Update DocumentationBrowserViewModel.cs

* handle overloads + fix hot reload bug

* use HtmlSanitizer to clean potential dangerous content from markdown files

* move PackageDocumentationManager to DocumentationBrowser

* update syntax highlighting + markdownStyling updates

* comment updates

* add Markdig to License files

* Change GetPackageName to GetMainCategory

* update markdig + htmlsanitizer version

* fix failing tests + add new node documentaion tests

* fix broken test

* update link to wiki

* Update DocumentationBrowserViewExtension.cs

* Add MD2HTML Tool

* First pass - singleton version

* Revert "Add MD2HTML Tool"

This reverts commit 71509da.

* Revert "First pass - singleton version"

This reverts commit bbefc36.

* fix test

* add doc folder to PackageDirectoryBuilder (#10)

* add doc folder to PackageDirectoryBuilder

* update tests

* comment update

* Use a CLI tool for converting MD to HTML and for Sanitizing HTML as a way to not add any new 3rd party dependencies to Dynamo (#11)

* Revert "Revert "Add MD2HTML Tool""

This reverts commit 99b42f2.

* Revert "Revert "First pass - singleton version""

This reverts commit f655c39.

* Implement HTML Sanitizer

* Remove unneeded dependecies from the doc extension

* Cleanup naming

* More naming cleanups

* Rename files

* Rename folder

* Add comments

* Use literal strings

* Hardening wrapper class

* Simplify API

* Make wrapper API internal

* Add Tools project to Mono solution

* Fix directory name (case)

* Add missing internal

* Use IDispose pattern

* Fix literal string

* Fix cross platform issues

* Use CS.props file

* Undo change to AssemblySharedInfo.cs

* Use shared assembly info

* Add more docs

* Add ndesk support and implement help option

* Rename class

* Add missing change

* Remove the use of ref

* Fix typo

* Fix toolpath and use nameof()

* Improve error handling

* Move strings to resources

* Enhance error messages

* Merge master (#12)

* Fix sorting for number keys in List.SortByKey (#11241)

* fix sorting for number keys in List.SortByKey

* add unit test

* Crash when accessing static hidden methods from zero touch nodes (#11238)

* handle hidden static methods from zero touch nodes

* add images (#11243)

* Revert "Adding copy of missing file from LibG nuget package (#11218)" (#11254)

This reverts commit a71b5c8.

* Revert "Revert "Adding copy of missing file from LibG nuget package (#11218)" (#11254)" (#11255)

This reverts commit 257ac14.

* Undock/redock extension tabs to windows (#11246)

* Somewhat working version

* Pretty much working version

* Finishing touches and test

* Cleanup

* Prevent both window and tab

* Improve method name and comment

* Forgot to include this in last commit

* add analytics to extensions load event (#11258)

* Revert Project Reference Changes (#11256)

* Initial Commit

* fix mono build

* Update to latest libG nuget version

* Cleanup entries VS Studio failed to update

* Fix Mono build

* Add the private flag back (modified by VS Studio)

* Regressions

* Add back missing resource

* Change DefaultValue setter to public (#11251)

* update load asm binaries from registry logic (#11261)

* update load asm binaries from registry

* Add coverage for docking (#11262)

* Adding a public API on the View extension that gets triggered when the view extension is closed. (#11260)

* Adding a public API on the View extension that gets triggered when the view extension is closed.

* Update variable name

* changing the name to ViewExtensionBaseClass

* Addressing some comments.

* Adding unit test.

* Changing the name to Closed()

* Some more comments.

* Adding an additional test

* Adding checks for the Menu items before setting its value.

* Update Style (#11263)

* CustomNodes that replicate do not access trace correctly. (#11244)

* add failing test

* this works, but seems like cheating.
more tests

* new tests, one failing, needs discussion

* fix test - still fails but as expected

* tests all pass with this change - but looking for better alternatives

* add test
use new field - cant find a better way currently
add comments

* revert internal
update test

* reset guid map before each test

* failing test

* reset

* whitespace

* Localize buttons (#11265)

* update version num and tt file (#11269)

* Fix merge error

* Fix merge error

* Revert "Fix merge error"

This reverts commit 0a21ca4.

Co-authored-by: aparajit-pratap <[email protected]>
Co-authored-by: pinzart90 <[email protected]>
Co-authored-by: Sylvester Knudsen <[email protected]>
Co-authored-by: Aaron (Qilong) <[email protected]>
Co-authored-by: Michael Kirschner <[email protected]>
Co-authored-by: Martin Misol Monzo <[email protected]>
Co-authored-by: Ashish Aggarwal <[email protected]>
Co-authored-by: reddyashish <[email protected]>

* Extract more strings (#13)

* Fix failing tests (#14)

* Fix failing tests

* Revert "Fix failing tests"

This reverts commit 824f785.

* Fix failing tests

* Properly dispose all string writers

* More failing test fixes (#15)

* Fix for regression in multi-output node preview  (#11266)

* fix for multi-output node preview regression

* update tests

* add test

* revert unwanted changes

* update test

* Life cycle refactoring: Get rid of singleton. Let the model create and own the MarkdownHandler on first use.

* Fix crash in some document browser tests

* Properly dispose all DocumentBrowserViewExtension objects

* Revert "Fix crash in some document browser tests"

This reverts commit ab146f9.

* Display input port type specific default suggestions only (#11268)

* input port type specific default suggestions

* test fix

* Test fixes

* Use InTestMode flag

* Delete empty lines

* turn off hit testing visibility for DM related render packages (#11282)

* Apply syntax highlighting to multi-line strings (#11289)

* Also sanitize node documentation html

* Save/Load view extension size and location (#11278)

Information of where an extension control was last shown is saved and
retrieved as preference settings. These are actually not directly
visible for the user and are updating automatically, just like the main
Dynamo window size. These settings are used when showing the extension
control, to restore it to how it used to be before closing it.

The available information for each view extension is:

1. How it is shown. For now this can be either as a floating window or
docked to the right-side panel.

2. In case it is shown as a floating window, the following information
about the window is saved:
- Location by Top/Left coordinates
- Size by Width/Height
- Whether the window is maximized

* add revit dlls to assembly conflict checker ignore list (#11285)

* Update StartupUtils.cs

Co-authored-by: pinzart <[email protected]>

* Fix sanitizing log warnings

* Node AutoComplete suggestions sorted alphabetically within the same group (#11280)


* add/update tests

* Address review comments

* Add ILMerge

* Fix typo

* Fix mono build

* Revert "Fix mono build"

This reverts commit 9904525.

* Refine mono solution

* Remove task condition

* Mono build fix

* Add Readme

Co-authored-by: aparajit-pratap <[email protected]>
Co-authored-by: Ashish Aggarwal <[email protected]>
Co-authored-by: Laurence Elsdon <[email protected]>
Co-authored-by: Martin Misol Monzo <[email protected]>
Co-authored-by: pinzart90 <[email protected]>
Co-authored-by: pinzart <[email protected]>

Co-authored-by: Radu Gidei <[email protected]>
Co-authored-by: Jorgen Dahl <[email protected]>
Co-authored-by: Jorgen Dahl <[email protected]>
Co-authored-by: aparajit-pratap <[email protected]>
Co-authored-by: pinzart90 <[email protected]>
Co-authored-by: Aaron (Qilong) <[email protected]>
Co-authored-by: Michael Kirschner <[email protected]>
Co-authored-by: Martin Misol Monzo <[email protected]>
Co-authored-by: Ashish Aggarwal <[email protected]>
Co-authored-by: reddyashish <[email protected]>
Co-authored-by: Laurence Elsdon <[email protected]>
Co-authored-by: pinzart <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QilongTang QilongTang QilongTang approved these changes

Assignees
No one assigned
Labels
PTAL Please Take A Look 👀
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aparajit-pratap @QilongTang