From b2401bb31f68d8aa0c82db8a65bf9a3ab9db854e Mon Sep 17 00:00:00 2001 From: yaojp123 <15989103230@163.com> Date: Sat, 7 Dec 2024 15:14:50 +0800 Subject: [PATCH] fix: reference and website links (#12) * fix: remove `www` of official website * chore: update docs' url --------- Co-authored-by: yaojiping --- web/config/config.js | 1 - web/package.json | 3 +-- web/src/components/GlobalHeader/RightContent.js | 6 +++--- web/src/components/InstallAgent/index.js | 3 ++- web/src/components/Licence/Version.js | 3 ++- web/src/components/Overview/Monitor/InstallAgent.tsx | 4 ++-- web/src/pages/Alerting/Rule/components/NoData.jsx | 4 ++-- .../pages/Alerting/components/VariablesExampleLabel.jsx | 7 ++----- .../View/components/FormItems/GroupDisplay/GroupLabels.jsx | 3 ++- web/src/pages/Gateway/Instance/Wizard/index.js | 3 ++- web/src/pages/Overview/components/Product/index.jsx | 3 ++- web/src/pages/Platform/Overview/Host/Detail/Metrics.js | 4 ++-- web/src/utils/utils.js | 7 +++---- 13 files changed, 25 insertions(+), 26 deletions(-) diff --git a/web/config/config.js b/web/config/config.js index bd913d8a..93b45910 100644 --- a/web/config/config.js +++ b/web/config/config.js @@ -58,7 +58,6 @@ export default { APP_TITLE: packageJson.title, APP_AUTHOR: packageJson.author, APP_OFFICIAL_WEBSITE: packageJson.official_website || "", - APP_DOCS_WEBSITE: packageJson.docs_website || "", }, // 路由配置 routes: pageRoutes, diff --git a/web/package.json b/web/package.json index 2082e77a..ad297f5f 100644 --- a/web/package.json +++ b/web/package.json @@ -6,8 +6,7 @@ "description": "Pursuing Excellence, Infinite Possibilities!", "author": "INFINI.LTD", "license": "INFINI-EULA", - "official_website": "https://www.infinilabs.com", - "docs_website": "https://www.infinilabs.com", + "official_website": "https://infinilabs.com", "dependencies": { "@ant-design/charts": "1.4.2", "@ant-design/icons": "^4.0.0", diff --git a/web/src/components/GlobalHeader/RightContent.js b/web/src/components/GlobalHeader/RightContent.js index 68aa965e..61a8171c 100644 --- a/web/src/components/GlobalHeader/RightContent.js +++ b/web/src/components/GlobalHeader/RightContent.js @@ -1,6 +1,6 @@ import React, { PureComponent } from "react"; import { FormattedMessage, formatMessage } from "umi/locale"; -import { getWebsitePathByLang } from "@/utils/utils"; +import { getDocPathByLang, getWebsitePathByLang } from "@/utils/utils"; import { Spin, Tag, Menu, Icon, Dropdown, Avatar, Tooltip } from "antd"; import moment from "moment"; import groupBy from "lodash/groupBy"; @@ -190,7 +190,7 @@ export default class GlobalHeaderRight extends PureComponent { @@ -199,7 +199,7 @@ export default class GlobalHeaderRight extends PureComponent { diff --git a/web/src/components/InstallAgent/index.js b/web/src/components/InstallAgent/index.js index 3f242a79..1f8cfd73 100644 --- a/web/src/components/InstallAgent/index.js +++ b/web/src/components/InstallAgent/index.js @@ -5,6 +5,7 @@ import { useEffect, useMemo, useState } from "react"; import request from "@/utils/request"; import { CopyToClipboard } from "react-copy-to-clipboard"; import { formatMessage } from "umi/locale"; +import { getDocPathByLang, getWebsitePathByLang } from "@/utils/utils"; export default ({autoInit = false}) => { const { loading, value } = useFetch(`/instance/_search`); @@ -116,7 +117,7 @@ export default ({autoInit = false}) => { · {formatMessage({ id:"agent.install.tips.desc" })} - {formatMessage({ + {formatMessage({ id:"agent.install.link.manual_install" })}>

diff --git a/web/src/components/Licence/Version.js b/web/src/components/Licence/Version.js index 53503e7c..d1b80091 100644 --- a/web/src/components/Licence/Version.js +++ b/web/src/components/Licence/Version.js @@ -4,6 +4,7 @@ import styles from "./Version.less"; import { DATE_FORMAT } from "."; import { formatMessage } from "umi/locale"; import AGPL from "./AGPL"; +import { getWebsitePathByLang } from "@/utils/utils"; const { Paragraph, Text } = Typography; export default ({ application, licence }) => { @@ -39,7 +40,7 @@ export default ({ application, licence }) => { For commercial licensing, contact us at: diff --git a/web/src/components/Overview/Monitor/InstallAgent.tsx b/web/src/components/Overview/Monitor/InstallAgent.tsx index 400c616b..5c96d03d 100644 --- a/web/src/components/Overview/Monitor/InstallAgent.tsx +++ b/web/src/components/Overview/Monitor/InstallAgent.tsx @@ -1,6 +1,6 @@ import { Button } from "antd"; import { formatMessage } from "umi/locale"; -import { getWebsitePathByLang } from "@/utils/utils"; +import { getDocPathByLang, getWebsitePathByLang } from "@/utils/utils"; interface IProps { height?: string | number; @@ -26,7 +26,7 @@ export default (props: IProps) => { type="primary" onClick={() => window.open( - `${getWebsitePathByLang()}/docs/latest/console/reference/agent/install/` + `${getDocPathByLang()}/reference/agent/install/` ) } > diff --git a/web/src/pages/Alerting/Rule/components/NoData.jsx b/web/src/pages/Alerting/Rule/components/NoData.jsx index dc46e45b..b814dfe6 100644 --- a/web/src/pages/Alerting/Rule/components/NoData.jsx +++ b/web/src/pages/Alerting/Rule/components/NoData.jsx @@ -2,7 +2,7 @@ import { Button, Card, Icon, message } from "antd"; import MessageIcon from "../../../Overview/components/Quick/icons/MessageIcon"; import { formatMessage } from "umi/locale"; import { Link } from "umi"; -import { getWebsitePathByLang } from "@/utils/utils"; +import { getDocPathByLang, getWebsitePathByLang } from "@/utils/utils"; import ExportAndImport from "../../components/ExportAndImport"; import Import from "../../components/Import"; import { useState } from "react"; @@ -63,7 +63,7 @@ export default ({ onSuccess }) => { ) : null} {" "} diff --git a/web/src/pages/Alerting/components/VariablesExampleLabel.jsx b/web/src/pages/Alerting/components/VariablesExampleLabel.jsx index 65a6bd67..d9458998 100644 --- a/web/src/pages/Alerting/components/VariablesExampleLabel.jsx +++ b/web/src/pages/Alerting/components/VariablesExampleLabel.jsx @@ -1,15 +1,12 @@ import { Table, Drawer } from "antd"; import { formatMessage } from "umi/locale"; -import { getWebsitePathByLang } from "@/utils/utils"; +import { getDocPathByLang, getWebsitePathByLang } from "@/utils/utils"; import { useState } from "react"; import TemplateVariables from "./Template/Variables"; const VariablesExampleLabel = (props) => { const [varVisible, setVarVisible] = useState(false); - const docsLink = - APP_DOCS_WEBSITE && APP_DOCS_WEBSITE.indexOf("infinilabs") > -1 - ? `${getWebsitePathByLang()}/docs/latest/console/reference/alerting/variables` - : APP_DOCS_WEBSITE; + const docsLink = `${getDocPathByLang()}/reference/alerting/variables`; return ( <> diff --git a/web/src/pages/DataManagement/View/components/FormItems/GroupDisplay/GroupLabels.jsx b/web/src/pages/DataManagement/View/components/FormItems/GroupDisplay/GroupLabels.jsx index 90393894..5edb1aa3 100644 --- a/web/src/pages/DataManagement/View/components/FormItems/GroupDisplay/GroupLabels.jsx +++ b/web/src/pages/DataManagement/View/components/FormItems/GroupDisplay/GroupLabels.jsx @@ -1,5 +1,6 @@ import Group from "@/components/Icons/Group"; import GroupBy from "@/components/Icons/GroupBy"; +import { getDocPathByLang, getWebsitePathByLang } from "@/utils/utils"; import { Button, Icon, Input, Switch } from "antd" import { cloneDeep } from "lodash"; import { useMemo } from "react"; @@ -84,7 +85,7 @@ export default (props) => { lineHeight: '32px', border: '1px solid #d9d9d9' }}> - {formatMessage({ id: "dashboard.widget.config.group.labels.template" })} + {formatMessage({ id: "dashboard.widget.config.group.labels.template" })} { · {formatMessage({ id: "gateway.guide.tips.content" })} {` `} {`${formatMessage({ diff --git a/web/src/pages/Overview/components/Product/index.jsx b/web/src/pages/Overview/components/Product/index.jsx index 6e6a4ef6..4f7ce515 100644 --- a/web/src/pages/Overview/components/Product/index.jsx +++ b/web/src/pages/Overview/components/Product/index.jsx @@ -5,6 +5,7 @@ import { getLocale, formatMessage } from "umi/locale"; import { useEffect, useState } from 'react'; import request from '@/utils/request'; import CardMore from '../CardMore'; +import { getWebsitePathByLang } from '@/utils/utils'; export default () => { @@ -39,7 +40,7 @@ export default () => { {formatMessage({ id: "overview.title.product_activities"})} - + { loading ?
: ( activities.map((item, index) => ( diff --git a/web/src/pages/Platform/Overview/Host/Detail/Metrics.js b/web/src/pages/Platform/Overview/Host/Detail/Metrics.js index 763214af..825da55b 100644 --- a/web/src/pages/Platform/Overview/Host/Detail/Metrics.js +++ b/web/src/pages/Platform/Overview/Host/Detail/Metrics.js @@ -7,7 +7,7 @@ import { formatter } from "@/utils/format"; import Table from "@/components/Overview/Detail/Infos/Table"; import { Button } from "antd"; import { formatMessage } from "umi/locale"; -import { getWebsitePathByLang } from "@/utils/utils"; +import { getDocPathByLang, getWebsitePathByLang } from "@/utils/utils"; export default (props) => { const id = props.data?._id; @@ -46,7 +46,7 @@ export default (props) => { type="primary" onClick={() => window.open( - `${getWebsitePathByLang()}/docs/latest/console/reference/agent/install/` + `${getDocPathByLang()}/reference/agent/install/` ) } > diff --git a/web/src/utils/utils.js b/web/src/utils/utils.js index 8d3dc71d..5770fa30 100644 --- a/web/src/utils/utils.js +++ b/web/src/utils/utils.js @@ -15,12 +15,11 @@ export function getWebsitePathByLang() { } } -export function getDocPathByLang() { - if (!APP_OFFICIAL_WEBSITE) return; +export function getDocPathByLang(product = 'console') { if (getLocale() === "zh-CN") { - return APP_OFFICIAL_WEBSITE.replace('.com', '.cn') + return `https://infinilabs.cn/docs/latest/${product}` } else { - return APP_OFFICIAL_WEBSITE + '/en' + return `https://docs.infinilabs.com/${product}/main/docs` } }