From 8eb8cfb10dd04558af48bb58e326c0c1f69d4666 Mon Sep 17 00:00:00 2001 From: Debora Crescenzo Date: Thu, 12 Feb 2026 15:27:41 +0000 Subject: [PATCH] MT#64432 Refactor Subscriber Phonebook Our nightly tests flagged the fact that the feature was unstable and unrealiable. Changes: * Extract subscriber phonebook api and state * Change direct use of http in the sub-phonebook method to use the relevant method in common.js * Simplify logic to PATCH single properties with a unique PUT in the Phonebook entry form * Amend getList, handleResponseError and put to allow use with API v2 endpoints * Amend translations and methods to replace "phonebook" with "phonebook entry" where necessary Change-Id: I189d45fe426a1ded400a251d7efdfa72f76f9061 (cherry picked from commit ff40864da0b46aa7e4b0525a98e0a335160022e5) --- src/api/common.js | 43 ++++++++- src/api/subscriber-phonebook.js | 65 +++++++++++++ src/api/subscriber.js | 73 ++------------- src/i18n/de.json | 52 +++++------ src/i18n/en.json | 4 +- src/i18n/es.json | 4 +- src/i18n/fr.json | 4 +- src/i18n/it.json | 4 +- src/pages/CscPageConversations.vue | 4 + src/pages/CscPageSubscriberPhonebook.vue | 49 ++++------ src/pages/CscPageSubscriberPhonebookAdd.vue | 20 +++- .../CscPageSubscriberPhonebookDetails.vue | 52 ++++------- src/store/index.js | 4 +- src/store/subscriber-phonebook.js | 91 +++++++++++++++++++ src/store/user.js | 66 +------------- 15 files changed, 303 insertions(+), 232 deletions(-) create mode 100644 src/api/subscriber-phonebook.js create mode 100644 src/store/subscriber-phonebook.js diff --git a/src/api/common.js b/src/api/common.js index b5ec4e0b..51b90658 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -7,7 +7,7 @@ import { getJwt, hasJwt } from 'src/auth' import { getCurrentLangAsV1Format } from 'src/i18n' export const LIST_DEFAULT_PAGE = 1 -export const LIST_DEFAULT_ROWS = 24 +export const LIST_DEFAULT_ROWS = 20 export const LIST_ALL_ROWS = 1000 export const API_REQUEST_DEFAULT_TIMEOUT = 30000 @@ -101,6 +101,7 @@ export async function getList (options) { }, options) if (requestConfig.all === true) { requestConfig.params.rows = LIST_ALL_ROWS + requestConfig.params.page = LIST_DEFAULT_PAGE } if (requestConfig.resource !== undefined) { requestConfig.path = `api/${requestConfig.resource}/` @@ -135,7 +136,12 @@ export async function getList (options) { if (lastPage === 0) { lastPage = null } - let items = _.get(body, requestConfig.root, []) + + let items = requestConfig.root + // This gets the results for the API V1 which has the list in the root of the response, and if not found it tries to get it from the API V2 response format + ? _.get(body, requestConfig.root, []) + // This gets the results for the API V2 which has the list in the data field, and if not found it tries to get it from the root of the response (for backward compatibility with API V1) + : _.get(body, 'data', []) if (!Array.isArray(items)) { items = [items] } @@ -149,12 +155,40 @@ export async function getList (options) { } } +function extractMessages (messageArray) { + const messages = [] + if (Array.isArray(messageArray)) { + messageArray.forEach((item) => { + Object.keys(item).forEach((fieldName) => { + const fieldErrors = item[fieldName] + if (Array.isArray(fieldErrors)) { + fieldErrors.forEach((errorObject) => { + Object.values(errorObject).forEach((errorMsg) => { + messages.push(errorMsg) + }) + }) + } + }) + }) + } + return messages.join(', ') +} + function handleResponseError (err) { - const code = _.get(err, 'response.data.code', null) + let code = _.get(err, 'response.data.code', null) let message = _.get(err, 'response.data.message', null) + if (code === 403 && message === 'Invalid license') { message = i18n.global.t('Contact your administrator to activate this functionality') } + + // API V2 returns an array of messages rather than a string + // and the code is available in the response status + if (Array.isArray(message)) { + message = extractMessages(message) + code = _.get(err, 'response.status', null) + } + if (code !== null && message !== null) { throw new ApiResponseError(code, message) } @@ -287,7 +321,8 @@ export async function put (options) { path = `api/${requestConfig.resource}/${requestConfig.resourceId}` } try { - const res = await httpApi.put(path, requestConfig.body, { + const payload = requestConfig.body || requestConfig.data + const res = await httpApi.put(path, payload, { headers: requestConfig.headers }) if (requestConfig.headers.Prefer === Prefer.representation) { diff --git a/src/api/subscriber-phonebook.js b/src/api/subscriber-phonebook.js new file mode 100644 index 00000000..c3099e50 --- /dev/null +++ b/src/api/subscriber-phonebook.js @@ -0,0 +1,65 @@ +import { + del, + get, + getList, + patchReplace, + post, + putMinimal +} from 'src/api/common' + +export async function createPhonebook (data) { + const payload = { + name: data.name, + number: data.number, + shared: data.shared, + subscriber_id: Number(data.subscriber_id) + } + return post({ + resource: 'subscriberphonebookentries', + body: payload + }) +} + +export async function deleteEntry (id) { + return del({ + resource: 'subscriberphonebookentries', + resourceId: id + }) +} + +export async function getEntryById (id) { + return get({ + resource: 'subscriberphonebookentries', + resourceId: id + }) +} + +export async function getPhonebook (options) { + return getList({ + resource: 'subscriberphonebookentries', + params: options, + ...(options.rows === 0 ? { all: true } : {}) + }) +} + +export function setSharedValue (id, value) { + return patchReplace({ + resource: 'subscriberphonebookentries', + resourceId: id, + fieldPath: 'shared', + value + }) +} + +export async function updateEntry (data) { + return putMinimal({ + resource: 'subscriberphonebookentries', + resourceId: data.id, + body: { + number: data.number, + shared: data.shared, + name: data.name, + subscriber_id: Number(data.subscriberId) + } + }) +} diff --git a/src/api/subscriber.js b/src/api/subscriber.js index 5f3974de..70764a0c 100644 --- a/src/api/subscriber.js +++ b/src/api/subscriber.js @@ -57,19 +57,7 @@ export async function setPreference (id, field, value) { } } } -export async function setPreferencePhonebook (id, field, value) { - if (value === undefined || value === null || value === '' || (Array.isArray(value) && !value.length)) { - await removePreferencePhonebook(id, field) - } else { - try { - await replacePreferencePhonebook(id, field, value) - } catch (err) { - if (err) { - throw err - } - } - } -} + export async function setPreferencePhonebookCustomer (id, field, value) { if (value === undefined || value === null || value === '' || (Array.isArray(value) && !value.length)) { await removePreferencePhonebookCustomer(id, field) @@ -83,6 +71,7 @@ export async function setPreferencePhonebookCustomer (id, field, value) { } } } + export function getNcosLevels (options) { return new Promise((resolve, reject) => { const mergedOptions = _.merge(options || {}, { @@ -115,12 +104,7 @@ export async function removePreference (id, field) { fieldPath: field }) } -export async function removePreferencePhonebook (id, field) { - return await patchRemove({ - path: `api/subscriberphonebookentries/${id}`, - fieldPath: field - }) -} + export async function removePreferencePhonebookCustomer (id, field) { return await patchRemove({ path: `api/customerphonebookentries/${id}`, @@ -167,19 +151,7 @@ export function replacePreference (id, field, value) { }) }) } -export function replacePreferencePhonebook (id, field, value) { - return new Promise((resolve, reject) => { - patchReplace({ - path: `api/subscriberphonebookentries/${id}`, - fieldPath: field, - value - }).then(() => { - resolve() - }).catch((err) => { - reject(err) - }) - }) -} + export function replacePreferencePhonebookCustomer (id, field, value) { return new Promise((resolve, reject) => { patchReplace({ @@ -763,24 +735,7 @@ export async function getSubscriberRegistrations (options) { }) return list } -export async function getSubscriberPhonebook (options) { - let all = false - if (options.rows === 0) { - delete options.rows - delete options.page - all = true - } - if (!options.order_by) { - delete options.order_by - delete options.order_by_direction - } - const list = await getList({ - resource: 'subscriberphonebookentries', - all, - params: options - }) - return list -} + export async function getCustomerPhonebook (options) { let all = false if (options.rows === 0) { @@ -799,14 +754,7 @@ export async function getCustomerPhonebook (options) { }) return list } -export async function createPhonebook (data) { - const payLoad = { - name: data.name, - number: data.number, - shared: data.shared - } - return await httpApi.post('api/subscriberphonebookentries/', payLoad) -} + export async function createCustomerPhonebook (data) { const payLoad = { name: data.name, @@ -827,18 +775,9 @@ export async function uploadCsv (context, formData) { config }) } -export function setValueShared (id, value) { - return setPreferencePhonebook(id, 'shared', value) -} -export function setValueName (id, value) { - return setPreferencePhonebook(id, 'name', value) -} export function setValueNameCustomer (id, value) { return setPreferencePhonebookCustomer(id, 'name', value) } -export function setValueNumber (id, value) { - return setPreferencePhonebook(id, 'number', value) -} export function setValueNumberCustomer (id, value) { return setPreferencePhonebookCustomer(id, 'number', value) } diff --git a/src/i18n/de.json b/src/i18n/de.json index cd365dc1..8e03a8d1 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -156,7 +156,7 @@ "Delete recording": "Aufnahme löschen", "Delete registered device": "Registriertes Gerät löschen", "Delete slot?": "Eintrag löschen?", - "Delete subscriber phonebook": "Telefonbuch des Teilnehmers löschen", + "Delete subscriber phonebook entry": "Telefonbucheintrag des Teilnehmers löschen", "Delete voicemail after email notification is delivered": "Voicemail nach dem Senden der E-Mail-Benachrichtigung löschen", "Deliver Incoming Faxes": "Eingehende Faxe zustellen", "Deliver Outgoing Faxes": "Ausgehende Faxe zustellen", @@ -589,31 +589,31 @@ "Wrong username or password": "Falscher Benutzername oder Passwort", "Yes": "Ja", "Yesterday": "Gestern", - "You are about to change your login password. After the password was changed successfully, you get automatically logged out to authenticate with the new password. ": "Anmeldepasswort ändern? Nachdem das Passwort erfolgreich geändert wurde, werden Sie automatisch abgemeldet, um sich mit dem neuen Passwort zu authentifizieren. ", - "You are about to delete recording #{id}": "Die Aufzeichnung #{id} löschen?", - "You are about to delete slot {slot}": "Den Eintrag {slot} löschen?", - "You are about to delete this destination": "Das Ziel löschen?", - "You are about to delete this forwarding": "Die Weiterleitung löschen?", - "You are about to delete this phonebook": "Das Telefonbuch löschen?", - "You are about to delete this registered device": "Das registrierte Gerät löschen?", - "You are about to delete time range \"{from} - {to}\"": "Den Zeitraum „{from} - {to}“ entfernen?", - "You are about to remove ACL: From email <{from_email}>": "Sie sind im Begriff, den folgenden ACL-Eintrag zu löschen: Absender-E-Mail-Adresse <{from_email}>", - "You are about to remove call queue for {subscriber}": "Anrufwarteschlange für {subscriber} löschen?", - "You are about to remove config for {msConfig}": "Konfiguration für {msConfig} löschen?", - "You are about to remove destination {destination}": "Das Ziel {destination} entfernen?", - "You are about to remove device {device}": "Gerät {device} löschen?", - "You are about to remove group {group}": "Gruppe {group} löschen?", - "You are about to remove seat {seat}": "Nebenstelle {seat} löschen?", - "You are about to remove secret key renew notify email: {email}": "Sie sind im Begriff, die E-Mail-Adresse zur Benachrichtigung bei Erneuerung des Geheimschlüssels zu entfernen: {email}", - "You are about to remove sound set {soundSetName}": "Sound-Set {soundSetName} löschen?", - "You are about to remove the number {number}": "Nummer {number} entfernen?", - "You are about to remove the speed dial {slot}": "Kurzwahl {slot} löschen?", - "You are about to remove this Fax": "Das Fax löschen?", - "You are about to remove this Voicemail": "Diese Sprachnachricht entfernen?", - "You are about to reset the custom {type} greeting sound to defaults": "Benutzerdefinierten Begrüßungs-Sound {type} auf Standard-Sound zurücksetzen?", - "You are now able to start and receive calls": "Sie können nun Anrufe starten und empfangen", - "You can neither make a call nor receive one, since the RTC:engine is not active. If you operate a C5 CE then first upgrade to a C5 PRO to be able to use the RTC:engine.": "Sie können weder einen Anruf tätigen noch einen empfangen, da die RTC:engine nicht aktiv ist. Wenn Sie eine C5 CE betreiben, aktualisieren Sie zuerst auf eine C5 PRO, um die RTC:engine nutzen zu können.", - "You can not join a conference, since the RTC:engine is not active. If you operate a C5 CE then first upgrade to a C5 PRO to be able to use the RTC:engine.": "Sie können keiner Konferenz beitreten, da die RTC:engine nicht aktiv ist. Wenn Sie derzeit ein C5 CE betreiben, schaffen Sie sich zuerst ein C5 PRO an, um die RTC:engine nutzen zu können.", + "You are about to change your login password. After the password was changed successfully, you get automatically logged out to authenticate with the new password.": "Sie sind dabei, Ihr Anmeldepasswort zu ändern. Nach erfolgreicher Änderung werden Sie automatisch abgemeldet, um sich mit dem neuen Passwort erneut anzumelden.", + "You are about to delete recording #{id}": "Sie sind dabei, die Aufzeichnung #{id} zu löschen.", + "You are about to delete slot {slot}": "Sie sind dabei, den Eintrag {slot} zu löschen.", + "You are about to delete this destination": "Sie sind dabei, dieses Ziel zu löschen.", + "You are about to delete this forwarding": "Sie sind dabei, diese Weiterleitung zu löschen.", + "You are about to delete this phonebook entry": "Sie sind dabei, diesen Telefonbucheintrag zu löschen.", + "You are about to delete this registered device": "Sie sind dabei, dieses registrierte Gerät zu löschen.", + "You are about to delete time range \"{from} - {to}\"": "Sie sind dabei, den Zeitraum „{from} - {to}“ zu entfernen.", + "You are about to remove ACL: From email <{from_email}>": "Sie sind dabei, die ACL-Regel für die E-Mail-Adresse <{from_email}> zu entfernen.", + "You are about to remove call queue for {subscriber}": "Sie sind dabei, die Anrufwarteschlange für {subscriber} zu entfernen.", + "You are about to remove config for {msConfig}": "Sie sind dabei, die Konfiguration für {msConfig} zu entfernen.", + "You are about to remove destination {destination}": "Sie sind dabei, das Ziel {destination} zu entfernen.", + "You are about to remove device {device}": "Sie sind dabei, das Gerät {device} zu entfernen.", + "You are about to remove group {group}": "Sie sind dabei, die Gruppe {group} zu entfernen.", + "You are about to remove seat {seat}": "Sie sind dabei, die Nebenstelle {seat} zu entfernen.", + "You are about to remove secret key renew notify email: {email}": "Sie sind dabei, die Benachrichtigungs-E-Mail zur Erneuerung des Geheimschlüssels zu entfernen: {email}", + "You are about to remove sound set {soundSetName}": "Sie sind dabei, das Sound-Set {soundSetName} zu löschen.", + "You are about to remove the number {number}": "Sie sind dabei, die Nummer {number} zu entfernen.", + "You are about to remove the speed dial {slot}": "Sie sind dabei, die Kurzwahl {slot} zu löschen.", + "You are about to remove this Fax": "Sie sind dabei, dieses Fax zu löschen.", + "You are about to remove this Voicemail": "Sie sind dabei, diese Sprachnachricht zu löschen.", + "You are about to reset the custom {type} greeting sound to defaults": "Sie sind dabei, den benutzerdefinierten Begrüßungston {type} auf die Standardeinstellung zurückzusetzen.", + "You are now able to start and receive calls": "Sie können jetzt Anrufe tätigen und empfangen.", + "You can neither make a call nor receive one, since the RTC:engine is not active. If you operate a C5 CE then first upgrade to a C5 PRO to be able to use the RTC:engine.": "Sie können weder Anrufe tätigen noch empfangen, da die RTC:engine nicht aktiv ist. Wenn Sie ein C5 CE verwenden, aktualisieren Sie bitte zunächst auf ein C5 PRO, um die RTC:engine nutzen zu können.", + "You can not join a conference, since the RTC:engine is not active. If you operate a C5 CE then first upgrade to a C5 PRO to be able to use the RTC:engine.": "Sie können keiner Konferenz beitreten, da die RTC:engine nicht aktiv ist. Wenn Sie ein C5 CE verwenden, aktualisieren Sie bitte zunächst auf ein C5 PRO, um die RTC:engine nutzen zu können.", "You have blocked incoming call notifications.": "Sie haben Benachrichtigungen über eingehende Anrufe blockiert.", "You have invalid form input. Please check and try again.": "Sie haben eine ungültige Formulareingabe. Bitte überprüfen Sie diese und versuchen Sie es erneut.", "Your SIP password has been changed successfully": "Ihr SIP-Passwort wurde erfolgreich geändert", diff --git a/src/i18n/en.json b/src/i18n/en.json index d423faf4..3633577b 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -153,7 +153,7 @@ "Delete recording": "Delete recording", "Delete registered device": "Delete registered device", "Delete slot?": "Delete slot?", - "Delete subscriber phonebook": "Delete subscriber phonebook", + "Delete subscriber phonebook entry": "Delete subscriber phonebook entry", "Delete voicemail after email notification is delivered": "Delete voicemail after email notification is delivered", "Deliver Incoming Faxes": "Deliver Incoming Faxes", "Deliver Outgoing Faxes": "Deliver Outgoing Faxes", @@ -577,7 +577,7 @@ "You are about to delete slot {slot}": "You are about to delete slot {slot}", "You are about to delete this destination": "You are about to delete this destination", "You are about to delete this forwarding": "You are about to delete this forwarding", - "You are about to delete this phonebook": "You are about to delete this phonebook", + "You are about to delete this phonebook entry": "You are about to delete this phonebook entry", "You are about to delete this registered device": "You are about to delete this registered device", "You are about to delete time range \"{from} - {to}\"": "You are about to delete time range \"{from} - {to}\"", "You are about to remove ACL: From email <{from_email}>": "You are about to remove ACL: From email <{from_email}>", diff --git a/src/i18n/es.json b/src/i18n/es.json index 02e1e128..47e17669 100644 --- a/src/i18n/es.json +++ b/src/i18n/es.json @@ -156,7 +156,7 @@ "Delete recording": "Eliminar grabación", "Delete registered device": "Eliminar dispositivo registrado", "Delete slot?": "¿Eliminar ranura?", - "Delete subscriber phonebook": "Eliminar agenda del suscriptor", + "Delete subscriber phonebook entry": "Eliminar la entrada de la agenda del abonado", "Delete voicemail after email notification is delivered": "Eliminar el correo de voz después de enviar la notificación por correo electrónico", "Deliver Incoming Faxes": "Entregar faxes entrantes", "Deliver Outgoing Faxes": "Entregar faxes salientes", @@ -607,7 +607,7 @@ "You are about to delete slot {slot}": "Está a punto de eliminar la ranura {slot}", "You are about to delete this destination": "Está a punto de eliminar este destino", "You are about to delete this forwarding": "Está a punto de eliminar este reenvío", - "You are about to delete this phonebook": "Está a punto de eliminar esta agenda", + "You are about to delete this phonebook entry": "Está a punto de eliminar esta entrada de la agenda", "You are about to delete this registered device": "Está a punto de eliminar este dispositivo registrado", "You are about to delete time range \"{from} - {to}\"": "Está a punto de borrar el rango de tiempo \"{from} - {to}\"", "You are about to remove ACL: From email <{from_email}>": "Está a punto de eliminar la ACL: Del correo electrónico <{from_email}>", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index 34821623..04c4a7f6 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -156,7 +156,7 @@ "Delete recording": "Supprimer l'enregistrement", "Delete registered device": "Supprimer l'appareil enregistré", "Delete slot?": "Supprimer emplacement ?", - "Delete subscriber phonebook": "Supprimer le répertoire de l'abonné", + "Delete subscriber phonebook entry": "Supprimer l’entrée du répertoire de l’abonné", "Delete voicemail after email notification is delivered": "Supprimer le message vocal une fois la notification e-mail délivrée", "Deliver Incoming Faxes": "Transmission des fax entrants", "Deliver Outgoing Faxes": "Livrer des fax sortants", @@ -600,7 +600,7 @@ "You are about to delete slot {slot}": "Vous êtes sur le point de supprimer l'emplacement {slot}", "You are about to delete this destination": "Vous êtes sur le point de supprimer cette destination", "You are about to delete this forwarding": "Vous êtes sur le point de supprimer cette redirection", - "You are about to delete this phonebook": "Vous êtes sur le point de supprimer ce répertoire téléphonique", + "You are about to delete this phonebook entry": "Vous êtes sur le point de supprimer cette entrée du répertoire", "You are about to delete this registered device": "Vous êtes sur le point de supprimer cet appareil enregistré", "You are about to delete time range \"{from} - {to}\"": "Vous êtes sur le point de supprimer la plage horaire \"{from} - {to}\"", "You are about to remove ACL: From email <{from_email}>": "Vous êtes sur le point de supprimer l'ACL : De l'e-mail <{from_email}>", diff --git a/src/i18n/it.json b/src/i18n/it.json index 9921a354..61ed7ad7 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -154,7 +154,7 @@ "Delete recording": "Elimina registrazione", "Delete registered device": "Elimina dispositivo registrato", "Delete slot?": "Eliminare slot?", - "Delete subscriber phonebook": "Elimina rubrica abbonato", + "Delete subscriber phonebook entry": "Eliminare la voce della rubrica dell’abbonato", "Delete voicemail after email notification is delivered": "Cancella il messaggio vocale dopo l'invio della notifica email", "Deliver Incoming Faxes": "Consegna fax in arrivo", "Deliver Outgoing Faxes": "Consegna fax in uscita", @@ -592,7 +592,7 @@ "You are about to delete slot {slot}": "Stai per eliminare la postazione {slot}", "You are about to delete this destination": "Stai per eliminare questa destinazione", "You are about to delete this forwarding": "Stai per eliminare questo inoltro", - "You are about to delete this phonebook": "Stai per eliminare questa rubrica", + "You are about to delete this phonebook entry": "Stai per eliminare questa voce della rubrica", "You are about to delete this registered device": "Stai per eliminare questo dispositivo registrato", "You are about to delete time range \"{from} - {to}\"": "Stai per eliminare l'intervallo di tempo \"{from} - {to}\"", "You are about to remove ACL: From email <{from_email}>": "Stai per rimuovere ACL: Dall'email <{from_email}>", diff --git a/src/pages/CscPageConversations.vue b/src/pages/CscPageConversations.vue index c79377e7..7783f63a 100644 --- a/src/pages/CscPageConversations.vue +++ b/src/pages/CscPageConversations.vue @@ -387,6 +387,10 @@ export default { this.$scrollTo(this.$parent.$el) this.filterDirection = filter this.forceReload() + }, + addToPhonebookAction (number) { + this.$store.commit('subscriber-phonebook/setNumber', number) + this.$router.push('subscriber-phonebook/create') } } } diff --git a/src/pages/CscPageSubscriberPhonebook.vue b/src/pages/CscPageSubscriberPhonebook.vue index 4f00c0f0..2861f3de 100644 --- a/src/pages/CscPageSubscriberPhonebook.vue +++ b/src/pages/CscPageSubscriberPhonebook.vue @@ -22,8 +22,8 @@ v-model:pagination="pagination" class="no-shadow" :columns="columns" - :rows="subscriberPhonebook" - :loading="$wait.is('loadSubscriberPhonebook')" + :rows="phonebookRows" + :loading="$wait.is('loadPhonebook')" row-key="id" @request="fetchPaginatedRegistrations" > @@ -89,9 +89,8 @@ import CscPage from 'components/CscPage' import CscPageSticky from 'components/CscPageSticky' import CscPopupMenuItem from 'components/CscPopupMenuItem' import CscSpinner from 'components/CscSpinner' -import { LIST_DEFAULT_ROWS } from 'src/api/common' import { mapWaitingActions } from 'vue-wait' -import { mapState } from 'vuex' +import { mapGetters, mapState } from 'vuex' export default { name: 'CscPageSubscriberPhonebook', components: { @@ -101,21 +100,14 @@ export default { CscPopupMenuItem, CscPageSticky }, - data () { - return { - data: [], - pagination: { - sortBy: 'id', - descending: false, - page: 1, - rowsPerPage: LIST_DEFAULT_ROWS, - rowsNumber: 0 - } - } - }, computed: { - ...mapState('user', [ - 'subscriberPhonebook' + ...mapState('subscriber-phonebook', { + phonebookRows: 'phonebookRows', + pagination: 'pagination' + }), + ...mapGetters('user', [ + 'isPbxEnabled', + 'getSubscriberId' ]), columns () { return [ @@ -165,10 +157,10 @@ export default { await this.refresh() }, methods: { - ...mapWaitingActions('user', { - loadSubscriberPhonebook: 'loadSubscriberPhonebook', - removeSubscriberPhonebook: 'removeSubscriberPhonebook', - updateValueShared: 'updateValueShared' + ...mapWaitingActions('subscriber-phonebook', { + loadPhonebook: 'loadPhonebook', + removeEntry: 'removeEntry', + updateSharedValue: 'updateSharedValue' }), async refresh () { await this.fetchPaginatedRegistrations({ @@ -177,14 +169,13 @@ export default { }, async fetchPaginatedRegistrations (props) { const { page, rowsPerPage, sortBy, descending } = props.pagination - const count = await this.loadSubscriberPhonebook({ + await this.loadPhonebook({ + subscriber_id: this.getSubscriberId, page, rows: rowsPerPage, order_by: sortBy, order_by_direction: descending ? 'desc' : 'asc' }) - this.pagination = { ...props.pagination } - this.pagination.rowsNumber = count }, async showPhonebookDetails (row) { this.$router.push(`/user/subscriber-phonebook/${row.id}`) @@ -206,18 +197,18 @@ export default { }, async deleteRow (row) { this.$q.dialog({ - title: this.$t('Delete subscriber phonebook'), - message: this.$t('You are about to delete this phonebook'), + title: this.$t('Delete subscriber phonebook entry'), + message: this.$t('You are about to delete this phonebook entry'), color: 'negative', cancel: true, persistent: true }).onOk(async (data) => { - await this.removeSubscriberPhonebook(row) + await this.removeEntry(row.id) await this.refresh() }) }, async toggleShared (row) { - await this.updateValueShared(row) + await this.updateSharedValue(row) } } } diff --git a/src/pages/CscPageSubscriberPhonebookAdd.vue b/src/pages/CscPageSubscriberPhonebookAdd.vue index e9f5240f..cac0b0f4 100644 --- a/src/pages/CscPageSubscriberPhonebookAdd.vue +++ b/src/pages/CscPageSubscriberPhonebookAdd.vue @@ -76,6 +76,7 @@ import CscPageSticky from 'components/CscPageSticky' import { showGlobalError } from 'src/helpers/ui' import { mapWaitingActions } from 'vue-wait' import { required } from 'vuelidate/lib/validators' +import { mapGetters } from 'vuex' export default { name: 'CscPageSubscriberPhonebookAdd', components: { @@ -101,6 +102,12 @@ export default { } }, computed: { + ...mapGetters('user', [ + 'getSubscriberId' + ]), + ...mapGetters('subscriber-phonebook', [ + 'getPrefilledNumber' + ]), nameErrorMessage () { const errorsTab = this.v$.formData.name.$errors if (errorsTab && errorsTab.length > 0 && errorsTab[0].$validator === 'required') { @@ -111,9 +118,15 @@ export default { return '' } }, + mounted () { + if (this.getPrefilledNumber) { + this.formData.number = this.getPrefilledNumber + this.$store.commit('subscriber-phonebook/setNumber', '') + } + }, methods: { - ...mapWaitingActions('user', { - createPhonebookSubscriber: 'createPhonebookSubscriber' + ...mapWaitingActions('subscriber-phonebook', { + createPhonebook: 'createPhonebook' }), getDefaultFormData () { return { @@ -144,7 +157,8 @@ export default { }, async confirm () { try { - await this.createPhonebookSubscriber(this.formData) + this.formData.subscriber_id = this.getSubscriberId + await this.createPhonebook(this.formData) await this.$router.push('/user/subscriber-phonebook/') } catch (error) { if (error.response && error.response.status === 422) { diff --git a/src/pages/CscPageSubscriberPhonebookDetails.vue b/src/pages/CscPageSubscriberPhonebookDetails.vue index b05a520b..1976f55c 100644 --- a/src/pages/CscPageSubscriberPhonebookDetails.vue +++ b/src/pages/CscPageSubscriberPhonebookDetails.vue @@ -70,6 +70,7 @@