Fix small TtlPIcker2 bug (#17376)
* fix * add changelog * wrong file name for changelog * update from what core responded with re: type duration
This commit is contained in:
parent
25f4cfac6b
commit
4cfd47d5fb
3
changelog/17376.txt
Normal file
3
changelog/17376.txt
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
```release-note:bug
|
||||||
|
ui: Remove default value of 30 to TtlPicker2 if no value is passed in.
|
||||||
|
```
|
|
@ -123,6 +123,7 @@ export default class MfaMethod extends Model {
|
||||||
editType: 'ttl',
|
editType: 'ttl',
|
||||||
helperTextEnabled: 'How long each generated TOTP is valid.',
|
helperTextEnabled: 'How long each generated TOTP is valid.',
|
||||||
hideToggle: true,
|
hideToggle: true,
|
||||||
|
defaultValue: 30, // API accepts both an integer as seconds and sting with unit e.g 30 || '30s'
|
||||||
})
|
})
|
||||||
period;
|
period;
|
||||||
@attr('number', {
|
@attr('number', {
|
||||||
|
|
|
@ -41,6 +41,7 @@ export default class PkiRoleEngineModel extends Model {
|
||||||
'Also called the not_before_duration property. Allows certificates to be valid for a certain time period before now. This is useful to correct clock misalignment on various systems when setting up your CA.',
|
'Also called the not_before_duration property. Allows certificates to be valid for a certain time period before now. This is useful to correct clock misalignment on various systems when setting up your CA.',
|
||||||
editType: 'ttl',
|
editType: 'ttl',
|
||||||
hideToggle: true,
|
hideToggle: true,
|
||||||
|
defaultValue: '30s', // type in API is duration which accepts both an integer and string e.g. 30 || '30s'
|
||||||
})
|
})
|
||||||
notBeforeDuration;
|
notBeforeDuration;
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
* @param helperTextDisabled="Allow tokens to be used indefinitely" {String} - This helper text is shown under the label when the toggle is switched off
|
* @param helperTextDisabled="Allow tokens to be used indefinitely" {String} - This helper text is shown under the label when the toggle is switched off
|
||||||
* @param helperTextEnabled="Disable the use of the token after" {String} - This helper text is shown under the label when the toggle is switched on
|
* @param helperTextEnabled="Disable the use of the token after" {String} - This helper text is shown under the label when the toggle is switched on
|
||||||
* @param description="Longer description about this value, what it does, and why it is useful. Shows up in tooltip next to helpertext"
|
* @param description="Longer description about this value, what it does, and why it is useful. Shows up in tooltip next to helpertext"
|
||||||
* @param time=30 {Number} - The time (in the default units) which will be adjustable by the user of the form
|
* @param time='' {Number} - The time (in the default units) which will be adjustable by the user of the form
|
||||||
* @param unit="s" {String} - This is the unit key which will show by default on the form. Can be one of `s` (seconds), `m` (minutes), `h` (hours), `d` (days)
|
* @param unit="s" {String} - This is the unit key which will show by default on the form. Can be one of `s` (seconds), `m` (minutes), `h` (hours), `d` (days)
|
||||||
* @param recalculationTimeout=5000 {Number} - This is the time, in milliseconds, that `recalculateSeconds` will be be true after time is updated
|
* @param recalculationTimeout=5000 {Number} - This is the time, in milliseconds, that `recalculateSeconds` will be be true after time is updated
|
||||||
* @param initialValue=null {String} - This is the value set initially (particularly from a string like '30h')
|
* @param initialValue=null {String} - This is the value set initially (particularly from a string like '30h')
|
||||||
|
@ -50,7 +50,7 @@ export default TtlForm.extend({
|
||||||
helperTextDisabled: 'Allow tokens to be used indefinitely',
|
helperTextDisabled: 'Allow tokens to be used indefinitely',
|
||||||
helperTextEnabled: 'Disable the use of the token after',
|
helperTextEnabled: 'Disable the use of the token after',
|
||||||
description: '',
|
description: '',
|
||||||
time: 30,
|
time: '', // if defaultValue is NOT set, then do not display a defaultValue.
|
||||||
unit: 's',
|
unit: 's',
|
||||||
initialValue: null,
|
initialValue: null,
|
||||||
changeOnInit: false,
|
changeOnInit: false,
|
||||||
|
@ -62,6 +62,7 @@ export default TtlForm.extend({
|
||||||
const enable = this.initialEnabled;
|
const enable = this.initialEnabled;
|
||||||
const changeOnInit = this.changeOnInit;
|
const changeOnInit = this.changeOnInit;
|
||||||
// if initial value is unset use params passed in as defaults
|
// if initial value is unset use params passed in as defaults
|
||||||
|
// and if no defaultValue is passed in display no time
|
||||||
if (!value && value !== 0) {
|
if (!value && value !== 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue