Skip to content

Feature/add devtools viewer link to sheets #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
david-benson-fc wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Feature/add devtools viewer link to sheets #131

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
163a514
reduce eslint warnings
paulirish Jun 23, 2017
e37b36e
Update readme (#126)
young Jun 29, 2017
095608e
ci: removing nodejs duplication
willmendesneto Jul 10, 2017
e489e92
ci: removing progress in install tasks
willmendesneto Jul 10, 2017
da99ff0
Adds timeline viewer link to sheet output if files uploaded to drive
david-benson-fc Jul 17, 2017
8262700
Merge remote-tracking branch 'upstream/master' into feature/add_devto…
david-benson-fc Jul 18, 2017
757b5c3
Correct file check in lib/sheets
david-benson-fc Jul 19, 2017
cddb412
Timeline viewer link: Check upload flag is true before adding link
david-benson-fc Jul 19, 2017
d770a4c
Merge remote-tracking branch 'origin/master' into feature/add_devtool…
Aug 4, 2017
a3bd4c7
Modifications in response to change requests [WIP]
Aug 4, 2017
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
6 changes: 5 additions & 1 deletion lib/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class PWMetrics {
this.displayOutput(results.median);
} else if (this.flags.submit) {
const sheets = new Sheets(this.sheets, this.clientSecret);
await sheets.appendResults(results.runs);
await sheets.appendResults(results.runs, this.flags.upload);
}
}
return results;
Expand Down Expand Up @@ -174,6 +174,10 @@ class PWMetrics {

if (this.flags.upload) {
const driveResponse = await upload(data, this.clientSecret);

preparedData.fileId = driveResponse.id;
preparedData.fileName = driveResponse.name;

this.view(driveResponse.id);
}

Expand Down
2 changes: 2 additions & 0 deletions lib/metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ function prepareData(res: LighthouseResults): MetricsResults {
});

return {
fileId: '',
fileName: '',
timings,
timestamps,
generatedTime: res.generatedTime,
Expand Down
16 changes: 12 additions & 4 deletions lib/sheets/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const metricsIds = require('../metrics').ids;
const SHEET_TYPES = {
'GOOGLE_SHEETS': 'GOOGLE_SHEETS'
};
const VIEWER_URL_PREFIX = 'https://chromedevtools.github.io/timeline-viewer/?loadTimelineFromURL=drive://';

class Sheets {
constructor(public config: SheetsConfig, public clientSecret: AuthorizeCredentials) {
Expand All @@ -38,18 +39,24 @@ class Sheets {
}
}

appendResults(results: Array<MetricsResults>) {
appendResults(results: Array<MetricsResults>, upload: boolean) {
switch (this.config.type) {
case SHEET_TYPES.GOOGLE_SHEETS:
return this.appendResultsToGSheets(results);
return this.appendResultsToGSheets(results, upload);
}
}

async appendResultsToGSheets(results: Array<MetricsResults>) {
async appendResultsToGSheets(results: Array<MetricsResults>, upload: boolean) {
let valuesToAppend: Array<GSheetsValuesToAppend> = [];
results.forEach(data => {
const getTiming = (key: string) => data.timings.find(t => t.id === key).timing;
const dateObj = new Date(data.generatedTime);
let viewerUrl = '';

if(upload && typeof data.fileId !== 'undefined') {
viewerUrl = VIEWER_URL_PREFIX + data.fileId;
}

// order matters
valuesToAppend.push([
data.lighthouseVersion,
Expand All @@ -62,7 +69,8 @@ class Sheets {
getTiming(metricsIds.VC100),
getTiming(metricsIds.TTFI),
getTiming(metricsIds.TTCI),
getTiming(metricsIds.VC85)
getTiming(metricsIds.VC85),
viewerUrl
]);
});

Expand Down
2 changes: 2 additions & 0 deletions types/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ interface FeatureFlags {
}

interface MetricsResults {
fileName: string,
fileId: string,
timestamps: Timestamp[];
timings: Timing[];
generatedTime: string;
Expand Down