diff --git a/console/src/app/modules/policies/notification-sms-provider/dialog-add-sms-provider/dialog-add-sms-provider.component.html b/console/src/app/modules/policies/notification-sms-provider/dialog-add-sms-provider/dialog-add-sms-provider.component.html index b8d239ef1..78f70c7fb 100644 --- a/console/src/app/modules/policies/notification-sms-provider/dialog-add-sms-provider/dialog-add-sms-provider.component.html +++ b/console/src/app/modules/policies/notification-sms-provider/dialog-add-sms-provider/dialog-add-sms-provider.component.html @@ -18,7 +18,7 @@ - diff --git a/console/src/app/modules/policies/notification-sms-provider/dialog-add-sms-provider/dialog-add-sms-provider.component.ts b/console/src/app/modules/policies/notification-sms-provider/dialog-add-sms-provider/dialog-add-sms-provider.component.ts index 2594dd072..01c1d6890 100644 --- a/console/src/app/modules/policies/notification-sms-provider/dialog-add-sms-provider/dialog-add-sms-provider.component.ts +++ b/console/src/app/modules/policies/notification-sms-provider/dialog-add-sms-provider/dialog-add-sms-provider.component.ts @@ -61,15 +61,14 @@ export class DialogAddSMSProviderComponent { } public closeDialogWithRequest(): void { - if (!!this.twilio) { + if (!!this.twilio && this.twilioProvider && this.twilioProvider.id) { this.req = new UpdateSMSProviderTwilioRequest(); - + this.req.setId(this.twilioProvider.id); this.req.setSid(this.sid?.value); this.req.setSenderNumber(this.senderNumber?.value); this.dialogRef.close(this.req); } else { this.req = new AddSMSProviderTwilioRequest(); - this.req.setSid(this.sid?.value); this.req.setToken(this.token?.value); this.req.setSenderNumber(this.senderNumber?.value); diff --git a/console/src/app/modules/policies/notification-sms-provider/notification-sms-provider.component.html b/console/src/app/modules/policies/notification-sms-provider/notification-sms-provider.component.html index adde321c6..33a2521e5 100644 --- a/console/src/app/modules/policies/notification-sms-provider/notification-sms-provider.component.html +++ b/console/src/app/modules/policies/notification-sms-provider/notification-sms-provider.component.html @@ -24,6 +24,7 @@ *ngIf="twilio && twilio.id" [disabled]="(['iam.write'] | hasRole | async) === false" mat-stroked-button + data-e2e="activate-sms-provider-button" (click)="toggleSMSProviderState(twilio.id)" > {{ diff --git a/console/src/app/modules/policies/notification-sms-provider/notification-sms-provider.component.ts b/console/src/app/modules/policies/notification-sms-provider/notification-sms-provider.component.ts index f13a3e699..dc8b2115d 100644 --- a/console/src/app/modules/policies/notification-sms-provider/notification-sms-provider.component.ts +++ b/console/src/app/modules/policies/notification-sms-provider/notification-sms-provider.component.ts @@ -33,6 +33,7 @@ export class NotificationSMSProviderComponent implements OnInit { ngOnInit(): void { this.fetchData(); } + private fetchData(): void { this.smsProvidersLoading = true; this.service @@ -63,7 +64,7 @@ export class NotificationSMSProviderComponent implements OnInit { this.service .updateSMSProviderTwilio(req as UpdateSMSProviderTwilioRequest) .then(() => { - this.toast.showInfo('SETTING.SMS.TWILIO.ADDED', true); + this.toast.showInfo('SETTING.SMS.TWILIO.UPDATED', true); this.fetchData(); }) .catch((error) => { diff --git a/console/src/assets/i18n/bg.json b/console/src/assets/i18n/bg.json index 2bb72ca7d..e9907811e 100644 --- a/console/src/assets/i18n/bg.json +++ b/console/src/assets/i18n/bg.json @@ -1085,6 +1085,7 @@ "TOKEN": "Токен", "SENDERNUMBER": "Номер на изпращача", "ADDED": "Twilio добави успешно.", + "UPDATED": "Twilio се актуализира успешно.", "REMOVED": "Twilio премахнат", "CHANGETOKEN": "Промяна на токена", "SETTOKEN": "Задаване на токен", diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index 9ae13c827..fc3c9633a 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -1091,6 +1091,7 @@ "TOKEN": "Token", "SENDERNUMBER": "Sender Number", "ADDED": "Twilio erfolgreich hinzugefügt.", + "UPDATED": "Twilio wurde erfolgreich aktualisiert.", "REMOVED": "Twilio entfernt", "CHANGETOKEN": "Token ändern", "SETTOKEN": "Token setzen", diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index 25ff13be2..5166c33f5 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -1092,6 +1092,7 @@ "TOKEN": "Token", "SENDERNUMBER": "Sender Number", "ADDED": "Twilio added successfully.", + "UPDATED": "Twilio updated successfully.", "REMOVED": "Twilio removed", "CHANGETOKEN": "Change Token", "SETTOKEN": "Set Token", diff --git a/console/src/assets/i18n/es.json b/console/src/assets/i18n/es.json index 34c0c6de4..d4faf3abf 100644 --- a/console/src/assets/i18n/es.json +++ b/console/src/assets/i18n/es.json @@ -1092,6 +1092,7 @@ "TOKEN": "Token", "SENDERNUMBER": "Número de emisor", "ADDED": "Twilio añadido con éxito.", + "UPDATED": "Twilio actualizado con éxito", "REMOVED": "Twilio eliminado", "CHANGETOKEN": "Cambiar token", "SETTOKEN": "Establecer token", diff --git a/console/src/assets/i18n/fr.json b/console/src/assets/i18n/fr.json index 373feb32a..bc52d02dd 100644 --- a/console/src/assets/i18n/fr.json +++ b/console/src/assets/i18n/fr.json @@ -1091,6 +1091,7 @@ "TOKEN": "Jeton", "SENDERNUMBER": "Numéro d'expéditeur", "ADDED": "Twilio a été ajouté avec succès.", + "UPDATED": "Twilio a été mis à jour avec succès.", "REMOVED": "Twilio a été supprimé avec succès", "CHANGETOKEN": "Changer de Token", "SETTOKEN": "Définir le jeton", diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json index cae3b1cf1..635d42c30 100644 --- a/console/src/assets/i18n/it.json +++ b/console/src/assets/i18n/it.json @@ -1091,6 +1091,7 @@ "TOKEN": "Token", "SENDERNUMBER": "Sender Number", "ADDED": "Twilio aggiunto con successo.", + "UPDATED": "Twilio aggiornato correttamente.", "REMOVED": "Twilio rimosso con successo.", "CHANGETOKEN": "Cambia Token", "SETTOKEN": "Cambia Token", diff --git a/console/src/assets/i18n/ja.json b/console/src/assets/i18n/ja.json index 651d00a26..3f6bd719a 100644 --- a/console/src/assets/i18n/ja.json +++ b/console/src/assets/i18n/ja.json @@ -1092,6 +1092,7 @@ "TOKEN": "トークン", "SENDERNUMBER": "送信者番号", "ADDED": "Twilioは正常に追加されました。", + "UPDATED": "Twilio が正常に更新されました。", "REMOVED": "Twilioが削除されました", "CHANGETOKEN": "トークンを変更する", "SETTOKEN": "トークンを設定する", diff --git a/console/src/assets/i18n/mk.json b/console/src/assets/i18n/mk.json index cad724be7..40360136b 100644 --- a/console/src/assets/i18n/mk.json +++ b/console/src/assets/i18n/mk.json @@ -1093,6 +1093,7 @@ "TOKEN": "Токен", "SENDERNUMBER": "Број на испраќач", "ADDED": "Twilio e успешно додаден.", + "UPDATED": "Twilio се ажурираше успешно.", "REMOVED": "Twilio отстранет", "CHANGETOKEN": "Смени токен", "SETTOKEN": "Постави токен", diff --git a/console/src/assets/i18n/pl.json b/console/src/assets/i18n/pl.json index a6ef90e0e..c78c6eef1 100644 --- a/console/src/assets/i18n/pl.json +++ b/console/src/assets/i18n/pl.json @@ -1091,6 +1091,7 @@ "TOKEN": "Token", "SENDERNUMBER": "Numer nadawcy", "ADDED": "Twilio dodano pomyślnie.", + "UPDATED": "Twilio zostało pomyślnie zaktualizowane.", "REMOVED": "Twilio usunięte", "CHANGETOKEN": "Zmień Token", "SETTOKEN": "Ustaw Token", diff --git a/console/src/assets/i18n/pt.json b/console/src/assets/i18n/pt.json index fb03b6c71..bd2a648a0 100644 --- a/console/src/assets/i18n/pt.json +++ b/console/src/assets/i18n/pt.json @@ -1093,6 +1093,7 @@ "TOKEN": "Token", "SENDERNUMBER": "Número do remetente", "ADDED": "Twilio adicionado com sucesso.", + "UPDATED": "Twilio atualizado com sucesso.", "REMOVED": "Twilio removido", "CHANGETOKEN": "Alterar token", "SETTOKEN": "Definir token", diff --git a/console/src/assets/i18n/zh.json b/console/src/assets/i18n/zh.json index 4192baed9..7d34e7a47 100644 --- a/console/src/assets/i18n/zh.json +++ b/console/src/assets/i18n/zh.json @@ -1091,6 +1091,7 @@ "TOKEN": "令牌", "SENDERNUMBER": "发件人号码", "ADDED": "Twilio 添加成功。", + "UPDATED": "Twilio 更新成功。", "REMOVED": "Twilio 已删除", "CHANGETOKEN": "更改令牌", "SETTOKEN": "设置令牌", diff --git a/e2e/cypress/e2e/instance/settings/notifications.cy.ts b/e2e/cypress/e2e/instance/settings/notifications.cy.ts index f2685c5d9..06207ce52 100644 --- a/e2e/cypress/e2e/instance/settings/notifications.cy.ts +++ b/e2e/cypress/e2e/instance/settings/notifications.cy.ts @@ -19,7 +19,6 @@ describe('instance notifications', () => { cy.visit(smtpPath); cy.contains('SMTP Settings'); }); - it(`should add SMTP provider settings`, () => { cy.visit(smtpPath); cy.get('[formcontrolname="senderAddress"]').clear().type('sender@example.com'); @@ -33,7 +32,6 @@ describe('instance notifications', () => { cy.get('[formcontrolname="hostAndPort"]').should('have.value', 'smtp.mailtrap.io:2525'); cy.get('[formcontrolname="user"]').should('have.value', 'user@example.com'); }); - it(`should add SMTP provider password`, () => { cy.visit(smtpPath); cy.get('[data-e2e="add-smtp-password-button"]').click(); @@ -60,5 +58,56 @@ describe('instance notifications', () => { cy.get('h4').contains('Twilio'); cy.get('.state').contains('Inactive'); }); + + it(`should activate SMS provider`, () => { + cy.visit(smsPath); + cy.get('h4').contains('Twilio'); + cy.get('.state').contains('Inactive'); + cy.get('[data-e2e="activate-sms-provider-button"]').click(); + cy.shouldConfirmSuccess(); + cy.get('.state').contains('Active'); + }); + + it(`should edit SMS provider`, () => { + cy.visit(smsPath); + cy.get('h4').contains('Twilio'); + cy.get('.state').contains('Active'); + cy.get('[data-e2e="new-twilio-button"]').click(); + cy.get('[formcontrolname="sid"]').should('have.value', 'test'); + cy.get('[formcontrolname="senderNumber"]').should('have.value', '2312123132'); + cy.get('[formcontrolname="sid"]').clear().type('test2'); + cy.get('[formcontrolname="senderNumber"]').clear().type('6666666666'); + cy.get('[data-e2e="save-sms-settings-button"]').click(); + cy.shouldConfirmSuccess(); + }); + + it(`should contain edited values`, () => { + cy.visit(smsPath); + cy.get('h4').contains('Twilio'); + cy.get('.state').contains('Active'); + cy.get('[data-e2e="new-twilio-button"]').click(); + cy.get('[formcontrolname="sid"]').should('have.value', 'test2'); + cy.get('[formcontrolname="senderNumber"]').should('have.value', '6666666666'); + }); + + it(`should edit SMS provider token`, () => { + cy.visit(smsPath); + cy.get('h4').contains('Twilio'); + cy.get('.state').contains('Active'); + cy.get('[data-e2e="new-twilio-button"]').click(); + cy.get('[data-e2e="edit-sms-token-button"]').click(); + cy.get('[data-e2e="notification-setting-password"]').clear().type('newsupertoken'); + cy.get('[data-e2e="save-notification-setting-password-button"]').click(); + cy.shouldConfirmSuccess(); + }); + + it(`should remove SMS provider`, () => { + cy.visit(smsPath); + cy.get('h4').contains('Twilio'); + cy.get('.state').contains('Active'); + cy.get('[data-e2e="remove-sms-provider-button"]').click(); + cy.get('[data-e2e="confirm-dialog-button"]').click(); + cy.shouldConfirmSuccess(); + }); }); });