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.
This commit is contained in:
Koen Vlaswinkel
2022-10-07 15:02:34 +02:00
parent 76a00e5fa5
commit 866b137fd4
2 changed files with 69 additions and 47 deletions

View File

@@ -1,11 +1,16 @@
import React from 'react';
import { ComponentStory, ComponentMeta } from '@storybook/react';
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { VariantAnalysis as VariantAnalysisComponent } from '../../view/variant-analysis/VariantAnalysis';
import {
VariantAnalysis as VariantAnalysisDomainModel,
VariantAnalysisQueryLanguage, VariantAnalysisRepoStatus, VariantAnalysisStatus
VariantAnalysisQueryLanguage,
VariantAnalysisRepoStatus,
VariantAnalysisScannedRepositoryDownloadStatus,
VariantAnalysisScannedRepositoryResult,
VariantAnalysisScannedRepositoryState,
VariantAnalysisStatus
} from '../../remote-queries/shared/variant-analysis';
export default {
@@ -35,7 +40,7 @@ const variantAnalysis: VariantAnalysisDomainModel = {
fullName: 'octodemo/hello-world-1',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
},
{
repository: {
@@ -43,7 +48,7 @@ const variantAnalysis: VariantAnalysisDomainModel = {
fullName: 'octodemo/hello-world-2',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
},
{
repository: {
@@ -51,7 +56,7 @@ const variantAnalysis: VariantAnalysisDomainModel = {
fullName: 'octodemo/hello-world-3',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
},
{
repository: {
@@ -67,7 +72,7 @@ const variantAnalysis: VariantAnalysisDomainModel = {
fullName: 'octodemo/hello-world-5',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
repository: {
@@ -75,7 +80,7 @@ const variantAnalysis: VariantAnalysisDomainModel = {
fullName: 'octodemo/hello-world-6',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
analysisStatus: VariantAnalysisRepoStatus.InProgress,
},
{
repository: {
@@ -164,10 +169,64 @@ const variantAnalysis: VariantAnalysisDomainModel = {
},
};
const repoStates: VariantAnalysisScannedRepositoryState[] = [
{
repositoryId: 1,
downloadStatus: VariantAnalysisScannedRepositoryDownloadStatus.Succeeded
},
{
repositoryId: 2,
downloadStatus: VariantAnalysisScannedRepositoryDownloadStatus.InProgress,
},
{
repositoryId: 3,
downloadStatus: VariantAnalysisScannedRepositoryDownloadStatus.Failed,
},
];
const repoResults: VariantAnalysisScannedRepositoryResult[] = [
{
variantAnalysisId: 1,
repositoryId: 1,
rawResults: {
schema: {
name: '#select',
rows: 1,
columns: [
{
kind: 'i'
}
]
},
resultSet: {
schema: {
name: '#select',
rows: 1,
columns: [
{
kind: 'i'
}
]
},
rows: [
[
60688
]
]
},
fileLinkPrefix: 'https://github.com/octodemo/hello-world-1/blob/59a2a6c7d9dde7a6ecb77c2f7e8197d6925c143b',
sourceLocationPrefix: '/home/runner/work/bulk-builder/bulk-builder',
capped: false
}
}
];
export const Loading = Template.bind({});
Loading.args = {};
export const FullExample = Template.bind({});
FullExample.args = {
variantAnalysis: variantAnalysis,
variantAnalysis,
repoStates,
repoResults,
};

View File

@@ -12,43 +12,6 @@ import { VariantAnalysisLoading } from './VariantAnalysisLoading';
import { ToVariantAnalysisMessage } from '../../pure/interface-types';
import { vscode } from '../vscode-api';
const repositoryResults: VariantAnalysisScannedRepositoryResult[] = [
{
variantAnalysisId: 1,
repositoryId: 1,
rawResults: {
schema: {
name: '#select',
rows: 1,
columns: [
{
kind: 'i'
}
]
},
resultSet: {
schema: {
name: '#select',
rows: 1,
columns: [
{
kind: 'i'
}
]
},
rows: [
[
60688
]
]
},
fileLinkPrefix: 'https://github.com/octodemo/hello-world-1/blob/59a2a6c7d9dde7a6ecb77c2f7e8197d6925c143b',
sourceLocationPrefix: '/home/runner/work/bulk-builder/bulk-builder',
capped: false
}
}
];
type Props = {
variantAnalysis?: VariantAnalysisDomainModel;
repoStates?: VariantAnalysisScannedRepositoryState[];
@@ -58,9 +21,9 @@ type Props = {
export function VariantAnalysis({
variantAnalysis: initialVariantAnalysis,
repoStates: initialRepoStates = [],
repoResults: initialRepoResults = repositoryResults,
repoResults: initialRepoResults = [],
}: Props): JSX.Element {
const [variantAnalysis, setVariantAnalysis] = useState<VariantAnalysisDomainModel | undefined>();
const [variantAnalysis, setVariantAnalysis] = useState<VariantAnalysisDomainModel | undefined>(initialVariantAnalysis);
const [repoStates, setRepoStates] = useState<VariantAnalysisScannedRepositoryState[]>(initialRepoStates);
const [repoResults, setRepoResults] = useState<VariantAnalysisScannedRepositoryResult[]>(initialRepoResults);