cherry-picj 2683d570e8 and resolved conflicts

frontend/.storybook/main.ts

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

frontend/app/components/Alerts/AlertForm.js

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

frontend/app/components/Dashboard/components/WidgetForm/renderMap.ts

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

frontend/app/components/Session/WebPlayer.tsx

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

frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx

@@ -61,7 +61,6 @@ function FilterModal(props: Props) {
   const isResultEmpty = (!filterSearchList || Object.keys(filterSearchList).length === 0)
     && matchingCategories.length === 0 && Object.keys(matchingFilters).length === 0
 
-    // console.log(matchingFilters)
   return (
     <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 }}>