Redefine cipher "share" to "move to organization" (#1039)

* Redefine cipher "share" to "move to organization" * Bump jslib Co-authored-by: = <=>
2025-12-27 21:53:25 +00:00 · 2021-06-21 19:27:27 -04:00
parent d6d71c94f5
commit f8a7439675
14 changed files with 58 additions and 38 deletions
--- a/src/app/services/event.service.ts
+++ b/src/app/services/event.service.ts
@@ -101,8 +101,8 @@ export class EventService {
                humanReadableMsg = this.i18nService.t('deletedAttachmentForItem', this.getShortId(ev.cipherId));
                break;
            case EventType.Cipher_Shared:
-                msg = this.i18nService.t('sharedItemId', this.formatCipherId(ev, options));
-                humanReadableMsg = this.i18nService.t('sharedItemId', this.getShortId(ev.cipherId));
+                msg = this.i18nService.t('movedItemIdToOrg', this.formatCipherId(ev, options));
+                humanReadableMsg = this.i18nService.t('movedItemIdToOrg', this.getShortId(ev.cipherId));
                break;
            case EventType.Cipher_ClientViewed:
                msg = this.i18nService.t('viewedItemId', this.formatCipherId(ev, options));
--- a/src/app/settings/emergency-access-view.component.html
+++ b/src/app/settings/emergency-access-view.component.html
@@ -12,7 +12,7 @@
                    <td class="reduced-lh wrap">
                        <a href="#" appStopClick (click)="selectCipher(c)" title="{{'editItem' | i18n}}">{{c.name}}</a>
                        <ng-container *ngIf="!organization && c.organizationId">
-                            <i class="fa fa-share-alt" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                            <i class="fa fa-cube" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
                            <span class="sr-only">{{'shared' | i18n}}</span>
                        </ng-container>
                        <ng-container *ngIf="c.hasAttachments">
--- a/src/app/tools/exposed-passwords-report.component.html
+++ b/src/app/tools/exposed-passwords-report.component.html
@@ -28,7 +28,7 @@
                            <span>{{c.name}}</span>
                        </ng-template>
                        <ng-container *ngIf="!organization && c.organizationId">
-                            <i class="fa fa-share-alt" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                            <i class="fa fa-cube" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
                            <span class="sr-only">{{'shared' | i18n}}</span>
                        </ng-container>
                        <ng-container *ngIf="c.hasAttachments">
--- a/src/app/tools/inactive-two-factor-report.component.html
+++ b/src/app/tools/inactive-two-factor-report.component.html
@@ -29,7 +29,7 @@
                    <td class="reduced-lh wrap">
                        <a href="#" appStopClick (click)="selectCipher(c)" title="{{'editItem' | i18n}}">{{c.name}}</a>
                        <ng-container *ngIf="!organization && c.organizationId">
-                            <i class="fa fa-share-alt" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                            <i class="fa fa-cube" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
                            <span class="sr-only">{{'shared' | i18n}}</span>
                        </ng-container>
                        <ng-container *ngIf="c.hasAttachments">
--- a/src/app/tools/reused-passwords-report.component.html
+++ b/src/app/tools/reused-passwords-report.component.html
@@ -34,7 +34,7 @@
                            <span>{{c.name}}</span>
                        </ng-template>
                        <ng-container *ngIf="!organization && c.organizationId">
-                            <i class="fa fa-share-alt" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                            <i class="fa fa-cube" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
                            <span class="sr-only">{{'shared' | i18n}}</span>
                        </ng-container>
                        <ng-container *ngIf="c.hasAttachments">
--- a/src/app/tools/unsecured-websites-report.component.html
+++ b/src/app/tools/unsecured-websites-report.component.html
@@ -29,7 +29,7 @@
                    <td class="reduced-lh wrap">
                        <a href="#" appStopClick (click)="selectCipher(c)" title="{{'editItem' | i18n}}">{{c.name}}</a>
                        <ng-container *ngIf="!organization && c.organizationId">
-                            <i class="fa fa-share-alt" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                            <i class="fa fa-cube" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
                            <span class="sr-only">{{'shared' | i18n}}</span>
                        </ng-container>
                        <ng-container *ngIf="c.hasAttachments">
--- a/src/app/tools/weak-passwords-report.component.html
+++ b/src/app/tools/weak-passwords-report.component.html
@@ -34,7 +34,7 @@
                            <span>{{c.name}}</span>
                        </ng-template>
                        <ng-container *ngIf="!organization && c.organizationId">
-                            <i class="fa fa-share-alt" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                            <i class="fa fa-cube" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
                            <span class="sr-only">{{'shared' | i18n}}</span>
                        </ng-container>
                        <ng-container *ngIf="c.hasAttachments">
--- a/src/app/vault/bulk-actions.component.html
+++ b/src/app/vault/bulk-actions.component.html
@@ -9,8 +9,8 @@
            {{'moveSelected' | i18n}}
        </button>
        <button class="dropdown-item" appStopClick (click)="bulkShare()" *ngIf="!deleted && !organization">
-            <i class="fa fa-fw fa-share-alt" aria-hidden="true"></i>
-            {{'shareSelected' | i18n}}
+            <i class="fa fa-fw fa-arrow-circle-o-right" aria-hidden="true"></i>
+            {{'moveSelectedToOrg' | i18n}}
        </button>
        <button class="dropdown-item" (click)="bulkRestore()" *ngIf="deleted && !organization">
            <i class="fa fa-fw fa-undo" aria-hidden="true"></i>
--- a/src/app/vault/bulk-share.component.html
+++ b/src/app/vault/bulk-share.component.html
@@ -1,17 +1,17 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="shareSelectedTitle">
+<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="moveSelectedToOrgTitle">
    <div class="modal-dialog modal-dialog-scrollable" role="document">
        <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
            <div class="modal-header">
-                <h2 class="modal-title" id="shareSelectedTitle">
-                    {{'shareSelected' | i18n}}
+                <h2 class="modal-title" id="moveSelectedToOrgTitle">
+                    {{'moveSelectedToOrg' | i18n}}
                </h2>
                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
                    <span aria-hidden="true">&times;</span>
                </button>
            </div>
            <div class="modal-body">
-                <p>{{'shareManyDesc' | i18n}}</p>
-                <p>{{'shareSelectedItemsCountDesc' | i18n: this.ciphers.length : shareableCiphers.length : nonShareableCount}}
+                <p>{{'moveManyToOrgDesc' | i18n}}</p>
+                <p>{{'moveSelectedItemsCountDesc' | i18n: this.ciphers.length : shareableCiphers.length : nonShareableCount}}
                </p>
                <div class="form-group">
                    <label for="organization">{{'organization' | i18n}}</label>
--- a/src/app/vault/bulk-share.component.ts
+++ b/src/app/vault/bulk-share.component.ts
@@ -71,7 +71,8 @@ export class BulkShareComponent implements OnInit {
                checkedCollectionIds);
            await this.formPromise;
            this.onShared.emit();
-            this.toasterService.popAsync('success', null, this.i18nService.t('sharedItems'));
+            const orgName = this.organizations.find(o => o.id === this.organizationId)?.name ?? this.i18nService.t('organization');
+            this.toasterService.popAsync('success', null, this.i18nService.t('movedItemsToOrg', orgName));
        } catch { }
    }

