Skip to content

Only use the default branch to determine repo-age #3445

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

Merged
fregante merged 5 commits into from
Aug 10, 2020
Merged

Only use the default branch to determine repo-age #3445

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0234eb5
Only use the api for `repo-age`
yakov116 Aug 10, 2020
16baeb8
Alignment
yakov116 Aug 10, 2020
cd7d9b1
Do it later
yakov116 Aug 10, 2020
dfa64d8
Remove if
yakov116 Aug 10, 2020
3a21397
Merge functions
fregante Aug 10, 2020
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
54 changes: 21 additions & 33 deletions source/features/repo-age.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import * as pageDetect from 'github-url-detection';

import features from '.';
import * as api from '../github-helpers/api';
import looseParseInt from '../helpers/loose-parse-int';
import {getRepoURL, getRepoGQL} from '../github-helpers';

const dateFormatter = new Intl.DateTimeFormat('en-US', {
Expand Down Expand Up @@ -43,34 +42,28 @@ const getRepoAge = async (commitSha: string, commitsCount: number): Promise<[str
return [committedDate, resourcePath];
};

const getFirstCommit = cache.function(async (): Promise<[string, string] | undefined> => {
const commitInfo = await elementReady<HTMLAnchorElement | HTMLScriptElement>([
// "Repository refresh" layout
'.Box-header--blue .hx_avatar_stack_commit + div a[href*="/commit/"]',
'include-fragment[aria-label="Loading latest commit"]',

// Pre "Repository refresh" layout
'a.commit-tease-sha',
'include-fragment.commit-tease'
].join());
const commitUrl = commitInfo instanceof HTMLAnchorElement ? commitInfo.href : commitInfo!.src;
const commitSha = commitUrl.split('/').pop()!;

// In "Repository refresh" layout, the number of commits may not be rendered yet
const commitsCountElement = select('li.commits .num') ?? (await elementReady('.Box-header--blue [aria-label^="Commits on "]'))!.parentElement;
const commitsCount = looseParseInt(commitsCountElement!.textContent!);

// Returning undefined will make sure that it is not cached. It will check again for commits on the next load.
// Reference: https://github.com/fregante/webext-storage-cache/#getter
if (commitsCount === 0) {
Copy link
Member

@fregante fregante Aug 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realized that this was removed. Why? It shouldn't be

Copy link
Member Author

@yakov116 yakov116 Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since until now the element could have not been ready on time so it would be undefined. Now the only case would be on a brand new repo.

Copy link
Member Author

@yakov116 yakov116 Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/sindresorhus/refined-github/pull/2783/files/f976d2c0fe70d52b9adfecec5a349526d6b6a2b5#diff-9d82f672e2199b6b2b455fa80d3373f2

Copy link
Member

@fregante fregante Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now the only case would be on a brand new repo.

Yes. Brand new repos still exist and now I think this would throw in those cases because repository.defaultBranchRef.target is null

Copy link
Member

@fregante fregante Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The easiest way is to add isEmptyRepoRoot to excludes

TODO lint <-- search this next week :D

Copy link
Member Author

@yakov116 yakov116 Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lol

return;
}
const getFirstCommit = cache.function(async (): Promise<[string, string]> => {
const {repository} = await api.v4(`
repository(${getRepoGQL()}) {
defaultBranchRef {
target {
... on Commit {
oid
committedDate
resourcePath
history {
totalCount
}
}
}
}
}
`);

const {oid: commitSha, history, committedDate, resourcePath} = repository.defaultBranchRef.target;
const commitsCount = history.totalCount;
if (commitsCount === 1) {
return [select([
'.commit-tease-sha + span relative-time', // Pre "Repository refresh" layout
'.js-details-container a relative-time'
])!.attributes.datetime.value, commitUrl];
return [committedDate, resourcePath];
}

return getRepoAge(commitSha, commitsCount);
Expand All @@ -79,12 +72,7 @@ const getFirstCommit = cache.function(async (): Promise<[string, string] | undef
});

async function init(): Promise<void> {
const [firstCommitDate, firstCommitHref] = await getFirstCommit() ?? [];

if (!firstCommitDate) {
return;
}

const [firstCommitDate, firstCommitHref] = await getFirstCommit()!;
const date = new Date(firstCommitDate);

// `twas` could also return `an hour ago` or `just now`
Expand Down