diff --git a/docs/test-plan.md b/docs/test-plan.md index cb3852c7f..61c1989fa 100644 --- a/docs/test-plan.md +++ b/docs/test-plan.md @@ -258,10 +258,10 @@ This requires running a MRVA query and seeing the results view. 2. When the file does not exist 7. Can open query text 8. Can sort repos - 1. By name - 2. By results - 3. By stars - 4. By last updated + 1. Alphabetically + 2. By number of results + 3. By popularity + 4. By most recent commit 9. Can filter repos 10. Shows correct statistics 1. Total number of results diff --git a/extensions/ql-vscode/src/view/common/LastUpdated.tsx b/extensions/ql-vscode/src/view/common/LastUpdated.tsx index 7deb0c478..b5db4ba88 100644 --- a/extensions/ql-vscode/src/view/common/LastUpdated.tsx +++ b/extensions/ql-vscode/src/view/common/LastUpdated.tsx @@ -34,7 +34,7 @@ export const LastUpdated = ({ lastUpdated }: Props) => { return (
- + {humanizeRelativeTime(date.getTime() - Date.now())}
diff --git a/extensions/ql-vscode/src/view/variant-analysis/RepositoriesSort.tsx b/extensions/ql-vscode/src/view/variant-analysis/RepositoriesSort.tsx index bb46ae812..820dd1918 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/RepositoriesSort.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/RepositoriesSort.tsx @@ -29,10 +29,14 @@ export const RepositoriesSort = ({ value, onChange, className }: Props) => { return ( - Name - Results - Stars - Last updated + Alphabetically + + Number of results + + Popularity + + Most recent commit + ); }; diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx index a0f90cf58..24e233c98 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx @@ -39,7 +39,7 @@ describe(RepoRow.name, () => { screen.queryByRole("img", { // There should not be any icons, except for the icons which are always shown name: (name) => - !["expand", "stars count", "last updated"].includes( + !["expand", "stars count", "most recent commit"].includes( name.toLowerCase(), ), }), @@ -293,7 +293,7 @@ describe(RepoRow.name, () => { expect(screen.getByText("last month")).toBeInTheDocument(); expect( screen.getByRole("img", { - name: "Last updated", + name: "Most recent commit", }), ).toBeInTheDocument(); }); @@ -314,7 +314,7 @@ describe(RepoRow.name, () => { ).not.toBeInTheDocument(); expect( screen.queryByRole("img", { - name: "Last updated", + name: "Most recent commit", }), ).not.toBeInTheDocument(); }); diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx index 64cb3729a..61fc8b0c0 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx @@ -206,7 +206,7 @@ describe(VariantAnalysisAnalyzedRepos.name, () => { expect(rows[5]).toHaveTextContent("octodemo/hello-world-6"); }); - it("uses the results count sort key", async () => { + it("uses the 'Number of results' sort key", async () => { render({ filterSortState: { ...defaultFilterSortState, diff --git a/extensions/ql-vscode/test/unit-tests/variant-analysis-filter-sort.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis-filter-sort.test.ts index 90319ee65..699f9ddc9 100644 --- a/extensions/ql-vscode/test/unit-tests/variant-analysis-filter-sort.test.ts +++ b/extensions/ql-vscode/test/unit-tests/variant-analysis-filter-sort.test.ts @@ -127,7 +127,7 @@ describe(compareRepository.name, () => { }); }); - describe("when sort key is name", () => { + describe("when sort key is 'Alphabetically'", () => { const sorter = compareRepository({ ...defaultFilterSortState, sortKey: SortKey.Name, @@ -153,7 +153,7 @@ describe(compareRepository.name, () => { }); }); - describe("when sort key is stars", () => { + describe("when sort key is 'Popularity'", () => { const sorter = compareRepository({ ...defaultFilterSortState, sortKey: SortKey.Stars, @@ -199,7 +199,7 @@ describe(compareRepository.name, () => { }); }); - describe("when sort key is last updated", () => { + describe("when sort key is 'Most recent commit'", () => { const sorter = compareRepository({ ...defaultFilterSortState, sortKey: SortKey.LastUpdated, @@ -271,7 +271,7 @@ describe(compareWithResults.name, () => { }); }); - describe("when sort key is stars", () => { + describe("when sort key is 'Popularity'", () => { const sorter = compareWithResults({ ...defaultFilterSortState, sortKey: SortKey.Stars, @@ -297,7 +297,7 @@ describe(compareWithResults.name, () => { }); }); - describe("when sort key is last updated", () => { + describe("when sort key is 'Most recent commit'", () => { const sorter = compareWithResults({ ...defaultFilterSortState, sortKey: SortKey.LastUpdated,