Skip to content

Commit f9d4c1f

Browse files
HardeepAsraniHardeepAsrani
authored
Merge pull request #415 from Codeinwp/chore/remove-hyve
Remove Hyve Promo
2 parents 2028aa7 + 2c501c1 commit f9d4c1f

File tree

6 files changed

+6
-156
lines changed

6 files changed

+6
-156
lines changed

‎assets/src/Components/ImportModal.js‎

Lines changed: 3 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ const ImportModal = ( {
5353
widgets: true,
5454
cleanup: false,
5555
performanceAddon: true,
56-
hyveLite: true,
5756
theme_install: themeData !== false,
5857
} );
5958
const site = tiobDash.onboarding.homeUrl || '';
@@ -62,7 +61,6 @@ const ImportModal = ( {
6261
const [ performanceAddonProgress, setPerformanceAddonProgress ] = useState(
6362
false
6463
);
65-
const [ hyveLiteProgress, setHyveLiteProgress ] = useState( false );
6664
const [ cleanupProgress, setCleanupProgress ] = useState( false );
6765
const [ pluginsProgress, setPluginsProgress ] = useState( false );
6866
const [ contentProgress, setContentProgress ] = useState( false );
@@ -261,44 +259,6 @@ const ImportModal = ( {
261259
}
262260
),
263261
},
264-
hyveLite: {
265-
title: __( 'AI Chatbot', 'templates-patterns-collection' ),
266-
icon: 'admin-comments',
267-
tooltip: createInterpolateElement(
268-
sprintf(
269-
// translators: %s is Hyve plugin name.
270-
__(
271-
'Hyve is an AI-powered chatbot that transforms your WordPress content into engaging conversations. %sHyve%s',
272-
'templates-patterns-collection'
273-
),
274-
'<a><span>',
275-
'</span><icon/></a>'
276-
),
277-
{
278-
a: (
279-
// eslint-disable-next-line jsx-a11y/anchor-has-content
280-
<a
281-
href="https://wordpress.org/plugins/hyve-lite/"
282-
target={ '_blank' }
283-
rel="external noreferrer noopener"
284-
style={ {
285-
textDecoration: 'none',
286-
display: 'inline-flex',
287-
alignItems: 'center',
288-
} }
289-
/>
290-
),
291-
icon: (
292-
<Icon
293-
size={ 10 }
294-
icon="external"
295-
style={ { marginLeft: 0 } }
296-
/>
297-
),
298-
span: <div />,
299-
}
300-
),
301-
},
302262
};
303263

