Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-25 03:43:10 +02:00
Code Issues Projects Releases Wiki Activity

fix send form defects (#11212)

Browse Source
This commit is contained in:
Jordan Aasen 2024-09-24 00:12:27 -07:00 committed by GitHub
parent e691e2dadb
commit aa91a8d5ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html
View File

@ -1,6 +1,6 @@
<bit-section [formGroup]="sendOptionsForm"> <bit-section [formGroup]="sendOptionsForm">
<bit-section-header> <bit-section-header>
<h2 class="tw-mt-4" bitTypography="h5">{{ "additionalOptions" | i18n }}</h2> <h2 class="tw-mt-4" bitTypography="h6">{{ "additionalOptions" | i18n }}</h2>
</bit-section-header> </bit-section-header>
<bit-card> <bit-card>
<bit-form-field> <bit-form-field>
@ -16,16 +16,21 @@
<bit-label *ngIf="hasPassword">{{ "newPassword" | i18n }}</bit-label> <bit-label *ngIf="hasPassword">{{ "newPassword" | i18n }}</bit-label>
<input bitInput type="password" formControlName="password" /> <input bitInput type="password" formControlName="password" />
<button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button> <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
<button type="button" bitIconButton="bwi-refresh" bitSuffix></button> <button
type="button"
bitIconButton="bwi-generate"
bitSuffix
[appA11yTitle]="'generatePassword' | i18n"
></button>
<bit-hint>{{ "sendPasswordDescV2" | i18n }}</bit-hint> <bit-hint>{{ "sendPasswordDescV2" | i18n }}</bit-hint>
</bit-form-field> </bit-form-field>
<bit-form-control *ngIf="!disableHideEmail"> <bit-form-control *ngIf="!disableHideEmail">
<input bitCheckbox type="checkbox" formControlName="hideEmail" /> <input bitCheckbox type="checkbox" formControlName="hideEmail" />
<bit-label>{{ "hideYourEmail" | i18n }}</bit-label> <bit-label>{{ "hideYourEmail" | i18n }}</bit-label>
</bit-form-control> </bit-form-control>
<bit-form-field> <bit-form-field disableMargin>
<bit-label>{{ "privateNote" | i18n }}</bit-label> <bit-label>{{ "privateNote" | i18n }}</bit-label>
<textarea bitInput rows="4" formControlName="notes"></textarea> <textarea bitInput rows="3" formControlName="notes"></textarea>
</bit-form-field> </bit-form-field>
</bit-card> </bit-card>
</bit-section> </bit-section>

6
libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html
View File

@ -1,6 +1,6 @@
<bit-section [formGroup]="sendDetailsForm"> <bit-section [formGroup]="sendDetailsForm">
<bit-section-header class="tw-mt-4"> <bit-section-header class="tw-mt-2">
<h2 bitTypography="h5">{{ "sendDetails" | i18n }}</h2> <h2 bitTypography="h6">{{ "sendDetails" | i18n }}</h2>
</bit-section-header> </bit-section-header>
<bit-card> <bit-card>
@ -34,7 +34,7 @@
></button> ></button>
</bit-form-field> </bit-form-field>
<bit-form-field> <bit-form-field disableMargin>
<bit-label>{{ "deletionDate" | i18n }}</bit-label> <bit-label>{{ "deletionDate" | i18n }}</bit-label>
<bit-select <bit-select
id="deletionDate" id="deletionDate"

6
libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html
View File

@ -1,12 +1,13 @@
<bit-section [formGroup]="sendFileDetailsForm"> <bit-section [formGroup]="sendFileDetailsForm">
<div *ngIf="config.mode === 'edit'"> <div *ngIf="config.mode === 'edit'">
<div class="tw-text-muted">{{ "file" | i18n }}</div> <div bitTypography="body2" class="tw-text-muted">{{ "file" | i18n }}</div>
<div>{{ originalSendView.file.fileName }}</div> <div>{{ originalSendView.file.fileName }}</div>
<div class="tw-text-muted">{{ originalSendView.file.sizeName }}</div> <div class="tw-text-muted">{{ originalSendView.file.sizeName }}</div>
</div> </div>
<bit-form-field *ngIf="config.mode !== 'edit'"> <bit-form-field *ngIf="config.mode !== 'edit'">
<bit-label for="file">{{ "fileToShare" | i18n }}</bit-label> <bit-label for="file">{{ "fileToShare" | i18n }}</bit-label>
<button bitButton type="button" buttonType="primary" (click)="fileSelector.click()"> <div class="tw-flex tw-mt-2 tw-mb-1">
<button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
{{ "chooseFile" | i18n }} {{ "chooseFile" | i18n }}
</button> </button>
<span <span
@ -15,6 +16,7 @@
> >
{{ fileName || ("noFileChosen" | i18n) }}</span {{ fileName || ("noFileChosen" | i18n) }}</span
> >
</div>
<input <input
bitInput bitInput
#fileSelector #fileSelector

8
libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
View File

@ -7,7 +7,12 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
import { SendFileView } from "@bitwarden/common/tools/send/models/view/send-file.view"; import { SendFileView } from "@bitwarden/common/tools/send/models/view/send-file.view";
import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
import { ButtonModule, FormFieldModule, SectionComponent } from "@bitwarden/components"; import {
ButtonModule,
FormFieldModule,
SectionComponent,
TypographyModule,
} from "@bitwarden/components";
import { SendFormConfig } from "../../abstractions/send-form-config.service"; import { SendFormConfig } from "../../abstractions/send-form-config.service";
import { SendFormContainer } from "../../send-form-container"; import { SendFormContainer } from "../../send-form-container";
@ -24,6 +29,7 @@ import { SendFormContainer } from "../../send-form-container";
FormFieldModule, FormFieldModule,
SectionComponent, SectionComponent,
FormsModule, FormsModule,
TypographyModule,
], ],
}) })
export class SendFileDetailsComponent implements OnInit { export class SendFileDetailsComponent implements OnInit {