Merge branch 'develop' into issue/9284-refactor-AuthError-error-notif…

…ication-use-new-notifications-datastore.

.eslintrc.staged.json

@@ -1,4 +1,6 @@
 {
 	"extends": [ "./.eslintrc.json" ],
-	"rules": {}
+	"rules": {
+		"sitekit/no-storybook-scenario-label": "error"
+	}
 }

.github/workflows/php-lint-tests.yml

@@ -105,6 +105,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install SVN
+        run: sudo apt-get update && sudo apt-get install -y subversion
+
       - uses: shivammathur/setup-php@v2
         with:
           extensions: mysqli, runkit7, uopz

.github/workflows/zips.yml

@@ -226,6 +226,10 @@ jobs:
     needs: build-zips
     timeout-minutes: 20
     steps:
+      - name: Install SVN ( Subversion )
+        run: |
+          sudo apt-get update
+          sudo apt-get install subversion
       - uses: actions/download-artifact@v4
         with:
           name: zip-files
@@ -242,7 +246,7 @@ jobs:
           SVN_PASSWORD: no-op-password
           SVN_USERNAME: no-op-username
           VERSION: ${{ inputs.release_version }}
-  
+
   publish-to-wporg:
     name: Publish to WordPress.org
     runs-on: ubuntu-latest
@@ -251,6 +255,10 @@ jobs:
     needs: build-zips
     timeout-minutes: 20
     steps:
+      - name: Install SVN ( Subversion )
+        run: |
+          sudo apt-get update
+          sudo apt-get install subversion
       - uses: actions/download-artifact@v4
         with:
           name: zip-files

.storybook/storybook-data.js

