From bd08542fe3b12d6f8ca20d7f5323dccbb8158d33 Mon Sep 17 00:00:00 2001 From: Wouter Admiraal Date: Fri, 29 May 2020 17:03:57 +0200 Subject: [PATCH] SONAR-13494 Prevent ALM binding table from blinking when showing the delete modal --- .../AlmBindingDefinitionsTable.tsx | 9 +- .../almIntegration/AlmIntegration.tsx | 18 ++-- .../almIntegration/AlmIntegrationRenderer.tsx | 18 ++-- .../components/almIntegration/AlmTab.tsx | 10 ++- .../almIntegration/AlmTabRenderer.tsx | 13 ++- .../components/almIntegration/AzureTab.tsx | 8 +- .../almIntegration/BitbucketTab.tsx | 8 +- .../components/almIntegration/GithubTab.tsx | 15 +++- .../components/almIntegration/GitlabTab.tsx | 15 +++- .../AlmBindingDefinitionsTable-test.tsx | 2 + .../__tests__/AlmIntegration-test.tsx | 2 +- .../__tests__/AlmIntegrationRenderer-test.tsx | 7 +- .../almIntegration/__tests__/AlmTab-test.tsx | 3 +- .../__tests__/AlmTabRenderer-test.tsx | 12 ++- .../__tests__/AzureTab-test.tsx | 3 +- .../__tests__/BitbucketTab-test.tsx | 3 +- .../__tests__/GithubTab-test.tsx | 3 +- .../__tests__/GitlabTab-test.tsx | 3 +- .../AlmBindingDefinitionsTable-test.tsx.snap | 60 ++++++++++++++ .../AlmIntegration-test.tsx.snap | 3 +- .../AlmIntegrationRenderer-test.tsx.snap | 18 ++-- .../__snapshots__/AlmTab-test.tsx.snap | 4 +- .../AlmTabRenderer-test.tsx.snap | 82 ++++++++++++++++++- .../__snapshots__/AzureTab-test.tsx.snap | 3 +- .../__snapshots__/BitbucketTab-test.tsx.snap | 3 +- .../__snapshots__/GithubTab-test.tsx.snap | 3 +- .../__snapshots__/GitlabTab-test.tsx.snap | 3 +- 27 files changed, 268 insertions(+), 63 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionsTable.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionsTable.tsx index 65253c4d6e0..c1bcc5bb36f 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionsTable.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionsTable.tsx @@ -31,13 +31,14 @@ export interface AlmBindingDefinitionsTableProps { key: string; additionalColumns: Array; }>; + loading: boolean; onCreate: () => void; onDelete: (definitionKey: string) => void; onEdit: (definitionKey: string) => void; } export default function AlmBindingDefinitionsTable(props: AlmBindingDefinitionsTableProps) { - const { additionalColumnsHeaders, additionalTableInfo, alm, definitions } = props; + const { additionalColumnsHeaders, additionalTableInfo, alm, definitions, loading } = props; return ( <> @@ -45,7 +46,7 @@ export default function AlmBindingDefinitionsTable(props: AlmBindingDefinitionsT

{translate('settings.almintegration.table.title')}

- @@ -86,12 +87,12 @@ export default function AlmBindingDefinitionsTable(props: AlmBindingDefinitionsT ))} - props.onEdit(key)}> + props.onEdit(key)}> - props.onDelete(key)} /> + props.onDelete(key)} /> )) diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegration.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegration.tsx index ee060e8f2bf..247abe17d20 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegration.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegration.tsx @@ -36,7 +36,8 @@ interface State { currentAlm: AlmKeys; definitionKeyForDeletion?: string; definitions: AlmSettingsBindingDefinitions; - loading: boolean; + loadingAlmDefinitions: boolean; + loadingProjectCount: boolean; projectCount?: number; } @@ -50,7 +51,8 @@ export class AlmIntegration extends React.PureComponent { [AlmKeys.GitHub]: [], [AlmKeys.GitLab]: [] }, - loading: true + loadingAlmDefinitions: true, + loadingProjectCount: false }; componentDidMount() { @@ -81,19 +83,19 @@ export class AlmIntegration extends React.PureComponent { return Promise.resolve(); } - this.setState({ loading: true }); + this.setState({ loadingAlmDefinitions: true }); return getAlmDefinitions() .then(definitions => { if (this.mounted) { this.setState({ definitions, - loading: false + loadingAlmDefinitions: false }); } }) .catch(() => { if (this.mounted) { - this.setState({ loading: false }); + this.setState({ loadingAlmDefinitions: false }); } }); }; @@ -107,20 +109,20 @@ export class AlmIntegration extends React.PureComponent { }; handleDelete = (definitionKey: string) => { - this.setState({ loading: true }); + this.setState({ loadingProjectCount: true }); return countBindedProjects(definitionKey) .then(projectCount => { if (this.mounted) { this.setState({ definitionKeyForDeletion: definitionKey, - loading: false, + loadingProjectCount: false, projectCount }); } }) .catch(() => { if (this.mounted) { - this.setState({ loading: false }); + this.setState({ loadingProjectCount: false }); } }); }; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx index c5c64310a4f..16e8f95b1e5 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx @@ -34,7 +34,8 @@ export interface AlmIntegrationRendererProps { currentAlm: AlmKeys; definitionKeyForDeletion?: string; definitions: AlmSettingsBindingDefinitions; - loading: boolean; + loadingAlmDefinitions: boolean; + loadingProjectCount: boolean; multipleAlmEnabled: boolean; onCancel: () => void; onConfirmDelete: (definitionKey: string) => void; @@ -111,7 +112,8 @@ export default function AlmIntegrationRenderer(props: AlmIntegrationRendererProp definitionKeyForDeletion, definitions, currentAlm, - loading, + loadingAlmDefinitions, + loadingProjectCount, branchesEnabled, multipleAlmEnabled, projectCount @@ -135,7 +137,8 @@ export default function AlmIntegrationRenderer(props: AlmIntegrationRendererProp {currentAlm === AlmKeys.Azure && ( { features?: AlmIntegrationFeatureBoxProps[]; form: (props: AlmBindingDefinitionFormChildrenProps) => React.ReactNode; help?: React.ReactNode; - loading: boolean; + loadingAlmDefinitions: boolean; + loadingProjectCount: boolean; multipleAlmEnabled: boolean; onDelete: (definitionKey: string) => void; onUpdateDefinitions: () => void; @@ -112,7 +113,8 @@ export default class AlmTab extends React.PureCo features, form, help, - loading, + loadingAlmDefinitions, + loadingProjectCount, multipleAlmEnabled, optionalFields } = this.props; @@ -130,7 +132,8 @@ export default class AlmTab extends React.PureCo features={features} form={form} help={help} - loading={loading || submitting} + loadingAlmDefinitions={loadingAlmDefinitions} + loadingProjectCount={loadingProjectCount} multipleAlmEnabled={multipleAlmEnabled} onCancel={this.handleCancel} onCreate={this.handleCreate} @@ -138,6 +141,7 @@ export default class AlmTab extends React.PureCo onEdit={this.handleEdit} onSubmit={this.handleSubmit} optionalFields={optionalFields} + submitting={submitting} success={success} /> ); diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx index 8f9feeabbed..7e946452002 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx @@ -42,7 +42,8 @@ export interface AlmTabRendererProps { features?: AlmIntegrationFeatureBoxProps[]; form: (props: AlmBindingDefinitionFormChildrenProps) => React.ReactNode; help?: React.ReactNode; - loading: boolean; + loadingAlmDefinitions: boolean; + loadingProjectCount: boolean; multipleAlmEnabled: boolean; onCancel: () => void; onCreate: () => void; @@ -50,6 +51,7 @@ export interface AlmTabRendererProps { onEdit: (definitionKey: string) => void; onSubmit: (config: B, originalKey: string) => void; optionalFields?: Array; + submitting: boolean; success: boolean; } @@ -66,9 +68,11 @@ export default function AlmTabRenderer( editedDefinition, features = [], form, - loading, + loadingAlmDefinitions, + loadingProjectCount, multipleAlmEnabled, optionalFields, + submitting, success, help = ( ( return (
{multipleAlmEnabled ? ( - + ( bindingDefinition={definition || defaultBinding} help={help} hideKeyField={true} - loading={loading} + loading={loadingAlmDefinitions || loadingProjectCount || submitting} onCancel={props.onCancel} onDelete={definition ? props.onDelete : undefined} onEdit={showEdit ? props.onEdit : undefined} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureTab.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureTab.tsx index bf2607a2396..b2d211ba787 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureTab.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureTab.tsx @@ -26,14 +26,15 @@ import AzureForm from './AzureForm'; export interface AzureTabProps { definitions: AzureBindingDefinition[]; - loading: boolean; + loadingAlmDefinitions: boolean; + loadingProjectCount: boolean; multipleAlmEnabled: boolean; onDelete: (definitionKey: string) => void; onUpdateDefinitions: () => void; } export default function AzureTab(props: AzureTabProps) { - const { multipleAlmEnabled, definitions, loading } = props; + const { multipleAlmEnabled, definitions, loadingAlmDefinitions, loadingProjectCount } = props; return (
@@ -51,7 +52,8 @@ export default function AzureTab(props: AzureTabProps) { } ]} form={childProps => } - loading={loading} + loadingAlmDefinitions={loadingAlmDefinitions} + loadingProjectCount={loadingProjectCount} multipleAlmEnabled={multipleAlmEnabled} onDelete={props.onDelete} onUpdateDefinitions={props.onUpdateDefinitions} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketTab.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketTab.tsx index e7bf53d56e5..46a7f3d3548 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketTab.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketTab.tsx @@ -32,14 +32,15 @@ import BitbucketForm from './BitbucketForm'; export interface BitbucketTabProps { definitions: BitbucketBindingDefinition[]; - loading: boolean; + loadingAlmDefinitions: boolean; + loadingProjectCount: boolean; multipleAlmEnabled: boolean; onDelete: (definitionKey: string) => void; onUpdateDefinitions: () => void; } export default function BitbucketTab(props: BitbucketTabProps) { - const { multipleAlmEnabled, definitions, loading } = props; + const { multipleAlmEnabled, definitions, loadingAlmDefinitions, loadingProjectCount } = props; return (
@@ -103,7 +104,8 @@ export default function BitbucketTab(props: BitbucketTabProps) {

} - loading={loading} + loadingAlmDefinitions={loadingAlmDefinitions} + loadingProjectCount={loadingProjectCount} multipleAlmEnabled={multipleAlmEnabled} onDelete={props.onDelete} onUpdateDefinitions={props.onUpdateDefinitions} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubTab.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubTab.tsx index 07818aa6c8d..bdeb29f3c89 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubTab.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubTab.tsx @@ -30,14 +30,22 @@ export interface GithubTabProps { branchesEnabled: boolean; component?: T.Component; definitions: GithubBindingDefinition[]; - loading: boolean; + loadingAlmDefinitions: boolean; + loadingProjectCount: boolean; multipleAlmEnabled: boolean; onDelete: (definitionKey: string) => void; onUpdateDefinitions: () => void; } export default function GithubTab(props: GithubTabProps) { - const { branchesEnabled, component, multipleAlmEnabled, definitions, loading } = props; + const { + branchesEnabled, + component, + multipleAlmEnabled, + definitions, + loadingAlmDefinitions, + loadingProjectCount + } = props; return (
@@ -62,7 +70,8 @@ export default function GithubTab(props: GithubTabProps) { } ]} form={childProps => } - loading={loading} + loadingAlmDefinitions={loadingAlmDefinitions} + loadingProjectCount={loadingProjectCount} multipleAlmEnabled={multipleAlmEnabled} onDelete={props.onDelete} onUpdateDefinitions={props.onUpdateDefinitions} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabTab.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabTab.tsx index 7ca66c1ac51..e334f5d398b 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabTab.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabTab.tsx @@ -30,14 +30,22 @@ export interface GitlabTabProps { branchesEnabled: boolean; component?: T.Component; definitions: GitlabBindingDefinition[]; - loading: boolean; + loadingAlmDefinitions: boolean; + loadingProjectCount: boolean; multipleAlmEnabled: boolean; onDelete: (definitionKey: string) => void; onUpdateDefinitions: () => void; } export default function GitlabTab(props: GitlabTabProps) { - const { branchesEnabled, component, multipleAlmEnabled, definitions, loading } = props; + const { + branchesEnabled, + component, + multipleAlmEnabled, + definitions, + loadingAlmDefinitions, + loadingProjectCount + } = props; return (
@@ -61,7 +69,8 @@ export default function GitlabTab(props: GitlabTabProps) { } ]} form={childProps => } - loading={loading} + loadingAlmDefinitions={loadingAlmDefinitions} + loadingProjectCount={loadingProjectCount} multipleAlmEnabled={multipleAlmEnabled} onDelete={props.onDelete} onUpdateDefinitions={props.onUpdateDefinitions} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionsTable-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionsTable-test.tsx index b75674c56c2..ab0455f10a9 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionsTable-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionsTable-test.tsx @@ -36,6 +36,7 @@ it('should render correctly', () => { ] }) ).toMatchSnapshot('additional columns'); + expect(shallowRender()).toMatchSnapshot('loading'); expect(shallowRender({ alm: AlmKeys.GitLab })).toMatchSnapshot('title adjusts for GitLab'); }); @@ -69,6 +70,7 @@ function shallowRender(props: Partial = {}) { additionalColumnsHeaders={[]} alm={AlmKeys.Azure} definitions={[]} + loading={false} onCreate={jest.fn()} onDelete={jest.fn()} onEdit={jest.fn()} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-test.tsx index 1e6a791f8b5..4940b4370ab 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-test.tsx @@ -85,7 +85,7 @@ it('should fetch settings', async () => { .then(() => { expect(getAlmDefinitions).toBeCalled(); expect(wrapper.state().definitions).toEqual({ github: [] }); - expect(wrapper.state().loading).toBe(false); + expect(wrapper.state().loadingAlmDefinitions).toBe(false); }); }); diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegrationRenderer-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegrationRenderer-test.tsx index 1752860997f..c23e364d9c4 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegrationRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegrationRenderer-test.tsx @@ -24,7 +24,9 @@ import AlmIntegrationRenderer, { AlmIntegrationRendererProps } from '../AlmInteg it('should render correctly', () => { expect(shallowRender()).toMatchSnapshot('default'); - expect(shallowRender({ loading: true })).toMatchSnapshot('loading'); + expect(shallowRender({ loadingAlmDefinitions: true, loadingProjectCount: true })).toMatchSnapshot( + 'loading' + ); expect(shallowRender({ definitionKeyForDeletion: 'keyToDelete' })).toMatchSnapshot( 'delete modal' ); @@ -39,7 +41,8 @@ function shallowRender(props: Partial = {}) { branchesEnabled={true} currentAlm={AlmKeys.GitHub} definitions={{ azure: [], bitbucket: [], github: [], gitlab: [] }} - loading={false} + loadingAlmDefinitions={false} + loadingProjectCount={false} multipleAlmEnabled={false} onCancel={jest.fn()} onConfirmDelete={jest.fn()} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTab-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTab-test.tsx index a6172bb85bb..2b1a6c45835 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTab-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTab-test.tsx @@ -98,7 +98,8 @@ function shallowRender(props: Partial['props']> = defaultBinding={DEFAULT_BINDING} definitions={[mockAzureBindingDefinition()]} form={jest.fn()} - loading={false} + loadingAlmDefinitions={false} + loadingProjectCount={false} multipleAlmEnabled={true} onDelete={jest.fn()} onUpdateDefinitions={jest.fn()} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTabRenderer-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTabRenderer-test.tsx index 4514ccf263f..63b1a2b0258 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTabRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTabRenderer-test.tsx @@ -24,7 +24,9 @@ import { AlmKeys, GithubBindingDefinition } from '../../../../../types/alm-setti import AlmTabRenderer, { AlmTabRendererProps } from '../AlmTabRenderer'; it('should render correctly for multi-ALM binding', () => { - expect(shallowRender({ loading: true })).toMatchSnapshot('loading'); + expect(shallowRender({ loadingAlmDefinitions: true })).toMatchSnapshot('loading ALM definitions'); + expect(shallowRender({ loadingProjectCount: true })).toMatchSnapshot('loading project count'); + expect(shallowRender({ submitting: true })).toMatchSnapshot('submitting'); expect(shallowRender()).toMatchSnapshot('loaded'); expect(shallowRender({ editedDefinition: mockGithubBindingDefinition() })).toMatchSnapshot( 'editing a definition' @@ -48,7 +50,9 @@ it('should render correctly for multi-ALM binding', () => { }); it('should render correctly for single-ALM binding', () => { - expect(shallowRender({ loading: true, multipleAlmEnabled: false })).toMatchSnapshot(); + expect( + shallowRender({ loadingAlmDefinitions: true, multipleAlmEnabled: false }) + ).toMatchSnapshot(); expect(shallowRender({ multipleAlmEnabled: false })).toMatchSnapshot(); expect( shallowRender({ definitions: [mockGithubBindingDefinition()], multipleAlmEnabled: false }) @@ -64,13 +68,15 @@ function shallowRender(props: Partial diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AzureTab-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AzureTab-test.tsx index 5b2389dda7c..ef7fe85ee3d 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AzureTab-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AzureTab-test.tsx @@ -30,7 +30,8 @@ function shallowRender(props: Partial = {}) { return shallow( = {}) { return shallow( = {}) { = {}) { +
+ + + + + + + + + + + + + +
+ settings.almintegration.table.column.name + + settings.almintegration.table.column.edit + + settings.almintegration.table.column.delete +
+ settings.almintegration.table.empty.azure +
+ +`; + exports[`should render correctly: title adjusts for GitLab 1`] = `
`; -exports[`should render correctly for multi-ALM binding: loading 1`] = ` +exports[`should render correctly for multi-ALM binding: loading ALM definitions 1`] = `
@@ -130,6 +132,79 @@ exports[`should render correctly for multi-ALM binding: loading 1`] = ` }, ] } + loading={false} + onCreate={[MockFunction]} + onDelete={[MockFunction]} + onEdit={[MockFunction]} + /> + +
+`; + +exports[`should render correctly for multi-ALM binding: loading project count 1`] = ` +
+ + + +
+`; + +exports[`should render correctly for multi-ALM binding: submitting 1`] = ` +
+ + } hideKeyField={true} - loading={false} + loading={true} onCancel={[MockFunction]} onDelete={[MockFunction]} onEdit={[MockFunction]} @@ -320,7 +396,7 @@ exports[`should render correctly for single-ALM binding 3`] = ` /> } hideKeyField={true} - loading={false} + loading={true} onCancel={[MockFunction]} onDelete={[MockFunction]} onEdit={[MockFunction]} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureTab-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureTab-test.tsx.snap index b5eda86fe17..35b9a582a23 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureTab-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureTab-test.tsx.snap @@ -32,7 +32,8 @@ exports[`should render correctly 1`] = ` ] } form={[Function]} - loading={false} + loadingAlmDefinitions={false} + loadingProjectCount={false} multipleAlmEnabled={true} onDelete={[MockFunction]} onUpdateDefinitions={[MockFunction]} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketTab-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketTab-test.tsx.snap index 35279875066..c09ac23275d 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketTab-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketTab-test.tsx.snap @@ -102,7 +102,8 @@ exports[`should render correctly 1`] = `

} - loading={false} + loadingAlmDefinitions={false} + loadingProjectCount={false} multipleAlmEnabled={true} onDelete={[MockFunction]} onUpdateDefinitions={[MockFunction]} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubTab-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubTab-test.tsx.snap index aaf2b45033d..bab4629b9d0 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubTab-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubTab-test.tsx.snap @@ -48,7 +48,8 @@ exports[`should render correctly: with branch support 1`] = ` ] } form={[Function]} - loading={false} + loadingAlmDefinitions={false} + loadingProjectCount={false} multipleAlmEnabled={true} onDelete={[MockFunction]} onUpdateDefinitions={[MockFunction]} diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabTab-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabTab-test.tsx.snap index 92b5d755cdd..a039ff5b3ee 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabTab-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabTab-test.tsx.snap @@ -43,7 +43,8 @@ exports[`should render correctly: with branch support 1`] = ` ] } form={[Function]} - loading={false} + loadingAlmDefinitions={false} + loadingProjectCount={false} multipleAlmEnabled={true} onDelete={[MockFunction]} onUpdateDefinitions={[MockFunction]} -- 2.39.5