elementor
diff --git a/‎modules/core/module.php‎
Lines changed: 7 additions & 1 deletion b/‎modules/core/module.php‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎modules/remediation/rest/register.php‎
Lines changed: 5 additions & 0 deletions b/‎modules/remediation/rest/register.php‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎modules/scanner/assets/js/components/manage-footer-actions/page/set-global.js‎
Lines changed: 94 additions & 62 deletions b/‎modules/scanner/assets/js/components/manage-footer-actions/page/set-global.js‎
Lines changed: 94 additions & 62 deletions
diff --git a/‎modules/scanner/assets/js/constants/index.js‎
Lines changed: 2 additions & 0 deletions b/‎modules/scanner/assets/js/constants/index.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎modules/scanner/assets/js/hooks/scanner-context/useScannerWizardActions.js‎
Lines changed: 0 additions & 1 deletion b/‎modules/scanner/assets/js/hooks/scanner-context/useScannerWizardActions.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎modules/scanner/assets/js/styles/manual-fixes.styles.js‎
Lines changed: 2 additions & 0 deletions b/‎modules/scanner/assets/js/styles/manual-fixes.styles.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎modules/settings/assets/js/app.js‎
Lines changed: 4 additions & 1 deletion b/‎modules/settings/assets/js/app.js‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎modules/settings/assets/js/components/admin-top-bar/index.js‎
Lines changed: 2 additions & 20 deletions b/‎modules/settings/assets/js/components/admin-top-bar/index.js‎
Lines changed: 2 additions & 20 deletions
@@ -37,7 +37,13 @@ public function add_plugin_links( $links, $plugin_file_name ) : array {
 			),
 		];
 
