Merge branch 'feature/VDR-room' into feature/VDR-lifetime

packages/client/public/locales/en/CreateEditRoomDialog.json

@@ -11,7 +11,6 @@
   "MakeRoomPrivateTitle": "Make the Room Private",
   "PeopleSelectorInfo": "Only a room admin or a {{productName}} admin can become the owner of the room",
   "PublicRoomBarDescription": "This room is available to anyone with the link. External users will have View Only permission for all the files.",
-  "VirtualDataRoomDescription": "Use VDR for advanced file security and transparency while filling and signing documents step-by-step. Set watermarks, automatically index and track all content, restrict downloading and copying.",
   "PublicRoomSystemFoldersDescription": "System folders store copies of forms at different stages of completion. Forms that are being filled are stored in the In progress folder, and completed forms are stored in the Complete folder.",
   "PublicRoomSystemFoldersTitle": "System Folders",
   "RoomEditing": "Room editing",
@@ -34,5 +33,4 @@
   "AddWatermarksToDocuments": "Add watermarks to documents",
   "AddWatermarksToDocumentsDescription": "Protect all documents in this room with watermarks. If a document already contains one, it will not be replaced.",
   "FilesOlderThan": "Files older than:"
-  "ThirdPartyStorageRoomAdminNoStorageAlert": "To connect a third-party storage, you need to add the corresponding service in the Integration section of DocSpace settings. Contact DocSpace owner or administrator to enable the integration."
 }

packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js

@@ -26,27 +26,6 @@
 
 import { RoomsType } from "@docspace/shared/enums";
 
-export const getRoomTypeDescriptionTranslation = (roomType = 1, t) => {
-  switch (roomType) {
-    case RoomsType.FillingFormsRoom:
-      return t("CreateEditRoomDialog:FillingFormsRoomDescription");
-    case RoomsType.EditingRoom:
-      return t("CreateEditRoomDialog:CollaborationRoomDescription");
-    case RoomsType.ReviewRoom:
-      return t("CreateEditRoomDialog:ReviewRoomDescription");
-    case RoomsType.ReadOnlyRoom:
-      return t("CreateEditRoomDialog:ViewOnlyRoomDescription");
-    case RoomsType.CustomRoom:
-      return t("CreateEditRoomDialog:CustomRoomDescription");
-    case RoomsType.PublicRoom:
-      return t("CreateEditRoomDialog:PublicRoomDescription");
-    case RoomsType.VirtualDataRoom:
-      return t("CreateEditRoomDialog:VirtualDataRoomDescription");
-    case RoomsType.FormRoom:
-      return t("CreateEditRoomDialog:FormFilingRoomDescription");
-  }
-};
-
 export const getRoomTypeDefaultTagTranslation = (roomType = 1, t) => {
   switch (roomType) {
     case RoomsType.FillingFormsRoom:
@@ -62,7 +41,7 @@ export const getRoomTypeDefaultTagTranslation = (roomType = 1, t) => {
     case RoomsType.PublicRoom:
       return t("Common:PublicRoom");
     case RoomsType.VirtualDataRoom:
-      return t("Files:VirtualDataRoom");
+      return t("Common:VirtualDataRoom");
     case RoomsType.FormRoom:
       return t("Common:FormRoom");
   }

packages/client/src/helpers/filesUtils.js

@@ -88,7 +88,7 @@ export const getDefaultRoomName = (room, t) => {
       return t("Common:PublicRoom");
 
     case RoomsType.VirtualDataRoom:
-      return t("Files:VirtualDataRoom");
+      return t("Common:VirtualDataRoom");
     case RoomsType.FormRoom:
       return t("Common:FormRoom");
   }

packages/client/src/pages/Home/Section/Filter/index.js

@@ -1624,7 +1624,7 @@ const SectionFilterContent = ({
                   id: "filter_type-virtual-data",
                   key: RoomsType.VirtualDataRoom,
                   group: FilterGroups.roomFilterType,
-                  label: t("VirtualDataRoom"),
+                  label: t("Common:VirtualDataRoom"),
                 };
               case RoomsType.CustomRoom:
               default:

packages/shared/components/room-type/RoomType.utils.ts

@@ -19,7 +19,7 @@ export const getRoomTypeTitleTranslation = (
     case RoomsType.PublicRoom:
       return t("Common:PublicRoom");
     case RoomsType.VirtualDataRoom:
-      return t("Files:VirtualDataRoom");
+      return t("Common:VirtualDataRoom");
     case RoomsType.FormRoom:
       return t("Common:FormFilingRoomTitle");
     default:
@@ -44,6 +44,8 @@ export const getRoomTypeDescriptionTranslation = (
       return t("Common:CustomRoomDescription");
     case RoomsType.PublicRoom:
       return t("Common:PublicRoomDescription");
+    case RoomsType.VirtualDataRoom:
+      return t("Common:VirtualDataRoomDescription");
     case RoomsType.FormRoom:
       return t("Common:FormFilingRoomDescription");
     default:

public/locales/en/Common.json

@@ -486,5 +486,7 @@
   "OverwriteDescription": "The new file will replace the existing one as a new version.",
   "OverwriteTitle": "Overwrite with version update",
   "SkipDescription": "No file will be copied. The original file will be retained in the destination folder.",
-  "SkipTitle": "Skip"
+  "SkipTitle": "Skip",
+  "VirtualDataRoom": "Virtual Data Room",
+  "VirtualDataRoomDescription": "Use VDR for advanced file security and transparency while filling and signing documents step-by-step. Set watermarks, automatically index and track all content, restrict downloading and copying."
 }