@elementor/editor-audits 4.3.0-1063 → 4.3.0-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-audits",
-  "version": "4.3.0-1063",
+  "version": "4.3.0-beta2",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -39,19 +39,19 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "4.3.0-1063",
-    "@elementor/editor-mcp": "4.3.0-1063",
-    "@elementor/editor-app-bar": "4.3.0-1063",
-    "@elementor/editor-elements": "4.3.0-1063",
-    "@elementor/editor-floating-panels": "4.3.0-1063",
-    "@elementor/editor-notifications": "4.3.0-1063",
-    "@elementor/editor-v1-adapters": "4.3.0-1063",
-    "@elementor/events": "4.3.0-1063",
-    "@elementor/http-client": "4.3.0-1063",
+    "@elementor/editor": "4.3.0-beta2",
+    "@elementor/editor-mcp": "4.3.0-beta2",
+    "@elementor/editor-app-bar": "4.3.0-beta2",
+    "@elementor/editor-elements": "4.3.0-beta2",
+    "@elementor/editor-floating-panels": "4.3.0-beta2",
+    "@elementor/editor-notifications": "4.3.0-beta2",
+    "@elementor/editor-v1-adapters": "4.3.0-beta2",
+    "@elementor/events": "4.3.0-beta2",
+    "@elementor/http-client": "4.3.0-beta2",
     "@elementor/icons": "~1.77.0",
-    "@elementor/locations": "4.3.0-1063",
-    "@elementor/session": "4.3.0-1063",
-    "@elementor/store": "4.3.0-1063",
+    "@elementor/locations": "4.3.0-beta2",
+    "@elementor/session": "4.3.0-beta2",
+    "@elementor/store": "4.3.0-beta2",
     "@elementor/ui": "1.37.5"
   },
   "peerDependencies": {

package/src/api/page-context-client.ts

@@ -1,19 +1,38 @@
 import { httpService } from '@elementor/http-client';
 
 import { type PageContextResponse } from '../types';
+import { isNonceInvalidError, refreshAuditsNonce } from '../utils/session-expiration';
 import { getWindowConfig } from '../utils/window-config';
 
 export async function fetchPageContext( documentId: number, attachmentIds: number[] ): Promise< PageContextResponse > {
+	return requestPageContext( documentId, attachmentIds, true );
+}
+
+async function requestPageContext(
+	documentId: number,
+	attachmentIds: number[],
+	allowNonceRetry: boolean
+): Promise< PageContextResponse > {
 	const { restNamespace, nonce } = getWindowConfig();
 	const url = `${ restNamespace }/audits/page-context`;
 
-	const response = await httpService().get< PageContextResponse >( url, {
-		params: {
-			document_id: documentId,
-			attachment_ids: attachmentIds,
-		},
-		headers: { 'X-WP-Nonce': nonce },
-	} );
+	try {
+		const response = await httpService().get< PageContextResponse >( url, {
+			params: {
+				document_id: documentId,
+				attachment_ids: attachmentIds,
+			},
+			headers: { 'X-WP-Nonce': nonce },
+		} );
+
+		return response.data;
+	} catch ( error ) {
+		if ( ! allowNonceRetry || ! isNonceInvalidError( error ) ) {
+			throw error;
+		}
+
+		await refreshAuditsNonce();
 
-	return response.data;
+		return requestPageContext( documentId, attachmentIds, false );
+	}
 }

package/src/audits/privacy-policy.ts

@@ -28,6 +28,7 @@ export const audit: Audit = {
 					auditId: audit.id,
 					label: __( 'No privacy policy page is set.', 'elementor' ),
 					externalUrl: ctx.pageContext.privacy_settings_url,
+					ctaLabel: __( 'Create', 'elementor' ),
 				},
 			],
 		};

package/src/audits/scan-for-cookies.ts

