Revert "Merge pull request #8870 from google/enhancement/8726-pivot-r…

…eport-audience-tiles" This reverts commit 0beeecd, reversing changes made to 8240ccf.
google · Jul 5, 2024 · 8f873c3 · 8f873c3
1 parent b67e9a1
commit 8f873c3
Show file tree

Hide file tree

Showing 50 changed files with 700 additions and 3,384 deletions.
diff --git a/...ics-4/components/audience-segmentation/dashboard/AudienceTile/AudienceTileCitiesMetric.js b/...ics-4/components/audience-segmentation/dashboard/AudienceTile/AudienceTileCitiesMetric.js
@@ -50,15 +50,15 @@ export default function AudienceTileCitiesMetric( {
 					{ hasDimensionValues &&
 						validDimensionValues.map( ( city, index ) => (
 							<div
-								key={ city }
+								key={ city?.value }
 								className="googlesitekit-audience-segmentation-tile-metric__cities-metric"
 							>
 								<div className="googlesitekit-audience-segmentation-tile-metric__cities-metric-name">
-									{ city }
+									{ city?.value }
 								</div>
 								<div className="googlesitekit-audience-segmentation-tile-metric__cities-metric-value">
 									{ numFmt(
-										topCities?.metricValues[ index ],
+										topCities?.metricValues[ index ]?.value,
 										{
 											style: 'percent',
 											maximumFractionDigits: 1,

diff --git a/...tics-4/components/audience-segmentation/dashboard/AudienceTile/AudienceTilePagesMetric.js b/...tics-4/components/audience-segmentation/dashboard/AudienceTile/AudienceTilePagesMetric.js
@@ -68,8 +68,8 @@ export default function AudienceTilePagesMetric( {
 	const hasDimensionValues = !! validDimensionValues.length;
 
 	function ContentLinkComponent( { content } ) {
-		const pageTitle = topContentTitles[ content ];
-		const url = content;
+		const pageTitle = topContentTitles[ content?.value ];
+		const url = content?.value;
 
 		const serviceURL = useSelect( ( select ) => {
 			return ! viewOnlyDashboard
@@ -131,13 +131,14 @@ export default function AudienceTilePagesMetric( {
 						validDimensionValues.map( ( content, index ) => {
 							return (
 								<div
-									key={ content }
+									key={ content?.value }
 									className="googlesitekit-audience-segmentation-tile-metric__page-metric-container"
 								>
 									<ContentLinkComponent content={ content } />
 									<div className="googlesitekit-audience-segmentation-tile-metric__page-metric-value">
 										{ numFmt(
 											topContent?.metricValues[ index ]
+												?.value
 										) }
 									</div>
 								</div>

diff --git a/...s/js/modules/analytics-4/components/audience-segmentation/dashboard/AudienceTile/index.js b/...s/js/modules/analytics-4/components/audience-segmentation/dashboard/AudienceTile/index.js
@@ -51,21 +51,25 @@ import ChangeBadge from '../../../../../../components/ChangeBadge';
 import InfoTooltip from '../../../../../../components/InfoTooltip';
 import PartialDataBadge from '../PartialDataBadge';
 import PartialDataNotice from '../PartialDataNotice';
-import { getDataFromRows, collectAudienceRows } from './utils';
 import { numFmt } from '../../../../../../util';
 import AudienceTileCollectingData from './AudienceTileCollectingData';
 import AudienceTileCollectingDataHideable from './AudienceTileCollectingDataHideable';
 
+// TODO: as part of #8484 the report props should be updated to expect
+// the full report rows for the current tile to reduce data manipulation
+// in AudienceTiles.
 export default function AudienceTile( {
 	loaded,
 	title,
 	infoTooltip,
-	reportRow,
-	previousReportRow,
-	topCitiesReport,
-	topContentReport,
-	topContentTitlesReport,
-	totalPageviewsReport,
+	visitors,
+	visitsPerVisitor,
+	pagesPerVisit,
+	pageviews,
+	percentageOfTotalPageViews,
+	topCities,
+	topContent,
+	topContentTitles,
 	Widget,
 	audienceResourceName,
 	isZeroData,
@@ -75,45 +79,6 @@ export default function AudienceTile( {
 } ) {
 	const breakpoint = useBreakpoint();
 
-	const topCitiesReportRows = collectAudienceRows(
-		audienceResourceName,
-		topCitiesReport?.rows
-	);
-
-	const topContentReportRows = collectAudienceRows(
-		audienceResourceName,
-		topContentReport?.rows
-	);
-
-	const topContentTitlesReportRows = collectAudienceRows(
-		audienceResourceName,
-		topContentTitlesReport?.rows,
-		2
-	);
-
-	const totalPageViews =
-		Number(
-			totalPageviewsReport?.totals?.[ 0 ]?.metricValues?.[ 0 ]?.value
-		) || 0;
-
-	const {
-		visitors,
-		visitsPerVisitor,
-		pagesPerVisit,
-		pageviews,
-		percentageOfTotalPageViews,
-		topCities,
-		topContent,
-		topContentTitles,
-	} = getDataFromRows( {
-		reportRow,
-		previousReportRow,
-		topCitiesReportRows,
-		topContentReportRows,
-		topContentTitlesReportRows,
-		totalPageViews,
-	} );
-
 	const isPropertyPartialData = useSelect( ( select ) => {
 		const propertyID = select( MODULES_ANALYTICS_4 ).getPropertyID();
 
@@ -312,7 +277,6 @@ AudienceTile.propTypes = {
 	topCities: PropTypes.object,
 	topContent: PropTypes.object,
 	topContentTitles: PropTypes.object,
-	totalPageviewsReport: PropTypes.object,
 	Widget: PropTypes.elementType.isRequired,
 	audienceResourceName: PropTypes.string.isRequired,
 	isZeroData: PropTypes.bool,