From 57f2d08d7c17a613027d55e5ea1db8cd8dcba123 Mon Sep 17 00:00:00 2001 From: Diego Ferreiro Val Date: Tue, 6 Feb 2018 18:52:48 +0000 Subject: [PATCH] fix(best-frontend): Fix Tab switching (#73) * fix(best-frontend): Fix Tab switching * Change default title --- packages/best-frontend/public/index.html | 2 +- packages/best-frontend/server/api_v1.js | 1 - .../app-nav-bar-item-root.js | 2 +- .../app-nav-bar-menu-item.js | 2 +- .../src/modules/one/app-router/app-router.js | 2 +- .../best-frontend/src/modules/one/app/app.js | 3 ++- .../src/modules/one/appnav/appnav.js | 2 +- .../page-project-panel/page-project-panel.js | 2 +- .../one/page-project/page-project.html | 2 +- .../modules/one/page-project/page-project.js | 24 +++++++++---------- .../src/modules/one/tmp-icon/tmp-icon.js | 2 +- .../one/tmp-menu-item/tmp-menu-item.js | 2 +- .../modules/one/tmp-spinner/tmp-spinner.js | 2 +- 13 files changed, 23 insertions(+), 25 deletions(-) diff --git a/packages/best-frontend/public/index.html b/packages/best-frontend/public/index.html index d9353971..6dd06b02 100644 --- a/packages/best-frontend/public/index.html +++ b/packages/best-frontend/public/index.html @@ -2,7 +2,7 @@ - Raptor SFX Shell + LWC performance {JS_PRELOAD} diff --git a/packages/best-frontend/server/api_v1.js b/packages/best-frontend/server/api_v1.js index f3f6dfd7..c822d851 100644 --- a/packages/best-frontend/server/api_v1.js +++ b/packages/best-frontend/server/api_v1.js @@ -82,7 +82,6 @@ function addRoutes(router, store) { async function getLastCommitStats(store, projectName, branch, size = 30) { const commits = await store.getCommits(projectName, branch); - console.log(`>>> ${projectName}/${branch}`, commits); const lastCommits = commits.slice(0, size); return Promise.all(lastCommits.map(async (commit) => { let benchmarks = await memoizedGetBenchPerCommit(projectName, commit); diff --git a/packages/best-frontend/src/modules/one/app-nav-bar-item-root/app-nav-bar-item-root.js b/packages/best-frontend/src/modules/one/app-nav-bar-item-root/app-nav-bar-item-root.js index 2c4a8a92..5ae68fea 100644 --- a/packages/best-frontend/src/modules/one/app-nav-bar-item-root/app-nav-bar-item-root.js +++ b/packages/best-frontend/src/modules/one/app-nav-bar-item-root/app-nav-bar-item-root.js @@ -1,4 +1,4 @@ -import { Element } from 'engine'; +import { api, Element } from 'engine'; import { isPureLeftClick } from 'one-tmp-utils'; const Labels = { diff --git a/packages/best-frontend/src/modules/one/app-nav-bar-menu-item/app-nav-bar-menu-item.js b/packages/best-frontend/src/modules/one/app-nav-bar-menu-item/app-nav-bar-menu-item.js index 84c3bcb5..29d15a92 100644 --- a/packages/best-frontend/src/modules/one/app-nav-bar-menu-item/app-nav-bar-menu-item.js +++ b/packages/best-frontend/src/modules/one/app-nav-bar-menu-item/app-nav-bar-menu-item.js @@ -1,4 +1,4 @@ -import { Element } from "engine"; +import { api, Element } from "engine"; import { joinClassNames, isPureLeftClick } from "one-tmp-utils"; export default class LightningMenuItem extends Element { diff --git a/packages/best-frontend/src/modules/one/app-router/app-router.js b/packages/best-frontend/src/modules/one/app-router/app-router.js index d2afe7de..6c95a333 100644 --- a/packages/best-frontend/src/modules/one/app-router/app-router.js +++ b/packages/best-frontend/src/modules/one/app-router/app-router.js @@ -1,4 +1,4 @@ -import { Element } from 'engine'; +import { api, Element } from 'engine'; import HomePage from "./page-home.html"; import ProjectPage from "./page-project.html"; export default class AppRouter extends Element { diff --git a/packages/best-frontend/src/modules/one/app/app.js b/packages/best-frontend/src/modules/one/app/app.js index 65de3f68..c0bbc0a6 100644 --- a/packages/best-frontend/src/modules/one/app/app.js +++ b/packages/best-frontend/src/modules/one/app/app.js @@ -1,4 +1,4 @@ -import { Element, unwrap } from 'engine'; +import { Element, unwrap, track } from 'engine'; import INITIAL_STATE from './state'; import { reifyBranches, emulateFetch, initializeState, normalizeStats, updateURL} from './utils'; @@ -42,6 +42,7 @@ export default class App extends Element { async setProjectLastestStats(project, branch = "master") { const projectBranch = `${project}:${branch}`; if (!this.state.lastCommits[projectBranch]) { + this.state.pageState = {}; const response = await fetch(`/api/v1/projects/${project}/${branch}/lastcommits`); if (response.ok) { const stats = await response.json(); diff --git a/packages/best-frontend/src/modules/one/appnav/appnav.js b/packages/best-frontend/src/modules/one/appnav/appnav.js index 6f0e6f7a..a1d2efa5 100644 --- a/packages/best-frontend/src/modules/one/appnav/appnav.js +++ b/packages/best-frontend/src/modules/one/appnav/appnav.js @@ -1,4 +1,4 @@ -import { Element } from 'engine'; +import { api, Element } from 'engine'; import { isPureLeftClick } from 'one-tmp-utils'; const NAV_TYPE_HORIZONTAL = 'horizontal'; const NAV_TYPE_DROPDOWN = 'dropdown'; diff --git a/packages/best-frontend/src/modules/one/page-project-panel/page-project-panel.js b/packages/best-frontend/src/modules/one/page-project-panel/page-project-panel.js index 7486c601..3f45aa32 100644 --- a/packages/best-frontend/src/modules/one/page-project-panel/page-project-panel.js +++ b/packages/best-frontend/src/modules/one/page-project-panel/page-project-panel.js @@ -1,4 +1,4 @@ -import { Element } from 'engine'; +import { api, Element } from 'engine'; export default class ComparePanel extends Element { @api selectedCommitBenchmarks; diff --git a/packages/best-frontend/src/modules/one/page-project/page-project.html b/packages/best-frontend/src/modules/one/page-project/page-project.html index 39703377..077cbe5c 100644 --- a/packages/best-frontend/src/modules/one/page-project/page-project.html +++ b/packages/best-frontend/src/modules/one/page-project/page-project.html @@ -4,7 +4,7 @@ diff --git a/packages/best-frontend/src/modules/one/page-project/page-project.js b/packages/best-frontend/src/modules/one/page-project/page-project.js index c38d2be2..48585797 100644 --- a/packages/best-frontend/src/modules/one/page-project/page-project.js +++ b/packages/best-frontend/src/modules/one/page-project/page-project.js @@ -1,4 +1,4 @@ -import { Element } from 'engine'; +import { api, track, Element } from 'engine'; import { normalizeForTrending, normalizeForComparison } from "./normalize-benchmarks"; import { generatePlot, cleanupPlots, isPlot } from "./plots"; @@ -15,22 +15,20 @@ export default class HomePage extends Element { @api set projectState(newState) { const { commitBenchmarks } = newState; - if (commitBenchmarks) { - this._projectState = newState; - this.benchmarksTrend = normalizeForTrending(commitBenchmarks); + this._projectState = newState; + this.benchmarksTrend = normalizeForTrending(commitBenchmarks); - // TODO: remove me one we have the logc for clicking correct - if (commitBenchmarks.length && this.benchmarksTrend && !this.selectedCommits.length) { - this.selectedCommits.push({ - commit: newState.commits[newState.commits.length - 1], - benchmarkName: Object.keys(this.benchmarksTrend)[0] - }); - } - } + // TODO: remove me one we have the logc for clicking correct + // if (commitBenchmarks && commitBenchmarks.length && this.benchmarksTrend && !this.selectedCommits.length) { + // this.selectedCommits.push({ + // commit: newState.commits[newState.commits.length - 1], + // benchmarkName: Object.keys(this.benchmarksTrend)[0] + // }); + // } } get isDataReady() { - return !!this.benchmarksTrend; + return !!(this.benchmarksTrend && Object.keys(this.benchmarksTrend).length); } get benchmarks() { return Object.keys(this.benchmarksTrend); diff --git a/packages/best-frontend/src/modules/one/tmp-icon/tmp-icon.js b/packages/best-frontend/src/modules/one/tmp-icon/tmp-icon.js index 5620e78c..f09e62ad 100644 --- a/packages/best-frontend/src/modules/one/tmp-icon/tmp-icon.js +++ b/packages/best-frontend/src/modules/one/tmp-icon/tmp-icon.js @@ -1,4 +1,4 @@ -import { Element } from 'engine'; +import { api, Element } from 'engine'; import { classListMutation, icon as iconUtil } from 'one-tmp-utils'; const validVariants = new Set([ diff --git a/packages/best-frontend/src/modules/one/tmp-menu-item/tmp-menu-item.js b/packages/best-frontend/src/modules/one/tmp-menu-item/tmp-menu-item.js index 8cf0760c..4b32127c 100644 --- a/packages/best-frontend/src/modules/one/tmp-menu-item/tmp-menu-item.js +++ b/packages/best-frontend/src/modules/one/tmp-menu-item/tmp-menu-item.js @@ -1,4 +1,4 @@ -import { Element } from "engine"; +import { api, Element } from "engine"; import { joinClassNames, isPureLeftClick } from "one-tmp-utils"; export default class LightningMenuItem extends Element { diff --git a/packages/best-frontend/src/modules/one/tmp-spinner/tmp-spinner.js b/packages/best-frontend/src/modules/one/tmp-spinner/tmp-spinner.js index 1e114e33..d8510a00 100644 --- a/packages/best-frontend/src/modules/one/tmp-spinner/tmp-spinner.js +++ b/packages/best-frontend/src/modules/one/tmp-spinner/tmp-spinner.js @@ -1,4 +1,4 @@ -import { Element } from "engine"; +import { Element, api } from "engine"; import { joinClassNames } from "one-tmp-utils"; export default class LightningSpinner extends Element {