Add value to inactive state of VideoPress

projects/packages/connection/changelog/update-type-for-tracking-string

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix type for tracking product string

projects/packages/connection/src/class-package-version.php

@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '2.11.3';
+	const PACKAGE_VERSION = '2.11.4-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

projects/packages/connection/src/class-tracking.php

@@ -38,7 +38,7 @@ class Tracking {
 	/**
 	 * Creates the Tracking object.
 	 *
-	 * @param String                                 $product_name the slug of the product that we are tracking.
+	 * @param string                                 $product_name the slug of the product that we are tracking.
 	 * @param \Automattic\Jetpack\Connection\Manager $connection   the connection manager object.
 	 */
 	public function __construct( $product_name = 'jetpack', $connection = null ) {

projects/packages/my-jetpack/.phan/baseline.php

@@ -11,28 +11,26 @@
     // # Issue statistics:
     // PhanTypeMismatchArgumentNullable : 60+ occurrences
     // PhanTypeMismatchPropertyDefault : 15+ occurrences
-    // PhanParamTooMany : 10+ occurrences
     // PhanTypeMismatchReturnProbablyReal : 10+ occurrences
+    // PhanParamTooMany : 9 occurrences
     // PhanAbstractStaticMethodCallInStatic : 8 occurrences
-    // PhanNoopNew : 6 occurrences
-    // PhanTypeMismatchReturn : 6 occurrences
+    // PhanNoopNew : 7 occurrences
     // PhanPluginDuplicateConditionalNullCoalescing : 5 occurrences
+    // PhanTypeMismatchReturn : 5 occurrences
     // PhanTypeMismatchReturnNullable : 3 occurrences
     // PhanImpossibleCondition : 2 occurrences
     // PhanNonClassMethodCall : 2 occurrences
+    // PhanRedundantCondition : 2 occurrences
     // PhanTypeMismatchArgumentProbablyReal : 2 occurrences
     // PhanPluginMixedKeyNoKey : 1 occurrence
-    // PhanRedundantCondition : 1 occurrence
-    // PhanTypeMismatchArgumentInternal : 1 occurrence
     // PhanTypeMismatchArgumentNullableInternal : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
         'src/class-activitylog.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'src/class-initializer.php' => ['PhanImpossibleCondition', 'PhanNoopNew', 'PhanParamTooMany', 'PhanRedundantCondition', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchReturn', 'PhanTypeMismatchReturnNullable', 'PhanTypeMismatchReturnProbablyReal'],
+        'src/class-initializer.php' => ['PhanImpossibleCondition', 'PhanNoopNew', 'PhanRedundantCondition', 'PhanTypeMismatchReturn', 'PhanTypeMismatchReturnNullable'],
         'src/class-jetpack-manage.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'src/class-products.php' => ['PhanNonClassMethodCall'],
-        'src/class-rest-product-data.php' => ['PhanParamTooMany', 'PhanTypeMismatchReturn'],
         'src/class-rest-products.php' => ['PhanParamTooMany', 'PhanPluginMixedKeyNoKey', 'PhanTypeMismatchReturn', 'PhanTypeMismatchReturnProbablyReal'],
         'src/class-rest-purchases.php' => ['PhanParamTooMany', 'PhanTypeMismatchReturn', 'PhanTypeMismatchReturnProbablyReal'],
         'src/class-rest-zendesk-chat.php' => ['PhanParamTooMany'],

projects/packages/my-jetpack/_inc/components/connected-product-card/index.tsx

@@ -15,21 +15,23 @@ import useProduct from '../../data/products/use-product';
 import useAnalytics from '../../hooks/use-analytics';
 import useMyJetpackConnection from '../../hooks/use-my-jetpack-connection';
 import useMyJetpackNavigate from '../../hooks/use-my-jetpack-navigate';
+import preventWidows from '../../utils/prevent-widows';
 import ProductCard from '../product-card';
 import type { AdditionalAction, SecondaryAction } from '../product-card/types';
 import type { FC, ReactNode } from 'react';
 
 interface ConnectedProductCardProps {
 	admin: boolean;
-	recommendation: boolean;
+	recommendation?: boolean;
+	showMenu?: boolean;
 	slug: JetpackModule;
-	children: ReactNode;
+	children?: ReactNode;
 	isDataLoading?: boolean;
 	Description?: FC;
 	additionalActions?: AdditionalAction[];
 	secondaryAction?: SecondaryAction;
 	upgradeInInterstitial?: boolean;
-	primaryActionOverride?: AdditionalAction;
+	primaryActionOverride?: { [ key: string ]: AdditionalAction };
 	onMouseEnter?: () => void;
 	onMouseLeave?: () => void;
 }
@@ -85,7 +87,7 @@ const ConnectedProductCard: FC< ConnectedProductCardProps > = ( {
 
 	const DefaultDescription = () => {
 		// Replace the last space with a non-breaking space to prevent widows
-		const cardDescription = defaultDescription.replace( /\s(?=[^\s]*$)/, '\u00A0' );
+		const cardDescription = preventWidows( defaultDescription );
 
 		return (
 			<Text variant="body-small" style={ { flexGrow: 1, marginBottom: '1rem' } }>

projects/packages/my-jetpack/_inc/components/product-card/index.tsx

@@ -29,7 +29,7 @@ export type ProductCardProps = {
 	slug: JetpackModule;
 	additionalActions?: AdditionalAction[];
 	upgradeInInterstitial?: boolean;
-	primaryActionOverride?: AdditionalAction;
+	primaryActionOverride?: { [ key: string ]: AdditionalAction };
 	secondaryAction?: SecondaryAction;
 	onInstallStandalone?: InstallCallback;
 	onActivateStandalone?: () => void;

projects/packages/my-jetpack/_inc/components/product-card/types.ts

@@ -7,9 +7,10 @@ type ProductButtonProps = Pick<
 >;
 
 export type AdditionalAction = ProductButtonProps & {
-	href: string;
 	label: string;
-	onClick: () => void;
+	href?: string;
+	onClick?: () => void;
+	isExternalLink?: boolean;
 };
 
 export type SecondaryAction = ProductButtonProps & {

projects/packages/my-jetpack/_inc/components/product-cards-section/ai-card.jsx

@@ -1,7 +1,8 @@
+import { PRODUCT_SLUGS } from '../../data/constants';
 import ProductCard from '../connected-product-card';
 
 const AiCard = props => {
-	return <ProductCard slug="jetpack-ai" upgradeInInterstitial { ...props } />;
+	return <ProductCard slug={ PRODUCT_SLUGS.JETPACK_AI } upgradeInInterstitial { ...props } />;
 };
 
 export default AiCard;

projects/packages/my-jetpack/_inc/components/product-cards-section/anti-spam-card.jsx

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { PRODUCT_SLUGS } from '../../data/constants';
 import ProductCard from '../connected-product-card';
 
 const AntiSpamCard = props => {
-	return <ProductCard slug="anti-spam" { ...props } />;
+	return <ProductCard slug={ PRODUCT_SLUGS.ANTI_SPAM } { ...props } />;
 };
 
 AntiSpamCard.propTypes = {

projects/packages/my-jetpack/_inc/components/product-cards-section/backup-card/index.jsx

@@ -11,6 +11,7 @@ import {
 	REST_API_COUNT_BACKUP_ITEMS_ENDPOINT,
 	QUERY_BACKUP_HISTORY_KEY,
 	QUERY_BACKUP_STATS_KEY,
+	PRODUCT_SLUGS,
 } from '../../../data/constants';
 import useProduct from '../../../data/products/use-product';
 import useSimpleQuery from '../../../data/use-simple-query';
@@ -19,6 +20,8 @@ import useAnalytics from '../../../hooks/use-analytics';
 import ProductCard from '../../connected-product-card';
 import styles from './style.module.scss';
 
+const productSlug = PRODUCT_SLUGS.BACKUP;
+
 const getIcon = slug => {
 	switch ( slug ) {
 		case 'post':
@@ -122,15 +125,14 @@ const getTimeSinceLastRenewableEvent = lastRewindableEventTime => {
 };
 
 const BackupCard = props => {
-	const slug = 'backup';
-	const { detail } = useProduct( slug );
+	const { detail } = useProduct( productSlug );
 	const { status } = detail;
 	const hasBackups = status === PRODUCT_STATUSES.ACTIVE || status === PRODUCT_STATUSES.CAN_UPGRADE;
 
 	return hasBackups ? (
-		<WithBackupsValueSection slug={ slug } { ...props } />
+		<WithBackupsValueSection slug={ productSlug } { ...props } />
 	) : (
-		<ProductCard slug={ slug } { ...props } />
+		<ProductCard slug={ productSlug } { ...props } />
 	);
 };
 

projects/packages/my-jetpack/_inc/components/product-cards-section/boost-card/index.tsx

@@ -1,11 +1,12 @@
 import { __ } from '@wordpress/i18n';
 import { useState, useCallback } from 'react';
 import { PRODUCT_STATUSES } from '../../../constants';
+import { PRODUCT_SLUGS } from '../../../data/constants';
 import ProductCard from '../../connected-product-card';
 import BoostSpeedScore from './boost-speed-score';
-import type { FC } from 'react';
+import type { ProductCardComponent } from '../types';
 
-const BoostCard: FC< { admin: boolean } > = props => {
+const BoostCard: ProductCardComponent = props => {
 	const [ shouldShowTooltip, setShouldShowTooltip ] = useState( false );
 	// Override the primary action button to read "Boost your site" instead
 	// of the default text, "Lern more".
@@ -25,7 +26,7 @@ const BoostCard: FC< { admin: boolean } > = props => {
 
 	return (
 		<ProductCard
-			slug="boost"
+			slug={ PRODUCT_SLUGS.BOOST }
 			primaryActionOverride={ primaryActionOverride }
 			onMouseEnter={ handleMouseEnter }
 			onMouseLeave={ handleMouseLeave }

projects/packages/my-jetpack/_inc/components/product-cards-section/creator-card.jsx

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { PRODUCT_SLUGS } from '../../data/constants';
 import ProductCard from '../connected-product-card';
 
 const CreatorCard = props => {
-	return <ProductCard slug="creator" upgradeInInterstitial { ...props } />;
+	return <ProductCard slug={ PRODUCT_SLUGS.CREATOR } upgradeInInterstitial { ...props } />;
 };
 
 CreatorCard.propTypes = {

projects/packages/my-jetpack/_inc/components/product-cards-section/crm-card.jsx

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { PRODUCT_SLUGS } from '../../data/constants';
 import ProductCard from '../connected-product-card';
 
 const CrmCard = props => {
-	return <ProductCard slug="crm" { ...props } />;
+	return <ProductCard slug={ PRODUCT_SLUGS.CRM } { ...props } />;
 };
 
 CrmCard.propTypes = {

projects/packages/my-jetpack/_inc/components/product-cards-section/extras-card.jsx

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { PRODUCT_SLUGS } from '../../data/constants';
 import ProductCard from '../connected-product-card';
 
 const ExtrasCard = props => {
-	return <ProductCard slug="extras" { ...props } />;
+	return <ProductCard slug={ PRODUCT_SLUGS.EXTRAS } { ...props } />;
 };
 
 ExtrasCard.propTypes = {

projects/packages/my-jetpack/_inc/components/product-cards-section/index.tsx

@@ -1,6 +1,7 @@
 import { Container, Col, Text, AdminSectionHero } from '@automattic/jetpack-components';
 import { __ } from '@wordpress/i18n';
 import { useMemo } from 'react';
+import { PRODUCT_SLUGS } from '../../data/constants';
 import { getMyJetpackWindowInitialState } from '../../data/utils/get-my-jetpack-window-state';
 import StatsSection from '../stats-section';
 import AiCard from './ai-card';
@@ -23,7 +24,7 @@ type DisplayItemsProps = {
 
 type DisplayItemType = Record<
 	// We don't have a card for Security or Extras, and scan is displayed as protect.
-	Exclude< JetpackModule, 'extras' | 'scan' | 'security' >,
+	Exclude< JetpackModule, 'extras' | 'scan' | 'security' | 'ai' >,
 	FC< { admin: boolean } >
 >;
 
@@ -46,7 +47,7 @@ const DisplayItems: FC< DisplayItemsProps > = ( { slugs } ) => {
 	};
 
 	const filteredSlugs = slugs.filter( slug => {
-		if ( slug === 'stats' && showFullJetpackStatsCard ) {
+		if ( slug === PRODUCT_SLUGS.STATS && showFullJetpackStatsCard ) {
 			return false;
 		}
 

projects/packages/my-jetpack/_inc/components/product-cards-section/protect-card/index.tsx

@@ -1,15 +1,12 @@
-import { type FC } from 'react';
+import { PRODUCT_SLUGS } from '../../../data/constants';
 import ProductCard from '../../connected-product-card';
 import ProtectValueSection from './protect-value-section';
+import type { ProductCardComponent } from '../types';
 
-const ProtectCard: FC< { admin: boolean; recommendation?: boolean } > = props => {
-	const slug = 'protect';
-
-	return (
-		<ProductCard { ...props } slug={ slug } upgradeInInterstitial={ true }>
-			<ProtectValueSection />
-		</ProductCard>
-	);
-};
+const ProtectCard: ProductCardComponent = props => (
+	<ProductCard { ...props } slug={ PRODUCT_SLUGS.PROTECT } upgradeInInterstitial={ true }>
+		<ProtectValueSection />
+	</ProductCard>
+);
 
 export default ProtectCard;

projects/packages/my-jetpack/_inc/components/product-cards-section/search-card.jsx

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { PRODUCT_SLUGS } from '../../data/constants';
 import ProductCard from '../connected-product-card';
 
 const SearchCard = props => {
-	return <ProductCard slug="search" showMenu { ...props } />;
+	return <ProductCard slug={ PRODUCT_SLUGS.SEARCH } showMenu { ...props } />;
 };
 
 SearchCard.propTypes = {

projects/packages/my-jetpack/_inc/components/product-cards-section/social-card.jsx

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { PRODUCT_SLUGS } from '../../data/constants';
 import ProductCard from '../connected-product-card';
 
 const SocialCard = props => {
-	return <ProductCard slug="social" showMenu { ...props } />;
+	return <ProductCard slug={ PRODUCT_SLUGS.SOCIAL } showMenu { ...props } />;
 };
 
 SocialCard.propTypes = {

projects/packages/my-jetpack/_inc/components/product-cards-section/stats-card.jsx

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import { PRODUCT_SLUGS } from '../../data/constants';
 import ProductCard from '../connected-product-card';
 
 const StatsCard = props => {
-	return <ProductCard slug="stats" showMenu { ...props } />;
+	return <ProductCard slug={ PRODUCT_SLUGS.STATS } showMenu { ...props } />;
 };
 
 StatsCard.propTypes = {

projects/packages/my-jetpack/_inc/components/product-cards-section/types.ts

@@ -0,0 +1,6 @@
+import type { FC } from 'react';
+
+export type ProductCardComponent = FC< {
+	admin: boolean;
+	recommendation?: boolean;
+} >;