Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0

packages/client/src/pages/PortalSettings/categories/security/audit-trail/RowView/AuditContent.js

@@ -20,6 +20,7 @@ export const AuditContent = ({ sectionWidth, item, isSettingNotPaid }) => {
   const to = moment(item.date).local();
 
   const dateStr = to.format(DATE_FORMAT);
+
   return (
     <StyledRowContent
       sideColor="#A3A9AE"
@@ -53,7 +54,7 @@ export const AuditContent = ({ sectionWidth, item, isSettingNotPaid }) => {
         fontWeight={600}
         className="settings_unavailable"
       >
-        {`${item.room ? item.room && "|" : ""} ${item.action}`}
+        {`${item.context ? item.context + " |" : ""} ${item.action}`}
       </Text>
     </StyledRowContent>
   );

packages/client/src/pages/PortalSettings/categories/security/audit-trail/RowView/AuditRowContainer.js

@@ -10,6 +10,7 @@ const AuditRowContainer = ({
   auditTrailUsers,
   theme,
   sectionWidth,
+  isAuditAvailable,
 }) => {
   useEffect(() => {
     if (viewAs !== "table" && viewAs !== "row") return;
@@ -29,6 +30,7 @@ const AuditRowContainer = ({
           theme={theme}
           item={item}
           sectionWidth={sectionWidth}
+          isSettingNotPaid={!isAuditAvailable}
         />
       ))}
     </RowContainer>

packages/client/src/pages/PortalSettings/categories/security/audit-trail/RowView/AuditUserRow.js

@@ -2,10 +2,14 @@ import React from "react";
 import Row from "@docspace/components/row";
 import { AuditContent } from "./AuditContent";
 
-export const AuditUserRow = ({ item, sectionWidth }) => {
+export const AuditUserRow = ({ item, sectionWidth, isSettingNotPaid }) => {
   return (
     <Row sectionWidth={sectionWidth} key={item.id} data={item}>
-      <AuditContent item={item} sectionWidth={sectionWidth} />
+      <AuditContent
+        item={item}
+        sectionWidth={sectionWidth}
+        isSettingNotPaid={isSettingNotPaid}
+      />
     </Row>
   );
 };

packages/client/src/pages/PortalSettings/categories/security/audit-trail/TableView/TableHeader.js

@@ -3,11 +3,11 @@ import TableHeader from "@docspace/components/table-container/TableHeader";
 import { inject, observer } from "mobx-react";
 import { withTranslation } from "react-i18next";
 
-const TABLE_VERSION = "4";
+const TABLE_VERSION = "5";
 const TABLE_COLUMNS = `auditTableColumns_ver-${TABLE_VERSION}`;
 const COLUMNS_SIZE = `auditColumnsSize_ver-${TABLE_VERSION}`;
 
-class PeopleTableHeader extends React.Component {
+class AuditTableHeader extends React.Component {
   constructor(props) {
     super(props);
 
@@ -33,7 +33,7 @@ class PeopleTableHeader extends React.Component {
       },
       {
         key: "Room",
-        title: t("Common:Room"),
+        title: t("Common:Context"),
         enable: true,
         resizable: true,
         onChange: this.onColumnChange,
@@ -125,6 +125,6 @@ export default inject(({ auth }) => {
   };
 })(
   withTranslation(["Home", "Common", "Translations"])(
-    observer(PeopleTableHeader)
+    observer(AuditTableHeader)
   )
 );

packages/client/src/pages/PortalSettings/categories/security/audit-trail/TableView/TableRow.js

@@ -81,7 +81,7 @@ const PeopleTableRow = (props) => {
           isTextOverflow
           className="settings_unavailable"
         >
-          {item.room}
+          {item.context}
         </Text>
       </TableCell>
 

public/locales/en/Common.json

@@ -38,6 +38,7 @@
   "Confirmation": "Confirmation",
   "Connect": "Connect",
   "Content": "Content",
+  "Context": "Context",
   "ContinueButton": "Continue",
   "CopyOperation": "Copying",
   "CountPerPage": "{{count}} per page",

public/locales/ru/Common.json

@@ -38,6 +38,7 @@
   "Confirmation": "Подтверждение",
   "Connect": "Подключить",
   "Content": "Контент",
+  "Context": "Контекст",
   "ContinueButton": "Продолжить",
   "CopyOperation": "Копирование",
   "CountPerPage": "{{count}} на странице",