--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -13,7 +13,7 @@
                    <a href="#" appStopClick appStopProp (click)="selectCipher(c)"
                        title="{{'editItem' | i18n}}">{{c.name}}</a>
                    <ng-container *ngIf="!organization && c.organizationId">
-                        <i class="fa fa-share-alt" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
+                        <i class="fa fa-cube" appStopProp title="{{'shared' | i18n}}" aria-hidden="true"></i>
                        <span class="sr-only">{{'shared' | i18n}}</span>
                    </ng-container>
                    <ng-container *ngIf="c.hasAttachments">
@@ -70,8 +70,8 @@
                            </a>
                            <a class="dropdown-item" href="#" appStopClick
                                *ngIf="!organization && !c.organizationId && !c.isDeleted" (click)="share(c)">
-                                <i class="fa fa-fw fa-share-alt" aria-hidden="true"></i>
-                                {{'share' | i18n}}
+                                <i class="fa fa-fw fa-arrow-circle-o-right" aria-hidden="true"></i>
+                                {{'moveToOrganization' | i18n}}
                            </a>
                            <a class="dropdown-item" href="#" appStopClick *ngIf="c.organizationId && !c.isDeleted"
                                (click)="collections(c)">
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -3,7 +3,7 @@
        <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
            <div class="modal-header">
                <h2 class="modal-title" id="shareTitle">
-                    {{'share' | i18n}}
+                    {{'moveToOrganization' | i18n}}
                    <small *ngIf="cipher">{{cipher.name}}</small>
                </h2>
                <button type="button" class="close" data-dismiss="modal" appA11yTitle="{{'close' | i18n}}">
@@ -14,7 +14,7 @@
                {{'noOrganizationsList' | i18n}}
            </div>
            <div class="modal-body" *ngIf="organizations && organizations.length">
-                <p>{{'shareDesc' | i18n}}</p>
+                <p>{{'moveToOrgDesc' | i18n}}</p>
                <div class="form-group">
                    <label for="organization">{{'organization' | i18n}}</label>
                    <select id="organization" name="OrganizationId" [(ngModel)]="organizationId" class="form-control"