fix ui - some small bug fixes (#2040)
This commit is contained in:
Delirium
GitHub
parent
44d934e956
commit
c1b2e0afe0
9 changed files with 25 additions and 286 deletions
|
|
@ -151,10 +151,10 @@ const Sites = ({ loading, sites, user, init }: PropsFromRedux) => {
|
|||
<Divider className="m-0" />
|
||||
|
||||
{sliceListPerPage(filteredSites, page - 1, pageSize).map((project: Project) => (
|
||||
<>
|
||||
<React.Fragment key={project.id}>
|
||||
<ProjectItem project={project} />
|
||||
<Divider className="m-0" />
|
||||
</>
|
||||
</React.Fragment>
|
||||
))}
|
||||
|
||||
<div className="w-full flex items-center justify-center py-10">
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ function AlertsView({ siteId }: IAlertsView) {
|
|||
<PageTitle title="Alerts" />
|
||||
</div>
|
||||
<div className="ml-auto flex items-center">
|
||||
<Link to={withSiteId(alertCreate(), siteId)}><Button variant="primary">Create Alert</Button></Link>
|
||||
<Link to={withSiteId(alertCreate(), siteId)}><Button variant="primary">New Alert</Button></Link>
|
||||
<div className="ml-4 w-1/4" style={{ minWidth: 300 }}>
|
||||
<AlertsSearch />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ function Player(props: IProps) {
|
|||
const max = diff > window.innerHeight / 2 ? window.innerHeight / 2 : diff;
|
||||
const newHeight = Math.max(50, max);
|
||||
setPanelHeight(newHeight);
|
||||
playerContext.player.scale();
|
||||
debounceUpdate(newHeight);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ function Player(props: IProps) {
|
|||
const max = diff > window.innerHeight / 2 ? window.innerHeight / 2 : diff;
|
||||
const newHeight = Math.max(50, max);
|
||||
setPanelHeight(newHeight);
|
||||
playerContext.player.scale();
|
||||
debounceUpdate(newHeight)
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ function Player(props: IProps) {
|
|||
const max = diff > window.innerHeight / 2 ? window.innerHeight / 2 : diff;
|
||||
const newHeight = Math.max(50, max);
|
||||
setPanelHeight(newHeight);
|
||||
playerContext.player.scale();
|
||||
debounceUpdate(newHeight)
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,282 +0,0 @@
|
|||
import React from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { hideHint } from 'Duck/components/player';
|
||||
import {
|
||||
connectPlayer,
|
||||
selectStorageType,
|
||||
STORAGE_TYPES,
|
||||
selectStorageListNow,
|
||||
selectStorageList,
|
||||
} from 'Player';
|
||||
import { JSONTree, NoContent } from 'UI';
|
||||
import { formatMs } from 'App/date';
|
||||
import { diff } from 'deep-diff';
|
||||
import { jump } from 'Player';
|
||||
import Autoscroll from '../Autoscroll';
|
||||
import BottomBlock from '../BottomBlock/index';
|
||||
|
||||
import stl from './storage.module.css';
|
||||
|
||||
// const STATE = 'STATE';
|
||||
// const DIFF = 'DIFF';
|
||||
// const TABS = [ DIFF, STATE ].map(tab => ({ text: tab, key: tab }));
|
||||
|
||||
function getActionsName(type) {
|
||||
switch(type) {
|
||||
case STORAGE_TYPES.MOBX:
|
||||
return "MUTATIONS";
|
||||
case STORAGE_TYPES.VUEX:
|
||||
return "MUTATIONS";
|
||||
default:
|
||||
return "ACTIONS";
|
||||
}
|
||||
}
|
||||
|
||||
@connectPlayer(state => ({
|
||||
type: selectStorageType(state),
|
||||
list: selectStorageList(state),
|
||||
listNow: selectStorageListNow(state),
|
||||
}))
|
||||
@connect(state => ({
|
||||
hintIsHidden: state.getIn(['components', 'player', 'hiddenHints', 'storage']),
|
||||
}), {
|
||||
hideHint
|
||||
})
|
||||
//@withEnumToggle('activeTab', 'setActiveTab', DIFF)
|
||||
export default class Storage extends React.PureComponent {
|
||||
lastBtnRef = React.createRef()
|
||||
|
||||
focusNextButton() {
|
||||
if (this.lastBtnRef.current) {
|
||||
this.lastBtnRef.current.focus();
|
||||
}
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.focusNextButton();
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
if (prevProps.listNow.length !== this.props.listNow.length) {
|
||||
this.focusNextButton();
|
||||
}
|
||||
}
|
||||
|
||||
renderDiff(item, prevItem) {
|
||||
if (!prevItem) {
|
||||
return <div style={{ flex: 1}} />
|
||||
}
|
||||
const stateDiff = diff(prevItem.state, item.state)
|
||||
console.log(item.state, prevItem.state, stateDiff)
|
||||
const greenPaths = []
|
||||
const redPaths = []
|
||||
const yellowPaths = []
|
||||
if (!stateDiff) {
|
||||
return <span> No diff </span>
|
||||
}
|
||||
// stateDiff.forEach(d => {
|
||||
// try {
|
||||
// let { path, kind, rhs: value } = d;
|
||||
// if (kind === 'A') {
|
||||
// path.slice().push(d.index);
|
||||
// kind = d.item.kind;
|
||||
// value = d.item.rhs;
|
||||
// }
|
||||
|
||||
// if (kind === 'N') greenPaths.push(d.path.slice().reverse());
|
||||
// if (kind === 'D') redPaths.push(d.path.slice().reverse());
|
||||
// if (kind === 'E') yellowPaths.push(d.path.slice().reverse());
|
||||
// } catch (e) {
|
||||
// console.error(e)
|
||||
// }
|
||||
// });
|
||||
function renderDiffs(diff, i) {
|
||||
const oldValue = diff.item ? JSON.stringify(diff.item.lhs) : JSON.stringify(diff.lhs)
|
||||
const newValue = diff.item ? JSON.stringify(diff.item.rhs) : JSON.stringify(diff.rhs)
|
||||
|
||||
const createPath = () => {
|
||||
let path = [];
|
||||
|
||||
if (diff.path) {
|
||||
path = path.concat(diff.path);
|
||||
}
|
||||
if (typeof(diff.index) !== 'undefined') {
|
||||
path.push(diff.index);
|
||||
}
|
||||
return path.length ? path.join('.') : '';
|
||||
}
|
||||
|
||||
return (
|
||||
<div key={i}>
|
||||
{ createPath() }: <span className="line-through">{ oldValue || 'undefined' }</span>{' -> '}<span className="font-semibold"> { newValue || 'undefined'} </span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<div style={{ flex: 1}} className='flex flex-col p-1 border bg-light-blue-bg font-mono'>
|
||||
{stateDiff.map((d, i) => renderDiffs(d, i))}
|
||||
</div>
|
||||
)
|
||||
// <DiffTree
|
||||
// data={ prevItem.state }
|
||||
// redPaths={ redPaths }
|
||||
// yellowPaths={ yellowPaths }
|
||||
// greenPaths={ greenPaths }
|
||||
// />
|
||||
;
|
||||
}
|
||||
|
||||
ensureString(actionType) {
|
||||
if (typeof actionType === 'string') return actionType;
|
||||
return "UNKNOWN";
|
||||
}
|
||||
|
||||
goNext = () => {
|
||||
const { list, listNow } = this.props;
|
||||
jump(list[ listNow.length ].time, list[ listNow.length ]._index);
|
||||
}
|
||||
|
||||
|
||||
renderTab () {
|
||||
const { listNow } = this.props;
|
||||
if (listNow.length === 0) {
|
||||
return "Not initialized"; //?
|
||||
}
|
||||
return <JSONTree src={ listNow[ listNow.length - 1 ].state } />;
|
||||
}
|
||||
|
||||
renderItem(item, i, prevItem) {
|
||||
const { type, listNow, list } = this.props;
|
||||
let src;
|
||||
let name;
|
||||
|
||||
switch(type) {
|
||||
case STORAGE_TYPES.REDUX:
|
||||
case STORAGE_TYPES.NGRX:
|
||||
src = item.action;
|
||||
name = src && src.type;
|
||||
break;
|
||||
case STORAGE_TYPES.VUEX:
|
||||
src = item.mutation;
|
||||
name = src && src.type;
|
||||
break;
|
||||
case STORAGE_TYPES.MOBX:
|
||||
src = item.payload;
|
||||
name = `@${item.type} ${src && src.type}`;
|
||||
break;
|
||||
case STORAGE_TYPES.ZUSTAND:
|
||||
src = null;
|
||||
name = item.mutation.join('')
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex justify-between items-start" key={ `store-${i}` }>
|
||||
{src === null ? (
|
||||
<div className="font-mono"> {name} </div>
|
||||
) : (
|
||||
<>
|
||||
{this.renderDiff(item, prevItem)}
|
||||
<div style={{ flex: 2 }} className="flex pl-10">
|
||||
<JSONTree
|
||||
name={ this.ensureString(name) }
|
||||
src={ src }
|
||||
collapsed
|
||||
collapseStringsAfterLength={ 7 }
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
<div style={{ flex: 1 }} className="flex-1 flex items-center justify-end">
|
||||
{ i + 1 < listNow.length &&
|
||||
<button
|
||||
className={ stl.button }
|
||||
onClick={ () => jump(item.time, item._index) }
|
||||
>
|
||||
{"JUMP"}
|
||||
</button>
|
||||
}
|
||||
{ i + 1 === listNow.length && i + 1 < list.length &&
|
||||
<button
|
||||
className={ stl.button }
|
||||
ref={ this.lastBtnRef }
|
||||
onClick={ this.goNext }
|
||||
>
|
||||
{"NEXT"}
|
||||
</button>
|
||||
}
|
||||
{ typeof item.duration === 'number' &&
|
||||
<div className="font-size-12 color-gray-medium">
|
||||
{ formatMs(item.duration) }
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
render() {
|
||||
const {
|
||||
type,
|
||||
listNow,
|
||||
list,
|
||||
hintIsHidden,
|
||||
} = this.props;
|
||||
|
||||
const showStore = type !== STORAGE_TYPES.MOBX;
|
||||
return (
|
||||
<BottomBlock>
|
||||
<BottomBlock.Header>
|
||||
<span className="font-semibold color-gray-medium mr-4">State</span>
|
||||
{ list.length > 0 &&
|
||||
<div className="flex w-full">
|
||||
{ showStore &&
|
||||
<h3 style={{ width: "40%" }}>
|
||||
{"STORE"}
|
||||
</h3>
|
||||
}
|
||||
<h3 style={{ width: "40%" }}>
|
||||
{getActionsName(type)}
|
||||
</h3>
|
||||
</div>
|
||||
}
|
||||
</BottomBlock.Header>
|
||||
<BottomBlock.Content className="flex" >
|
||||
<NoContent
|
||||
title="Nothing to display yet"
|
||||
subtext={ !hintIsHidden
|
||||
?
|
||||
<>
|
||||
{'Inspect your application state while you’re replaying your users sessions. OpenReplay supports '}
|
||||
<a className="underline color-teal" href="https://docs.openreplay.com/plugins/redux" target="_blank">Redux</a>{', '}
|
||||
<a className="underline color-teal" href="https://docs.openreplay.com/plugins/vuex" target="_blank">VueX</a>{', '}
|
||||
<a className="underline color-teal" href="https://docs.openreplay.com/plugins/pinia" target="_blank">Pinia</a>{', '}
|
||||
<a className="underline color-teal" href="https://docs.openreplay.com/plugins/zustand" target="_blank">Zustand</a>{', '}
|
||||
<a className="underline color-teal" href="https://docs.openreplay.com/plugins/mobx" target="_blank">MobX</a>{' and '}
|
||||
<a className="underline color-teal" href="https://docs.openreplay.com/plugins/ngrx" target="_blank">NgRx</a>.
|
||||
<br/><br/>
|
||||
<button className="color-teal" onClick={() => this.props.hideHint("storage")}>Got It!</button>
|
||||
</>
|
||||
: null
|
||||
}
|
||||
size="small"
|
||||
show={ listNow.length === 0 }
|
||||
>
|
||||
{ showStore &&
|
||||
<div className="ph-10 scroll-y" style={{ width: "40%" }} >
|
||||
{ listNow.length === 0
|
||||
? <div className="color-gray-light font-size-16 mt-20 text-center" >{ "Empty state." }</div>
|
||||
: this.renderTab()
|
||||
}
|
||||
</div>
|
||||
}
|
||||
<div className="flex" style={{ width: showStore ? "60%" : "100%" }} >
|
||||
<Autoscroll className="ph-10" >
|
||||
{ listNow.map((item, i) => this.renderItem(item, i, i > 0 ? listNow[i - 1] : undefined)) }
|
||||
</Autoscroll>
|
||||
</div>
|
||||
</NoContent>
|
||||
</BottomBlock.Content>
|
||||
</BottomBlock>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -652,6 +652,16 @@ export const conditionalFilters = [
|
|||
operatorOptions: filterOptions.stringConditional,
|
||||
isEvent: false
|
||||
},
|
||||
{
|
||||
key: FilterKey.USERID,
|
||||
type: FilterType.MULTIPLE,
|
||||
category: FilterCategory.USER,
|
||||
label: 'User Id',
|
||||
placeholder: 'E.g. Alex, or alex@domain.com, or EMP123',
|
||||
operator: 'is',
|
||||
operatorOptions: filterOptions.stringOperators.concat([{ label: 'is undefined', value: 'isUndefined' }]),
|
||||
icon: 'filters/userid'
|
||||
}
|
||||
].sort((a, b) => {
|
||||
const aOrder = filterOrder[a.category] ?? 9
|
||||
const bOrder = filterOrder[b.category] ?? 9
|
||||
|
|
|
|||
|
|
@ -1,3 +1,11 @@
|
|||
# 12.0.8
|
||||
|
||||
- better logging for network batches
|
||||
|
||||
# 12.0.7
|
||||
|
||||
- fixes for window.open reinit method
|
||||
|
||||
# 12.0.6
|
||||
|
||||
- allow network sanitizer to return null (will ignore network req)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@openreplay/tracker",
|
||||
"description": "The OpenReplay tracker main package",
|
||||
"version": "12.0.8-2",
|
||||
"version": "12.0.8",
|
||||
"keywords": [
|
||||
"logging",
|
||||
"replay"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue