@automattic/jetpack-components 0.45.9 → 0.46.0

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## [0.46.0] - 2024-01-18
+### Changed
+- Use blog ID for links instead of site slug. [#34950]
+
+## [0.45.10] - 2024-01-04
+### Changed
+- Updated package dependencies. [#34815] [#34816]
+
+### Fixed
+- Added consistency for Jetpack footer links [#34787]
+
 ## [0.45.9] - 2024-01-02
 ### Changed
 - Updated the design and fixed a11y for Quick Share buttons. [#34754]
@@ -910,6 +921,8 @@
 ### Changed
 - Update node version requirement to 14.16.1
 
+[0.46.0]: https://github.com/Automattic/jetpack-components/compare/0.45.10...0.46.0
+[0.45.10]: https://github.com/Automattic/jetpack-components/compare/0.45.9...0.45.10
 [0.45.9]: https://github.com/Automattic/jetpack-components/compare/0.45.8...0.45.9
 [0.45.8]: https://github.com/Automattic/jetpack-components/compare/0.45.7...0.45.8
 [0.45.7]: https://github.com/Automattic/jetpack-components/compare/0.45.6...0.45.7

package/components/admin-page/types.ts

@@ -33,4 +33,9 @@ export type AdminPageProps = {
 	 * Whether or not to display the Background Color
 	 */
 	showBackground?: boolean;
+
+	/**
+	 * URL of the site WP Admin.
+	 */
+	siteAdminUrl?: string;
 };

package/components/jetpack-footer/README.md

@@ -18,4 +18,3 @@ It takes moduleName and URL to show in the footer.
 - `onAboutClick`: () => void - (default: `undefined`) function called when the About link is clicked.
 - `onPrivacyClick`: () => void - (default: `undefined`) function called when the Privacy link is clicked.
 - `onTermsClick`: () => void - (default: `undefined`) function called when the Terms link is clicked.
-- `siteAdminUrl`: String - (default: `undefined`) URL of the site WP Admin. Required to link to internal pages when applicable (e.g., Privacy).

package/components/jetpack-footer/index.tsx

@@ -5,6 +5,7 @@ import classnames from 'classnames';
 import React from 'react';
 import { getRedirectUrl } from '../..';
 import { STORE_ID as CONNECTION_STORE_ID } from '../../../../js-packages/connection/state/store';
+import getSiteAdminUrl from '../../tools/get-site-admin-url';
 import AutomatticBylineLogo from '../automattic-byline-logo';
 import './style.scss';
 import JetpackLogo from '../jetpack-logo';
@@ -26,7 +27,6 @@ const JetpackFooter: React.FC< JetpackFooterProps > = ( {
 	className,
 	moduleNameHref = 'https://jetpack.com',
 	menu,
-	siteAdminUrl,
 	onAboutClick,
 	onPrivacyClick,
 	onTermsClick,
@@ -50,7 +50,7 @@ const JetpackFooter: React.FC< JetpackFooterProps > = ( {
 		},
 		[ CONNECTION_STORE_ID ]
 	);
-
+	const siteAdminUrl = getSiteAdminUrl();
 	const areAdminLinksEnabled =
 		siteAdminUrl &&
 		// Some admin pages require the site to be connected (e.g., Privacy)
@@ -65,7 +65,7 @@ const JetpackFooter: React.FC< JetpackFooterProps > = ( {
 			href: areAdminLinksEnabled
 				? new URL( 'admin.php?page=jetpack_about', siteAdminUrl ).href
 				: getRedirectUrl( 'jetpack-about' ),
-			target: '_blank',
+			target: areAdminLinksEnabled ? '_self' : '_blank',
 			onClick: onAboutClick,
 		},
 		{

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.45.9",
+	"version": "0.46.0",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
@@ -15,16 +15,16 @@
 	},
 	"dependencies": {
 		"@automattic/format-currency": "1.0.1",
-		"@automattic/jetpack-boost-score-api": "^0.1.18",
+		"@automattic/jetpack-boost-score-api": "^0.1.19",
 		"@babel/runtime": "^7",
-		"@wordpress/browserslist-config": "5.30.0",
-		"@wordpress/components": "25.13.0",
-		"@wordpress/compose": "6.24.0",
-		"@wordpress/data": "9.17.0",
-		"@wordpress/date": "4.47.0",
-		"@wordpress/element": "5.24.0",
-		"@wordpress/i18n": "4.47.0",
-		"@wordpress/icons": "9.38.0",
+		"@wordpress/browserslist-config": "5.31.0",
+		"@wordpress/components": "25.14.0",
+		"@wordpress/compose": "6.25.0",
+		"@wordpress/data": "9.18.0",
+		"@wordpress/date": "4.48.0",
+		"@wordpress/element": "5.25.0",
+		"@wordpress/i18n": "4.48.0",
+		"@wordpress/icons": "9.39.0",
 		"classnames": "2.3.2",
 		"prop-types": "^15.7.2",
 		"qrcode.react": "3.1.0",
@@ -34,7 +34,7 @@
 		"uplot-react": "1.1.4"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-base-styles": "^0.6.14",
+		"@automattic/jetpack-base-styles": "^0.6.15",
 		"@babel/core": "7.23.5",
 		"@babel/preset-react": "7.23.3",
 		"@jest/globals": "29.4.3",
@@ -43,8 +43,8 @@
 		"@storybook/react": "7.6.5",
 		"@testing-library/dom": "9.3.3",
 		"@testing-library/react": "14.1.2",
-		"@testing-library/user-event": "14.5.1",
-		"@types/jest": "29.5.10",
+		"@testing-library/user-event": "14.5.2",
+		"@types/jest": "29.5.11",
 		"@types/qrcode.react": "1.0.4",
 		"@types/react": "18.2.33",
 		"@types/react-dom": "18.2.14",

package/tools/get-site-admin-url/README.md

@@ -0,0 +1,10 @@
+# GetSiteAdminUrl
+
+The `getsiteadminurl` tool is a utility that retrieves the URL of the site administrator for a given website. It is designed to unify the process of obtaining the admin URL.
+
+## Usage
+
+```jsx
+import { getSiteAdminUrl } from '@automattic/jetpack-components';
+getSiteAdminUrl();
+```

package/tools/get-site-admin-url/index.ts

@@ -0,0 +1,14 @@
+import './types.ts';
+/**
+ * Returns the site admin URL.
+ *
+ * @returns {?string} The site admin URL or null if not available.
+ */
+export default function getSiteAdminUrl() {
+	return (
+		window.Initial_State?.adminUrl ||
+		window.Jetpack_Editor_Initial_State?.adminUrl ||
+		window?.myJetpackInitialState?.adminUrl ||
+		null
+	);
+}

package/tools/get-site-admin-url/types.ts

@@ -0,0 +1,14 @@
+declare global {
+	interface Window {
+		Initial_State?: {
+			adminUrl?: string;
+		};
+		Jetpack_Editor_Initial_State?: {
+			adminUrl?: string;
+		};
+		myJetpackInitialState?: {
+			adminUrl?: string;
+		};
+	}
+}
+export {};

package/tools/jp-redirect/README.md

@@ -25,7 +25,7 @@ This is optional and allows you to pass an object with more parameters to build
 
 This is not a complete list as any argument passed here will be sent to as a query parameter to the Redirect server. These parameters will not necessarily be passed over to the final destination URL. If you want to add a parameter to the final destination URL, use the `query` argument.
 
-* **site**: Optional (but recommended). This is used to identify the site and also to fill in the `[site]` placeholder in the target. Will default to the value of `jetpack_redirects.currentSiteRawUrl`, if available.
+* **site**: Optional (but recommended). This is used to identify the site and also to fill in the `[site]` placeholder in the target. Will default to the value of `jetpack_redirects.currentBlogID` or `jetpack_redirects.currentSiteRawUrl`, if available.
 
 * **path**: Optional. Used to fill in the `[path]` placeholder in the target.
 

package/tools/jp-redirect/index.ts

@@ -47,7 +47,7 @@ export default function getRedirectUrl( source: string, args: GetRedirectUrlArgs
 		typeof jetpack_redirects !== 'undefined' &&
 		jetpack_redirects.hasOwnProperty( 'currentSiteRawUrl' )
 	) {
-		queryVars.site = jetpack_redirects.currentSiteRawUrl;
+		queryVars.site = jetpack_redirects.currentBlogID ?? jetpack_redirects.currentSiteRawUrl;
 	}
 
 	if ( calypsoEnv ) {

package/tools/jp-redirect/types.ts

@@ -45,5 +45,6 @@ declare global {
 	}
 	const jetpack_redirects: {
 		currentSiteRawUrl?: string;
+		currentBlogID?: string;
 	};
 }