304264
if ( isCleanupAllowed === 'yes' ) {
@@ -546,8 +506,7 @@ const ImportModal = ( {
546506
// console.clear();
547507
if (
548508
! pluginOptions &&
549-
! general.performanceAddon &&
550-
! general.hyveLite
509+
! general.performanceAddon
551510
) {
552511
console.log( '[S] Plugins.' );
553512
runImportContent();
@@ -656,7 +615,7 @@ const ImportModal = ( {
656615
function runPerformanceAddonInstall() {
657616
if ( ! general.performanceAddon ) {
658617
console.log( '[S] Performance Addon.' );
659-
runHyveLiteInstall();
618+
importDone();
660619
return false;
661620
}
662621
setCurrentStep( 'performanceAddon' );
@@ -670,34 +629,10 @@ const ImportModal = ( {
670629
}
671630
console.log( '[D] Performance Addon.' );
672631
setPerformanceAddonProgress( 'done' );
673-
runHyveLiteInstall();
674-
} )
675-
.catch( ( incomingError ) =>
676-
handleError( incomingError, 'performanceAddon' )
677-
);
678-
}
679-
680-
function runHyveLiteInstall() {
681-
if ( ! general.hyveLite ) {
682-
console.log( '[S] Hyve Lite.' );
683-
importDone();
684-
return false;
685-
}
686-
setCurrentStep( 'hyveLite' );
687-
console.log( '[P] Hyve Lite.' );
688-
689-
installPlugins( { 'hyve-lite': true } )
690-
.then( ( response ) => {
691-
if ( ! response.success ) {
692-
handleError( response, 'hyveLite' );
693-
return false;
694-
}
695-
console.log( '[D] Hyve Lite.' );
696-
setHyveLiteProgress( 'done' );
697632
importDone();
698633
} )
699634
.catch( ( incomingError ) =>
700-
handleError( incomingError, 'hyveLite' )
635+
handleError( incomingError, 'performanceAddon' )
701636
);
702637
}
703638

@@ -749,10 +684,6 @@ const ImportModal = ( {
749684
'Something went wrong while installing the performance addon.',
750685
'templates-patterns-collection'
751686
),
752-
hyveLite: __(
753-
'Something went wrong while installing the Hyve Lite plugin.',
754-
'templates-patterns-collection'
755-
),
756687
};
757688

758689
switch ( step ) {
@@ -774,9 +705,6 @@ const ImportModal = ( {
774705
case 'performanceAddon':
775706
setPerformanceAddonProgress( 'error' );
776707
break;
777-
case 'hyveLite':
778-
setHyveLiteProgress( 'error' );
779-
break;
780708
}
781709
setError(
782710
incomingError.data
@@ -959,7 +887,6 @@ const ImportModal = ( {
959887
customizer: customizerProgress,
960888
widgets: widgetsProgress,
961889
performanceAddon: performanceAddonProgress,
962-
hyveLite: hyveLiteProgress,
963890
} }
964891
currentStep={ currentStep }
965892
willDo={ general }

‎assets/src/Components/ImportStepper.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ const ImportStepper = ( { currentStep, progress, willDo } ) => {
5252
status: progress.performanceAddon,
5353
willDo: willDo.performanceAddon,
5454
},
55-
hyveLite: {
56-
label: __(
57-
'Installing Hyve Lite Plugin',
58-
'templates-patterns-collection'
59-
),
60-
status: progress.hyveLite,
61-
willDo: willDo.hyveLite,
62-
},
6355
};
6456

6557
return (

‎onboarding/src/Components/CustomizeControls/ImportOptionsControl.js‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -113,44 +113,6 @@ const ImportOptionsControl = ( {
113113
}
114114
),
115115
},
116-
hyveLite: {
117-
title: __( 'AI Chatbot', 'templates-patterns-collection' ),
118-
icon: 'admin-comments',
119-
tooltip: createInterpolateElement(
120-
sprintf(
121-
// translators: %1$s is the opening tag for the link %2$s is the closing tag for the link.
122-
__(
123-
'Hyve is an AI-powered chatbot that transforms your WordPress content into engaging conversations. %1$sHyve%2$s',
124-
'templates-patterns-collection'
125-
),
126-
'<a><span>',
127-
'</span><icon/></a>'
128-
),
129-
{
130-
a: (
131-
// eslint-disable-next-line jsx-a11y/anchor-has-content
132-
<a
133-
href="https://wordpress.org/plugins/hyve-lite/"
134-
target={ '_blank' }
135-
rel="external noreferrer noopener"
136-
style={ {
137-
textDecoration: 'none',
138-
display: 'inline-flex',
139-
alignItems: 'center',
140-
} }
141-
/>
142-
),
143-
icon: (
144-
<Icon
145-
size={ 10 }
146-
icon="external"
147-
style={ { marginLeft: 0 } }
148-
/>
149-
),
150-
span: <div />,
151-
}
152-
),
153-
},
154116
};
155117

156118
if ( cleanupAllowed === 'yes' ) {

‎onboarding/src/Components/ImportProgress.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const ImportProgress = ( { currentStep, actionsNb, actionsDone } ) => {
2222
'Installing Performance Features',
2323
'templates-patterns-collection'
2424
),
25-
hyveLite: __( 'Installing Chatbot', 'templates-patterns-collection' ),
2625
};
2726

2827
const increaseAmount = 100 / ( actionsNb + 1 );

‎onboarding/src/Components/Onboarding.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const Onboarding = ( { step, themeData } ) => {
1414
widgets: true,
1515
cleanup: false,
1616
performanceAddon: true,
17-
hyveLite: true,
1817
theme_install: themeData !== false,
1918
} );
2019
const [ importing, setImporting ] = useState( false );

‎onboarding/src/Components/Steps/Import.js‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ const Import = ( {
123123
function runImportPlugins() {
124124
if (
125125
! pluginOptions &&
126-
! general.performanceAddon &&
127-
! general.hyveLite
126+
! general.performanceAddon
128127
) {
129128
console.log( '[S] Plugins.' );
130129
runImportContent();
@@ -231,7 +230,7 @@ const Import = ( {
231230
function runPerformanceAddonInstall() {
232231
if ( ! general.performanceAddon ) {
233232
console.log( '[S] Performance Addon.' );
234-
runHyveLiteInstall();
233+
importDone();
235234
return false;
236235
}
237236
setCurrentStep( 'performanceAddon' );
@@ -245,37 +244,13 @@ const Import = ( {
245244
}
246245
console.log( '[D] Performance Addon.' );
247246
setActionsDone( ( prevActionsDone ) => prevActionsDone + 1 );
248-
runHyveLiteInstall();
247+
importDone();
249248
} )
250249
.catch( ( incomingError ) =>
251250
handleError( incomingError, 'performanceAddon' )
252251
);
253252
}
254253

255-
function runHyveLiteInstall() {
256-
if ( ! general.hyveLite ) {
257-
console.log( '[S] Hyve Lite.' );
258-
importDone();
259-
return false;
260-
}
261-
setCurrentStep( 'hyveLite' );
262-
console.log( '[P] Hyve Lite.' );
263-
264-
installPlugins( { 'hyve-lite': true } )
265-
.then( ( response ) => {
266-
if ( ! response.success ) {
267-
handleError( response, 'hyveLite' );
268-
return false;
269-
}
270-
console.log( '[D] Hyve Lite.' );
271-
setActionsDone( ( prevActionsDone ) => prevActionsDone + 1 );
272-
setTimeout( importDone, 2000 );
273-
} )
274-
.catch( ( incomingError ) =>
275-
handleError( incomingError, 'hyveLite' )
276-
);
277-
}
278-
279254
function importDone() {
280255
setCurrentStep( 'done' );
281256
tiobDash.cleanupAllowed = 'yes';
@@ -311,10 +286,6 @@ const Import = ( {
311286
'Something went wrong while installing the performance addon.',
312287
'templates-patterns-collection'
313288
),
314-
hyveLite: __(
315-
'Something went wrong while installing the Hyve Lite theme.',
316-
'templates-patterns-collection'
317-
),
318289
};
319290

320291
setError(

0 commit comments

Comments
 (0)