1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-29 12:55:21 +01:00

Revert "Merge branch 'PM-9853' into PM-9852"

This reverts commit 9f65ded13f, reversing
changes made to 63f95600e8.
This commit is contained in:
jaasen-livefront 2024-07-19 11:26:50 -07:00
parent 9f65ded13f
commit 81e9860c25
No known key found for this signature in database
10 changed files with 17 additions and 182 deletions

View File

@ -1996,9 +1996,6 @@
"passwordProtected": { "passwordProtected": {
"message": "Password protected" "message": "Password protected"
}, },
"copyLink": {
"message": "Copy link"
},
"copySendLink": { "copySendLink": {
"message": "Copy Send link", "message": "Copy Send link",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."

View File

@ -8,12 +8,14 @@
</ng-container> </ng-container>
</popup-header> </popup-header>
<div *ngIf="sends.length === 0" class="tw-flex tw-flex-col tw-h-full tw-justify-center"> <div
*ngIf="sendsListState === SendsListStateEnum.Empty"
class="tw-flex tw-flex-col tw-h-full tw-justify-center"
>
<bit-no-items [icon]="noItemIcon" class="tw-text-main"> <bit-no-items [icon]="noItemIcon" class="tw-text-main">
<ng-container slot="title">{{ "sendsNoItemsTitle" | i18n }}</ng-container> <ng-container slot="title">{{ "sendsNoItemsTitle" | i18n }}</ng-container>
<ng-container slot="description">{{ "sendsNoItemsMessage" | i18n }}</ng-container> <ng-container slot="description">{{ "sendsNoItemsMessage" | i18n }}</ng-container>
<tools-new-send-dropdown slot="button"></tools-new-send-dropdown> <tools-new-send-dropdown slot="button"></tools-new-send-dropdown>
</bit-no-items> </bit-no-items>
</div> </div>
<app-send-list-items-container [sends]="sends" />
</popup-page> </popup-page>

View File

@ -1,24 +1,21 @@
import { CommonModule } from "@angular/common"; import { CommonModule } from "@angular/common";
import { Component, OnDestroy, OnInit } from "@angular/core"; import { Component, OnDestroy, OnInit } from "@angular/core";
import { RouterLink } from "@angular/router"; import { RouterLink } from "@angular/router";
import { mergeMap, Subject, takeUntil } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module"; 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 { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
import { ButtonModule, NoItemsModule } from "@bitwarden/components"; import { ButtonModule, NoItemsModule } from "@bitwarden/components";
import { import { NoSendsIcon, NewSendDropdownComponent } from "@bitwarden/send-ui";
NoSendsIcon,
NewSendDropdownComponent,
SendListItemsContainerComponent,
} from "@bitwarden/send-ui";
import { CurrentAccountComponent } from "../../../auth/popup/account-switching/current-account.component"; import { CurrentAccountComponent } from "../../../auth/popup/account-switching/current-account.component";
import { PopOutComponent } from "../../../platform/popup/components/pop-out.component"; import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component"; import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component"; import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
enum SendsListState {
Empty,
}
@Component({ @Component({
templateUrl: "send-v2.component.html", templateUrl: "send-v2.component.html",
standalone: true, standalone: true,
@ -33,30 +30,23 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
ButtonModule, ButtonModule,
RouterLink, RouterLink,
NewSendDropdownComponent, NewSendDropdownComponent,
SendListItemsContainerComponent,
], ],
}) })
export class SendV2Component implements OnInit, OnDestroy { export class SendV2Component implements OnInit, OnDestroy {
sendType = SendType; sendType = SendType;
protected sends: SendView[] = []; /** Visual state of the Sends list */
protected sendsListState: SendsListState | null = null;
private destroy$ = new Subject<void>();
protected noItemIcon = NoSendsIcon; protected noItemIcon = NoSendsIcon;
constructor(protected sendService: SendService) {} protected SendsListStateEnum = SendsListState;
async ngOnInit() { constructor() {
this.sendService.sendViews$ this.sendsListState = SendsListState.Empty;
.pipe(
mergeMap(async (sends) => {
this.sends = sends.sort((a, b) => a.name.localeCompare(b.name));
}),
takeUntil(this.destroy$),
)
.subscribe();
} }
ngOnInit(): void {}
ngOnDestroy(): void {} ngOnDestroy(): void {}
} }

View File

