Skip to content

fix: normalize phone number and ensure label selection #2451

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

Open
bhavesh-018 wants to merge 5 commits into
base: 2.1
Choose a base branch
from
+17 −2
Open

fix: normalize phone number and ensure label selection #2451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
860c095
fix: normalize phone number and ensure label selection
Feb 12, 2026
b8af5f6
chore: code formatting cleanup
Feb 12, 2026
23c2f94
fix: adjust phone normalization fallback logic
Feb 12, 2026
bdea73a
fix: prevent phone normalization on component initialization
Feb 12, 2026
290e190
test: add visibility wait before clicking edit icon in person test
Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions packages/Webkul/Admin/src/Resources/views/components/attributes/edit/phone.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class="flex w-fit cursor-pointer items-center gap-2 text-brandColor"
@lang("admin::app.common.custom-attributes.add-more")
</span>
</script>

<script src="https://unpkg.com/libphonenumber-js/bundle/libphonenumber-max.js"></script>
<script type="module">
app.component('v-phone-component', {
template: '#v-phone-component-template',
Expand All @@ -98,7 +98,12 @@ class="flex w-fit cursor-pointer items-center gap-2 text-brandColor"
watch: {
value(newValue, oldValue) {
if (JSON.stringify(newValue) !== JSON.stringify(oldValue)) {
this.contactNumbers = newValue || [{'value': '', 'label': 'work'}];
this.contactNumbers = (newValue || [{'value': '', 'label': 'work'}])
.map(contactNumber => ({
...contactNumber,
value: this.cleanPhone(contactNumber.value),
label: (contactNumber.label || 'work').toLowerCase()
}));
}
},
},
Expand All @@ -122,6 +127,7 @@ class="flex w-fit cursor-pointer items-center gap-2 text-brandColor"
'label': 'work'
}];
}

},

methods: {
Expand All @@ -135,6 +141,14 @@ class="flex w-fit cursor-pointer items-center gap-2 text-brandColor"
remove(contactNumber) {
this.contactNumbers = this.contactNumbers.filter(number => number !== contactNumber);
},
cleanPhone(value) {
if (!value) return value;
const phone = libphonenumber.parsePhoneNumberFromString(value);
if (phone) {
return phone.nationalNumber;
}
return value.replace(/\D/g, '');
},

extendValidations() {
defineRule('unique_contact_number', async (value, contactNumbers) => {
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/tests/e2e-pw/tests/contacts/person.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ test("should be able to assign a company to person", async ({ adminPage }) => {
*/
await adminPage.goto("admin/contacts/persons");
await createPerson(adminPage);
await expect(adminPage.locator("span.icon-edit")).toBeVisible();
await adminPage.locator("span.icon-edit").first().click();
await adminPage
.locator("div")
Expand Down
Loading