Merge pull request Automattic#13874 from Automattic/fix/wpsc-empty-in…

…itial-state

Extensions: WPSC - Handle empty initial state

client/extensions/wp-super-cache/advanced-tab.jsx

@@ -24,7 +24,6 @@ const AdvancedTab = ( {
  is_cache_enabled,
  is_super_cache_enabled,
  },
- siteUrl,
 } ) => {
  return (
  <div>
@@ -37,7 +36,7 @@ const AdvancedTab = ( {
  <RejectedUserAgents />
  <LockDown />
  { is_cache_enabled && is_super_cache_enabled &&
- <DirectlyCachedFiles siteUrl={ siteUrl } />
+ <DirectlyCachedFiles />
  }
  <FixConfig />
  </div>

client/extensions/wp-super-cache/cdn-tab.jsx

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import React from 'react';
-import { pick } from 'lodash';
+import { get, pick } from 'lodash';
 
 /**
  * Internal dependencies
@@ -32,7 +32,7 @@ const CdnTab = ( {
  handleSubmitForm,
  isRequesting,
  isSaving,
- siteUrl,
+ site,
  translate,
 } ) => {
  return (
@@ -79,7 +79,7 @@ const CdnTab = ( {
  { translate(
  'The new URL to be used in place of %(url)s for rewriting. No trailing / please.',
  {
- args: { url: siteUrl },
+ args: { url: get( site, 'URL' ) },
  }
  ) }
  </FormSettingExplanation>
@@ -147,9 +147,7 @@ const CdnTab = ( {
  'off-site URL above). Use a comma as the delimiter. For pages with a large number of static files, ' +
  'this can improve browser performance. CNAMEs may also need to be configured on your CDN.',
  {
- args: {
- url: siteUrl,
- },
+ args: { url: get( site, 'URL' ) },
  components: {
  a: (
  <ExternalLink

client/extensions/wp-super-cache/contents-tab.js

@@ -20,6 +20,10 @@ import {
  successNotice,
 } from 'state/notices/actions';
 import { generateStats } from './state/stats/actions';
+import {
+ getSiteTitle,
+ isJetpackSiteMultiSite,
+} from 'state/sites/selectors';
 import {
  getStats,
  isGeneratingStats,
@@ -32,13 +36,16 @@ class ContentsTab extends Component {
  handleDeleteCache: PropTypes.func.isRequired,
  isDeleting: PropTypes.bool,
  isMultisite: PropTypes.bool,
+ site: PropTypes.object.isRequired,
+ siteTitle: PropTypes.string,
  translate: PropTypes.func.isRequired,
  };
 
  static defaultProps = {
  fields: {},
  isDeleting: false,
  isMultisite: false,
+ siteTitle: '',
  };
 
  state = {
@@ -64,13 +71,13 @@ class ContentsTab extends Component {
 
  const {
  isSuccessful,
- site,
+ siteTitle,
  translate,
  } = this.props;
 
  if ( isSuccessful ) {
  this.props.successNotice(
- translate( 'Cache stats regenerated on %(site)s.', { args: { site: site && site.title } } ),
+ translate( 'Cache stats regenerated on %(site)s.', { args: { site: siteTitle } } ),
  { id: 'wpsc-cache-stats' }
  );
  } else {
@@ -246,10 +253,14 @@ const connectComponent = connect(
  const stats = getStats( state, siteId );
  const isGenerating = isGeneratingStats( state, siteId );
  const isSuccessful = isStatsGenerationSuccessful( state, siteId );
+ const isMultisite = isJetpackSiteMultiSite( state, siteId );
+ const siteTitle = getSiteTitle( state, siteId );
 
  return {
  isGenerating,
+ isMultisite,
  isSuccessful,
+ siteTitle,
  stats,
  };
  },

client/extensions/wp-super-cache/directly-cached-files.jsx

@@ -41,13 +41,11 @@ class DirectlyCachedFiles extends Component {
  isRequesting,
  isSaving,
  setFieldArrayValue,
- siteUrl,
+ site,
  translate
  } = this.props;
- const {
- cache_direct_pages = [],
- cache_path,
- } = fields;
+ const cache_direct_pages = fields.cache_direct_pages || [];
+ const cache_path = fields.cache_path || '';
  const notices = pick( this.props.notices, [
  'cache_readonly',
  'cache_writable',
@@ -98,7 +96,7 @@ class DirectlyCachedFiles extends Component {
  'For example: to cache {{em}}%(url)s/about/{{/em}}, you would enter %(url)s/about/ or /about/. ' +
  'The cached file will be generated the next time an anonymous user visits that page.',
  {
- args: { url: siteUrl },
+ args: { url: site && site.URL },
  components: { em: <em /> },
  }
  ) }

client/extensions/wp-super-cache/easy-tab.jsx

@@ -29,8 +29,6 @@ class EasyTab extends Component {
  isSaving: PropTypes.bool,
  isTesting: PropTypes.bool,
  site: PropTypes.object.isRequired,
- siteId: PropTypes.number.isRequired,
- testCache: PropTypes.func.isRequired,
  translate: PropTypes.func.isRequired,
  };
 

client/extensions/wp-super-cache/main.jsx

@@ -19,15 +19,15 @@ const WPSuperCache = ( { site, tab } ) => {
  const renderTab = () => {
  switch ( tab ) {
  case Tabs.ADVANCED:
- return <AdvancedTab siteUrl={ site.URL } />;
+ return <AdvancedTab />;
  case Tabs.CDN:
- return <CdnTab siteUrl={ site.URL } />;
+ return <CdnTab />;
  case Tabs.CONTENTS:
- return <ContentsTab isMultisite={ site.is_multisite } />;
+ return <ContentsTab />;
  case Tabs.PRELOAD:
  return <PreloadTab />;
  default:
- return <EasyTab site={ site } />;
+ return <EasyTab />;
  }
  };
 

client/extensions/wp-super-cache/navigation.jsx

@@ -48,7 +48,9 @@ const Navigation = ( { activeTab, site, translate } ) => {
  path = `${ path }/${ tab }`;
  }
 
- path += `/${ site.slug }`;
+ if ( site ) {
+ path += `/${ site.slug }`;
+ }
 
  return (
  <SectionNavTabItem
@@ -72,12 +74,12 @@ const Navigation = ( { activeTab, site, translate } ) => {
 
 Navigation.propTypes = {
  activeTab: PropTypes.string,
- site: React.PropTypes.object.isRequired,
+ site: PropTypes.object,
  translate: PropTypes.func.isRequired,
 };
 
 Navigation.defaultProps = {
- activeTab: ''
+ activeTab: '',
 };
 
 export default localize( Navigation );

client/extensions/wp-super-cache/preload-tab.jsx

@@ -150,10 +150,10 @@ class PreloadTab extends Component {
  onChange={ this.handlePreloadRefreshChange }>
  <span>
  { translate(
- 'Refresh preloaded cache files every {{number /}} minute. ',
- 'Refresh preloaded cache files every {{number /}} minutes. ',
+ 'Refresh preloaded cache files every {{number /}} minute ',
+ 'Refresh preloaded cache files every {{number /}} minutes ',
  {
- count: preload_interval,
+ count: preload_interval || 0,
  components: {
  number: renderCachePreloadInterval( {
  handleChange,
@@ -166,11 +166,11 @@ class PreloadTab extends Component {
  ) }
 
  { translate(
- '(minimum %d minute)',
- '(minimum %d minutes)',
+ '(minimum %(minutes)d minute).',
+ '(minimum %(minutes)d minutes).',
  {
- args: minimum_preload_interval,
- count: minimum_preload_interval,
+ args: { minutes: minimum_preload_interval || 0 },
+ count: minimum_preload_interval || 0,
  }
  ) }
  </span>