From 9905b5d63000c720f2c9d82224cc13f81cd5216c Mon Sep 17 00:00:00 2001 From: Renmin Gu Date: Mon, 10 Feb 2020 17:53:03 +0800 Subject: [PATCH 1/3] done --- frontend/src/components/SideNav.tsx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frontend/src/components/SideNav.tsx b/frontend/src/components/SideNav.tsx index ffc2a21b7dc..5c60e4e4a01 100644 --- a/frontend/src/components/SideNav.tsx +++ b/frontend/src/components/SideNav.tsx @@ -548,6 +548,18 @@ export default class SideNav extends React.Component )} + +
+ + Report an Issue + +
+ ); From 4d7625aaeabd26c515a4401e9a3762ff8a026767 Mon Sep 17 00:00:00 2001 From: Renmin Gu Date: Wed, 12 Feb 2020 14:43:04 +0800 Subject: [PATCH 2/3] done --- frontend/src/components/SideNav.tsx | 46 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/frontend/src/components/SideNav.tsx b/frontend/src/components/SideNav.tsx index 5c60e4e4a01..0089108f6a0 100644 --- a/frontend/src/components/SideNav.tsx +++ b/frontend/src/components/SideNav.tsx @@ -14,29 +14,29 @@ * limitations under the License. */ -import * as React from 'react'; +import Button from '@material-ui/core/Button'; +import IconButton from '@material-ui/core/IconButton'; +import Tooltip from '@material-ui/core/Tooltip'; import ArchiveIcon from '@material-ui/icons/Archive'; import ArtifactsIcon from '@material-ui/icons/BubbleChart'; -import Button from '@material-ui/core/Button'; import ChevronLeftIcon from '@material-ui/icons/ChevronLeft'; -import ExecutionsIcon from '@material-ui/icons/PlayArrow'; -import ExperimentsIcon from '../icons/experiments'; -import IconButton from '@material-ui/core/IconButton'; import JupyterhubIcon from '@material-ui/icons/Code'; -import OpenInNewIcon from '@material-ui/icons/OpenInNew'; import DescriptionIcon from '@material-ui/icons/Description'; +import OpenInNewIcon from '@material-ui/icons/OpenInNew'; +import ExecutionsIcon from '@material-ui/icons/PlayArrow'; +import * as React from 'react'; +import { RouterProps } from 'react-router'; +import { Link } from 'react-router-dom'; +import { classes, stylesheet } from 'typestyle'; +import { ExternalLinks, RoutePage, RoutePrefix } from '../components/Router'; +import { commonCss, fontsize } from '../Css'; +import ExperimentsIcon from '../icons/experiments'; import GitHubIcon from '../icons/GitHub-Mark-120px-plus.png'; import PipelinesIcon from '../icons/pipelines'; -import Tooltip from '@material-ui/core/Tooltip'; import { Apis } from '../lib/Apis'; -import { Link } from 'react-router-dom'; +import { Deployments, KFP_FLAGS } from '../lib/Flags'; import { LocalStorage, LocalStorageKey } from '../lib/LocalStorage'; -import { RoutePage, RoutePrefix, ExternalLinks } from '../components/Router'; -import { RouterProps } from 'react-router'; -import { classes, stylesheet } from 'typestyle'; -import { fontsize, commonCss } from '../Css'; import { logger } from '../lib/Utils'; -import { KFP_FLAGS, Deployments } from '../lib/Flags'; export const sideNavColors = { bg: '#f8fafb', @@ -523,6 +523,7 @@ export default class SideNav extends React.Component {gkeMetadata.clusterName} @@ -541,6 +542,7 @@ export default class SideNav extends React.Component {displayBuildInfo.commitHash} @@ -548,17 +550,17 @@ export default class SideNav extends React.Component )} - +
- - Report an Issue + + Report an Issue -
+ From 65ca1f22cda76a357c0a60f3989507d6a4015676 Mon Sep 17 00:00:00 2001 From: Renmin Gu Date: Wed, 12 Feb 2020 18:31:18 +0800 Subject: [PATCH 3/3] done --- frontend/src/components/SideNav.tsx | 4 +- .../__snapshots__/SideNav.test.tsx.snap | 307 ++++++++++++++++-- 2 files changed, 290 insertions(+), 21 deletions(-) diff --git a/frontend/src/components/SideNav.tsx b/frontend/src/components/SideNav.tsx index 0089108f6a0..b6af998cf7b 100644 --- a/frontend/src/components/SideNav.tsx +++ b/frontend/src/components/SideNav.tsx @@ -223,7 +223,9 @@ export default class SideNav extends React.Component commitHash: commitHash ? commitHash.substring(0, 7) : 'unknown', commitUrl: 'https://www.github.com/kubeflow/pipelines' + (commitHash ? `/commit/${commitHash}` : ''), - date: buildInfo.buildDate ? new Date(buildInfo.buildDate).toLocaleDateString() : 'unknown', + date: buildInfo.buildDate + ? new Date(buildInfo.buildDate).toLocaleDateString('en-US') + : 'unknown', }; } async function fetchGkeMetadata() { diff --git a/frontend/src/components/__snapshots__/SideNav.test.tsx.snap b/frontend/src/components/__snapshots__/SideNav.test.tsx.snap index 2108c866c9e..a6cfa2ad612 100644 --- a/frontend/src/components/__snapshots__/SideNav.test.tsx.snap +++ b/frontend/src/components/__snapshots__/SideNav.test.tsx.snap @@ -5,26 +5,27 @@ exports[`SideNav populates the cluster information using the response from the s - First value + Second value -@@ -63,7 +63,18 @@ -
+@@ -64,10 +64,20 @@ --
-+
+
+ +
+ + Cluster name: + -+ ++ + some-cluster-name + +
+ -+
-
" + +
+ + Report an Issue + " `; exports[`SideNav populates the display build information using the response from the healthz endpoint 1`] = ` @@ -246,12 +247,31 @@ exports[`SideNav populates the display build information using the response from 0a7b9e3
+ + +
`; @@ -460,7 +480,26 @@ exports[`SideNav renders Pipelines as active page 1`] = `
+ > + + + +
`; @@ -668,7 +707,26 @@ exports[`SideNav renders Pipelines as active when on PipelineDetails page 1`] =
+ > + + + +
`; @@ -876,7 +934,26 @@ exports[`SideNav renders collapsed state 1`] = `
+ > + + + +
`; @@ -1084,7 +1161,26 @@ exports[`SideNav renders expanded state 1`] = `
+ > + + + +
`; @@ -1292,7 +1388,26 @@ exports[`SideNav renders experiments as active page 1`] = `
+ > + + + +
`; @@ -1500,7 +1615,26 @@ exports[`SideNav renders experiments as active page when on AllRuns page 1`] = `
+ > + + + +
`; @@ -1708,7 +1842,26 @@ exports[`SideNav renders experiments as active page when on Compare page 1`] = `
+ > + + + +
`; @@ -1916,7 +2069,26 @@ exports[`SideNav renders experiments as active page when on NewExperiment page 1
+ > + + + +
`; @@ -2124,7 +2296,26 @@ exports[`SideNav renders experiments as active page when on NewRun page 1`] = `
+ > + + + +
`; @@ -2332,7 +2523,26 @@ exports[`SideNav renders experiments as active page when on RecurringRunDetails
+ > + + + +
`; @@ -2540,7 +2750,26 @@ exports[`SideNav renders experiments as active page when on RunDetails page 1`]
+ > + + + +
`; @@ -2748,7 +2977,26 @@ exports[`SideNav renders experiments as active when on ExperimentDetails page 1`
+ > + + + +
`; @@ -2992,6 +3240,25 @@ exports[`SideNav show jupyterhub link if accessible 1`] = `
+ > + + + +
`;