Skip to content

Conversation

@lexiv0re
Copy link
Collaborator

Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
@lexiv0re lexiv0re requested review from Copilot and haiodo September 22, 2025 14:33
@huly-github-staging
Copy link

Connected to Huly®: UBERF-13748

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR adjusts merge contact functionality to integrate with global accounts by refactoring the person merging logic from service operations to regular operations and enhancing the UI to support social identity merging and validation.

Key changes:

  • Moved person merging functions from service operations to regular operations with enhanced validation
  • Enhanced the merge persons UI to display social identities and check merge eligibility
  • Added a new SocialIdentityPresenter component for consistent social identity display
  • Added infrastructure for Redis and HulyPulse services

Reviewed Changes

Copilot reviewed 23 out of 23 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
server/account/src/serviceOperations.ts Removed mergeSpecifiedPersons function and related imports/exports
server/account/src/operations.ts Added canMergeSpecifiedPersons and mergeSpecifiedPersons functions with validation
plugins/setting-resources/src/components/socialIds/SocialIdsEditor.svelte Updated to use new SocialIdRow component
plugins/setting-resources/src/components/socialIds/SocialIdRow.svelte Refactored to use SocialIdentityPresenter component
plugins/contact-resources/src/visibilityTester.ts Added canMergePersons visibility tester
plugins/contact-resources/src/plugin.ts Added CannotMerge string and CanMergePersons function
plugins/contact-resources/src/index.ts Exported SocialIdentityPresenter and canMergePersons
plugins/contact-resources/src/components/SocialIdentityPresenter.svelte New component for displaying social identity information
plugins/contact-resources/src/components/MergePersons.svelte Enhanced merge dialog with social identity handling and validation
plugins/contact-assets/lang/*.json Added CannotMerge error message translations
packages/account-client/src/client.ts Added canMergeSpecifiedPersons method
models/contact/src/plugin.ts Added SocialIdentityPresenter component reference
models/contact/src/index.ts Added presenter configuration and visibility tester
dev/docker-compose.min.yaml Added Redis and HulyPulse services

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@haiodo haiodo merged commit 550f1a5 into develop Sep 22, 2025
15 checks passed
@haiodo haiodo deleted the uberf-13692/adjust-merge-contacts branch September 22, 2025 15:25
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