@@ -0,0 +1,30 @@
+import { __ } from '@wordpress/i18n';
+
+import { type Audit } from '../types';
+
+export const audit: Audit = {
+	id: 'audits/scan-for-cookies',
+	title: __( 'Scan for cookies', 'elementor' ),
+	description: __(
+		"Your site may be setting cookies you haven't disclosed. Some countries require a banner even without a full consent policy. Scan to see what needs disclosure.",
+		'elementor'
+	),
+	fixHint: __( 'Run a Cookiez scan on this page to see which cookies need disclosure.', 'elementor' ),
+	categories: [ 'compliance' ],
+	severity: 'info',
+	weight: 0,
+	evaluate: ( ctx ) => {
+		const isReady = ctx.pageContext.cookiez_plugin_installed && ctx.pageContext.cookiez_plugin_active;
+
+		return {
+			status: 'fail',
+			violations: [
+				{
+					auditId: audit.id,
+					label: __( 'This page has not been scanned for cookies yet.', 'elementor' ),
+					externalUrl: isReady ? ctx.pageContext.cookiez_scan_url : ctx.pageContext.cookiez_plugin_action_url,
+				},
+			],
+		};
+	},
+};

package/src/components/status-section.tsx

@@ -15,7 +15,7 @@ type Props = {
 export default function StatusSection( { label, count, color = 'default', defaultExpanded = false, children }: Props ) {
 	const [ expanded, setExpanded ] = useState( defaultExpanded );
 
-	if ( count === 0 ) {
+	if ( React.Children.count( children ) === 0 ) {
 		return null;
 	}
 

package/src/components/violation-cta-button.tsx

@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { Button } from '@elementor/ui';
+
+type Props = {
+	ctaLabel: string;
+	externalUrl: string;
+};
+
+export default function ViolationCtaButton( { ctaLabel, externalUrl }: Props ) {
+	const handleClick = ( event: React.MouseEvent< HTMLButtonElement > ) => {
+		event.stopPropagation();
+		event.preventDefault();
+
+		window.open( externalUrl, '_blank', 'noopener' );
+	};
+
+	return (
+		<Button variant="outlined" color="secondary" size="small" onClick={ handleClick }>
+			{ ctaLabel }
+		</Button>
+	);
+}

package/src/components/violation-row.tsx

@@ -8,9 +8,11 @@ import { __ } from '@wordpress/i18n';
 import { focusViolation } from '../hooks/focus-violation';
 import { type AuditMeta, type AuditViolation } from '../types';
 import { buildAngiePrompt } from '../utils/build-angie-prompt';
+import { isScoredAudit } from '../utils/is-scored-audit';
 import { onKeyboardClick } from '../utils/keyboard-click';
 import FixViolationWithAngie from './fix-violation-with-angie';
 import SeverityIcon from './severity-icons';
+import ViolationCtaButton from './violation-cta-button';
 import ViolationIcon from './violation-icons';
 
 type Props = {
@@ -33,9 +35,11 @@ function StatusIndicator( { audit, violations }: Pick< Props, 'audit' | 'violati
 	if ( violations ) {
 		return (
 			<>
-				<Typography variant="caption" color="text.secondary" fontWeight="bold">
-					{ violations.length }
-				</Typography>
+				{ isScoredAudit( audit ) && (
+					<Typography variant="caption" color="text.secondary" fontWeight="bold">
+						{ violations.length }
+					</Typography>
+				) }
 				<SeverityIcon severity={ audit.severity } />
 			</>
 		);
@@ -157,7 +161,18 @@ export default function ViolationRow( { audit, skipReason, violations }: Props )
 									{ violation.angieFix && (
 										<FixViolationWithAngie prompt={ buildAngiePrompt( rowLabel ) } />
 									) }
-									<EyeIcon className="violation-hover-icon" fontSize="tiny" aria-hidden={ true } />
+									{ violation.ctaLabel && violation.externalUrl ? (
+										<ViolationCtaButton
+											ctaLabel={ violation.ctaLabel }
+											externalUrl={ violation.externalUrl }
+										/>
+									) : (
+										<EyeIcon
+											className="violation-hover-icon"
+											fontSize="tiny"
+											aria-hidden={ true }
+										/>
+									) }
 								</Box>
 							);
 						} ) }

package/src/hooks/use-audit-report.ts

@@ -5,6 +5,7 @@ import { __useDispatch as useDispatch, __useSelector as useSelector } from '@ele
 import { runPageAudit } from '../runner';
 import { type GlobalState, selectError, selectReport, selectStatus, slice } from '../store';
 import { getPersistedReport, persistReport } from '../utils/report-storage';
+import { SessionExpiredError } from '../utils/session-expiration';
 
 export function useAuditReport() {
 	const status = useSelector( ( state: GlobalState ) => selectStatus( state ) );
@@ -35,6 +36,11 @@ export function useAuditReport() {
 			dispatch( slice.actions.runSucceeded( nextReport ) );
 			persistReport( documentIdToRun, nextReport );
 		} catch ( e ) {
+			if ( e instanceof SessionExpiredError ) {
+				dispatch( slice.actions.runAborted() );
+				return;
+			}
+
 			dispatch( slice.actions.runFailed( e instanceof Error ? e.message : 'Unknown error' ) );
 		}
 	};

package/src/register-audits.ts

@@ -15,6 +15,7 @@ import * as preferGlobalColors from './audits/prefer-global-colors';
 import * as preferGlobalFonts from './audits/prefer-global-fonts';
 import * as privacyPolicy from './audits/privacy-policy';
 import * as robotsNoindex from './audits/robots-noindex';
+import * as scanForCookies from './audits/scan-for-cookies';
 import * as sectionsAndColumns from './audits/sections-and-columns';
 import * as siteIdentity from './audits/site-identity';
 import * as tooManyWidgets from './audits/too-many-widgets';
@@ -47,6 +48,7 @@ const AUDITS: Audit[] = [
 	privacyPolicy.audit,
 	accessibilityPolicy.audit,
 	cookiePolicy.audit,
+	scanForCookies.audit,
 ];
 
 export function registerAllAudits(): void {

package/src/register-promotions.ts

@@ -49,6 +49,14 @@ export const PROMOTIONS: PromotionConfig[] = [
 			run.result.status === 'fail' ? __( 'Generate cookie policy', 'elementor' ) : null,
 		getCtaUrl: firstFailExternalUrl,
 	},
+	{
+		auditId: 'audits/scan-for-cookies',
+		icon: ElementorCookieIcon,
+		ctaLabel: __( 'Scan', 'elementor' ),
+		formatSubtitle: ( run ) =>
+			run.result.status === 'fail' ? __( 'Scan this page for cookies', 'elementor' ) : null,
+		getCtaUrl: firstFailExternalUrl,
+	},
 	{
 		auditId: 'audits/images-too-large',
 		icon: ShieldHalfFilledIcon,

package/src/store/slice.ts

@@ -26,6 +26,9 @@ export const slice = __createSlice( {
 			state.status = 'error';
 			state.error = action.payload;
 		},
+		runAborted( state ) {
+			state.status = state.report ? 'ready' : 'idle';
+		},
 		reportRestored( state, action: PayloadAction< PageAuditReport > ) {
 			state.status = 'ready';
 			state.report = action.payload;

package/src/types.ts

@@ -38,6 +38,7 @@ export type AuditViolation = {
 	label: string;
 	detail?: string;
 	angieFix?: boolean;
+	ctaLabel?: string;
 };
 
 export type PageContextResponse = {
@@ -65,6 +66,9 @@ export type PageContextResponse = {
 	ally_plugin_url: string;
 	cookiez_plugin_active: boolean;
 	cookiez_plugin_url: string;
+	cookiez_plugin_installed: boolean;
+	cookiez_plugin_action_url: string;
+	cookiez_scan_url: string;
 	image_optimization_plugin_active: boolean;
 	image_optimization_plugin_url: string;
 	site_identity: {

package/src/utils/audit-status-summary.ts

@@ -2,6 +2,7 @@ import { type ChipProps } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { type AuditCategory, type AuditResult, type AuditRun, type PageAuditReport } from '../types';
+import { isScoredAudit } from './is-scored-audit';
 import { sortFailedAuditResults } from './sort-failed-audits';
 
 export type AuditStatusGroup = 'fail' | 'pass' | 'skipped';
@@ -37,7 +38,11 @@ export function partitionAuditResults(
 		switch ( run.result.status ) {
 			case 'fail':
 				failed.push( { ...run, result: run.result } );
-				totalViolations += run.result.violations.length;
+
+				if ( isScoredAudit( run.audit ) ) {
+					totalViolations += run.result.violations.length;
+				}
+
 				break;
 			case 'pass':
 				passed.push( { ...run, result: run.result } );
@@ -61,7 +66,11 @@ export function auditStatusDisplayCounts( report: PageAuditReport ): Record< Aud
 	let skipped = 0;
 	let totalViolations = 0;
 
-	for ( const { result } of report.auditResults ) {
+	for ( const { audit, result } of report.auditResults ) {
+		if ( ! isScoredAudit( audit ) ) {
+			continue;
+		}
+
 		switch ( result.status ) {
 			case 'fail':
 				totalViolations += result.violations.length;

package/src/utils/is-scored-audit.ts

@@ -0,0 +1,5 @@
+import { type AuditMeta } from '../types';
+
+export function isScoredAudit( audit: AuditMeta ): boolean {
+	return audit.weight > 0;
+}

package/src/utils/session-expiration.ts

@@ -0,0 +1,63 @@
+import { getWindowConfig } from './window-config';
+
+const NONCE_INVALID_CODE = 'rest_cookie_invalid_nonce';
+const DEFAULT_AJAX_URL = '/wp-admin/admin-ajax.php';
+
+type AjaxErrorLikeResponse = {
+	status?: number;
+	data?: { code?: string };
+};
+
+type AjaxErrorLike = {
+	response?: AjaxErrorLikeResponse;
+};
+
+type SessionWindow = Window & {
+	elementorCommon?: { ajax?: { config?: { url?: string } } };
+};
+
+export class SessionExpiredError extends Error {}
+
+let nonceRefreshPromise: Promise< string > | null = null;
+
+export function isNonceInvalidError( error: unknown ): boolean {
+	const response = ( error as AjaxErrorLike | undefined )?.response;
+
+	return response?.status === 403 && response?.data?.code === NONCE_INVALID_CODE;
+}
+
+export async function refreshAuditsNonce(): Promise< string > {
+	if ( nonceRefreshPromise ) {
+		return nonceRefreshPromise;
+	}
+
+	nonceRefreshPromise = requestFreshNonce();
+
+	try {
+		return await nonceRefreshPromise;
+	} finally {
+		nonceRefreshPromise = null;
+	}
+}
+
+async function requestFreshNonce(): Promise< string > {
+	const ajaxUrl = ( window as SessionWindow ).elementorCommon?.ajax?.config?.url ?? DEFAULT_AJAX_URL;
+	const url = new URL( ajaxUrl, window.location.origin );
+	url.searchParams.set( 'action', 'rest-nonce' );
+
+	const response = await fetch( url.toString(), { credentials: 'same-origin' } );
+
+	if ( ! response.ok ) {
+		throw new Error( `Failed to refresh audits nonce: HTTP ${ response.status }` );
+	}
+
+	const nonce = await response.text();
+
+	if ( ! nonce || '0' === nonce ) {
+		throw new SessionExpiredError( 'Session expired — received invalid nonce' );
+	}
+
+	window.elementorAudits = { ...getWindowConfig(), nonce };
+
+	return nonce;
+}

package/src/utils/severity-counts.ts

@@ -1,6 +1,7 @@
 import { __, sprintf } from '@wordpress/i18n';
 
 import { type AuditCategory, type AuditSeverity, type PageAuditReport } from '../types';
+import { isScoredAudit } from './is-scored-audit';
 
 export type SeverityCounts = Record< AuditSeverity, number >;
 
@@ -18,6 +19,10 @@ export function countSeverities( report: PageAuditReport, category?: AuditCatego
 			continue;
 		}
 
+		if ( ! isScoredAudit( audit ) ) {
+			continue;
+		}
+
 		counts[ audit.severity ] += result.violations.length;
 	}