Merge branch 'dev' into 'main'

feat: update doclink

See merge request locker/web-selfhosted!141

Author: NguyenTienQuyet

src/components/items/DocLink.jsx

@@ -0,0 +1,31 @@
+import React, { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+
+import {
+  ArrowRightOutlined,
+} from '@ant-design/icons';
+
+import common from '../../utils/common';
+import global from '../../config/global';
+
+function DocLink(props) {
+  const { className, docKey, title, showIcon = true } = props
+  const locale = useSelector((state) => state.system.locale);
+  const linkUrl = useMemo(() => {
+    const localeLinks = global.urls.DOC_LINKS[locale] || global.urls.DOC_LINKS.en
+    return localeLinks[docKey] || global.urls[docKey]
+  }, [locale, docKey])
+  return <span
+    className={`flex items-center text-primary cursor-pointer ${className}`}
+    onClick={() => common.openNewTab(linkUrl)}
+  >
+    <span>
+      {title}
+      {
+        showIcon && <ArrowRightOutlined className='ml-2'/>
+      }
+    </span>
+  </span>
+}
+
+export default DocLink;

src/components/items/index.jsx

@@ -11,6 +11,7 @@ import NotifyButton from "./NotifyButton";
 import PolicyResult from "./PolicyResult";
 import UserInfo from "./UserInfo";
 import Attachment from "./Attachment";
+import DocLink from "./DocLink";
 
 const itemsComponents = {
   FilterTime,
@@ -25,7 +26,8 @@ const itemsComponents = {
   NotifyButton,
   PolicyResult,
   UserInfo,
-  Attachment
+  Attachment,
+  DocLink
 }
 
 export default itemsComponents

src/components/modals/EncryptionUpdate.jsx

@@ -12,7 +12,7 @@ import {
 
 import itemsComponents from "../items";
 
-import global from "../../config/global";
+import common from "../../utils/common";
 
 const EncryptionUpdateModal = (props) => {
   const { RouterLink } = itemsComponents;
@@ -52,7 +52,7 @@ const EncryptionUpdateModal = (props) => {
           type="primary"
           size="large"
           onClick={() => {
-            global.navigate(global.keys.SETTINGS_SECURITY);
+            common.encryptionUpdateNow();
             onClose();
           }}
         >

src/config/urls.js

@@ -6,5 +6,13 @@ export default {
   CHROME_LINK: 'https://support.locker.io/articles/Import-from-Google-Chrome-3418bcd6e1ea48b6a891d1f828e46ebb',
   FIREFOX_LINK: 'https://support.locker.io/articles/Import-from-Firefox-1995673b585a4a7f98192abdea06a0e6',
   ONE_PASSWORD_LINK: 'https://support.locker.io/articles/Import-from-1Password-50b668a9f5ab439a9c10f05df5de8544',
-  DOWNLOAD_DESKTOP_URL: 'https://locker.io/passwords/download'
+  DOWNLOAD_DESKTOP_URL: 'https://locker.io/passwords/download',
+  DOC_LINKS: {
+    vi: {
+      SECURITY_UPGRADE_URL: 'https://locker.io/vi/blog/nang-cap-bao-mat-khoa-chinh-master-key'
+    },
+    en: {
+      SECURITY_UPGRADE_URL: 'https://locker.io/blog/master-key-security-upgrade'
+    }
+  }
 }

src/pages/admin/settings/components/security/drawers/UpdateEncryptionSettings.jsx

@@ -28,7 +28,7 @@ import userServices from '../../../../../../services/user';
 import authServices from '../../../../../../services/auth';
 
 function UpdateEncryptionSettingsDrawer(props) {
-  const { RouterLink } = itemsComponents;
+  const { DocLink } = itemsComponents;
   const { ConfirmEncryptionUpdateModal } = securityModalsComponents;
   const {
     visible = false,
@@ -150,11 +150,10 @@ function UpdateEncryptionSettingsDrawer(props) {
                 {t('form_data.note3')}
               </li>
             </ul>
-            <RouterLink
-              className={'font-semibold'}
-              label={t('form_data.explore_more')}
-              icon={<ArrowRightOutlined />}
-              onClick={() => {}}
+            <DocLink
+              className="font-semibold"
+              title={t('form_data.explore_more')}
+              docKey="SECURITY_UPGRADE_URL"
             />
           </div>}
           type={'warning'}

src/utils/common/other.js

@@ -221,6 +221,10 @@ const getDuplicateObjects = (arr) => {
   return duplicates
 }
 
+const encryptionUpdateNow = () => {
+  global.navigate(global.keys.SETTINGS_SECURITY);
+}
+
 export default {
   isDiff,
   isEmpty,
@@ -248,5 +252,6 @@ export default {
   openDesktopApp,
   allRouters,
   allMenus,
-  getDuplicateObjects
+  getDuplicateObjects,
+  encryptionUpdateNow
 }