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.

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

Merge if node changes #11728

Merged
merged 9 commits into from
Jun 8, 2021
Merged

Conversation

reddyashish
Copy link
Contributor

@reddyashish reddyashish commented Jun 2, 2021

Purpose

This PR is to merge the "IF" node implementation changes from feature branch to master.

#11481
#11598
#11721

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

@QilongTang @zeusongit @aparajit-pratap @mjkkirschner

reddyashish and others added 4 commits February 16, 2021 16:12
…evalue based on the test condition. (DynamoDS#11481)

* attempt1 at creating partially applied function

* change implementation of If NodeModel node

* Move the functionality to a new if node that will be renamed.

* Update IfTest.cs

* Hiding the old If node and renaming to the new one to have the same  name.

* Throw a warning message when the old node is opened.

* add comments.

* Update the warning message and move it to the resources file.

* Fix failing test

Co-authored-by: Aparajit Pratap <[email protected]>
…DS#11598)

* Add lacing feature to the "If" node.

* Addressing comments

* additional comments

* Move code into a private function.
[OutPortTypes("Function")]
[IsDesignScriptCompatible]
[AlsoKnownAs("DSCoreNodesUI.Logic.If")]
public class RefactoredIf : NodeModel
Copy link
Contributor Author

@reddyashish reddyashish Jun 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is going to be a public class, is "RefactoredIf" name fine with everyone? Are we going to obsolete the old node in 3.0 and then rename this class name to "If"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a more descriptive name and summary? Is there any reason not to obsolete the old node right now?

Copy link
Contributor Author

@reddyashish reddyashish Jun 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I meant, if we are going to remove this old node completely in 3.0. Currently the old one is obsoleted and the new node has a summary under BuildOutputAst(). Do you want me to add any other information?

Copy link
Contributor

@aparajit-pratap aparajit-pratap left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@reddyashish there is still work to be done to apply the existing If node icon to this new node. I tried your branch locally and the icon doesn't work for the new node.

@reddyashish
Copy link
Contributor Author

@aparajit-pratap looking into it.

@aparajit-pratap
Copy link
Contributor

@reddyashish can you also change the names of the small and large png files from the old class name to the new class name. You should find them in src/Resources/CoreNodeModels/Large(Small)Icons if I'm not wrong.

@aparajit-pratap
Copy link
Contributor

You might also need to update this file for the icons accordingly for the library tests to pass: test/ViewExtensionLibraryTests/resources/libraryItems.json

@reddyashish
Copy link
Contributor Author

@aparajit-pratap changed the png file name in both the locations and updated libraryItems.json. Let me know if those changes look good to you.

@reddyashish
Copy link
Contributor Author

reddyashish commented Jun 8, 2021

Addressed the failing test, but somehow the self-serve job validation here is still showing it is unstable.
The job on master-15 passed all the tests: https://master-15.jenkins.autodesk.com/view/DYN/job/DYN-DevCI_Self_Service/800/
Merging this.

@reddyashish reddyashish merged commit 8aff378 into DynamoDS:master Jun 8, 2021
@reddyashish reddyashish deleted the MergeIfNodeChanges branch November 23, 2022 07:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants