mirror of
https://github.com/bitwarden/browser
synced 2025-12-11 05:43:41 +00:00
[PM-17688] - generator dialog - add missing button label i18n keys. fix logic for disabling button (#13140)
* add missing button label i18n keys. fix logic for displaying button label * Update comment Co-authored-by: ✨ Audrey ✨ <ajensen@bitwarden.com> --------- Co-authored-by: ✨ Audrey ✨ <ajensen@bitwarden.com>
This commit is contained in:
@@ -2061,6 +2061,9 @@
|
|||||||
"usernameGenerator": {
|
"usernameGenerator": {
|
||||||
"message": "Username generator"
|
"message": "Username generator"
|
||||||
},
|
},
|
||||||
|
"useThisEmail": {
|
||||||
|
"message": "Use this email"
|
||||||
|
},
|
||||||
"useThisPassword": {
|
"useThisPassword": {
|
||||||
"message": "Use this password"
|
"message": "Use this password"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2550,6 +2550,9 @@
|
|||||||
"catchallEmailDesc": {
|
"catchallEmailDesc": {
|
||||||
"message": "Use your domain's configured catch-all inbox."
|
"message": "Use your domain's configured catch-all inbox."
|
||||||
},
|
},
|
||||||
|
"useThisEmail": {
|
||||||
|
"message": "Use this email"
|
||||||
|
},
|
||||||
"random": {
|
"random": {
|
||||||
"message": "Random"
|
"message": "Random"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<vault-cipher-form-generator
|
<vault-cipher-form-generator
|
||||||
[type]="data.type"
|
[type]="data.type"
|
||||||
(valueGenerated)="onCredentialGenerated($event)"
|
(valueGenerated)="onCredentialGenerated($event)"
|
||||||
[algorithm]="algorithm"
|
[onAlgorithmSelected]="onAlgorithmSelected"
|
||||||
/>
|
/>
|
||||||
<bit-item>
|
<bit-item>
|
||||||
<button
|
<button
|
||||||
@@ -28,6 +28,7 @@
|
|||||||
appA11yTitle="{{ buttonLabel }}"
|
appA11yTitle="{{ buttonLabel }}"
|
||||||
bitButton
|
bitButton
|
||||||
bitDialogClose
|
bitDialogClose
|
||||||
|
[disabled]="!(buttonLabel && credentialValue)"
|
||||||
>
|
>
|
||||||
{{ buttonLabel }}
|
{{ buttonLabel }}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -46,8 +46,14 @@ export class CredentialGeneratorDialogComponent {
|
|||||||
private dialogService: DialogService,
|
private dialogService: DialogService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
algorithm = (selected: AlgorithmInfo) => {
|
onAlgorithmSelected = (selected?: AlgorithmInfo) => {
|
||||||
this.buttonLabel = selected.useGeneratedValue;
|
if (selected) {
|
||||||
|
this.buttonLabel = selected.useGeneratedValue;
|
||||||
|
} else {
|
||||||
|
// clear the credential value when the user is
|
||||||
|
// selecting the credential generation algorithm
|
||||||
|
this.credentialValue = undefined;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
applyCredentials = () => {
|
applyCredentials = () => {
|
||||||
|
|||||||
@@ -6767,6 +6767,9 @@
|
|||||||
"catchallEmailDesc": {
|
"catchallEmailDesc": {
|
||||||
"message": "Use your domain's configured catch-all inbox."
|
"message": "Use your domain's configured catch-all inbox."
|
||||||
},
|
},
|
||||||
|
"useThisEmail": {
|
||||||
|
"message": "Use this email"
|
||||||
|
},
|
||||||
"random": {
|
"random": {
|
||||||
"message": "Random",
|
"message": "Random",
|
||||||
"description": "Generates domain-based username using random letters"
|
"description": "Generates domain-based username using random letters"
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
*ngIf="type === 'password'"
|
*ngIf="type === 'password'"
|
||||||
[disableMargin]="disableMargin"
|
[disableMargin]="disableMargin"
|
||||||
(onGenerated)="onCredentialGenerated($event)"
|
(onGenerated)="onCredentialGenerated($event)"
|
||||||
(onAlgorithm)="algorithm($event)"
|
(onAlgorithm)="onAlgorithmSelected($event)"
|
||||||
></tools-password-generator>
|
></tools-password-generator>
|
||||||
<tools-username-generator
|
<tools-username-generator
|
||||||
*ngIf="type === 'username'"
|
*ngIf="type === 'username'"
|
||||||
[disableMargin]="disableMargin"
|
[disableMargin]="disableMargin"
|
||||||
(onGenerated)="onCredentialGenerated($event)"
|
(onGenerated)="onCredentialGenerated($event)"
|
||||||
(onAlgorithm)="algorithm($event)"
|
(onAlgorithm)="onAlgorithmSelected($event)"
|
||||||
></tools-username-generator>
|
></tools-username-generator>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import { AlgorithmInfo, GeneratedCredential } from "@bitwarden/generator-core";
|
|||||||
})
|
})
|
||||||
export class CipherFormGeneratorComponent {
|
export class CipherFormGeneratorComponent {
|
||||||
@Input()
|
@Input()
|
||||||
algorithm: (selected: AlgorithmInfo) => void;
|
onAlgorithmSelected: (selected: AlgorithmInfo) => void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The type of generator form to show.
|
* The type of generator form to show.
|
||||||
|
|||||||
Reference in New Issue
Block a user