-		if ( ! Connect::is_connected() ) {
+		if ( Connect::is_connected() ) {
+			$custom_links['upgrade'] = sprintf(
+				'<a href="%s" style="color: #524CFF; font-weight: 700;" target="_blank" rel="noopener noreferrer">%s</a>',
+				'https://go.elementor.com/ally-plugins-upgrade/',
+				esc_html__( 'Upgrade', 'pojo-accessibility' )
+			);
+		} else {
 			$custom_links['connect'] = sprintf(
 				'<a href="%s" style="color: #524CFF; font-weight: 700;">%s</a>',
 				admin_url( 'admin.php?page=' . Settings::SETTING_BASE_SLUG ),
 
@@ -6,6 +6,7 @@
 use EA11y\Modules\Remediation\Classes\Route_Base;
 use EA11y\Modules\Remediation\Database\Page_Entry;
 use EA11y\Modules\Remediation\Database\Page_Table;
+use EA11y\Modules\Settings\Module as Settings_Module;
 use Throwable;
 use WP_Error;
 use WP_REST_Response;
@@ -71,13 +72,17 @@ public function POST( $request ) {
 				true,
 			);
 
+			Settings_Module::delete_plan_data_refresh_transient();
+			Settings_Module::refresh_plan_data();
+
 			if ( ! is_wp_error( $response ) ) {
 				$page->save();
 			}
 
 			if ( is_wp_error( $response ) && str_contains( $response->get_error_message(), 'Quota exceeded' ) ) {
 				return $this->respond_error_json( [
 					'message' => 'Quota exceeded',
+					'code' => 'internal_server_error',
 				] );
 			}
 
 
@@ -10,7 +10,7 @@ import { ProCrownIcon } from '@ea11y/icons';
 import CrownFilled from '@ea11y-apps/global/icons/crown-filled';
 import { mixpanelEvents, mixpanelService } from '@ea11y-apps/global/services';
 import { SetGlobalRemediationModal } from '@ea11y-apps/scanner/components/manage-footer-actions/page/set-global-remediation-modal';
-import { IS_PRO_PLAN, UPGRADE_URL } from '@ea11y-apps/scanner/constants';
+import { IS_PRO_PLAN, UPGRADE_GLOBAL_URL } from '@ea11y-apps/scanner/constants';
 import { useScannerWizardContext } from '@ea11y-apps/scanner/context/scanner-wizard-context';
 import { useGlobalManageActions } from '@ea11y-apps/scanner/hooks/use-global-manage-actions';
 import infotipImageSrc from '@ea11y-apps/scanner/static/global-infotip-image.png';
@@ -72,56 +72,19 @@ export const SetGlobal = ({
 		});
 	};
 
-	return (
-		<Box display="flex" gap={0.5} alignItems="center">
-			<Box display="flex" alignItems="center">
-				<Switch
-					checked={isChecked}
-					size="small"
-					color={isChecked ? 'info' : 'secondary'}
-					onChange={onSwitchChange}
-					disabled={!IS_PRO_PLAN}
-				/>
-				<WorldIcon color="action" fontSize="small" />
-			</Box>
-			<Typography variant="body2" color="action">
-				{__('Apply across scans', 'pojo-accessibility')}
-			</Typography>
-			{IS_PRO_PLAN ? (
-				<Infotip
-					tabIndex="0"
-					placement="top"
-					PopperProps={{
-						disablePortal: true,
-					}}
-					content={
-						<>
-							<InfotipImage src={infotipImageSrc} role="presentation" />
-							<InfotipBox sx={{ maxWidth: '260px' }}>
-								<Typography variant="subtitle2" sx={{ mb: 1 }}>
-									{__('Fix once, apply everywhere', 'pojo-accessibility')}
-								</Typography>
-								<Typography variant="body2" color="text.secondary">
-									{__(
-										'Apply this fix automatically to pages already scanned and to future scans.',
-										'pojo-accessibility',
-									)}
-								</Typography>
-							</InfotipBox>
-						</>
-					}
-				>
-					<InfoCircleIcon color="action" fontSize="tiny" />
-				</Infotip>
-			) : (
-				<Infotip
-					tabIndex="0"
-					placement="top"
-					PopperProps={{
-						disablePortal: true,
-					}}
-					content={
-						<InfotipBox>
+	const UpgradeInfoTip = ({ children }) => {
+		return (
+			<Infotip
+				tabIndex="0"
+				placement="top"
+				PopperProps={{
+					disablePortal: true,
+				}}
+				disableFocusListener
+				content={
+					<>
+						<InfotipImage src={infotipImageSrc} role="presentation" />
+						<InfotipBox sx={{ maxWidth: '265px' }}>
 							<Typography variant="subtitle1" sx={{ mb: 1 }}>
 								{__('Upgrade to unlock cross-scan fixes', 'pojo-accessibility')}
 							</Typography>
@@ -131,7 +94,7 @@ export const SetGlobal = ({
 								color="text.secondary"
 							>
 								{__(
-									'Cross-scan fixes let you resolve the same issue on all of your scanned pages with a click.',
+									'Cross-scan fixes let you resolve the same issue on all scanned pages with a click.',
 									'pojo-accessibility',
 								)}
 							</Typography>
@@ -140,7 +103,7 @@ export const SetGlobal = ({
 									size="small"
 									color="promotion"
 									variant="contained"
-									href={UPGRADE_URL}
+									href={UPGRADE_GLOBAL_URL}
 									target="_blank"
 									rel="noreferrer"
 									startIcon={<CrownFilled />}
@@ -150,15 +113,84 @@ export const SetGlobal = ({
 								</Button>
 							</Box>
 						</InfotipBox>
-					}
-				>
-					<StyledProChip
-						color="promotion"
-						variant="standard"
-						icon={<ProCrownIcon />}
-						size="small"
-					/>
-				</Infotip>
+					</>
+				}
+			>
+				{children}
+			</Infotip>
+		);
+	};
+
+	return (
+		<Box>
+			{IS_PRO_PLAN ? (
+				<Box display="flex" gap={0.5} alignItems="center">
+					<Box display="flex" alignItems="center">
+						<Switch
+							checked={isChecked}
+							size="small"
+							color={isChecked ? 'info' : 'secondary'}
+							onChange={onSwitchChange}
+						/>
+						<WorldIcon color="action" fontSize="small" />
+					</Box>
+					<Typography variant="body2" color="action">
+						{__('Apply across scans', 'pojo-accessibility')}
+					</Typography>
+					<Infotip
+						tabIndex="0"
+						placement="top"
+						PopperProps={{
+							disablePortal: true,
+						}}
+						content={
+							<>
+								<InfotipImage src={infotipImageSrc} role="presentation" />
+								<InfotipBox sx={{ maxWidth: '260px' }}>
+									<Typography variant="subtitle2" sx={{ mb: 1 }}>
+										{__('Fix once, apply everywhere', 'pojo-accessibility')}
+									</Typography>
+									<Typography variant="body2" color="text.secondary">
+										{__(
+											'Apply this fix automatically to pages already scanned and to future scans.',
+											'pojo-accessibility',
+										)}
+									</Typography>
+								</InfotipBox>
+							</>
+						}
+					>
+						<InfoCircleIcon color="action" fontSize="tiny" />
+					</Infotip>
+				</Box>
+			) : (
+				<Box display="flex" gap={0.5} alignItems="center">
+					<Box display="flex" alignItems="center">
+						<UpgradeInfoTip>
+							<Box>
+								<Switch
+									checked={false}
+									size="small"
+									color="secondary"
+									onChange={onSwitchChange}
+									disabled
+								/>
+							</Box>
+						</UpgradeInfoTip>
+						<WorldIcon color="action" fontSize="small" />
+					</Box>
+					<Typography variant="body2" color="action" sx={{ cursor: 'default' }}>
+						{__('Apply across scans', 'pojo-accessibility')}
+					</Typography>
+					<UpgradeInfoTip>
+						<StyledProChip
+							color="promotion"
+							variant="standard"
+							icon={<ProCrownIcon />}
+							size="small"
+						/>
+					</UpgradeInfoTip>
+				</Box>
 			)}
 			<SetGlobalRemediationModal
 				open={showModal}
 
@@ -21,6 +21,8 @@ export const RULE_TEXT_CONTRAST = 'text_contrast_sufficient';
 export const RATIO_EXCLUDED = 1;
 
 export const UPGRADE_URL = 'https://go.elementor.com/acc-free-no-AI-scanner';
+export const UPGRADE_GLOBAL_URL =
+	'https://go.elementor.com/acc-global-remediation';
 export const COMPARE_PLAN_URL = 'https://go.elementor.com/acc-AI-limit-scanner';
 export const PAGE_LIMIT_URL = 'https://go.elementor.com/acc-URL-limit-scanner';
 
 
@@ -79,7 +79,6 @@ export default function useScannerWizardActions(state) {
 					data.summary,
 				);
 				window.ea11yScannerData.pageData.unregistered = false;
-				runNewScan();
 			}
 
 			setResults(data);
 
@@ -49,6 +49,8 @@ export const InfotipBox = styled(Box)`
 export const InfotipImage = styled('img')`
 	max-width: 304px;
 	height: auto;
+	border-top-left-radius: ${({ theme }) => theme.spacing(0.5)};
+	border-top-right-radius: ${({ theme }) => theme.spacing(0.5)};
 `;
 
 export const InfotipFooter = styled(Box)`
 
@@ -5,6 +5,7 @@ import Grid from '@elementor/ui/Grid';
 import { styled, ThemeProvider } from '@elementor/ui/styles';
 import {
 	ConnectModal,
+	GetStartedModal,
 	MenuItems,
 	OnboardingModal,
 	PostConnectModal,
@@ -15,7 +16,7 @@ import {
 	useSavedSettings,
 	useSettings,
 } from '@ea11y/hooks';
-import { Sidebar, TopBar } from '@ea11y/layouts';
+import { QuotaNotices, Sidebar, TopBar } from '@ea11y/layouts';
 import Notifications from '@ea11y-apps/global/components/notifications';
 import { mixpanelEvents, mixpanelService } from '@ea11y-apps/global/services';
 import { useEffect } from '@wordpress/element';
@@ -54,13 +55,15 @@ const App = () => {
 				{isConnected && !closePostConnectModal && <PostConnectModal />}
 				{isUrlMismatch && !isConnected && <UrlMismatchModal />}
 				<OnboardingModal />
+				<GetStartedModal />
 
 				<TopBar />
 
 				<StyledGrid>
 					<Sidebar />
 
 					<StyledContainer>
+						<QuotaNotices />
 						<PageContent
 							// Looks the best if we have both checks
 							isLoading={!hasFinishedResolution || loading}
 
@@ -1,11 +1,7 @@
-import HelpIcon from '@elementor/icons/HelpIcon';
 import AppBar from '@elementor/ui/AppBar';
-import Link from '@elementor/ui/Link';
 import Toolbar from '@elementor/ui/Toolbar';
 import { styled } from '@elementor/ui/styles';
-import { GOLINKS } from '@ea11y-apps/global/constants';
-import { mixpanelEvents, mixpanelService } from '@ea11y-apps/global/services';
-import { __ } from '@wordpress/i18n';
+import HelpMenu from '../help-menu';
 
 const StyledToolbar = styled(Toolbar)`
 	justify-content: end;
@@ -20,21 +16,7 @@ const AdminTopBar = () => {
 	return (
 		<AppBar position="static">
 			<StyledToolbar variant="dense">
-				<Link
-					color="secondary"
-					underline="hover"
-					href={GOLINKS.HELP}
-					target="_blank"
-					sx={{ display: 'inline-flex', alignItems: 'center', gap: 1 }}
-					aria-label={__('Help', 'pojo-accessibility')}
-					onClick={() =>
-						mixpanelService.sendEvent(mixpanelEvents.helpButtonClicked, {
-							source: 'Header',
-						})
-					}
-				>
-					<HelpIcon />
-				</Link>
+				<HelpMenu />
 			</StyledToolbar>
 		</AppBar>
 	);
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ export default function useScannerWizardActions(state) {`
`79`	`79`	`data.summary,`
`80`	`80`	`);`
`81`	`81`	`window.ea11yScannerData.pageData.unregistered = false;`
`82`		`- runNewScan();`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`setResults(data);`