Skip to content
This repository has been archived by the owner on Dec 23, 2019. It is now read-only.

feat(modem.template): display error message if name invalid #1414

Merged
merged 3 commits into from
Jun 18, 2019
Merged

feat(modem.template): display error message if name invalid #1414

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b001b90
feat(modem.template): display error message if name invalid
Jun 10, 2019
7943fdf
feat(xdsl.modem.template): use constant
Jun 11, 2019
7324002
Merge branch 'develop' into feat/modem-template
Jun 11, 2019
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
6 changes: 6 additions & 0 deletions client/app/telecom/pack/xdsl/modem/templates/pack-xdsl-modem-template.constant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
angular.module('managerApp').constant('PACK_XDSL_MODEM_TEMPLATE', {
errors: {
duplicate: 'TemplateName',
invalid: 'Invalid',
},
});
15 changes: 11 additions & 4 deletions client/app/telecom/pack/xdsl/modem/templates/pack-xdsl-modem-templates.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
angular.module('managerApp').controller('XdslModemTemplateCtrl', class XdslModemTemplateCtrl {
/* @ngInject */
constructor($stateParams, $translate, $uibModal, OvhApiXdsl, TucPackXdslModemMediator,
TucToast) {
TucToast, PACK_XDSL_MODEM_TEMPLATE) {
this.$stateParams = $stateParams;
this.$translate = $translate;
this.$uibModal = $uibModal;
this.mediator = TucPackXdslModemMediator;
this.OvhApiXdsl = OvhApiXdsl;
this.templateName = null;
this.TucToast = TucToast;
this.TEMPLATE_CONSTANT = PACK_XDSL_MODEM_TEMPLATE;
}

/*= =====================================
Expand Down Expand Up @@ -46,11 +47,17 @@ angular.module('managerApp').controller('XdslModemTemplateCtrl', class XdslModem
this.templateName = null;
this.getModemTemplates();
}).catch((err) => {
let errorMessage = '';
if (err.data.message.includes(this.TEMPLATE_CONSTANT.errors.duplicate)) {
errorMessage = this.$translate.instant('xdsl_modem_template_name_already_exist', { templateName: this.templateName });
} else if (err.data.message.includes(this.TEMPLATE_CONSTANT.errors.invalid)) {
errorMessage = this.$translate.instant('xdsl_modem_template_invalid_name', { templateName: this.templateName });
} else {
errorMessage = this.$translate.instant('xdsl_modem_template_an_error_ocurred');
}
this.message = {
type: 'error',
detail: err.data.message.includes('TemplateName')
? this.$translate.instant('xdsl_modem_template_name_already_exist', { templateName: this.templateName })
: this.$translate.instant('xdsl_modem_template_an_error_ocurred'),
detail: errorMessage,
};
});
}
Expand Down
5 changes: 3 additions & 2 deletions client/app/telecom/pack/xdsl/modem/templates/translations/Messages_fr_FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"xdsl_modem_template_apply_doing": "Chargement de la configuration du modem en cours",
"xdsl_modem_template_creation_doing": "Enregistrement de la configuration du modem en cours",
"xdsl_modem_template_an_error_ocurred": "TEMPLATE : Une erreur est survenue !",
"xdsl_modem_template_name_already_exist": "{{templateName}} existe déjà dans votre liste de templates. Veuillez utiliser un autre nom."
}
"xdsl_modem_template_name_already_exist": "{{templateName}} existe déjà dans votre liste de templates. Veuillez utiliser un autre nom.",
"xdsl_modem_template_invalid_name": "Le nom de template ({{templateName}}) est invalide. Veuillez utiliser un autre nom."
}