Always display status indicator on product cards on My Jetpack (#35377)

* Always show status indicator on My Jetpack cards * changelog * Fix changelog
Automattic · Feb 2, 2024 · 202e306 · 202e306
1 parent 0a65186
commit 202e306
Show file tree

Hide file tree

Showing 24 changed files with 79 additions and 30 deletions.
diff --git a/projects/packages/my-jetpack/_inc/components/product-card/index.jsx b/projects/packages/my-jetpack/_inc/components/product-card/index.jsx
@@ -16,6 +16,8 @@ export const PRODUCT_STATUSES_LABELS = {
 	[ PRODUCT_STATUSES.INACTIVE ]: __( 'Inactive', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.NEEDS_PURCHASE ]: __( 'Inactive', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.NEEDS_PURCHASE_OR_FREE ]: __( 'Inactive', 'jetpack-my-jetpack' ),
+	[ PRODUCT_STATUSES.ABSENT ]: __( 'Inactive', 'jetpack-my-jetpack' ),
+	[ PRODUCT_STATUSES.ABSENT_WITH_PLAN ]: __( 'Inactive', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.ERROR ]: __( 'Error', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.CAN_UPGRADE ]: __( 'Active', 'jetpack-my-jetpack' ),
 };
@@ -281,14 +283,12 @@ const ProductCard = props => {
 					className={ styles.button }
 					additionalActions={ additionalActions }
 				/>
-				{ ! isAbsent && (
-					<Status
-						status={ status }
-						isFetching={ isDeactivatingStandalone }
-						isInstallingStandalone={ isInstallingStandalone }
-						isDeactivatingStandalone={ isFetching }
-					/>
-				) }
+				<Status
+					status={ status }
+					isFetching={ isDeactivatingStandalone }
+					isInstallingStandalone={ isInstallingStandalone }
+					isDeactivatingStandalone={ isFetching }
+				/>
 			</div>
 		</Card>
 	);

diff --git a/projects/packages/my-jetpack/_inc/components/product-card/status.jsx b/projects/packages/my-jetpack/_inc/components/product-card/status.jsx
@@ -16,7 +16,7 @@ const getStatusClassName = status => {
 		case PRODUCT_STATUSES.ERROR:
 			return styles.error;
 		default:
-			return '';
+			return styles.inactive;
 	}
 };
 

diff --git a/projects/packages/my-jetpack/changelog/always-show-status-indicator-my-jetpack b/projects/packages/my-jetpack/changelog/always-show-status-indicator-my-jetpack
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Update product cards on My Jetpack to always display the status indidicator.
diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json
@@ -76,7 +76,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "4.7.x-dev"
+			"dev-trunk": "4.8.x-dev"
 		},
 		"version-constants": {
 			"::PACKAGE_VERSION": "src/class-initializer.php"

diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "4.7.1-alpha",
+	"version": "4.8.0-alpha",
 	"description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme",
 	"bugs": {

diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
@@ -34,7 +34,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '4.7.1-alpha';
+	const PACKAGE_VERSION = '4.8.0-alpha';
 
 	/**
 	 * HTML container ID for the IDC screen on My Jetpack page.

diff --git a/projects/plugins/backup/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/backup/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
diff --git a/projects/plugins/boost/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/boost/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
diff --git a/projects/plugins/jetpack/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/jetpack/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
diff --git a/projects/plugins/migration/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/migration/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock
diff --git a/projects/plugins/protect/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/protect/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
diff --git a/projects/plugins/search/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/search/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
diff --git a/projects/plugins/social/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/social/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
diff --git a/projects/plugins/starter-plugin/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/starter-plugin/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
diff --git a/projects/plugins/videopress/changelog/fix-always-show-status-indicator-my-jetpack b/projects/plugins/videopress/changelog/fix-always-show-status-indicator-my-jetpack
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock