Skip to content

Commit 82a7fc5

Browse files
committed
Move filter and sort functions to pure
These functions can be re-used by the sorting and filtering code for exporting results and copying repository lists, so these should not be in the view directory. The tests have been kept in the same place for now, but they should be moved to the pure tests directory once those have been switched to Jest. I figured it wasn't worth it to convert these to Mocha, and convert them back to Jest in a week.
1 parent 3fd9fd4 commit 82a7fc5

11 files changed

+13
-12
lines changed

extensions/ql-vscode/src/view/variant-analysis/filterSort.ts renamed to extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Repository, RepositoryWithMetadata } from '../../remote-queries/shared/repository';
2-
import { parseDate } from '../../pure/date';
1+
import { Repository, RepositoryWithMetadata } from '../remote-queries/shared/repository';
2+
import { parseDate } from './date';
33

44
export enum SortKey {
55
Name = 'name',

extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSearchSortRow.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, { useState } from 'react';
33
import { ComponentMeta } from '@storybook/react';
44

55
import { RepositoriesSearchSortRow as RepositoriesSearchSortRowComponent } from '../../view/variant-analysis/RepositoriesSearchSortRow';
6-
import { defaultFilterSortState } from '../../view/variant-analysis/filterSort';
6+
import { defaultFilterSortState } from '../../pure/variant-analysis-filter-sort';
77

88
export default {
99
title: 'Variant Analysis/Repositories Search and Sort Row',

extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSort.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, { useState } from 'react';
33
import { ComponentMeta } from '@storybook/react';
44

55
import { RepositoriesSort as RepositoriesSortComponent } from '../../view/variant-analysis/RepositoriesSort';
6-
import { SortKey } from '../../view/variant-analysis/filterSort';
6+
import { SortKey } from '../../pure/variant-analysis-filter-sort';
77

88
export default {
99
title: 'Variant Analysis/Repositories Sort',

extensions/ql-vscode/src/view/variant-analysis/RepositoriesSearchSortRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { Dispatch, SetStateAction, useCallback } from 'react';
33
import styled from 'styled-components';
4-
import { RepositoriesFilterSortState, SortKey } from './filterSort';
4+
import { RepositoriesFilterSortState, SortKey } from '../../pure/variant-analysis-filter-sort';
55
import { RepositoriesSearch } from './RepositoriesSearch';
66
import { RepositoriesSort } from './RepositoriesSort';
77

extensions/ql-vscode/src/view/variant-analysis/RepositoriesSort.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { useCallback } from 'react';
33
import styled from 'styled-components';
44
import { VSCodeDropdown, VSCodeOption } from '@vscode/webview-ui-toolkit/react';
5-
import { SortKey } from './filterSort';
5+
import { SortKey } from '../../pure/variant-analysis-filter-sort';
66
import { Codicon } from '../common';
77

88
const Dropdown = styled(VSCodeDropdown)`

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisAnalyzedRepos.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
VariantAnalysisScannedRepositoryResult,
88
VariantAnalysisScannedRepositoryState
99
} from '../../remote-queries/shared/variant-analysis';
10-
import { compareWithResults, matchesFilter, RepositoriesFilterSortState } from './filterSort';
10+
import { compareWithResults, matchesFilter, RepositoriesFilterSortState } from '../../pure/variant-analysis-filter-sort';
1111

1212
const Container = styled.div`
1313
display: flex;

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
import { VariantAnalysisAnalyzedRepos } from './VariantAnalysisAnalyzedRepos';
1313
import { Alert } from '../common';
1414
import { VariantAnalysisSkippedRepositoriesTab } from './VariantAnalysisSkippedRepositoriesTab';
15-
import { defaultFilterSortState, RepositoriesFilterSortState } from './filterSort';
15+
import { defaultFilterSortState, RepositoriesFilterSortState } from '../../pure/variant-analysis-filter-sort';
1616
import { RepositoriesSearchSortRow } from './RepositoriesSearchSortRow';
1717
import { FailureReasonAlert } from './FailureReasonAlert';
1818

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import styled from 'styled-components';
44
import { VariantAnalysisSkippedRepositoryGroup } from '../../remote-queries/shared/variant-analysis';
55
import { Alert } from '../common';
66
import { RepoRow } from './RepoRow';
7-
import { compareRepository, matchesFilter, RepositoriesFilterSortState } from './filterSort';
7+
import { compareRepository, matchesFilter, RepositoriesFilterSortState } from '../../pure/variant-analysis-filter-sort';
88

99
export type VariantAnalysisSkippedRepositoriesTabProps = {
1010
alertTitle: string,

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { VariantAnalysisAnalyzedRepos, VariantAnalysisAnalyzedReposProps } from
1010
import { createMockVariantAnalysis } from '../../../vscode-tests/factories/remote-queries/shared/variant-analysis';
1111
import { createMockRepositoryWithMetadata } from '../../../vscode-tests/factories/remote-queries/shared/repository';
1212
import { createMockScannedRepo } from '../../../vscode-tests/factories/remote-queries/shared/scanned-repositories';
13-
import { defaultFilterSortState, SortKey } from '../filterSort';
13+
import { defaultFilterSortState, SortKey } from '../../../pure/variant-analysis-filter-sort';
1414

1515
describe(VariantAnalysisAnalyzedRepos.name, () => {
1616
const defaultVariantAnalysis = createMockVariantAnalysis({

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisSkippedRepositoriesTab.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { render as reactRender, screen } from '@testing-library/react';
33
import { VariantAnalysisSkippedRepositoriesTab, VariantAnalysisSkippedRepositoriesTabProps } from '../VariantAnalysisSkippedRepositoriesTab';
4-
import { defaultFilterSortState, SortKey } from '../filterSort';
4+
import { defaultFilterSortState, SortKey } from '../../../pure/variant-analysis-filter-sort';
55

66
describe(VariantAnalysisSkippedRepositoriesTab.name, () => {
77
const render = (props: VariantAnalysisSkippedRepositoriesTabProps) =>

0 commit comments

Comments
 (0)