From e01231ecdcd9d424b4f18e6fc7f732950fb1ee5a Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 18 Dec 2023 17:13:09 -0500 Subject: [PATCH 1/4] chore(about): clean up for 3.0.0 development --- package.json | 2 +- src/app/About/AboutDescription.tsx | 10 +++++----- src/app/build.json | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 2720c519d..db32ffa73 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cryostat-web", - "version": "2.5.0-dev", + "version": "3.0.0-dev", "description": "Web-Client for Cryostat", "repository": "https://github.com/cryostatio/cryostat-web.git", "license": "Apache-2.0", diff --git a/src/app/About/AboutDescription.tsx b/src/app/About/AboutDescription.tsx index 34c5d3804..3c0f71b71 100644 --- a/src/app/About/AboutDescription.tsx +++ b/src/app/About/AboutDescription.tsx @@ -36,25 +36,25 @@ export const AboutDescription: React.FC = () => { if (!cryostatVersion) { return; } - const expr = /^(?[a-zA-Z0-9-_.]+-[0-9]+-[a-z0-9]+)(?:-dirty)?$/; + const expr = /^(?v[0-9]+\\.[0-9]+\\.[0-9]+)(?:-snapshot)$/; const result = cryostatVersion.match(expr); if (!result) { notificationsContext.warning( 'Cryostat Version Parse Failure', `Could not parse Cryostat version string '${cryostatVersion}'.`, ); - return 'main'; + return; } - return result.groups?.describe || 'main'; + return result.groups?.tag; }, [cryostatVersion, notificationsContext]); const versionComponent = React.useMemo(() => { - if (build.commitHashUrl) { + if (build.releaseTagUrl) { return ( {cryostatVersion} diff --git a/src/app/build.json b/src/app/build.json index d3f68580e..13e93e3f7 100644 --- a/src/app/build.json +++ b/src/app/build.json @@ -1,6 +1,7 @@ { "productName": "Cryostat", - "commitHashUrl": "https://github.com/cryostatio/cryostat/commits/__REPLACE_HASH__", + "developmentUrl": "https://github.com/cryostatio/cryostat", + "releaseTagUrl": "https://github.com/cryostatio/cryostat/releases/tag/__REPLACE_HASH__", "homePageUrl": "https://cryostat.io", "blogPageUrl": "https://cryostat.io/blog", "documentationUrl": "https://cryostat.io/guides", @@ -12,5 +13,5 @@ "mailingListName": "Google Groups", "mailingListUrl": "https://groups.google.com/g/cryostat-development", "licenseUrl": "https://github.com/cryostatio/cryostat/blob/main/LICENSE.txt", - "version": "2.5.0-dev" + "version": "3.0.0-dev" } From 43c91de53c2b25b978ea26c5a97d5c9de8e4aacb Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 18 Dec 2023 17:16:17 -0500 Subject: [PATCH 2/4] fixup! chore(about): clean up for 3.0.0 development --- src/app/About/AboutDescription.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/About/AboutDescription.tsx b/src/app/About/AboutDescription.tsx index 3c0f71b71..e1629b216 100644 --- a/src/app/About/AboutDescription.tsx +++ b/src/app/About/AboutDescription.tsx @@ -36,7 +36,7 @@ export const AboutDescription: React.FC = () => { if (!cryostatVersion) { return; } - const expr = /^(?v[0-9]+\\.[0-9]+\\.[0-9]+)(?:-snapshot)$/; + const expr = /^(?v[0-9]+\.[0-9]+\.[0-9]+)(?:-snapshot)?$/; const result = cryostatVersion.match(expr); if (!result) { notificationsContext.warning( From 64e5360d37cb2461e445b396fc406b33e995c695 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 18 Dec 2023 17:19:35 -0500 Subject: [PATCH 3/4] fixup! chore(about): clean up for 3.0.0 development --- src/app/build.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/build.json b/src/app/build.json index 13e93e3f7..72a32e1fd 100644 --- a/src/app/build.json +++ b/src/app/build.json @@ -1,17 +1,17 @@ { "productName": "Cryostat", - "developmentUrl": "https://github.com/cryostatio/cryostat", - "releaseTagUrl": "https://github.com/cryostatio/cryostat/releases/tag/__REPLACE_HASH__", + "developmentUrl": "https://github.com/cryostatio/cryostat3", + "releaseTagUrl": "https://github.com/cryostatio/cryostat3/releases/tag/__REPLACE_HASH__", "homePageUrl": "https://cryostat.io", "blogPageUrl": "https://cryostat.io/blog", "documentationUrl": "https://cryostat.io/guides", "automatedRulesGuideUrl": "https://cryostat.io/guides/#create-an-automated-rule", "dashboardGuideUrl": "https://cryostat.io/guides/#dashboard", - "discussionUrl": "https://github.com/cryostatio/cryostat/discussions", - "knownIssuesUrl": "https://github.com/cryostatio/cryostat/issues", - "fileIssueUrl": "https://github.com/cryostatio/cryostat/issues/new?labels=user+report,bug&body=Affects+__REPLACE_VERSION__", + "discussionUrl": "https://github.com/cryostatio/cryostat3/discussions", + "knownIssuesUrl": "https://github.com/cryostatio/cryostat3/issues", + "fileIssueUrl": "https://github.com/cryostatio/cryostat3/issues/new?labels=user+report,bug&body=Affects+__REPLACE_VERSION__", "mailingListName": "Google Groups", "mailingListUrl": "https://groups.google.com/g/cryostat-development", - "licenseUrl": "https://github.com/cryostatio/cryostat/blob/main/LICENSE.txt", + "licenseUrl": "https://github.com/cryostatio/cryostat3/blob/main/LICENSE.txt", "version": "3.0.0-dev" } From a68de0dd5acef0c65ac95b427383975742517e30 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 18 Dec 2023 17:32:21 -0500 Subject: [PATCH 4/4] format:apply --- src/app/About/AboutDescription.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/About/AboutDescription.tsx b/src/app/About/AboutDescription.tsx index e1629b216..e091becb2 100644 --- a/src/app/About/AboutDescription.tsx +++ b/src/app/About/AboutDescription.tsx @@ -54,7 +54,11 @@ export const AboutDescription: React.FC = () => { {cryostatVersion}