-
-
Notifications
You must be signed in to change notification settings - Fork 26
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
feat(#648): add --disable-users command for merge-contacts action #649
Merged
Merged
Changes from all commits
Commits
Show all changes
51 commits
Select commit
Hold shift + click to select a range
d16df6d
Testing this common library going to get weird
kennsippell 3e1827e
Move-Contacts tests passing again
kennsippell d914e64
First test passing for merge
kennsippell 090895c
Negative cases
kennsippell 3e6168c
Fix move-contacts tests again
kennsippell 2449dd4
Some renaming
kennsippell b5f8c3b
Refactor to use options
kennsippell 1273fb6
Move folder structure
kennsippell 25ad230
Lineage Constraints
kennsippell 5ad9d85
Rename to Hierarchy Operations
kennsippell 7ea3393
replaceRelevantLineage
kennsippell 78f2c01
Refacatoring for lineage-manipulation
kennsippell d677b48
Tests for fn folder
kennsippell 2442fcc
Pass eslint
kennsippell a0a0c84
Backend interface change
kennsippell f73f9c6
Fix failing test in mock-hierarchies
kennsippell 8e35f2d
SonarCube
kennsippell 17c4c04
SonarQube - Is his really better code?
kennsippell 7af035c
SonarQube - Fix?
kennsippell 687a6a2
SonarQube
kennsippell 49c6d51
Oops
kennsippell 9536ff6
Late night wireframe
kennsippell 8b751b6
Passing with automation
kennsippell ad09272
After testing
kennsippell de78eb0
Passing eslint
kennsippell 6d0cc3e
Reduced nesting via curried function
kennsippell e561431
4 feedbacks
kennsippell 92ae094
Remove getHierarchyErrors public interface
kennsippell d68a294
Lots of lineage-constraints feedback
kennsippell c964aa7
Remove lineageAttribute
kennsippell 88ea9fd
Still code reviewing
kennsippell 296088a
Eslint
kennsippell 42c6789
One more
kennsippell 8f2bbd6
Why 5? wtf
kennsippell 4ecf723
Phrasing
kennsippell 8cb2840
Merge branch '373-merge-contacts-options' into 373-upload-docs-delete…
kennsippell 0a9db49
Unneeded comment
kennsippell af9a9ac
lineage-manipulation refactor
kennsippell 546f9cb
Docs
kennsippell fe27a5a
Oh that is why
kennsippell 28be7fb
Remove function nesting
kennsippell 99745c6
Last code review feedback
kennsippell 6cb96d8
Merge branch '373-merge-contacts-options' into 373-upload-docs-delete…
kennsippell d4dcd45
No function nesting
kennsippell b323c9f
SonarCube after refactor
kennsippell bdbead6
Merge branch 'main' into 373-upload-docs-delete-user
kennsippell bd9bf60
Avoid breaking change with #652
kennsippell da6a8cb
Review feedback
kennsippell aebfb93
--disable-users also needed on upload-docs
kennsippell f729e80
Change tactics
kennsippell ec4effd
Docs update
kennsippell 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 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 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 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 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 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 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
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.
question: I've noticed an inconsistency in the command structure. The
disable-users
argument was moved from thedisable-users
command to themerge-contacts
command. However, after reviewing themerge-contacts
command, I don't see a direct invocation ofupload-docs
.Are we looking at a scenario where these commands should be combined, such as
cht merge-contacts upload-docs --disable-users
?My concern is that running this against a CHT 4.6.0 instance might result in an error, even if the
--disable-users
flag isn't explicitly passed.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.
@sugat009 You can read here about the intended use of the commands. Yes, you are right that the two need to be combined like this:
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.
I guess we have a few options:
cht_disable_linked_users
. Keep--disable-users
flag onmerge-contacts
action and note that it is only supported by CHT Core 4.8 and above.--disable-users
flag to upload-docs. Remove it from merge-contacts and (delete-contacts added in feat(#650): delete-contacts action #652 )--disable-users
flag on both upload-docs and merge-contacts.I suspect 1 is the best option?
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.
Yes, option 1 is the best option. Let's go with that.
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.
OK. Nice to confirm. That is what is in this PR now.