@@ -10,47 +10,6 @@ module.exports = [
 	 * rendered and the lack of a readySelector in the corresponding test here
 	 * indicates that we're not expecting render to occur.
 	 */
-	{
-		id: 'global-layout--layout-with-header-footer-and-ctas',
-		kind: 'Global/Layout',
-		name: 'Layout with Header Footer and CTAs',
-		story: 'Layout with Header Footer and CTAs',
-		parameters: {
-			fileName: './stories/layout.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'global-layout--layout-with-header-and-footer',
-		kind: 'Global/Layout',
-		name: 'Layout with Header and Footer',
-		story: 'Layout with Header and Footer',
-		parameters: {
-			fileName: './stories/layout.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'global--links',
-		kind: 'Global',
-		name: 'Links',
-		story: 'Links',
-		parameters: {
-			fileName: './stories/links.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-				hoverSelector: '.googlesitekit-cta-link--hover',
-				onReadyScript: 'mouse.js',
-			},
-		},
-	},
 	{
 		id: 'adsense-module-components-module-overview-widget--loaded',
 		kind: 'AdSense Module',
@@ -66,153 +25,4 @@ module.exports = [
 			},
 		},
 	},
-	{
-		id: 'global--page-headers',
-		kind: 'Global',
-		name: 'Page Headers',
-		story: 'Page Headers',
-		parameters: {
-			fileName: './stories/page-header.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'global--progress-bars',
-		kind: 'Global',
-		name: 'Progress Bars',
-		story: 'Progress Bars',
-		parameters: {
-			fileName: './stories/progress-bars.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'global--radios',
-		kind: 'Global',
-		name: 'Radios',
-		story: 'Radios',
-		parameters: {
-			fileName: './stories/radio.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'global--selects',
-		kind: 'Global',
-		name: 'Selects',
-		story: 'Selects',
-		parameters: {
-			fileName: './stories/select.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-				delay: 3000,
-				clickSelector: '.googlesitekit-story-select-click',
-				postInteractionWait: 3000,
-				onReadyScript: 'mouse.js',
-			},
-		},
-	},
-	{
-		id: 'settings--settings-tabs',
-		kind: 'Settings',
-		name: 'Settings Tabs',
-		story: 'Settings Tabs',
-		parameters: {
-			fileName: './stories/settings.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-				delay: 3000,
-			},
-		},
-	},
-	{
-		id: 'settings--connected-services',
-		kind: 'Settings',
-		name: 'Connected Services',
-		story: 'Connected Services',
-		parameters: {
-			fileName: './stories/settings.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-				delay: 1000,
-			},
-		},
-	},
-	{
-		id: 'settings--connect-more-services',
-		kind: 'Settings',
-		name: 'Connect More Services',
-		story: 'Connect More Services',
-		parameters: {
-			fileName: './stories/settings.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'settings--admin-settings',
-		kind: 'Settings',
-		name: 'Admin Settings',
-		story: 'Admin Settings',
-		parameters: {
-			fileName: './stories/settings.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'setup-using-gcp--step-one',
-		kind: 'Setup / Using GCP',
-		name: 'Step One',
-		story: 'Step One',
-		parameters: {
-			fileName: './stories/setup.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'global--switches',
-		kind: 'Global',
-		name: 'Switches',
-		story: 'Switches',
-		parameters: {
-			fileName: './stories/switch.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
-	{
-		id: 'global--visually-hidden',
-		kind: 'Global',
-		name: 'Visually Hidden',
-		story: 'Visually Hidden',
-		parameters: {
-			fileName: './stories/visually-hidden.stories.js',
-			options: {
-				hierarchyRootSeparator: '|',
-				hierarchySeparator: {},
-			},
-		},
-	},
 ];

assets/js/components/Accordion.stories.js

@@ -0,0 +1,63 @@
+/**
+ * Accordion Component Stories.
+ *
+ * Site Kit by Google, Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Internal dependencies
+ */
+import Accordion from './Accordion';
+
+function Template() {
+	return (
+		<div className="js">
+			<Accordion title="First" initialOpen>
+				Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc
+				vestibulum varius felis, in eleifend eros. Duis vel dolor
+				sagittis, tincidunt sapien at, sagittis sem.
+			</Accordion>
+			<Accordion title="Second">
+				Fusce pretium ac eros vel sollicitudin. Nulla commodo suscipit
+				quam vel feugiat. Donec dictum sodales justo, id malesuada
+				tortor euismod bibendum.
+			</Accordion>
+			<Accordion title="Third">
+				Morbi sollicitudin suscipit erat, vel ullamcorper erat tincidunt
+				et. Nulla vel efficitur sapien. Phasellus facilisis, augue id
+				rhoncus cursus, dolor mauris porta arcu, vel volutpat urna ipsum
+				non purus.
+			</Accordion>
+			<Accordion title="Fourth">
+				Quisque lacus magna, congue eu purus vitae, tristique molestie
+				magna. Ut in elit erat. Ut a libero in ante ultricies efficitur.
+				Quisque laoreet semper magna ac mollis.
+			</Accordion>
+			<Accordion title="Disabled" disabled>
+				Fusce sit amet tellus neque. Praesent egestas dapibus ipsum vel
+				vulputate. Nunc massa ante, interdum eget semper nec, malesuada
+				congue neque. Vestibulum ante ipsum primis in faucibus.
+			</Accordion>
+		</div>
+	);
+}
+
+export const DefaultAccordion = Template.bind( {} );
+DefaultAccordion.storyName = 'Accordion';
+
+export default {
+	title: 'Components/Accordion',
+	component: Accordion,
+};

assets/js/components/DashboardMainApp.js

@@ -46,7 +46,6 @@ import {
 	AudienceSegmentationSetupCTAWidget,
 	AudienceSelectionPanel,
 } from '../modules/analytics-4/components/audience-segmentation/dashboard';
-import ReaderRevenueManagerSetupCTABanner from '../modules/reader-revenue-manager/components/dashboard/ReaderRevenueManagerSetupCTABanner';
 import EntitySearchInput from './EntitySearchInput';
 import DateRangeSelector from './DateRangeSelector';
 import HelpMenu from './help/HelpMenu';
@@ -88,7 +87,6 @@ import {
 
 export default function DashboardMainApp() {
 	const audienceSegmentationEnabled = useFeature( 'audienceSegmentation' );
-	const readerRevenueManagerEnabled = useFeature( 'rrmModule' );
 
 	const [ showSurveyPortal, setShowSurveyPortal ] = useState( false );
 
@@ -276,14 +274,6 @@ export default function DashboardMainApp() {
 				</Fragment>
 			) }
 
-			{ ! viewOnlyDashboard && (
-				<Fragment>
-					{ readerRevenueManagerEnabled && (
-						<ReaderRevenueManagerSetupCTABanner />
-					) }
-				</Fragment>
-			) }
-
 			<Notifications
 				areaSlug={ NOTIFICATION_AREAS.BANNERS_BELOW_NAV }
 				groupID={ NOTIFICATION_GROUPS.SETUP_CTAS }