[PM-40252] feat: migrate shared vault components to shared-folder terminology

apps/browser/src/_locales/en/messages.json

@@ -1496,6 +1496,48 @@
   "myFolders": {
     "message": "My folders"
   },
+  "addSharedFolder": {
+    "message": "Add shared folder"
+  },
+  "newSharedFolder": {
+    "message": "New shared folder"
+  },
+  "assignToSharedFolders": {
+    "message": "Assign to shared folders"
+  },
+  "selectSharedFoldersToAssign": {
+    "message": "Select shared folders to assign"
+  },
+  "bulkSharedFolderAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these shared folders will be able to see the item."
+  },
+  "bulkSharedFolderAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these shared folders will be able to see the items."
+  },
+  "cannotRemoveViewOnlySharedFolders": {
+    "message": "You cannot remove shared folders with View only permissions: $SHAREDFOLDERS$",
+    "placeholders": {
+      "sharedfolders": {
+        "content": "$1",
+        "example": "Work, Personal"
+      }
+    }
+  },
+  "successfullyAssignedSharedFolders": {
+    "message": "Successfully assigned shared folders"
+  },
+  "itemMovedToSharedFolder": {
+    "message": "Item moved to shared folder"
+  },
+  "itemMovedToSharedFolders": {
+    "message": "Item moved to shared folders"
+  },
+  "itemsMovedToSharedFolder": {
+    "message": "Items moved to shared folder"
+  },
+  "itemsMovedToSharedFolders": {
+    "message": "Items moved to shared folders"
+  },
   "bitwardenForBusinessPageDesc": {
     "message": "Bitwarden for Business allows you to share your vault items with others by using an organization. Learn more on the bitwarden.com website."
   },

apps/browser/src/autofill/content/components/notification/confirmation/message.ts

@@ -32,35 +32,35 @@ export function NotificationConfirmationMessage({
           ? html`
               <div class=${singleLineWrapperStyles}>
                 ${
-                  itemName
-                    ? html`
-                        <span class=${itemNameStyles(theme)} title=${itemName}> ${itemName} </span>
-                      `
-                    : nothing
-                }
+                itemName
+                  ? html`
+                      <span class=${itemNameStyles(theme)} title=${itemName}> ${itemName} </span>
+                    `
+                  : nothing
+              }
                 <span
                   title=${message || buttonText}
                   class=${notificationConfirmationMessageStyles(theme)}
                 >
                   ${message || nothing}
                   ${
-                    buttonText
-                      ? html`
-                          <a
-                            title=${buttonText}
-                            class=${notificationConfirmationButtonTextStyles(theme)}
-                            @click=${handleClick}
-                            @keydown=${(e: KeyboardEvent) =>
-                              handleButtonKeyDown(e, () => handleClick(e))}
-                            aria-label=${buttonAria}
-                            tabindex="0"
-                            role="button"
-                          >
-                            ${buttonText}
-                          </a>
-                        `
-                      : nothing
-                  }
+                  buttonText
+                    ? html`
+                        <a
+                          title=${buttonText}
+                          class=${notificationConfirmationButtonTextStyles(theme)}
+                          @click=${handleClick}
+                          @keydown=${(e: KeyboardEvent) =>
+                          handleButtonKeyDown(e, () => handleClick(e))}
+                          aria-label=${buttonAria}
+                          tabindex="0"
+                          role="button"
+                        >
+                          ${buttonText}
+                        </a>
+                      `
+                    : nothing
+                }
                 </span>
               </div>
             `

apps/desktop/src/app/services/services.module.ts

@@ -149,6 +149,7 @@ import {
   RoutedVaultFilterService,
   RoutedVaultFilterBridgeService,
   VAULT_FILTER_BASE_ROUTE,
+  Vfo1TerminologyService,
 } from "@bitwarden/vault";
 
 import { DesktopLoginComponentService } from "../../auth/login/desktop-login-component.service";
@@ -615,6 +616,7 @@ const safeProviders: SafeProvider[] = [
       CollectionService,
       AccountServiceAbstraction,
       ConfigService,
+      Vfo1TerminologyService,
     ],
   }),
   safeProvider({

apps/desktop/src/locales/en/messages.json

@@ -116,6 +116,48 @@
   "myFolders": {
     "message": "My folders"
   },
+  "addSharedFolder": {
+    "message": "Add shared folder"
+  },
+  "newSharedFolder": {
+    "message": "New shared folder"
+  },
+  "assignToSharedFolders": {
+    "message": "Assign to shared folders"
+  },
+  "selectSharedFoldersToAssign": {
+    "message": "Select shared folders to assign"
+  },
+  "bulkSharedFolderAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these shared folders will be able to see the item."
+  },
+  "bulkSharedFolderAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these shared folders will be able to see the items."
+  },
+  "cannotRemoveViewOnlySharedFolders": {
+    "message": "You cannot remove shared folders with View only permissions: $SHAREDFOLDERS$",
+    "placeholders": {
+      "sharedfolders": {
+        "content": "$1",
+        "example": "Work, Personal"
+      }
+    }
+  },
+  "successfullyAssignedSharedFolders": {
+    "message": "Successfully assigned shared folders"
+  },
+  "itemMovedToSharedFolder": {
+    "message": "Item moved to shared folder"
+  },
+  "itemMovedToSharedFolders": {
+    "message": "Item moved to shared folders"
+  },
+  "itemsMovedToSharedFolder": {
+    "message": "Items moved to shared folder"
+  },
+  "itemsMovedToSharedFolders": {
+    "message": "Items moved to shared folders"
+  },
   "share": {
     "message": "Share"
   },

apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.html

@@ -137,7 +137,7 @@
       @if (showAssignToCollections()) {
         <button bitMenuItem type="button" (click)="assignToCollections()">
           <i class="bwi bwi-fw bwi-collection-shared" aria-hidden="true"></i>
-          {{ "assignToCollections" | i18n }}
+          {{ "assignToCollections" | vfo1I18n: "assignToSharedFolders" }}
         </button>
       }
       @if (showArchiveButton()) {

apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.ts

@@ -28,6 +28,7 @@ import {
   CopyCipherFieldDirective,
   GetOrgNameFromIdPipe,
   OrganizationNameBadgeComponent,
+  Vfo1I18nPipe,
 } from "@bitwarden/vault";
 
 import { VaultItemEvent } from "./vault-item-event";
@@ -46,6 +47,7 @@ interface CopyFieldConfig {
   imports: [
     NgClass,
     I18nPipe,
+    Vfo1I18nPipe,
     TableModule,
     OrganizationNameBadgeComponent,
     BitIconButtonComponent,

apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.html

@@ -1,6 +1,6 @@
 <bit-dialog dialogSize="large">
   <span bitDialogTitle>
-    {{ "assignToCollections" | i18n }}
+    {{ "assignToCollections" | vfo1I18n: "assignToSharedFolders" }}
     <span class="tw-text-sm tw-normal-case tw-text-muted">
       {{ editableItemCount | pluralize: ("item" | i18n) : ("items" | i18n) }}
     </span>

apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.ts

@@ -10,14 +10,22 @@ import {
   AssignCollectionsComponent,
   CollectionAssignmentParams,
   CollectionAssignmentResult,
+  Vfo1I18nPipe,
 } from "@bitwarden/vault";
 
 // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
 // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   standalone: true,
   templateUrl: "./assign-collections-desktop.component.html",
-  imports: [AssignCollectionsComponent, PluralizePipe, DialogModule, ButtonModule, I18nPipe],
+  imports: [
+    AssignCollectionsComponent,
+    PluralizePipe,
+    DialogModule,
+    ButtonModule,
+    I18nPipe,
+    Vfo1I18nPipe,
+  ],
 })
 export class AssignCollectionsDesktopComponent {
   protected editableItemCount: number;

apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.service.ts

@@ -12,7 +12,11 @@ import { StateProvider } from "@bitwarden/common/platform/state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
-import { VaultFilterService as BaseVaultFilterService, CollectionFilter } from "@bitwarden/vault";
+import {
+  VaultFilterService as BaseVaultFilterService,
+  CollectionFilter,
+  Vfo1TerminologyService,
+} from "@bitwarden/vault";
 
 @Injectable()
 export class VaultFilterService extends BaseVaultFilterService implements OnDestroy {
@@ -35,6 +39,7 @@ export class VaultFilterService extends BaseVaultFilterService implements OnDest
     collectionService: CollectionService,
     accountService: AccountService,
     configService: ConfigService,
+    vfo1Terminology: Vfo1TerminologyService,
   ) {
     super(
       organizationService,
@@ -46,6 +51,7 @@ export class VaultFilterService extends BaseVaultFilterService implements OnDest
       collectionService,
       accountService,
       configService,
+      vfo1Terminology,
     );
   }
 

apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.html

@@ -1,6 +1,6 @@
 <bit-dialog dialogSize="large">
   <span bitDialogTitle>
-    {{ "assignToCollections" | i18n }}
+    {{ "assignToCollections" | vfo1I18n: "assignToSharedFolders" }}
     <span class="tw-text-sm tw-normal-case tw-text-muted">
       {{ editableItemCount | pluralize: ("item" | i18n) : ("items" | i18n) }}
     </span>

apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts

@@ -8,14 +8,15 @@ import {
   AssignCollectionsComponent,
   CollectionAssignmentParams,
   CollectionAssignmentResult,
+  Vfo1I18nPipe,
 } from "@bitwarden/vault";
 
 import { SharedModule } from "../../../shared";
 
 // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
 // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
-  imports: [SharedModule, AssignCollectionsComponent, PluralizePipe],
+  imports: [SharedModule, AssignCollectionsComponent, PluralizePipe, Vfo1I18nPipe],
   templateUrl: "./assign-collections-web.component.html",
 })
 export class AssignCollectionsWebComponent {

apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html

@@ -317,7 +317,7 @@
         @if (showAssignToCollections) {
           <button bitMenuItem type="button" (click)="assignToCollections()">
             <i class="bwi bwi-fw bwi-collection-shared" aria-hidden="true"></i>
-            {{ "assignToCollections" | i18n }}
+            {{ "assignToCollections" | vfo1I18n: "assignToSharedFolders" }}
           </button>
         }
         @if (showEventLogs) {

apps/web/src/app/vault/components/vault-items/vault-items.component.html

@@ -102,7 +102,7 @@
               ) {
                 <button type="button" bitMenuItem (click)="assignToCollections()">
                   <i class="bwi bwi-fw bwi-collection-shared" aria-hidden="true"></i>
-                  {{ "assignToCollections" | i18n }}
+                  {{ "assignToCollections" | vfo1I18n: "assignToSharedFolders" }}
                 </button>
               }
 

apps/web/src/app/vault/components/vault-items/vault-items.module.ts

@@ -10,7 +10,11 @@ import {
   TooltipDirective,
   IconModule,
 } from "@bitwarden/components";
-import { CopyCipherFieldDirective, VaultItemCopyActionsComponent } from "@bitwarden/vault";
+import {
+  CopyCipherFieldDirective,
+  VaultItemCopyActionsComponent,
+  Vfo1I18nPipe,
+} from "@bitwarden/vault";
 
 import { CollectionNameBadgeComponent } from "../../../admin-console/organizations/collections";
 import { GroupBadgeModule } from "../../../admin-console/organizations/collections/group-badge/group-badge.module";
@@ -39,6 +43,7 @@ import { VaultItemsComponent } from "./vault-items.component";
     ScrollLayoutDirective,
     PremiumBadgeComponent,
     IconModule,
+    Vfo1I18nPipe,
   ],
   declarations: [VaultItemsComponent, VaultCipherRowComponent, VaultCollectionRowComponent],
   exports: [VaultItemsComponent],

