Skip to content

Commit e7a0c7e

Browse files
elenatanasoiuelenatanasoiu
authored
Merge pull request #1710 from github/elena/sort-sorting
Make sorting tests work with remote queries & variant analysis history items
2 parents 4e3b201 + f0aa0a5 commit e7a0c7e

16 files changed

+480
-427
lines changed

‎extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const Template: ComponentStory<typeof VariantAnalysisComponent> = (args) => (
2424
);
2525

2626
const variantAnalysis: VariantAnalysisDomainModel = {
27-
...createMockVariantAnalysis(VariantAnalysisStatus.InProgress),
27+
...createMockVariantAnalysis({ status: VariantAnalysisStatus.InProgress }),
2828
controllerRepo: {
2929
id: 1,
3030
fullName: 'octodemo/variant-analysis-controller',

‎extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx‎

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -36,64 +36,67 @@ const interpretedResultsForRepo = (nwo: string): AnalysisAlert[] | undefined =>
3636

3737
export const Example = Template.bind({});
3838
Example.args = {
39-
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, [
40-
{
41-
repository: {
42-
...createMockRepositoryWithMetadata(),
43-
id: 63537249,
44-
fullName: 'facebook/create-react-app',
45-
private: false,
39+
variantAnalysis: createMockVariantAnalysis({
40+
status: VariantAnalysisStatus.InProgress,
41+
scannedRepos: [
42+
{
43+
repository: {
44+
...createMockRepositoryWithMetadata(),
45+
id: 63537249,
46+
fullName: 'facebook/create-react-app',
47+
private: false,
48+
},
49+
analysisStatus: VariantAnalysisRepoStatus.Succeeded, resultCount: 198,
4650
},
47-
analysisStatus: VariantAnalysisRepoStatus.Succeeded, resultCount: 198,
48-
},
49-
{
50-
repository: {
51-
...createMockRepositoryWithMetadata(),
52-
id: 167174,
53-
fullName: 'jquery/jquery',
54-
private: false,
51+
{
52+
repository: {
53+
...createMockRepositoryWithMetadata(),
54+
id: 167174,
55+
fullName: 'jquery/jquery',
56+
private: false,
57+
},
58+
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
59+
resultCount: 67,
5560
},
56-
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
57-
resultCount: 67,
58-
},
59-
{
60-
repository: {
61-
...createMockRepositoryWithMetadata(),
62-
id: 237159,
63-
fullName: 'expressjs/express',
64-
private: false,
61+
{
62+
repository: {
63+
...createMockRepositoryWithMetadata(),
64+
id: 237159,
65+
fullName: 'expressjs/express',
66+
private: false,
67+
},
68+
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
69+
resultCount: 26,
6570
},
66-
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
67-
resultCount: 26,
68-
},
69-
{
70-
repository: {
71-
...createMockRepositoryWithMetadata(),
72-
id: 15062869,
73-
fullName: 'facebook/jest',
74-
private: false,
71+
{
72+
repository: {
73+
...createMockRepositoryWithMetadata(),
74+
id: 15062869,
75+
fullName: 'facebook/jest',
76+
private: false,
77+
},
78+
analysisStatus: VariantAnalysisRepoStatus.Failed,
7579
},
76-
analysisStatus: VariantAnalysisRepoStatus.Failed,
77-
},
78-
{
79-
repository: {
80-
...createMockRepositoryWithMetadata(),
81-
id: 24195339,
82-
fullName: 'angular/angular',
83-
private: false,
80+
{
81+
repository: {
82+
...createMockRepositoryWithMetadata(),
83+
id: 24195339,
84+
fullName: 'angular/angular',
85+
private: false,
86+
},
87+
analysisStatus: VariantAnalysisRepoStatus.InProgress,
8488
},
85-
analysisStatus: VariantAnalysisRepoStatus.InProgress,
86-
},
87-
{
88-
repository: {
89-
...createMockRepositoryWithMetadata(),
90-
id: 24560307,
91-
fullName: 'babel/babel',
92-
private: false,
89+
{
90+
repository: {
91+
...createMockRepositoryWithMetadata(),
92+
id: 24560307,
93+
fullName: 'babel/babel',
94+
private: false,
95+
},
96+
analysisStatus: VariantAnalysisRepoStatus.Pending,
9397
},
94-
analysisStatus: VariantAnalysisRepoStatus.Pending,
95-
},
96-
]),
98+
]
99+
}),
97100
repositoryResults: [
98101
{
99102
variantAnalysisId: 1,

‎extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -64,40 +64,46 @@ const Template: ComponentStory<typeof VariantAnalysisHeader> = (args) => (
6464

6565
export const InProgress = Template.bind({});
6666
InProgress.args = {
67-
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, [
68-
{
69-
...createMockScannedRepo(),
70-
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
71-
resultCount: 99_999,
72-
},
73-
{
74-
...createMockScannedRepo(),
75-
analysisStatus: VariantAnalysisRepoStatus.Failed,
76-
},
77-
{
78-
...createMockScannedRepo(),
79-
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
80-
resultCount: 0,
81-
},
82-
createMockScannedRepo(),
83-
createMockScannedRepo(),
84-
createMockScannedRepo(),
85-
createMockScannedRepo(),
86-
createMockScannedRepo(),
87-
createMockScannedRepo(),
88-
createMockScannedRepo(),
89-
]),
67+
variantAnalysis: createMockVariantAnalysis({
68+
status: VariantAnalysisStatus.InProgress,
69+
scannedRepos: [
70+
{
71+
...createMockScannedRepo(),
72+
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
73+
resultCount: 99_999,
74+
},
75+
{
76+
...createMockScannedRepo(),
77+
analysisStatus: VariantAnalysisRepoStatus.Failed,
78+
},
79+
{
80+
...createMockScannedRepo(),
81+
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
82+
resultCount: 0,
83+
},
84+
createMockScannedRepo(),
85+
createMockScannedRepo(),
86+
createMockScannedRepo(),
87+
createMockScannedRepo(),
88+
createMockScannedRepo(),
89+
createMockScannedRepo(),
90+
createMockScannedRepo(),
91+
]
92+
}),
9093
};
9194

9295
export const Succeeded = Template.bind({});
9396
Succeeded.args = {
9497
...InProgress.args,
9598
variantAnalysis: {
96-
...createMockVariantAnalysis(VariantAnalysisStatus.Succeeded, Array.from({ length: 1000 }, (_) => ({
97-
...createMockScannedRepo(),
98-
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
99-
resultCount: 100,
100-
}))),
99+
...createMockVariantAnalysis({
100+
status: VariantAnalysisStatus.Succeeded,
101+
scannedRepos: Array.from({ length: 1000 }, (_) => ({
102+
...createMockScannedRepo(),
103+
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
104+
resultCount: 100,
105+
}))
106+
}),
101107
createdAt: new Date(1661262726000).toISOString(),
102108
completedAt: new Date(1661263446000).toISOString(),
103109
},
@@ -107,7 +113,11 @@ export const Failed = Template.bind({});
107113
Failed.args = {
108114
...InProgress.args,
109115
variantAnalysis: {
110-
...createMockVariantAnalysis(VariantAnalysisStatus.Failed, [], {}),
116+
...createMockVariantAnalysis({
117+
status: VariantAnalysisStatus.Failed,
118+
scannedRepos: [],
119+
skippedRepos: {}
120+
}),
111121
createdAt: new Date(1661263436000).toISOString(),
112122
completedAt: new Date(1661263446000).toISOString(),
113123
},

0 commit comments

Comments
 (0)