From ced46e674e7fe1d5974fb26bb81cc44c4045857e Mon Sep 17 00:00:00 2001 From: Alex Ramsdell Date: Fri, 27 Oct 2023 13:45:28 -0400 Subject: [PATCH 1/5] add Applications/CustomFunctions Url to instance overview section of the instance config page. --- src/components/instance/config/Details.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/components/instance/config/Details.js b/src/components/instance/config/Details.js index 9f3d9ca42..fb5464130 100644 --- a/src/components/instance/config/Details.js +++ b/src/components/instance/config/Details.js @@ -8,6 +8,7 @@ import CopyableText from '../../shared/CopyableText'; function Details({ clusterNodeName }) { const url = useStoreState(instanceState, (s) => s.url); + const all = useStoreState(instanceState, (s) => s); const auth = useStoreState(instanceState, (s) => s.auth); const totalPriceStringWithInterval = useStoreState(instanceState, (s) => s.totalPriceStringWithInterval); const compute = useStoreState(instanceState, (s) => s.compute); @@ -21,6 +22,10 @@ function Details({ clusterNodeName }) { const iopsString = is_local ? 'HARDWARE LIMIT' : `${storage?.iops}`; const formatted_creation_date = creation_date ? new Date(creation_date).toLocaleDateString() : 'N/A'; + const version = useStoreState(instanceState, (s) => s.registration?.version); + const [ major, minor ] = version?.split('.') || []; + const versionAsFloat = parseFloat(`${major}.${minor}`); + return ( <> instance overview @@ -34,6 +39,13 @@ function Details({ clusterNodeName }) { + + = 4.2 ? 'Applications' : 'Custom Functions'} URL`} className="mb-3"> +
+ +
+ +
{clusterNodeName ? : 'clustering not enabled'}
From 3e319441e011180e74e6aeb537e14866085d559a Mon Sep 17 00:00:00 2001 From: Alex Ramsdell Date: Fri, 27 Oct 2023 14:13:47 -0400 Subject: [PATCH 2/5] fix isNumeric library fn in order to fix setting custom functions port. --- src/functions/util/isNumeric.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions/util/isNumeric.js b/src/functions/util/isNumeric.js index e3f7518ab..cc8717ca6 100644 --- a/src/functions/util/isNumeric.js +++ b/src/functions/util/isNumeric.js @@ -1 +1 @@ -export default (n) => !Number.isNaN(parseFloat(n)) && Number.isFinite(n); +export default (n) => !Number.isNaN(parseFloat(n)) && Number.isFinite(parseFloat(n)); From c2064a111ea4255f6afbb10f10d9cd0699b00b81 Mon Sep 17 00:00:00 2001 From: Alex Ramsdell Date: Fri, 27 Oct 2023 14:49:22 -0400 Subject: [PATCH 3/5] add akamai section to editor styles that use light theme for akamai. --- src/assets/styles/components/_web-ide.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/styles/components/_web-ide.scss b/src/assets/styles/components/_web-ide.scss index a7e11db8b..313f90172 100644 --- a/src/assets/styles/components/_web-ide.scss +++ b/src/assets/styles/components/_web-ide.scss @@ -197,6 +197,7 @@ } +.akamai, .light { .editor-window { From 9d6631d0b2f3d613e0bec38a534e02c64cc14abe Mon Sep 17 00:00:00 2001 From: Alex Ramsdell Date: Fri, 27 Oct 2023 14:53:03 -0400 Subject: [PATCH 4/5] fix select label bug for deploy target in web ide. --- src/components/shared/webide/windows/PackageInstallWindow.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/shared/webide/windows/PackageInstallWindow.js b/src/components/shared/webide/windows/PackageInstallWindow.js index 714b66685..2b86b573e 100644 --- a/src/components/shared/webide/windows/PackageInstallWindow.js +++ b/src/components/shared/webide/windows/PackageInstallWindow.js @@ -10,6 +10,7 @@ import UrlInstallField from './UrlInstallField'; export default function PackageInstallWindow({ selectedPackage, onConfirm, onCancel, deployTargets: availableDeployTargets }) { + console.log(availableDeployTargets); const packageTypes = [ 'npm', 'github', 'url' ]; const defaultPackageType = packageTypes[0]; @@ -155,7 +156,7 @@ export default function PackageInstallWindow({ selectedPackage, onConfirm, onCan } options={ availableDeployTargets.map((t) => ({ - label: t.instance.host, + label: t.instance.instance_name, value: t.instance.url })) } /> From cadfc7d6fe1e7b7df99873f9c323ffdabd0b61e7 Mon Sep 17 00:00:00 2001 From: Alex Ramsdell Date: Fri, 27 Oct 2023 15:34:09 -0400 Subject: [PATCH 5/5] lint --- src/components/instance/config/Details.js | 1 - src/components/shared/webide/windows/PackageInstallWindow.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/components/instance/config/Details.js b/src/components/instance/config/Details.js index fb5464130..570803ff8 100644 --- a/src/components/instance/config/Details.js +++ b/src/components/instance/config/Details.js @@ -8,7 +8,6 @@ import CopyableText from '../../shared/CopyableText'; function Details({ clusterNodeName }) { const url = useStoreState(instanceState, (s) => s.url); - const all = useStoreState(instanceState, (s) => s); const auth = useStoreState(instanceState, (s) => s.auth); const totalPriceStringWithInterval = useStoreState(instanceState, (s) => s.totalPriceStringWithInterval); const compute = useStoreState(instanceState, (s) => s.compute); diff --git a/src/components/shared/webide/windows/PackageInstallWindow.js b/src/components/shared/webide/windows/PackageInstallWindow.js index 2b86b573e..d2af320d2 100644 --- a/src/components/shared/webide/windows/PackageInstallWindow.js +++ b/src/components/shared/webide/windows/PackageInstallWindow.js @@ -10,7 +10,6 @@ import UrlInstallField from './UrlInstallField'; export default function PackageInstallWindow({ selectedPackage, onConfirm, onCancel, deployTargets: availableDeployTargets }) { - console.log(availableDeployTargets); const packageTypes = [ 'npm', 'github', 'url' ]; const defaultPackageType = packageTypes[0];