-
Notifications
You must be signed in to change notification settings - Fork 395
feat(contact-center): Dial number validation supports international #4759
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
Open
zachraymer
wants to merge
2
commits into
webex:next
Choose a base branch
from
zachraymer:next
base: next
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+100
−7
Open
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ import { | |
| Interaction, | ||
| } from '../task/types'; | ||
| import {PARTICIPANT_TYPES, STATE_CONSULT} from './constants'; | ||
| import {DialPlan} from '../config/types'; | ||
|
|
||
| /** | ||
| * Extracts common error details from a Webex request payload. | ||
|
|
@@ -48,11 +49,37 @@ const getAgentActionTypeFromTask = (taskData?: TaskData): 'DIAL_NUMBER' | '' => | |
| return isDialNumber || isEntryPointVariant ? 'DIAL_NUMBER' : ''; | ||
| }; | ||
|
|
||
| export const isValidDialNumber = (input: string): boolean => { | ||
| // This regex checks for a valid dial number format for only few countries such as US, Canada. | ||
| const regexForDn = /1[0-9]{3}[2-9][0-9]{6}([,]{1,10}[0-9]+){0,1}/; | ||
| // Fallback regex for US/Canada dial numbers when no dial plan entries are configured | ||
| export const FALLBACK_DIAL_NUMBER_REGEX = /1[0-9]{3}[2-9][0-9]{6}([,]{1,10}[0-9]+){0,1}/; | ||
|
|
||
| return regexForDn.test(input); | ||
| /** | ||
| * Validates a dial number against the provided dial plan regex patterns. | ||
| * A number is valid if it matches at least one regex pattern in the dial plans. | ||
| * Falls back to US/Canada regex validation if no dial plan entries are configured. | ||
| * | ||
| * @param input - The dial number to validate | ||
| * @param dialPlanEntries - Array of dial plan entries containing regex patterns | ||
| * @returns true if the input matches at least one dial plan regex pattern, false otherwise | ||
| */ | ||
| export const isValidDialNumber = ( | ||
| input: string, | ||
| dialPlanEntries: DialPlan['dialPlanEntity'] | ||
| ): boolean => { | ||
| if (!dialPlanEntries || dialPlanEntries.length === 0) { | ||
| LoggerProxy.info('No dial plan entries found. Falling back to US number validation.'); | ||
|
|
||
| return FALLBACK_DIAL_NUMBER_REGEX.test(input); | ||
zachraymer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| return dialPlanEntries.some((entry) => { | ||
| try { | ||
| const regex = new RegExp(entry.regex); | ||
|
|
||
| return regex.test(input); | ||
zachraymer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } catch { | ||
| return false; | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| export const getStationLoginErrorData = (failure: Failure, loginOption: LoginOption) => { | ||
|
|
@@ -74,7 +101,7 @@ export const getStationLoginErrorData = (failure: Failure, loginOption: LoginOpt | |
| }, | ||
| INVALID_DIAL_NUMBER: { | ||
| message: | ||
| 'Enter a valid US dial number. For help, reach out to your administrator or support team.', | ||
| 'Enter a valid dial number. For help, reach out to your administrator or support team.', | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we include the supported country list here?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you for the review Rajesh. Can we satisfy this item or go forward with merge? |
||
| fieldName: loginOption, | ||
| }, | ||
| }; | ||
|
|
||
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
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.
Uh oh!
There was an error while loading. Please reload this page.