- { selectedTab !== 'business-services' && (
+ { selectedTab === 'search' && (
{ isLoading ? ' ' : title }
diff --git a/plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx b/plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx
index 5fba21cc55b..1f852a2b982 100644
--- a/plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx
+++ b/plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx
@@ -50,7 +50,7 @@ const tabs: Tabs = {
},
extensions: {
name: 'extensions',
- title: __( 'Browse', 'woocommerce' ),
+ title: __( 'Extensions', 'woocommerce' ),
showUpdateCount: false,
updateCount: 0,
},
diff --git a/plugins/woocommerce-admin/client/marketplace/utils/functions.tsx b/plugins/woocommerce-admin/client/marketplace/utils/functions.tsx
index 7c62b07346c..d7fbc982c15 100644
--- a/plugins/woocommerce-admin/client/marketplace/utils/functions.tsx
+++ b/plugins/woocommerce-admin/client/marketplace/utils/functions.tsx
@@ -144,6 +144,10 @@ async function fetchSearchResults(
featuredImage: product.featured_image,
productCategory: product.product_category,
color: product.color,
+ billingPeriod: product.billing_period,
+ billingPeriodInterval:
+ product.billing_period_interval,
+ currency: product.currency,
};
}
);
@@ -407,6 +411,7 @@ const subscriptionToProduct = ( subscription: Subscription ): Product => {
averageRating: null,
reviewsCount: null,
isInstallable: false,
+ currency: '',
};
};
diff --git a/plugins/woocommerce-admin/client/profile-wizard/header.js b/plugins/woocommerce-admin/client/profile-wizard/header.js
deleted file mode 100644
index 2a1590b4144..00000000000
--- a/plugins/woocommerce-admin/client/profile-wizard/header.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * External dependencies
- */
-import { Component } from '@wordpress/element';
-import { filter, isEqual } from 'lodash';
-import { Stepper } from '@woocommerce/components';
-import { updateQueryString } from '@woocommerce/navigation';
-
-/**
- * Internal dependencies
- */
-import UnsavedChangesModal from './unsaved-changes-modal';
-
-export default class ProfileWizardHeader extends Component {
- constructor( props ) {
- super( props );
- this.state = {
- showUnsavedChangesModal: false,
- };
- this.lastClickedStepKey = null;
- this.onStepClick = this.onStepClick.bind( this );
- }
-
- shouldWarnForUnsavedChanges( step ) {
- if ( typeof this.props.stepValueChanges[ step ] !== 'undefined' ) {
- const initialValues =
- this.props.stepValueChanges[ step ].initialValues;
- const currentValues =
- this.props.stepValueChanges[ step ].currentValues;
-
- if (
- Array.isArray( initialValues ) &&
- Array.isArray( currentValues )
- ) {
- initialValues.sort();
- currentValues.sort();
- }
-
- return ! isEqual( initialValues, currentValues );
- }
- return false;
- }
-
- findCurrentStep() {
- return this.props.steps.find(
- ( s ) => s.key === this.props.currentStep
- );
- }
-
- moveToLastClickedStep() {
- if ( this.lastClickedStepKey ) {
- updateQueryString( { step: this.lastClickedStepKey } );
- this.lastClickedStepKey = null;
- }
- }
-
- saveCurrentStepChanges() {
- const currentStep = this.findCurrentStep();
- if ( ! currentStep ) {
- return null;
- }
- const stepValueChanges = this.props.stepValueChanges[ currentStep.key ];
- if ( typeof stepValueChanges.onSave === 'function' ) {
- stepValueChanges.onSave();
- }
- }
-
- renderStepper() {
- const { currentStep, steps } = this.props;
- const visibleSteps = filter( steps, ( step ) => !! step.label );
- const currentStepIndex = visibleSteps.findIndex(
- ( step ) => step.key === currentStep
- );
-
- visibleSteps.forEach( ( step, index ) => {
- const previousStep = visibleSteps[ index - 1 ];
- step.isComplete = step.isComplete || index < currentStepIndex;
-
- const canClickStepLabel =
- ! previousStep || previousStep.isComplete || step.isComplete;
-
- if ( canClickStepLabel ) {
- step.onClick = this.onStepClick;
- }
- } );
- return
;
- }
-
- onStepClick( key ) {
- const { currentStep } = this.props;
- if ( this.shouldWarnForUnsavedChanges( currentStep ) ) {
- this.setState( { showUnsavedChangesModal: true } );
- this.lastClickedStepKey = key;
- } else {
- updateQueryString( { step: key } );
- }
- }
-
- render() {
- const currentStep = this.findCurrentStep();
-
- if ( ! currentStep || ! currentStep.label ) {
- return null;
- }
-
- return (
-
- { this.state.showUnsavedChangesModal && (
- {
- this.setState( { showUnsavedChangesModal: false } );
- this.moveToLastClickedStep();
- } }
- onSave={ () => {
- this.saveCurrentStepChanges();
- this.setState( { showUnsavedChangesModal: false } );
- this.moveToLastClickedStep();
- } }
- />
- ) }
- { this.renderStepper() }
-
- );
- }
-}
diff --git a/plugins/woocommerce-admin/client/profile-wizard/index.js b/plugins/woocommerce-admin/client/profile-wizard/index.js
deleted file mode 100644
index 73bbbe3b9eb..00000000000
--- a/plugins/woocommerce-admin/client/profile-wizard/index.js
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- * External dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { applyFilters } from '@wordpress/hooks';
-import { Component, createElement } from '@wordpress/element';
-import { compose } from '@wordpress/compose';
-import { identity, pick } from 'lodash';
-import { withDispatch, withSelect } from '@wordpress/data';
-import {
- getHistory,
- getNewPath,
- updateQueryString,
-} from '@woocommerce/navigation';
-import {
- NOTES_STORE_NAME,
- ONBOARDING_STORE_NAME,
- OPTIONS_STORE_NAME,
- PLUGINS_STORE_NAME,
- withPluginsHydration,
- QUERY_DEFAULTS,
-} from '@woocommerce/data';
-import { recordEvent } from '@woocommerce/tracks';
-import { getAdminLink, getSetting } from '@woocommerce/settings';
-
-/**
- * Internal dependencies
- */
-import { BusinessDetailsStep } from './steps/business-details';
-import Industry from './steps/industry';
-import ProductTypes from './steps/product-types';
-import ProfileWizardHeader from './header';
-import StoreDetails from './steps/store-details';
-import { getAdminSetting } from '~/utils/admin-settings';
-import './style.scss';
-
-const STEPS_FILTER = 'woocommerce_admin_profile_wizard_steps';
-
-class ProfileWizard extends Component {
- constructor( props ) {
- super( props );
- this.cachedActivePlugins = props.activePlugins;
- this.goToNextStep = this.goToNextStep.bind( this );
- this.trackStepValueChanges = this.trackStepValueChanges.bind( this );
- this.updateCurrentStepValues =
- this.updateCurrentStepValues.bind( this );
- this.stepValueChanges = {};
- }
-
- componentDidUpdate( prevProps ) {
- const { step: prevStep } = prevProps.query;
- const { step } = this.props.query;
- const { isError, isGetProfileItemsRequesting, createNotice } =
- this.props;
-
- const isRequestError =
- ! isGetProfileItemsRequesting && prevProps.isRequesting && isError;
- if ( isRequestError ) {
- createNotice(
- 'error',
- __(
- 'There was a problem finishing the setup wizard',
- 'woocommerce'
- )
- );
- }
-
- if ( prevStep !== step ) {
- window.document.documentElement.scrollTop = 0;
-
- recordEvent( 'storeprofiler_step_view', {
- step: this.getCurrentStep().key,
- wc_version: getSetting( 'wcVersion' ),
- } );
- }
- }
-
- componentDidMount() {
- document.body.classList.remove( 'woocommerce-admin-is-loading' );
- document.body.classList.add( 'woocommerce-profile-wizard__body' );
- document.body.classList.add( 'woocommerce-admin-full-screen' );
- document.body.classList.add( 'is-wp-toolbar-disabled' );
-
- recordEvent( 'storeprofiler_step_view', {
- step: this.getCurrentStep().key,
- wc_version: getSetting( 'wcVersion' ),
- } );
- }
-
- componentWillUnmount() {
- document.body.classList.remove( 'woocommerce-profile-wizard__body' );
- document.body.classList.remove( 'woocommerce-admin-full-screen' );
- document.body.classList.remove( 'is-wp-toolbar-disabled' );
- }
-
- /**
- * Set the initial and current values of a step to track the state of the step.
- * This is used to determine if the step has been changes or not.
- *
- * @param {string} step key of the step
- * @param {*} initialValues the initial values of the step
- * @param {*} currentValues the current values of the step
- * @param {Function} onSave a function to call when the step is saved
- */
- trackStepValueChanges( step, initialValues, currentValues, onSave ) {
- this.stepValueChanges[ step ] = {
- initialValues,
- currentValues,
- onSave,
- };
- }
-
- /**
- * Update currentValues of the given step.
- *
- * @param {string} step key of the step
- * @param {*} currentValues the current values of the step
- */
- updateCurrentStepValues( step, currentValues ) {
- if ( ! this.stepValueChanges[ step ] ) {
- return;
- }
- this.stepValueChanges[ step ].currentValues = currentValues;
- }
-
- getSteps() {
- const { profileItems } = this.props;
- const steps = [];
-
- steps.push( {
- key: 'store-details',
- container: StoreDetails,
- label: __( 'Store Details', 'woocommerce' ),
- isComplete:
- profileItems.hasOwnProperty( 'setup_client' ) &&
- profileItems.setup_client !== null,
- } );
- steps.push( {
- key: 'industry',
- container: Industry,
- label: __( 'Industry', 'woocommerce' ),
- isComplete:
- profileItems.hasOwnProperty( 'industry' ) &&
- profileItems.industry !== null,
- } );
- steps.push( {
- key: 'product-types',
- container: ProductTypes,
- label: __( 'Product Types', 'woocommerce' ),
- isComplete:
- profileItems.hasOwnProperty( 'product_types' ) &&
- profileItems.product_types !== null,
- } );
- steps.push( {
- key: 'business-details',
- container: BusinessDetailsStep,
- label: __( 'Business Details', 'woocommerce' ),
- isComplete:
- profileItems.hasOwnProperty( 'product_count' ) &&
- profileItems.product_count !== null,
- } );
- /**
- * Filter for Onboarding steps configuration.
- *
- * @filter woocommerce_admin_profile_wizard_steps
- * @param {Array.