Skip to content

Commit 866b137

Browse files
committed
Remove default values from VariantAnalysis component
The `VariantAnalysis` component will now only receive values from the `VariantAnalysisView`. We still allow setting defaults to support Storybook.
1 parent 76a00e5 commit 866b137

File tree

2 files changed

+69
-47
lines changed

2 files changed

+69
-47
lines changed

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

Lines changed: 67 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
import React from 'react';
22

3-
import { ComponentStory, ComponentMeta } from '@storybook/react';
3+
import { ComponentMeta, ComponentStory } from '@storybook/react';
44

55
import { VariantAnalysis as VariantAnalysisComponent } from '../../view/variant-analysis/VariantAnalysis';
66
import {
77
VariantAnalysis as VariantAnalysisDomainModel,
8-
VariantAnalysisQueryLanguage, VariantAnalysisRepoStatus, VariantAnalysisStatus
8+
VariantAnalysisQueryLanguage,
9+
VariantAnalysisRepoStatus,
10+
VariantAnalysisScannedRepositoryDownloadStatus,
11+
VariantAnalysisScannedRepositoryResult,
12+
VariantAnalysisScannedRepositoryState,
13+
VariantAnalysisStatus
914
} from '../../remote-queries/shared/variant-analysis';
1015

1116
export default {
@@ -35,23 +40,23 @@ const variantAnalysis: VariantAnalysisDomainModel = {
3540
fullName: 'octodemo/hello-world-1',
3641
private: false,
3742
},
38-
analysisStatus: VariantAnalysisRepoStatus.Pending,
43+
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
3944
},
4045
{
4146
repository: {
4247
id: 2,
4348
fullName: 'octodemo/hello-world-2',
4449
private: false,
4550
},
46-
analysisStatus: VariantAnalysisRepoStatus.Pending,
51+
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
4752
},
4853
{
4954
repository: {
5055
id: 3,
5156
fullName: 'octodemo/hello-world-3',
5257
private: false,
5358
},
54-
analysisStatus: VariantAnalysisRepoStatus.Pending,
59+
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
5560
},
5661
{
5762
repository: {
@@ -67,15 +72,15 @@ const variantAnalysis: VariantAnalysisDomainModel = {
6772
fullName: 'octodemo/hello-world-5',
6873
private: false,
6974
},
70-
analysisStatus: VariantAnalysisRepoStatus.Pending,
75+
analysisStatus: VariantAnalysisRepoStatus.Failed,
7176
},
7277
{
7378
repository: {
7479
id: 6,
7580
fullName: 'octodemo/hello-world-6',
7681
private: false,
7782
},
78-
analysisStatus: VariantAnalysisRepoStatus.Pending,
83+
analysisStatus: VariantAnalysisRepoStatus.InProgress,
7984
},
8085
{
8186
repository: {
@@ -164,10 +169,64 @@ const variantAnalysis: VariantAnalysisDomainModel = {
164169
},
165170
};
166171

172+
const repoStates: VariantAnalysisScannedRepositoryState[] = [
173+
{
174+
repositoryId: 1,
175+
downloadStatus: VariantAnalysisScannedRepositoryDownloadStatus.Succeeded
176+
},
177+
{
178+
repositoryId: 2,
179+
downloadStatus: VariantAnalysisScannedRepositoryDownloadStatus.InProgress,
180+
},
181+
{
182+
repositoryId: 3,
183+
downloadStatus: VariantAnalysisScannedRepositoryDownloadStatus.Failed,
184+
},
185+
];
186+
187+
const repoResults: VariantAnalysisScannedRepositoryResult[] = [
188+
{
189+
variantAnalysisId: 1,
190+
repositoryId: 1,
191+
rawResults: {
192+
schema: {
193+
name: '#select',
194+
rows: 1,
195+
columns: [
196+
{
197+
kind: 'i'
198+
}
199+
]
200+
},
201+
resultSet: {
202+
schema: {
203+
name: '#select',
204+
rows: 1,
205+
columns: [
206+
{
207+
kind: 'i'
208+
}
209+
]
210+
},
211+
rows: [
212+
[
213+
60688
214+
]
215+
]
216+
},
217+
fileLinkPrefix: 'https://github.com/octodemo/hello-world-1/blob/59a2a6c7d9dde7a6ecb77c2f7e8197d6925c143b',
218+
sourceLocationPrefix: '/home/runner/work/bulk-builder/bulk-builder',
219+
capped: false
220+
}
221+
}
222+
];
223+
167224
export const Loading = Template.bind({});
168225
Loading.args = {};
169226

170227
export const FullExample = Template.bind({});
171228
FullExample.args = {
172-
variantAnalysis: variantAnalysis,
229+
variantAnalysis,
230+
repoStates,
231+
repoResults,
173232
};

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

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,6 @@ import { VariantAnalysisLoading } from './VariantAnalysisLoading';
1212
import { ToVariantAnalysisMessage } from '../../pure/interface-types';
1313
import { vscode } from '../vscode-api';
1414

15-
const repositoryResults: VariantAnalysisScannedRepositoryResult[] = [
16-
{
17-
variantAnalysisId: 1,
18-
repositoryId: 1,
19-
rawResults: {
20-
schema: {
21-
name: '#select',
22-
rows: 1,
23-
columns: [
24-
{
25-
kind: 'i'
26-
}
27-
]
28-
},
29-
resultSet: {
30-
schema: {
31-
name: '#select',
32-
rows: 1,
33-
columns: [
34-
{
35-
kind: 'i'
36-
}
37-
]
38-
},
39-
rows: [
40-
[
41-
60688
42-
]
43-
]
44-
},
45-
fileLinkPrefix: 'https://github.com/octodemo/hello-world-1/blob/59a2a6c7d9dde7a6ecb77c2f7e8197d6925c143b',
46-
sourceLocationPrefix: '/home/runner/work/bulk-builder/bulk-builder',
47-
capped: false
48-
}
49-
}
50-
];
51-
5215
type Props = {
5316
variantAnalysis?: VariantAnalysisDomainModel;
5417
repoStates?: VariantAnalysisScannedRepositoryState[];
@@ -58,9 +21,9 @@ type Props = {
5821
export function VariantAnalysis({
5922
variantAnalysis: initialVariantAnalysis,
6023
repoStates: initialRepoStates = [],
61-
repoResults: initialRepoResults = repositoryResults,
24+
repoResults: initialRepoResults = [],
6225
}: Props): JSX.Element {
63-
const [variantAnalysis, setVariantAnalysis] = useState<VariantAnalysisDomainModel | undefined>();
26+
const [variantAnalysis, setVariantAnalysis] = useState<VariantAnalysisDomainModel | undefined>(initialVariantAnalysis);
6427
const [repoStates, setRepoStates] = useState<VariantAnalysisScannedRepositoryState[]>(initialRepoStates);
6528
const [repoResults, setRepoResults] = useState<VariantAnalysisScannedRepositoryResult[]>(initialRepoResults);
6629

0 commit comments

Comments
 (0)