aherman
/
bitwarden-clients
mirror of https://github.com/bitwarden/clients
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PM-24951] - update "My Items" icon to bwi-user (#16674)

Browse Source 
* update "My Items" icon to bwi-user

* fix tests

* revert changse to reports. fix assign collections.

* revert remaining changes to reports
pull/15997/head
Jordan Aasen 8 months ago committed by GitHub
parent 83c457920e
commit 7a38b22667
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 63 additions and 18 deletions
Show Stats Download Patch File Download Diff File

15
apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
Unescape View File

@ -14,7 +14,11 @@ import {
take,
} from "rxjs";
import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
import {
CollectionService,
CollectionTypes,
CollectionView,
} from "@bitwarden/admin-console/common";
import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
import { DynamicTreeNode } from "@bitwarden/angular/vault/vault-filter/models/dynamic-tree-node.model";
import { sortDefaultCollections } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
@ -473,7 +477,14 @@ export class VaultPopupListFiltersService {
});
}),
map((tree) =>
tree.nestedList.map((c) => this.convertToChipSelectOption(c, "bwi-collection-shared")),
tree.nestedList.map((c) =>
this.convertToChipSelectOption(
c,
c.node.type === CollectionTypes.DefaultUserCollection
? "bwi-user"
: "bwi-collection-shared",
),
),
),
shareReplay({ bufferSize: 1, refCount: true }),
);

5
apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html
Unescape View File

@ -55,7 +55,10 @@
>
<i
*ngIf="c.children.length === 0"
class="bwi bwi-fw bwi-collection-shared"
[class]="
'bwi bwi-fw ' +
(c.node.type === DefaultCollectionType ? 'bwi-user' : 'bwi-collection-shared')
"
aria-hidden="true"
></i>
&nbsp;{{ c.node.name }}

7
apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
Unescape View File

@ -13,7 +13,12 @@
</td>
<td bitCell [ngClass]="RowHeightClass" class="tw-min-w-fit">
<div aria-hidden="true">
<i class="bwi bwi-fw bwi-lg bwi-collection-shared"></i>
<i
[class]="
'bwi bwi-fw bwi-lg ' +
(collection.type === DefaultCollectionType ? 'bwi-user' : 'bwi-collection-shared')
"
></i>
</div>
</td>
<td bitCell [ngClass]="RowHeightClass">

8
apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
Unescape View File

@ -2,7 +2,12 @@
// @ts-strict-ignore
import { Component, EventEmitter, Input, Output } from "@angular/core";
import { CollectionAdminView, Unassigned, CollectionView } from "@bitwarden/admin-console/common";
import {
CollectionAdminView,
Unassigned,
CollectionView,
CollectionTypes,
} from "@bitwarden/admin-console/common";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
@ -26,6 +31,7 @@ export class VaultCollectionRowComponent<C extends CipherViewLike> {
protected RowHeightClass = RowHeightClass;
protected Unassigned = "unassigned";
protected CollectionPermission = CollectionPermission;
protected DefaultCollectionType = CollectionTypes.DefaultUserCollection;
@Input() disabled: boolean;
@Input() collection: CollectionView;

9
apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
Unescape View File

@ -12,7 +12,11 @@ import {
switchMap,
} from "rxjs";
import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
import {
CollectionService,
CollectionTypes,
CollectionView,
} from "@bitwarden/admin-console/common";
import { sortDefaultCollections } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@ -257,7 +261,8 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
const collectionCopy = cloneCollection(
new CollectionView({ ...c, name: c.name }),
) as CollectionFilter;
collectionCopy.icon = "bwi-collection-shared";
collectionCopy.icon =
c.type === CollectionTypes.DefaultUserCollection ? "bwi-user" : "bwi-collection-shared";
const parts = c.name ? c.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
ServiceUtils.nestedTraverse(nodes, 0, parts, collectionCopy, undefined, NestingDelimiter);
}

10
apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
Unescape View File

