Skip to content

Commit 845fb3a

Browse files
authored
Forms: remove integrations loading spinner (#45373)
1 parent a109576 commit 845fb3a

File tree

3 files changed

+53
-68
lines changed

3 files changed

+53
-68
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: fixed
3+
4+
Forms: remove integrations loading spinner.

projects/packages/forms/src/dashboard/integrations/index.tsx

Lines changed: 49 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* External dependencies
33
*/
44
import jetpackAnalytics from '@automattic/jetpack-analytics';
5-
import { Spinner } from '@wordpress/components';
65
import { __ } from '@wordpress/i18n';
76
import { useState, useCallback } from 'react';
87
/**
@@ -22,7 +21,7 @@ import './style.scss';
2221
import type { Integration } from '../../types';
2322

2423
const Integrations = () => {
25-
const { integrations, refreshIntegrations, isLoading } = useIntegrationsStatus();
24+
const { integrations, refreshIntegrations } = useIntegrationsStatus();
2625
const [ expandedCards, setExpandedCards ] = useState( {
2726
akismet: false,
2827
googleSheets: false,
@@ -88,65 +87,54 @@ const Integrations = () => {
8887
) }
8988
</div>
9089
</div>
91-
<div
92-
className={
93-
'jp-forms__integrations-body' +
94-
( isLoading ? ' jp-forms__integrations-body--loading' : '' )
95-
}
96-
>
97-
{ isLoading ? (
98-
<Spinner />
99-
) : (
100-
<>
101-
{ akismetData && (
102-
<AkismetDashboardCard
103-
isExpanded={ expandedCards.akismet }
104-
onToggle={ handleToggleAkismet }
105-
data={ akismetData }
106-
refreshStatus={ refreshIntegrations }
107-
/>
108-
) }
109-
{ googleDriveData && (
110-
<GoogleSheetsDashboardCard
111-
isExpanded={ expandedCards.googleSheets }
112-
onToggle={ handleToggleGoogleSheets }
113-
data={ googleDriveData }
114-
refreshStatus={ refreshIntegrations }
115-
/>
116-
) }
117-
{ crmData && (
118-
<JetpackCRMDashboardCard
119-
isExpanded={ expandedCards.crm }
120-
onToggle={ handleToggleCRM }
121-
data={ crmData }
122-
refreshStatus={ refreshIntegrations }
123-
/>
124-
) }
125-
{ mailpoetData && (
126-
<MailPoetDashboardCard
127-
isExpanded={ expandedCards.mailpoet }
128-
onToggle={ handleToggleMailPoet }
129-
data={ mailpoetData }
130-
refreshStatus={ refreshIntegrations }
131-
/>
132-
) }
133-
{ salesforceData && (
134-
<SalesforceDashboardCard
135-
isExpanded={ expandedCards.salesforce }
136-
onToggle={ handleToggleSalesforce }
137-
data={ salesforceData }
138-
refreshStatus={ refreshIntegrations }
139-
/>
140-
) }
141-
{ creativeMailData && (
142-
<CreativeMailDashboardCard
143-
isExpanded={ expandedCards.creativemail }
144-
onToggle={ handleToggleCreativeMail }
145-
data={ creativeMailData }
146-
refreshStatus={ refreshIntegrations }
147-
/>
148-
) }
149-
</>
90+
<div className="jp-forms__integrations-body">
91+
{ akismetData && (
92+
<AkismetDashboardCard
93+
isExpanded={ expandedCards.akismet }
94+
onToggle={ handleToggleAkismet }
95+
data={ akismetData }
96+
refreshStatus={ refreshIntegrations }
97+
/>
98+
) }
99+
{ googleDriveData && (
100+
<GoogleSheetsDashboardCard
101+
isExpanded={ expandedCards.googleSheets }
102+
onToggle={ handleToggleGoogleSheets }
103+
data={ googleDriveData }
104+
refreshStatus={ refreshIntegrations }
105+
/>
106+
) }
107+
{ crmData && (
108+
<JetpackCRMDashboardCard
109+
isExpanded={ expandedCards.crm }
110+
onToggle={ handleToggleCRM }
111+
data={ crmData }
112+
refreshStatus={ refreshIntegrations }
113+
/>
114+
) }
115+
{ mailpoetData && (
116+
<MailPoetDashboardCard
117+
isExpanded={ expandedCards.mailpoet }
118+
onToggle={ handleToggleMailPoet }
119+
data={ mailpoetData }
120+
refreshStatus={ refreshIntegrations }
121+
/>
122+
) }
123+
{ salesforceData && (
124+
<SalesforceDashboardCard
125+
isExpanded={ expandedCards.salesforce }
126+
onToggle={ handleToggleSalesforce }
127+
data={ salesforceData }
128+
refreshStatus={ refreshIntegrations }
129+
/>
130+
) }
131+
{ creativeMailData && (
132+
<CreativeMailDashboardCard
133+
isExpanded={ expandedCards.creativemail }
134+
onToggle={ handleToggleCreativeMail }
135+
data={ creativeMailData }
136+
refreshStatus={ refreshIntegrations }
137+
/>
150138
) }
151139
</div>
152140
</div>

projects/packages/forms/src/dashboard/integrations/style.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@
3131
border-radius: 8px;
3232
padding: 12px 24px;
3333

34-
&.jp-forms__integrations-body--loading {
35-
min-height: 240px;
36-
display: flex;
37-
align-items: center;
38-
justify-content: center;
39-
}
40-
4134
> div:last-of-type {
4235
border-bottom: none;
4336
}

0 commit comments

Comments
 (0)