@ -4350,9 +4350,6 @@
"message": "Send link", "message": "Send link",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
}, },
"copyLink": {
"message": "Copy link"
},
"copySendLink": { "copySendLink": {
"message": "Copy Send link", "message": "Copy Send link",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."

View File

@ -115,7 +115,6 @@ export class DefaultConfigService implements ConfigService {
return DefaultFeatureFlagValue[key]; return DefaultFeatureFlagValue[key];
} }
serverConfig.featureStates[FeatureFlag.ExtensionRefresh] = true;
return serverConfig.featureStates[key] as FeatureFlagValueType<Flag>; return serverConfig.featureStates[key] as FeatureFlagValueType<Flag>;
}), }),
); );

View File

@ -1,3 +1,2 @@
export * from "./icons"; export * from "./icons";
export { NewSendDropdownComponent } from "./new-send-dropdown/new-send-dropdown.component"; export { NewSendDropdownComponent } from "./new-send-dropdown/new-send-dropdown.component";
export { SendListItemsContainerComponent } from "./send-list-items-container/send-list-items-container.component";

View File

@ -1,54 +0,0 @@
<bit-section *ngIf="sends?.length > 0">
<bit-section-header>
<h2 class="tw-font-bold" bitTypography="h5">
{{ "allSends" | i18n }}
</h2>
<span bitTypography="body1" slot="end">{{ sends.length }}</span>
</bit-section-header>
<bit-item-group>
<bit-item *ngFor="let send of sends">
<button
bit-item-content
appA11yTitle="{{ 'edit' | i18n }} - {{ send.name }}"
appStopClick
type="button"
class="tw-pb-1"
>
<i
slot="start"
*ngIf="send.type === sendType.Text"
class="bwi bwi-file-text tw-text-2xl text-muted"
></i>
<i
slot="start"
*ngIf="send.type === sendType.File"
class="bwi bwi-file tw-text-2xl text-muted"
></i>
{{ send.name }}
<span slot="secondary">
{{ "deletionDate" | i18n }}:&nbsp;{{ send.deletionDate | date: "mediumDate" }}
</span>
<ng-container slot="end">
<bit-item-action>
<button
type="button"
(click)="copySendLink(send)"
appA11yTitle="{{ 'copyLink' | i18n }} - {{ send.name }}"
>
<i class="bwi tw-text-lg bwi-clone"></i>
</button>
</bit-item-action>
<bit-item-action>
<button
type="button"
(click)="deleteSend(send)"
appA11yTitle="{{ 'delete' | i18n }} - {{ send.name }}"
>
<i class="bwi tw-text-lg bwi-trash"></i>
</button>
</bit-item-action>
</ng-container>
</button>
</bit-item>
</bit-item-group>
</bit-section>

View File

@ -1,95 +0,0 @@
import { CommonModule } from "@angular/common";
import { Component, Input } from "@angular/core";
import { RouterLink } from "@angular/router";
import { firstValueFrom } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
import {
BadgeModule,
ButtonModule,
DialogService,
IconButtonModule,
ItemModule,
SectionComponent,
SectionHeaderComponent,
ToastService,
TypographyModule,
} from "@bitwarden/components";
@Component({
imports: [
CommonModule,
ItemModule,
ButtonModule,
BadgeModule,
IconButtonModule,
SectionComponent,
TypographyModule,
JslibModule,
SectionHeaderComponent,
RouterLink,
],
selector: "app-send-list-items-container",
templateUrl: "send-list-items-container.component.html",
standalone: true,
})
export class SendListItemsContainerComponent {
sendType = SendType;
/**
* The list of sends to display.
*/
@Input()
sends: SendView[] = [];
constructor(
protected dialogService: DialogService,
protected environmentService: EnvironmentService,
protected i18nService: I18nService,
protected logService: LogService,
protected platformUtilsService: PlatformUtilsService,
protected sendApiService: SendApiService,
protected toastService: ToastService,
) {}
async deleteSend(s: SendView): Promise<boolean> {
const confirmed = await this.dialogService.openSimpleDialog({
title: { key: "deleteSend" },
content: { key: "deleteSendConfirmation" },
type: "warning",
});
if (!confirmed) {
return false;
}
await this.sendApiService.delete(s.id);
try {
this.toastService.showToast({
variant: "success",
title: null,
message: this.i18nService.t("deletedSend"),
});
} catch (e) {
this.logService.error(e);
}
}
async copySendLink(s: SendView) {
const env = await firstValueFrom(this.environmentService.environment$);
const link = env.getSendUrl() + s.accessId + "/" + s.urlB64Key;
this.platformUtilsService.copyToClipboard(link);
this.toastService.showToast({
variant: "success",
title: null,
message: this.i18nService.t("valueCopied", this.i18nService.t("sendLink")),
});
}
}