This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new 3ce7b145a7 [Bug] Fix download error (#968)
3ce7b145a7 is described below
commit 3ce7b145a74438dafb99913066bef683959967d4
Author: xiangzihao <[email protected]>
AuthorDate: Wed Oct 23 16:01:26 2024 +0800
[Bug] Fix download error (#968)
---
public/index.html | 1 -
public/manifest.json | 10 ----------
src/components/NavBar/index.jsx | 10 ----------
src/hooks/useVersions.js | 14 ++++++++++++--
src/views/Documentation/index.jsx | 5 +++++
5 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/public/index.html b/public/index.html
index 25de07bcb9..85400c7c42 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,7 +13,6 @@
name="keywords"
content="apache
dolphinscheduler,dolphinscheduler,document,community,workflow scheduler,data
orchestration,workflow orchestration,drag and drop workflow,DAG"
/>
- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See
https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/public/manifest.json b/public/manifest.json
index 080d6c77ac..1f2f141faf 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -6,16 +6,6 @@
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
- },
- {
- "src": "logo192.png",
- "type": "image/png",
- "sizes": "192x192"
- },
- {
- "src": "logo512.png",
- "type": "image/png",
- "sizes": "512x512"
}
],
"start_url": ".",
diff --git a/src/components/NavBar/index.jsx b/src/components/NavBar/index.jsx
index 63818b43ad..aa384a9173 100644
--- a/src/components/NavBar/index.jsx
+++ b/src/components/NavBar/index.jsx
@@ -143,16 +143,6 @@ const NavBar = () => {
>
<Button shape="round">{t("contacts")}</Button>
</Dropdown>
- <Button
- type="primary"
- shape="round"
- onClick={() => {
- navigate(`/${locale}/download`);
- setSelectedKeys("");
- }}
- >
- {t("download")}
- </Button>
</Space>
</section>
</nav>
diff --git a/src/hooks/useVersions.js b/src/hooks/useVersions.js
index 72c9fe0d8a..2121ad8f86 100644
--- a/src/hooks/useVersions.js
+++ b/src/hooks/useVersions.js
@@ -2,13 +2,23 @@ import { useEffect, useState } from "react";
import getVersions from "../api/getVersions";
export const useVersions = () => {
+ const reverseVersions = (versions) => {
+ let reversedVersions = versions.reverse();
+ const devIndex = reversedVersions.indexOf("dev");
+ if (devIndex > -1) {
+ reversedVersions.splice(devIndex, 1);
+ reversedVersions.push("dev");
+ }
+ return reversedVersions;
+ };
+
const stored = JSON.parse(sessionStorage.getItem("versions")) || [];
- const [versions, setVersions] = useState(stored.reverse());
+ const [versions, setVersions] = useState(reverseVersions(stored));
useEffect(() => {
if (!stored.length) {
getVersions().then((result) => {
- setVersions(result.reverse());
+ setVersions(reverseVersions(result));
});
}
// eslint-disable-next-line
diff --git a/src/views/Documentation/index.jsx
b/src/views/Documentation/index.jsx
index c10df3af63..bea95b8992 100644
--- a/src/views/Documentation/index.jsx
+++ b/src/views/Documentation/index.jsx
@@ -42,11 +42,15 @@ const Documentation = () => {
handleAnchor,
navigate,
} = useDocumentation(params);
+ let downloadButtonIsDisabled = false;
const searchRef = useRef();
if (!versions.includes(params.version)) {
return <Navigate to={`/${locale}/docs/${versions[0]}`} replace={true} />;
}
+ if (params.version === "dev") {
+ downloadButtonIsDisabled = true;
+ }
return (
<section className="documentation" id="documentation">
<div className="documentation-sider">
@@ -69,6 +73,7 @@ const Documentation = () => {
shape="round"
ghost
size="large"
+ disabled={downloadButtonIsDisabled}
onClick={() => {
navigate(`/${locale}/download/${params.version}`);
}}
