jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cherry-picj 2683d570e8 and resolved conflicts

Browse source
This commit is contained in:
Shekar Siri 2023-01-03 13:54:45 +01:00
parent 2831420306
commit 0ebc7a6085
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/.storybook/main.ts
View file

@ -15,13 +15,13 @@ export default {
fastRefresh: true, fastRefresh: true,
}, },
webpackFinal: async (config: any) => { webpackFinal: async (config: any) => {
// console.log('CONFIG', config);
// config.plugins.push(...);
config.module = custom.module; config.module = custom.module;
config.resolve = custom.resolve; config.resolve = custom.resolve;
if (custom.plugins) {
config.plugins.unshift(custom.plugins[0]); config.plugins.unshift(custom.plugins[0]);
config.plugins.unshift(custom.plugins[1]); config.plugins.unshift(custom.plugins[1]);
config.plugins.unshift(custom.plugins[4]); config.plugins.unshift(custom.plugins[4]);
}
config.module.rules.unshift({ config.module.rules.unshift({
test: /\.(svg)$/i, test: /\.(svg)$/i,
exclude: /node_modules/, exclude: /node_modules/,

2
frontend/app/components/Alerts/AlertForm.js
View file

@ -61,8 +61,6 @@ const AlertForm = (props) => {
const write = ({ target: { value, name } }) => props.edit({ [name]: value }); const write = ({ target: { value, name } }) => props.edit({ [name]: value });
const writeOption = (e, { name, value }) => props.edit({ [name]: value.value }); const writeOption = (e, { name, value }) => props.edit({ [name]: value.value });
const onChangeCheck = ({ target: { checked, name } }) => props.edit({ [name]: checked }); const onChangeCheck = ({ target: { checked, name } }) => props.edit({ [name]: checked });
// const onChangeOption = ({ checked, name }) => props.edit({ [ name ]: checked })
// const onChangeCheck = (e) => { console.log(e) }
useEffect(() => { useEffect(() => {
props.fetchTriggerOptions(); props.fetchTriggerOptions();

1
frontend/app/components/Dashboard/components/WidgetForm/renderMap.ts
View file

@ -4,7 +4,6 @@ export const renderClickmapThumbnail = () => {
// @ts-ignore // @ts-ignore
window.html2canvas = html2canvas; window.html2canvas = html2canvas;
const element = document.querySelector<HTMLIFrameElement>('#clickmap-render * iframe').contentDocument.body const element = document.querySelector<HTMLIFrameElement>('#clickmap-render * iframe').contentDocument.body
console.log(element)
if (element) { if (element) {
const dimensions = element.getBoundingClientRect() const dimensions = element.getBoundingClientRect()
return html2canvas( return html2canvas(

1
frontend/app/components/Session/WebPlayer.tsx
View file

@ -82,7 +82,6 @@ function WebPlayer(props: any) {
contextValue.player.jump(jumpTimestamp) contextValue.player.jump(jumpTimestamp)
contextValue.player.pause() contextValue.player.pause()
contextValue.player.scaleFullPage() contextValue.player.scaleFullPage()
console.log(jumpTimestamp, insights)
setTimeout(() => { contextValue.player.showClickmap(insights) }, 250) setTimeout(() => { contextValue.player.showClickmap(insights) }, 250)
}, 500) }, 500)
} }

1
frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx
View file

@ -61,7 +61,6 @@ function FilterModal(props: Props) {
const isResultEmpty = (!filterSearchList || Object.keys(filterSearchList).length === 0) const isResultEmpty = (!filterSearchList || Object.keys(filterSearchList).length === 0)
&& matchingCategories.length === 0 && Object.keys(matchingFilters).length === 0 && matchingCategories.length === 0 && Object.keys(matchingFilters).length === 0
// console.log(matchingFilters)
return ( return (
<div className={stl.wrapper} style={{ width: '480px', maxHeight: '380px', overflowY: 'auto'}}> <div className={stl.wrapper} style={{ width: '480px', maxHeight: '380px', overflowY: 'auto'}}>
<div className={searchQuery && !isResultEmpty ? 'mb-6' : ''} style={{ columns: matchingCategories.length > 1 ? 'auto 200px' : 1 }}> <div className={searchQuery && !isResultEmpty ? 'mb-6' : ''} style={{ columns: matchingCategories.length > 1 ? 'auto 200px' : 1 }}>