diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts index a8155eff7..ccc6b437c 100644 --- a/src/app/vault/add-edit.component.ts +++ b/src/app/vault/add-edit.component.ts @@ -22,6 +22,7 @@ import { UserService } from 'jslib/abstractions/user.service'; import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/add-edit.component'; +import { CipherType } from 'jslib/enums/cipherType'; const BroadcasterSubscriptionId = 'AddEditComponent'; @@ -44,9 +45,11 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges, } async ngOnInit() { - // @override by Cozy : remove the notes from the possible types of ciphers - this.typeOptions.pop(); - // end override + // Cozy Customization, Remove notes and profiles from available types + // /* + const ignoredTypes = [CipherType.Identity, CipherType.SecureNote]; + this.typeOptions = this.typeOptions.filter(type => !ignoredTypes.includes(type.value)); + // */ this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => { this.ngZone.run(() => { switch (message.command) { diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html index 9e8fe45bc..a19685fcc 100644 --- a/src/app/vault/ciphers.component.html +++ b/src/app/vault/ciphers.component.html @@ -48,10 +48,13 @@
+ + + cipher.isDeleted) + /*/ + .filter(cipher => cipher.isDeleted && cipher.type !== CipherType.Identity) + // */ .map(cipher => cipher.id); return this.cipherService.restoreManyWithServer(ids); diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html index 341117bc8..0d32a1a74 100644 --- a/src/app/vault/groupings.component.html +++ b/src/app/vault/groupings.component.html @@ -62,7 +62,9 @@

{{'types' | i18n}}

 {{'typeCard' | i18n}} -
  • + + +
  • @@ -73,6 +75,7 @@

    {{'types' | i18n}}

     {{'typeIdentity' | i18n}}
    • +
  • diff --git a/src/app/vault/groupings.component.ts b/src/app/vault/groupings.component.ts index 147e0d045..496833254 100644 --- a/src/app/vault/groupings.component.ts +++ b/src/app/vault/groupings.component.ts @@ -11,7 +11,9 @@ import { GroupingsComponent as BaseGroupingsComponent } from 'jslib/angular/comp import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { CollectionView } from 'jslib/models/view/collectionView'; +import { CipherType } from 'jslib/enums/cipherType'; import { ServiceUtils } from 'jslib/misc/serviceUtils'; +import { CipherView } from 'jslib/models/view'; const NestingDelimiter = '/'; @@ -26,6 +28,10 @@ export class GroupingsComponent extends BaseGroupingsComponent { @Output() onImportClicked = new EventEmitter(); importSelected = false; collectionsWithUsersToValidateIds: { [id: string]: string[] } = {}; + // Cozy customization, Add typeCounts to conditionnaly remove Profiles section + // /* + typeCounts = new Map(); + // */ hasNotes: boolean; private prevSelection: any = new Object(); @@ -57,6 +63,10 @@ export class GroupingsComponent extends BaseGroupingsComponent { return (c.type === 2 && !c.isDeleted); }); this.hasNotes = (noteIndex > -1) ; + // Cozy customization, Add typeCounts to conditionnaly remove Profiles section + // /* + await this.getCounts(); + // */ // run super super.load(setLoaded); } @@ -188,6 +198,28 @@ export class GroupingsComponent extends BaseGroupingsComponent { // */ + // Cozy customization, Add typeCounts to conditionnaly remove Profiles section + // /* + async getCounts() { + const typeCounts = new Map(); + + const ciphers = await this.cipherService.getAllDecrypted(); + ciphers.forEach(c => { + if (c.isDeleted) { + return; + } + + if (typeCounts.has(c.type)) { + typeCounts.set(c.type, typeCounts.get(c.type) + 1); + } else { + typeCounts.set(c.type, 1); + } + }); + + this.typeCounts = typeCounts; + } + // */ + protected isOrgWithNoKey(collection: CollectionView) { // in loadCollections() we set collection.id = collection.organization.id for organizations with no key return collection.id === collection.organizationId; diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html index f26dabe35..e2407a2ec 100644 --- a/src/app/vault/vault.component.html +++ b/src/app/vault/vault.component.html @@ -4,13 +4,17 @@ (onAddFolder)="addFolder()" (onEditFolder)="editFolder($event.id)" (onCollectionClicked)="filterCollection($event.id)" (onTrashClicked)="filterDeleted()" (onImportClicked)="startImport()"> + + + {{'edit' | i18n}} + + diff --git a/src/app/vault/view.component.ts b/src/app/vault/view.component.ts index eb7946304..0a9725246 100644 --- a/src/app/vault/view.component.ts +++ b/src/app/vault/view.component.ts @@ -21,6 +21,7 @@ import { StorageService } from 'jslib/abstractions/storage.service'; import { TokenService } from 'jslib/abstractions/token.service'; import { TotpService } from 'jslib/abstractions/totp.service'; import { UserService } from 'jslib/abstractions/user.service'; +import { CipherType } from 'jslib/enums/cipherType'; import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; @@ -38,6 +39,10 @@ export class ViewComponent extends BaseViewComponent implements OnChanges { @Output() onViewCipherPasswordHistory = new EventEmitter(); isReadOnly = false; + // Cozy customization, Prevent to restore deleted Profiles as they will be replaced by Cozy Contacts + // /* + cipherType = CipherType; + // */ constructor(cipherService: CipherService, totpService: TotpService, tokenService: TokenService, i18nService: I18nService,