Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions src/assets/styles/components/_web-ide.scss
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,13 @@
}


.akamai,
.light {

.editor-window {
border: 1px solid $color-lightergrey;
}

.name-input {

.validation-message {
Expand Down
14 changes: 9 additions & 5 deletions src/components/TopNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,16 @@ function TopNav({ isMaintenance }) {
</NavItem>
</>
)}
<NavItem>
<NavLink id="viewResources" title="View Install Instructions, Tutorials, the HarperDB Marketplace, and Example Code" to="/resources">
<li className="nav-item">
<a target="_blank"
rel="noreferrer"
href="https://harperdb.io/docs"
id="viewResources"
title="HarperDB Documentation">
<i className="fas fa-tools" />
<span className="d-none d-lg-inline-block">&nbsp;resources</span>
</NavLink>
</NavItem>
<span className="d-none d-lg-inline-block">&nbsp;docs</span>
</a>
</li>
{themes.length > 1 && (
<NavItem>
<Button
Expand Down
11 changes: 11 additions & 0 deletions src/components/instance/config/Details.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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 (
<>
<span className="floating-card-header">instance overview</span>
Expand All @@ -34,6 +38,13 @@ function Details({ clusterNodeName }) {
</div>
</ContentContainer>
</Col>
<Col md="4" xs="12">
<ContentContainer header={`${versionAsFloat >= 4.2 ? 'Applications' : 'Custom Functions'} URL`} className="mb-3">
<div className="nowrap-scroll">
<CopyableText text={url} />
</div>
</ContentContainer>
</Col>
<Col md="4" xs="12">
<ContentContainer header="Instance Node Name (for clustering)" className="mb-3">
<div className="nowrap-scroll">{clusterNodeName ? <CopyableText text={clusterNodeName} /> : 'clustering not enabled'}</div>
Expand Down
14 changes: 3 additions & 11 deletions src/components/instance/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const Metrics = lazy(() => import(/* webpackChunkName: "instance-status" */ './s
const Users = lazy(() => import(/* webpackChunkName: "instance-users" */ './users'));
const Roles = lazy(() => import(/* webpackChunkName: "instance-roles" */ './roles'));
const Functions = lazy(() => import(/* webpackChunkName: "custom-functions" */ './functions'));
const Examples = lazy(() => import(/* webpackChunkName: "instance-examples" */ './examples'));

const browse = {
element: <Browse />,
Expand Down Expand Up @@ -102,14 +101,6 @@ const config = {
iconCode: 'f0ad',
};

const examples = {
element: <Examples />,
path: `examples/:folder?/:method?`,
link: 'examples',
label: 'example code',
icon: 'code',
iconCode: 'f121',
};

const routes = ({ super_user, version=null }) => {

Expand All @@ -128,9 +119,10 @@ const routes = ({ super_user, version=null }) => {
}

if (super_user) {
return [browse, query, users, roles, charts, cluster, supportsApplications ? applications : functions, metrics, config, examples];
return [browse, query, users, roles, charts, cluster, supportsApplications ? applications : functions, metrics, config];
}
return [browse, query, charts, examples];

return [browse, query, charts];

}
export default routes;
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,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
}))
} />
Expand Down
2 changes: 1 addition & 1 deletion src/functions/util/isNumeric.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default (n) => !Number.isNaN(parseFloat(n)) && Number.isFinite(n);
export default (n) => !Number.isNaN(parseFloat(n)) && Number.isFinite(parseFloat(n));