@ -7,6 +7,7 @@ import {
Unassigned,
CollectionView,
CollectionAdminService,
CollectionTypes,
} from "@bitwarden/admin-console/common";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@ -152,9 +153,12 @@ export class VaultHeaderComponent {
}
protected get icon() {
return this.filter?.collectionId && this.filter.collectionId !== All
? "bwi-collection-shared"
: "";
if (!this.filter?.collectionId || this.filter.collectionId === All) {
return "";
}
return this.collection?.node.type === CollectionTypes.DefaultUserCollection
? "bwi-user"
: "bwi-collection-shared";
}
/**

3
libs/angular/src/vault/vault-filter/components/collection-filter.component.ts
Unescape View File

@ -4,7 +4,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core";
// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
// eslint-disable-next-line no-restricted-imports
import { CollectionView } from "@bitwarden/admin-console/common";
import { CollectionTypes, CollectionView } from "@bitwarden/admin-console/common";
import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
import { DynamicTreeNode } from "../models/dynamic-tree-node.model";
@ -21,6 +21,7 @@ export class CollectionFilterComponent {
@Output() onNodeCollapseStateChange: EventEmitter<ITreeNodeObject> =
new EventEmitter<ITreeNodeObject>();
@Output() onFilterChange: EventEmitter<VaultFilter> = new EventEmitter<VaultFilter>();
DefaultCollectionType = CollectionTypes.DefaultUserCollection;
readonly collectionsGrouping: TopLevelTreeNode = {
id: "collections",

2
libs/importer/src/components/import.component.html
Unescape View File

@ -49,7 +49,7 @@
*ngFor="let c of collections$ | async"
[value]="c"
[label]="c.name"
icon="bwi-collection-shared"
[icon]="c.type === DefaultCollectionType ? 'bwi-user' : 'bwi-collection-shared'"
/>
</ng-container>
</bit-select>

8
libs/importer/src/components/import.component.ts
Unescape View File

@ -29,7 +29,11 @@ import { combineLatestWith, filter, map, switchMap, takeUntil } from "rxjs/opera
// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
// eslint-disable-next-line no-restricted-imports
import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
import {
CollectionService,
CollectionTypes,
CollectionView,
} from "@bitwarden/admin-console/common";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import {
getOrganizationById,
@ -103,6 +107,8 @@ import { ImportLastPassComponent } from "./lastpass";
providers: ImporterProviders,
})
export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
DefaultCollectionType = CollectionTypes.DefaultUserCollection;
featuredImportOptions: ImportOption[];
importOptions: ImportOption[];
format: ImportType = null;

6
libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
Unescape View File

@ -7,7 +7,7 @@ import { toSignal } from "@angular/core/rxjs-interop";
import { fromEvent, map, startWith } from "rxjs";
// eslint-disable-next-line no-restricted-imports
import { CollectionView } from "@bitwarden/admin-console/common";
import { CollectionTypes, CollectionView } from "@bitwarden/admin-console/common";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@ -102,7 +102,9 @@ export class ItemDetailsV2Component {
getIconClass(item: Organization | CollectionView | FolderView): string {
if (item instanceof CollectionView) {
return "bwi-collection-shared";
return item.type === CollectionTypes.DefaultUserCollection
? "bwi-user"
: "bwi-collection-shared";
} else if (item instanceof FolderView) {
return "bwi-folder";
}

8
libs/vault/src/components/assign-collections.component.ts
Unescape View File

@ -330,7 +330,8 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
);
})
.map((c) => ({
icon: "bwi-collection-shared",
icon:
c.type === CollectionTypes.DefaultUserCollection ? "bwi-user" : "bwi-collection-shared",
id: c.id,
labelName: c.name,
listName: c.name,
@ -371,7 +372,7 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
collection.id !== this.params.activeCollection?.id,
)
.map((collection) => ({
icon: "bwi-collection-shared",
icon: collection.icon,
id: collection.id,
labelName: collection.labelName,
listName: collection.listName,
@ -435,7 +436,8 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
)
.subscribe((collections) => {
this.availableCollections = collections.map((c) => ({
icon: "bwi-collection-shared",
icon:
c.type === CollectionTypes.DefaultUserCollection ? "bwi-user" : "bwi-collection-shared",
id: c.id,
labelName: c.name,
listName: c.name,

Write Preview
Loading…
Cancel
Save