Skip to content

fix(web-console): prevent BuildVersion button crash on unexpected value #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bluestreak01 merged 1 commit into from
Jun 29, 2023
Merged

fix(web-console): prevent BuildVersion button crash on unexpected value #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions packages/web-console/src/scenes/Footer/BuildVersion/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@ import React, { useContext, useEffect, useState } from "react"
import styled from "styled-components"
import * as QuestDB from "../../../utils/questdb"
import { SecondaryButton } from "../../../components"
import { formatCommitHash, formatVersion, Versions } from "./services"
import {
getCanUpgrade,
formatCommitHash,
formatVersion,
Versions,
} from "./services"
import { ExternalLink, ArrowUpCircle } from "styled-icons/remix-line"
import { Release } from "../../../utils/questdb"
import { compare } from "compare-versions"
import { Team } from "styled-icons/remix-line"
import { BuildingMultiple } from "styled-icons/fluentui-system-filled"
import { ShieldLockFill } from "styled-icons/bootstrap"
Expand Down Expand Up @@ -116,14 +120,10 @@ const BuildVersion = () => {
}

const enterpriseVersion = buildVersion.kind.includes("enterprise")

const upgradeAvailable =
!enterpriseVersion &&
newestRelease &&
compare(buildVersion.version, newestRelease.name, "<")
const upgradeAvailable = getCanUpgrade(buildVersion, newestRelease?.name)

const releaseUrl = upgradeAvailable
? newestRelease.html_url
? newestRelease?.html_url
: `https://github.com/questdb/questdb${
buildVersion
? `/releases/tag/${buildVersion.version}`
Expand Down Expand Up @@ -157,7 +157,7 @@ const BuildVersion = () => {
{upgradeAvailable && (
<>
<UpgradeIcon size="18px" />
<NewestRelease>{newestRelease.name}</NewestRelease>
<NewestRelease>{newestRelease?.name}</NewestRelease>
</>
)}
</ReleaseNotesButton>
Expand Down
22 changes: 21 additions & 1 deletion packages/web-console/src/scenes/Footer/BuildVersion/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
*
******************************************************************************/

import { compare } from "compare-versions"

const buildVersionRegex =
/Build Information: QuestDB ([\w- ]+ )?([0-9A-Za-z.-]*),/

Expand Down Expand Up @@ -51,7 +53,7 @@ export const formatVersion = (value: string): Versions => {

return {
kind: "dev",
version: "x.x.x",
version: "0.0.0",
}
}

Expand All @@ -62,3 +64,21 @@ export const formatCommitHash = (value: string | number | boolean) => {

return matches ? matches[1] : ""
}

export const getCanUpgrade = (
buildVersion: Versions,
newestReleaseTag?: string,
): boolean => {
if (typeof newestReleaseTag === "undefined") {
return false
}

const enterpriseVersion = buildVersion.kind.includes("enterprise")

try {
const isOlder = compare(buildVersion.version, newestReleaseTag, "<")
return !enterpriseVersion && isOlder
} catch (e) {
return false
}
}