Skip to content

Commit 4c1d855

Browse files
FredericEspiauantleblanc
authored andcommitted
fix(sms.sms.compose): display STOP option only when needed (#389)
ref: MBP-52
1 parent 014feb5 commit 4c1d855

File tree

6 files changed

+134
-108
lines changed

6 files changed

+134
-108
lines changed
Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
import angular from 'angular';
2-
import controller from './telecom-sms-sms-compose.controller';
3-
import template from './telecom-sms-sms-compose.html';
2+
import '@uirouter/angularjs';
3+
import '@ovh-ux/ng-ovh-telecom-universe-components';
4+
5+
import {
6+
component,
7+
name as componentName,
8+
} from './telecom-sms-sms-compose.component';
9+
10+
import routing from './telecom-sms-sms-compose.routing';
411

512
import './addPhonebookContact/telecom-sms-sms-compose-addPhonebookContact.less';
613

714
const moduleName = 'ovhManagerSmsSmsCompose';
815

9-
angular.module(moduleName, []).config(($stateProvider) => {
10-
$stateProvider.state('sms.service.sms.compose', {
11-
url: '/compose',
12-
views: {
13-
'smsView@sms.service': {
14-
template,
15-
controller,
16-
controllerAs: 'SmsComposeCtrl',
17-
},
18-
},
19-
translations: ['../../../sms/dashboard', '.'],
20-
});
21-
});
16+
angular
17+
.module(moduleName, [
18+
'ngOvhTelecomUniverseComponents',
19+
'ui.router',
20+
])
21+
.component(componentName, component)
22+
.config(routing)
23+
.run(/* @ngTranslationsInject ./translations */);
2224

2325
export default moduleName;
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import controller from './telecom-sms-sms-compose.controller';
2+
import template from './telecom-sms-sms-compose.html';
3+
4+
export const component = {
5+
controller,
6+
template,
7+
};
8+
9+
export const name = 'smsCompose';
10+
11+
export default {
12+
component,
13+
name,
14+
};

packages/manager/modules/sms/src/sms/compose/telecom-sms-sms-compose.controller.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ export default class {
9595
sender: 'shortNumber',
9696
senderForResponse: false,
9797
};
98-
this.advice = false;
9998
this.moreOptions = false;
10099
this.picker = {
101100
date: null,
@@ -134,7 +133,7 @@ export default class {
134133
}
135134
})).then(() => {
136135
this.service = this.TucSmsMediator.getCurrentSmsService();
137-
this.computeRemainingChar();
136+
this.showAdvice();
138137
})).catch((err) => {
139138
this.TucToastError(err);
140139
}).finally(() => {
@@ -236,13 +235,15 @@ export default class {
236235
* @return {Object}
237236
*/
238237
showAdvice() {
239-
if (this.sms.sender && /[0-9+]/.test(this.sms.sender) && !this.isVirtualNumber()) {
240-
this.advice = true;
241-
this.sms.noStopClause = true;
242-
} else {
243-
this.advice = false;
244-
this.sms.noStopClause = false;
245-
}
238+
const isRealNumber = /[0-9+]/.test(this.sms.sender)
239+
&& !this.isVirtualNumber();
240+
241+
this.displaySenderCustomizationAdvice = isRealNumber
242+
|| this.sms.sender === 'shortNumber';
243+
this.canHaveSTOPAnswer = !isRealNumber
244+
&& this.sms.sender !== 'shortNumber';
245+
this.sms.noStopClause = isRealNumber;
246+
246247
return this.computeRemainingChar();
247248
}
248249

0 commit comments

Comments
 (0)