apps/web/src/locales/en/messages.json

@@ -1206,6 +1206,48 @@
   "myFolders": {
     "message": "My folders"
   },
+  "addSharedFolder": {
+    "message": "Add shared folder"
+  },
+  "newSharedFolder": {
+    "message": "New shared folder"
+  },
+  "assignToSharedFolders": {
+    "message": "Assign to shared folders"
+  },
+  "selectSharedFoldersToAssign": {
+    "message": "Select shared folders to assign"
+  },
+  "bulkSharedFolderAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these shared folders will be able to see the item."
+  },
+  "bulkSharedFolderAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these shared folders will be able to see the items."
+  },
+  "cannotRemoveViewOnlySharedFolders": {
+    "message": "You cannot remove shared folders with View only permissions: $SHAREDFOLDERS$",
+    "placeholders": {
+      "sharedfolders": {
+        "content": "$1",
+        "example": "Work, Personal"
+      }
+    }
+  },
+  "successfullyAssignedSharedFolders": {
+    "message": "Successfully assigned shared folders"
+  },
+  "itemMovedToSharedFolder": {
+    "message": "Item moved to shared folder"
+  },
+  "itemMovedToSharedFolders": {
+    "message": "Item moved to shared folders"
+  },
+  "itemsMovedToSharedFolder": {
+    "message": "Items moved to shared folder"
+  },
+  "itemsMovedToSharedFolders": {
+    "message": "Items moved to shared folders"
+  },
   "attachments": {
     "message": "Attachments"
   },

libs/vault/src/cipher-form/components/item-details/item-details-section.component.html

@@ -39,7 +39,7 @@ <h2 bitTypography="h6">{{ "itemDetails" | i18n }}</h2>
     @if (showCollectionsControl) {
       <ng-container>
         <bit-form-field class="tw-w-full" [disableMargin]="config.hideIndividualVaultFields">
-          <bit-label>{{ "collections" | i18n }}</bit-label>
+          <bit-label>{{ "collections" | vfo1I18n: "sharedFolders" }}</bit-label>
           <bit-multi-select
             class="tw-w-full"
             formControlName="collectionIds"
@@ -55,7 +55,7 @@ <h2 bitTypography="h6">{{ "itemDetails" | i18n }}</h2>
     }
     @if (!config.hideIndividualVaultFields) {
       <bit-form-field disableMargin>
-        <bit-label>{{ "folder" | i18n }}</bit-label>
+        <bit-label>{{ "folder" | vfo1I18n: "myFolder" }}</bit-label>
         <bit-select formControlName="folderId">
           @for (folder of config.folders; track folder.id) {
             <bit-option [value]="folder.id" [label]="folder.name"></bit-option>