Litjs fixes2 (#3381)
* ui: fixes for litjs capture * ui: introduce vmode for lwc light dom * ui: fixup the mode toggle and remover
This commit is contained in:
parent
2a483b62f0
commit
500fb44856
13 changed files with 148 additions and 59 deletions
|
|
@ -6,6 +6,7 @@ import DefaultPlaying from 'Shared/SessionSettings/components/DefaultPlaying';
|
|||
import DefaultTimezone from 'Shared/SessionSettings/components/DefaultTimezone';
|
||||
import ListingVisibility from 'Shared/SessionSettings/components/ListingVisibility';
|
||||
import MouseTrailSettings from 'Shared/SessionSettings/components/MouseTrailSettings';
|
||||
import VirtualModeSettings from '../shared/SessionSettings/components/VirtualMode';
|
||||
import DebugLog from './DebugLog';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
|
|
@ -35,6 +36,7 @@ function SessionsListingSettings() {
|
|||
<div className="flex flex-col gap-2">
|
||||
<MouseTrailSettings />
|
||||
<DebugLog />
|
||||
<VirtualModeSettings />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ function SubHeader(props) {
|
|||
projectsStore,
|
||||
userStore,
|
||||
issueReportingStore,
|
||||
settingsStore
|
||||
} = useStore();
|
||||
const { t } = useTranslation();
|
||||
const { favorite } = sessionStore.current;
|
||||
|
|
@ -45,7 +46,7 @@ function SubHeader(props) {
|
|||
const currentSession = sessionStore.current;
|
||||
const projectId = projectsStore.siteId;
|
||||
const integrations = integrationsStore.issues.list;
|
||||
const { store } = React.useContext(PlayerContext);
|
||||
const { player, store } = React.useContext(PlayerContext);
|
||||
const { location: currentLocation = 'loading...' } = store.get();
|
||||
const hasIframe = localStorage.getItem(IFRAME) === 'true';
|
||||
const [hideTools, setHideTools] = React.useState(false);
|
||||
|
|
@ -127,6 +128,13 @@ function SubHeader(props) {
|
|||
});
|
||||
};
|
||||
|
||||
const showVModeBadge = store.get().vModeBadge;
|
||||
const onVMode = () => {
|
||||
settingsStore.sessionSettings.updateKey('virtualMode', true);
|
||||
player.enableVMode?.();
|
||||
location.reload();
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
|
|
@ -143,6 +151,8 @@ function SubHeader(props) {
|
|||
siteId={projectId!}
|
||||
currentLocation={currentLocation}
|
||||
version={currentSession?.trackerVersion ?? ''}
|
||||
virtualElsFailed={showVModeBadge}
|
||||
onVMode={onVMode}
|
||||
/>
|
||||
|
||||
<SessionTabs />
|
||||
|
|
|
|||
|
|
@ -34,38 +34,46 @@ const WarnBadge = React.memo(
|
|||
currentLocation,
|
||||
version,
|
||||
siteId,
|
||||
virtualElsFailed,
|
||||
onVMode,
|
||||
}: {
|
||||
currentLocation: string;
|
||||
version: string;
|
||||
siteId: string;
|
||||
virtualElsFailed: boolean;
|
||||
onVMode: () => void;
|
||||
}) => {
|
||||
const { t } = useTranslation();
|
||||
const localhostWarnSiteKey = localhostWarn(siteId);
|
||||
const defaultLocalhostWarn =
|
||||
localStorage.getItem(localhostWarnSiteKey) !== '1';
|
||||
const localhostWarnActive =
|
||||
const localhostWarnActive = Boolean(
|
||||
currentLocation &&
|
||||
defaultLocalhostWarn &&
|
||||
/(localhost)|(127.0.0.1)|(0.0.0.0)/.test(currentLocation);
|
||||
/(localhost)|(127.0.0.1)|(0.0.0.0)/.test(currentLocation)
|
||||
)
|
||||
const trackerVersion = window.env.TRACKER_VERSION ?? undefined;
|
||||
const trackerVerDiff = compareVersions(version, trackerVersion);
|
||||
const trackerWarnActive = trackerVerDiff !== VersionComparison.Same;
|
||||
|
||||
const [showLocalhostWarn, setLocalhostWarn] =
|
||||
React.useState(localhostWarnActive);
|
||||
const [showTrackerWarn, setTrackerWarn] = React.useState(trackerWarnActive);
|
||||
const [warnings, setWarnings] = React.useState<[localhostWarn: boolean, trackerWarn: boolean, virtualElsFailWarn: boolean]>([localhostWarnActive, trackerWarnActive, virtualElsFailed])
|
||||
|
||||
const closeWarning = (type: 1 | 2) => {
|
||||
React.useEffect(() => {
|
||||
setWarnings([localhostWarnActive, trackerWarnActive, virtualElsFailed])
|
||||
}, [localhostWarnActive, trackerWarnActive, virtualElsFailed])
|
||||
|
||||
const closeWarning = (type: 0 | 1 | 2) => {
|
||||
if (type === 1) {
|
||||
localStorage.setItem(localhostWarnSiteKey, '1');
|
||||
setLocalhostWarn(false);
|
||||
}
|
||||
if (type === 2) {
|
||||
setTrackerWarn(false);
|
||||
}
|
||||
setWarnings((prev) => {
|
||||
const newWarnings = [...prev];
|
||||
newWarnings[type] = false;
|
||||
return newWarnings;
|
||||
});
|
||||
};
|
||||
|
||||
if (!showLocalhostWarn && !showTrackerWarn) return null;
|
||||
if (!warnings.some(el => el === true)) return null;
|
||||
|
||||
return (
|
||||
<div
|
||||
|
|
@ -79,7 +87,7 @@ const WarnBadge = React.memo(
|
|||
fontWeight: 500,
|
||||
}}
|
||||
>
|
||||
{showLocalhostWarn ? (
|
||||
{warnings[0] ? (
|
||||
<div className="px-3 py-1 border border-gray-lighter drop-shadow-md rounded bg-active-blue flex items-center justify-between">
|
||||
<div>
|
||||
<span>{t('Some assets may load incorrectly on localhost.')}</span>
|
||||
|
|
@ -101,7 +109,7 @@ const WarnBadge = React.memo(
|
|||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
{showTrackerWarn ? (
|
||||
{warnings[1] ? (
|
||||
<div className="px-3 py-1 border border-gray-lighter drop-shadow-md rounded bg-active-blue flex items-center justify-between">
|
||||
<div>
|
||||
<div>
|
||||
|
|
@ -125,6 +133,21 @@ const WarnBadge = React.memo(
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
className="py-1 ml-3 cursor-pointer"
|
||||
onClick={() => closeWarning(2)}
|
||||
>
|
||||
<Icon name="close" size={16} color="black" />
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
{warnings[2] ? (
|
||||
<div className="px-3 py-1 border border-gray-lighter drop-shadow-md rounded bg-active-blue flex items-center justify-between">
|
||||
<div className="flex flex-col">
|
||||
<div>{t('If you have issues displaying custom HTML elements (i.e when using LWC), consider turning on Virtual Mode.')}</div>
|
||||
<div className='link' onClick={onVMode}>{t('Enable')}</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
className="py-1 ml-3 cursor-pointer"
|
||||
onClick={() => closeWarning(2)}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import ListingVisibility from './components/ListingVisibility';
|
|||
import DefaultPlaying from './components/DefaultPlaying';
|
||||
import DefaultTimezone from './components/DefaultTimezone';
|
||||
import CaptureRate from './components/CaptureRate';
|
||||
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
function SessionSettings() {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
import React from 'react';
|
||||
import { useStore } from 'App/mstore';
|
||||
import { observer } from 'mobx-react-lite';
|
||||
import { Switch } from 'UI';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
function VirtualModeSettings() {
|
||||
const { settingsStore } = useStore();
|
||||
const { sessionSettings } = settingsStore;
|
||||
const { virtualMode } = sessionSettings;
|
||||
const { t } = useTranslation();
|
||||
|
||||
const updateSettings = (checked: boolean) => {
|
||||
settingsStore.sessionSettings.updateKey('virtualMode', !virtualMode);
|
||||
};
|
||||
|
||||
return (
|
||||
<div>
|
||||
<h3 className="text-lg">{t('Virtual Mode')}</h3>
|
||||
<div className="my-1">
|
||||
{t('Change this setting if you have issues with recordings containing Lightning Web Components (or similar custom HTML Element libraries).')}
|
||||
</div>
|
||||
<div className="mt-2">
|
||||
<Switch onChange={updateSettings} checked={virtualMode} />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default observer(VirtualModeSettings);
|
||||
|
|
@ -9,6 +9,7 @@ export const GLOBAL_HAS_NO_RECORDINGS = '__$global-hasNoRecordings$__';
|
|||
export const SITE_ID_STORAGE_KEY = '__$user-siteId$__';
|
||||
export const GETTING_STARTED = '__$user-gettingStarted$__';
|
||||
export const MOUSE_TRAIL = '__$session-mouseTrail$__';
|
||||
export const VIRTUAL_MODE_KEY = '__$session-virtualMode$__'
|
||||
export const IFRAME = '__$session-iframe$__';
|
||||
export const JWT_PARAM = '__$session-jwt-param$__';
|
||||
export const MENU_COLLAPSED = '__$global-menuCollapsed$__';
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import {
|
|||
SHOWN_TIMEZONE,
|
||||
DURATION_FILTER,
|
||||
MOUSE_TRAIL,
|
||||
VIRTUAL_MODE_KEY,
|
||||
} from 'App/constants/storageKeys';
|
||||
import { DateTime, Settings } from 'luxon';
|
||||
|
||||
|
|
@ -71,27 +72,19 @@ export const generateGMTZones = (): Timezone[] => {
|
|||
|
||||
export default class SessionSettings {
|
||||
defaultTimezones = [...generateGMTZones()];
|
||||
|
||||
skipToIssue: boolean = localStorage.getItem(SKIP_TO_ISSUE) === 'true';
|
||||
|
||||
timezone: Timezone;
|
||||
|
||||
durationFilter: any = JSON.parse(
|
||||
localStorage.getItem(DURATION_FILTER) ||
|
||||
JSON.stringify(defaultDurationFilter),
|
||||
);
|
||||
|
||||
captureRate: string = '0';
|
||||
|
||||
conditionalCapture: boolean = false;
|
||||
|
||||
captureConditions: { name: string; captureRate: number; filters: any[] }[] =
|
||||
[];
|
||||
|
||||
mouseTrail: boolean = localStorage.getItem(MOUSE_TRAIL) !== 'false';
|
||||
|
||||
shownTimezone: 'user' | 'local';
|
||||
|
||||
virtualMode: boolean = localStorage.getItem(VIRTUAL_MODE_KEY) === 'true';
|
||||
usingLocal: boolean = false;
|
||||
|
||||
constructor() {
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ export default class MessageLoader {
|
|||
|
||||
let artificialStartTime = Infinity;
|
||||
let startTimeSet = false;
|
||||
|
||||
msgs.forEach((msg, i) => {
|
||||
if (msg.tp === MType.Redux || msg.tp === MType.ReduxDeprecated) {
|
||||
if ('actionTime' in msg && msg.actionTime) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// @ts-ignore
|
||||
import { Decoder } from 'syncod';
|
||||
import logger from 'App/logger';
|
||||
|
||||
import { VIRTUAL_MODE_KEY } from '@/constants/storageKeys';
|
||||
import type { Store, ILog, SessionFilesInfo } from 'Player';
|
||||
import TabSessionManager, { TabState } from 'Player/web/TabManager';
|
||||
import ActiveTabManager from 'Player/web/managers/ActiveTabManager';
|
||||
|
|
@ -69,6 +69,7 @@ export interface State extends ScreenState {
|
|||
tabChangeEvents: TabChangeEvent[];
|
||||
closedTabs: string[];
|
||||
sessionStart: number;
|
||||
vModeBadge: boolean;
|
||||
}
|
||||
|
||||
export const visualChanges = [
|
||||
|
|
@ -99,6 +100,7 @@ export default class MessageManager {
|
|||
closedTabs: [],
|
||||
sessionStart: 0,
|
||||
tabNames: {},
|
||||
vModeBadge: false,
|
||||
};
|
||||
|
||||
private clickManager: ListWalker<MouseClick> = new ListWalker();
|
||||
|
|
@ -126,7 +128,6 @@ export default class MessageManager {
|
|||
private tabsAmount = 0;
|
||||
|
||||
private tabChangeEvents: TabChangeEvent[] = [];
|
||||
|
||||
private activeTab = '';
|
||||
|
||||
constructor(
|
||||
|
|
@ -142,8 +143,19 @@ export default class MessageManager {
|
|||
this.activityManager = new ActivityManager(
|
||||
this.session.duration.milliseconds,
|
||||
); // only if not-live
|
||||
|
||||
const vMode = localStorage.getItem(VIRTUAL_MODE_KEY);
|
||||
if (vMode === 'true') {
|
||||
this.setVirtualMode(true);
|
||||
}
|
||||
}
|
||||
|
||||
private virtualMode = false;
|
||||
public setVirtualMode = (virtualMode: boolean) => {
|
||||
this.virtualMode = virtualMode;
|
||||
Object.values(this.tabs).forEach((tab) => tab.setVirtualMode(virtualMode));
|
||||
};
|
||||
|
||||
public getListsFullState = () => {
|
||||
const fullState: Record<string, any> = {};
|
||||
for (const tab in Object.keys(this.tabs)) {
|
||||
|
|
@ -394,6 +406,9 @@ export default class MessageManager {
|
|||
this.sessionStart,
|
||||
this.initialLists,
|
||||
);
|
||||
if (this.virtualMode) {
|
||||
this.tabs[msg.tabId].setVirtualMode(this.virtualMode);
|
||||
}
|
||||
}
|
||||
|
||||
const lastMessageTime = Math.max(msg.time, this.lastMessageTime);
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ export default class TabSessionManager {
|
|||
tabStates: { [tabId: string]: TabState };
|
||||
tabNames: { [tabId: string]: string };
|
||||
location?: string;
|
||||
vModeBadge?: boolean;
|
||||
}>,
|
||||
private readonly screen: Screen,
|
||||
private readonly id: string,
|
||||
|
|
@ -116,6 +117,14 @@ export default class TabSessionManager {
|
|||
screen,
|
||||
this.session.isMobile,
|
||||
this.setCSSLoading,
|
||||
() => {
|
||||
setTimeout(() => {
|
||||
this.state.update({
|
||||
vModeBadge: true,
|
||||
})
|
||||
// easier to spot the warning appearing plus more time to go over all messages
|
||||
}, 1000)
|
||||
}
|
||||
);
|
||||
this.lists = new Lists(initialLists);
|
||||
initialLists?.event?.forEach((e: Record<string, string>) => {
|
||||
|
|
@ -126,6 +135,10 @@ export default class TabSessionManager {
|
|||
});
|
||||
}
|
||||
|
||||
public setVirtualMode = (virtualMode: boolean) => {
|
||||
this.pagesManager.setVirtualMode(virtualMode);
|
||||
};
|
||||
|
||||
setSession = (session: any) => {
|
||||
this.session = session;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,15 +21,10 @@ export default class WebPlayer extends Player {
|
|||
inspectorMode: false,
|
||||
mobsFetched: false,
|
||||
};
|
||||
|
||||
private inspectorController: InspectorController;
|
||||
|
||||
protected screen: Screen;
|
||||
|
||||
protected readonly messageManager: MessageManager;
|
||||
|
||||
protected readonly messageLoader: MessageLoader;
|
||||
|
||||
private targetMarker: TargetMarker;
|
||||
|
||||
constructor(
|
||||
|
|
@ -124,6 +119,10 @@ export default class WebPlayer extends Player {
|
|||
})
|
||||
}
|
||||
|
||||
enableVMode = () => {
|
||||
this.messageManager.setVirtualMode(true);
|
||||
}
|
||||
|
||||
preloadFirstFile(data: Uint8Array, fileKey?: string) {
|
||||
void this.messageLoader.preloadFirstFile(data, fileKey);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import logger from 'App/logger';
|
||||
import { resolveCSS } from '../../messages/rewriter/urlResolve';
|
||||
|
||||
import type Screen from '../../Screen/Screen';
|
||||
import type { Message, SetNodeScroll } from '../../messages';
|
||||
|
|
@ -45,47 +44,33 @@ const ATTR_NAME_REGEXP = /([^\t\n\f \/>"'=]+)/;
|
|||
|
||||
export default class DOMManager extends ListWalker<Message> {
|
||||
private readonly vTexts: Map<number, VText> = new Map(); // map vs object here?
|
||||
|
||||
private readonly vElements: Map<number, VElement> = new Map();
|
||||
|
||||
private readonly olVRoots: Map<number, OnloadVRoot> = new Map();
|
||||
|
||||
/** required to keep track of iframes, frameId : vnodeId */
|
||||
private readonly iframeRoots: Record<number, number> = {};
|
||||
|
||||
private shadowRootParentMap: Map<number, number> = new Map();
|
||||
|
||||
/** Constructed StyleSheets https://developer.mozilla.org/en-US/docs/Web/API/Document/adoptedStyleSheets
|
||||
* as well as <style> tag owned StyleSheets
|
||||
*/
|
||||
private olStyleSheets: Map<number, OnloadStyleSheet> = new Map();
|
||||
|
||||
/** @depreacted since tracker 4.0.2 Mapping by nodeID */
|
||||
private olStyleSheetsDeprecated: Map<number, OnloadStyleSheet> = new Map();
|
||||
|
||||
private upperBodyId: number = -1;
|
||||
|
||||
private nodeScrollManagers: Map<number, ListWalker<SetNodeScroll>> =
|
||||
new Map();
|
||||
|
||||
private stylesManager: StylesManager;
|
||||
|
||||
private focusManager: FocusManager = new FocusManager(this.vElements);
|
||||
|
||||
private selectionManager: SelectionManager;
|
||||
|
||||
private readonly screen: Screen;
|
||||
|
||||
private readonly isMobile: boolean;
|
||||
|
||||
private readonly stringDict: Record<number, string>;
|
||||
|
||||
private readonly globalDict: {
|
||||
get: (key: string) => string | undefined;
|
||||
all: () => Record<string, string>;
|
||||
};
|
||||
|
||||
public readonly time: number;
|
||||
private virtualMode: boolean = false;
|
||||
private showVModeBadge?: () => void;
|
||||
|
||||
constructor(params: {
|
||||
screen: Screen;
|
||||
|
|
@ -97,6 +82,8 @@ export default class DOMManager extends ListWalker<Message> {
|
|||
get: (key: string) => string | undefined;
|
||||
all: () => Record<string, string>;
|
||||
};
|
||||
virtualMode?: boolean;
|
||||
showVModeBadge?: () => void;
|
||||
}) {
|
||||
super();
|
||||
this.screen = params.screen;
|
||||
|
|
@ -106,6 +93,8 @@ export default class DOMManager extends ListWalker<Message> {
|
|||
this.globalDict = params.globalDict;
|
||||
this.selectionManager = new SelectionManager(this.vElements, params.screen);
|
||||
this.stylesManager = new StylesManager(params.screen, params.setCssLoading);
|
||||
this.virtualMode = params.virtualMode || false;
|
||||
this.showVModeBadge = params.showVModeBadge;
|
||||
setupWindowLogging(this.vTexts, this.vElements, this.olVRoots);
|
||||
}
|
||||
|
||||
|
|
@ -451,14 +440,18 @@ export default class DOMManager extends ListWalker<Message> {
|
|||
return;
|
||||
}
|
||||
// shadow DOM for a custom element + SALESFORCE (<slot>)
|
||||
const isCustomElement = vElem.tagName.includes('-') || vElem.tagName === 'SLOT';
|
||||
const isNotActualIframe = !["IFRAME", "FRAME"].includes(vElem.tagName.toUpperCase());
|
||||
const isLikelyShadowRoot = isCustomElement && isNotActualIframe;
|
||||
const isCustomElement =
|
||||
vElem.tagName.includes('-') || vElem.tagName === 'SLOT';
|
||||
const hasSlots = vElem.tagName === 'SLOT';
|
||||
|
||||
if (isLikelyShadowRoot) {
|
||||
// Store the mapping but don't create the actual shadow root
|
||||
this.shadowRootParentMap.set(msg.id, msg.frameID);
|
||||
return;
|
||||
if (isCustomElement) {
|
||||
if (this.virtualMode) {
|
||||
// Store the mapping but don't create the actual shadow root
|
||||
this.shadowRootParentMap.set(msg.id, msg.frameID);
|
||||
return;
|
||||
} else if (hasSlots) {
|
||||
this.showVModeBadge?.();
|
||||
}
|
||||
}
|
||||
|
||||
// Real iframes
|
||||
|
|
@ -474,7 +467,11 @@ export default class DOMManager extends ListWalker<Message> {
|
|||
case MType.AdoptedSsInsertRule: {
|
||||
const styleSheet = this.olStyleSheets.get(msg.sheetID);
|
||||
if (!styleSheet) {
|
||||
logger.warn('No stylesheet was created for ', msg, this.olStyleSheets);
|
||||
logger.warn(
|
||||
'No stylesheet was created for ',
|
||||
msg,
|
||||
this.olStyleSheets,
|
||||
);
|
||||
return;
|
||||
}
|
||||
insertRule(styleSheet, msg);
|
||||
|
|
@ -495,9 +492,8 @@ export default class DOMManager extends ListWalker<Message> {
|
|||
logger.warn('No stylesheet was created for ', msg);
|
||||
return;
|
||||
}
|
||||
|
||||
// styleSheet.replaceRule(msg.text);
|
||||
// styleSheet.whenReady((sheet) => sheet.replaceSync(msg.text))
|
||||
// @ts-ignore (configure ts with recent WebaAPI)
|
||||
styleSheet.replaceSync(msg.text);
|
||||
return;
|
||||
}
|
||||
case MType.AdoptedSsAddOwner: {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ export default class PagesManager extends ListWalker<DOMManager> {
|
|||
private screen: Screen,
|
||||
private isMobile: boolean,
|
||||
private setCssLoading: (flag: boolean) => void,
|
||||
private showVModeBadge: () => void,
|
||||
) {
|
||||
super();
|
||||
}
|
||||
|
|
@ -30,6 +31,10 @@ export default class PagesManager extends ListWalker<DOMManager> {
|
|||
Assumed that messages added in a correct time sequence.
|
||||
*/
|
||||
falseOrder = false;
|
||||
virtualMode = false;
|
||||
setVirtualMode = (virtualMode: boolean) => {
|
||||
this.virtualMode = virtualMode;
|
||||
};
|
||||
|
||||
appendMessage(m: Message): void {
|
||||
if ([MType.StringDict, MType.StringDictGlobal].includes(m.tp)) {
|
||||
|
|
@ -62,6 +67,8 @@ export default class PagesManager extends ListWalker<DOMManager> {
|
|||
get: (key: string) => this.globalDictionary.get(key),
|
||||
all: () => Object.fromEntries(this.globalDictionary),
|
||||
},
|
||||
virtualMode: this.virtualMode,
|
||||
showVModeBadge: this.showVModeBadge,
|
||||
}),
|
||||
);
|
||||
this.falseOrder = false;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue