@ -5,7 +5,7 @@ import { navigateToQuery } from '../../query'
import * as api from '../../api'
import * as storage from '../../util/storage'
import LazyLoader from '../../components/lazy-loader'
import { GraphTooltip , buildDataSet , METRIC _MAPPING , METRIC _LABELS , METRIC _FORMATTER } from './graph-util' ;
import { GraphTooltip , buildDataSet , METRIC _MAPPING , METRIC _LABELS , METRIC _FORMATTER , LoadingState } from './graph-util' ;
import dateFormatter from './date-formatter' ;
import TopStats from './top-stats' ;
import { IntervalPicker , getStoredInterval , storeInterval } from './interval-picker' ;
@ -13,12 +13,6 @@ import FadeIn from '../../fade-in';
import * as url from '../../util/url'
import classNames from "classnames" ;
const LOADING _STATE = {
loading : 'loading' ,
refreshing : 'refreshing' ,
loaded : 'loaded'
}
class LineGraph extends React . Component {
constructor ( props ) {
super ( props ) ;
@ -35,8 +29,6 @@ class LineGraph extends React.Component {
const graphEl = document . getElementById ( "main-graph-canvas" )
this . ctx = graphEl . getContext ( '2d' ) ;
const dataSet = buildDataSet ( graphData . plot , graphData . present _index , this . ctx , METRIC _LABELS [ metric ] )
// const prev_dataSet = graphData.prev_plot && buildDataSet(graphData.prev_plot, false, this.ctx, METRIC_LABELS[metric], true)
// const combinedDataSets = comparison.enabled && prev_dataSet ? [...dataSet, ...prev_dataSet] : dataSet;
return new Chart ( this . ctx , {
type : 'line' ,
@ -122,14 +114,14 @@ class LineGraph extends React.Component {
}
componentDidMount ( ) {
if ( this . props . metric && this . props . graphData) {
if ( this . props . graphData) {
this . chart = this . regenerateChart ( ) ;
}
window . addEventListener ( 'mousemove' , this . repositionTooltip ) ;
}
componentDidUpdate ( prevProps ) {
const { graphData , metric, darkTheme } = this . props ;
const { graphData , darkTheme } = this . props ;
const tooltip = document . getElementById ( 'chartjs-tooltip' ) ;
if (
@ -137,7 +129,7 @@ class LineGraph extends React.Component {
darkTheme !== prevProps . darkTheme
) {
if ( metric && graphData) {
if ( graphData) {
if ( this . chart ) {
this . chart . destroy ( ) ;
}
@ -150,7 +142,7 @@ class LineGraph extends React.Component {
}
}
if ( ! graphData || ! metric ) {
if ( ! graphData ) {
if ( this . chart ) {
this . chart . destroy ( ) ;
}
@ -312,8 +304,8 @@ export default class VisitorGraph extends React.Component {
constructor ( props ) {
super ( props )
this . state = {
topStatsLoadingState : L OADING_STATE . loading ,
mainGraphLoadingState : L OADING_STATE . loading ,
topStatsLoadingState : L oadingState . loading ,
mainGraphLoadingState : L oadingState . loading ,
metric : storage . getItem ( ` metric__ ${ this . props . site . domain } ` ) || 'visitors'
}
this . onVisible = this . onVisible . bind ( this )
@ -344,12 +336,12 @@ export default class VisitorGraph extends React.Component {
updateInterval ( interval ) {
if ( this . isIntervalValid ( interval ) ) {
storeInterval ( this . props . query . period , this . props . site . domain , interval )
this . setState ( { mainGraphLoadingState : L OADING_STATE . refreshing } , this . fetchGraphData )
this . setState ( { mainGraphLoadingState : L oadingState . refreshing } , this . fetchGraphData )
}
}
onVisible ( ) {
this . setState ( { mainGraphLoadingState : L OADING_STATE . loading } , this . fetchGraphData )
this . setState ( { mainGraphLoadingState : L oadingState . loading } , this . fetchGraphData )
this . fetchTopStatData ( )
if ( this . props . query . period === 'realtime' ) {
document . addEventListener ( 'tick' , this . fetchGraphData )
@ -362,16 +354,12 @@ export default class VisitorGraph extends React.Component {
const { query } = this . props
if ( query !== prevProps . query ) {
if ( this . isGraphCollapsed ( ) ) {
this . setState ( { topStatsLoadingState : LOADING _STATE . loading , topStatData : null } )
} else {
this . setState ( { mainGraphLoadingState : LOADING _STATE . loading , topStatsLoadingState : LOADING _STATE . loading , graphData : null , topStatData : null } , this . fetchGraphData )
}
this . setState ( { mainGraphLoadingState : LoadingState . loading , topStatsLoadingState : LoadingState . loading , graphData : null , topStatData : null } , this . fetchGraphData )
this . fetchTopStatData ( )
}
if ( metric !== prevState . metric ) {
this . setState ( { mainGraphLoadingState : L OADING_STATE . refreshing } , this . fetchGraphData )
this . setState ( { mainGraphLoadingState : L oadingState . refreshing } , this . fetchGraphData )
}
}
@ -385,35 +373,26 @@ export default class VisitorGraph extends React.Component {
if ( query . filters . goal ) {
this . setState ( { metric : 'conversions' } )
} else if ( canSelectSavedMetric || savedMetric === "" ) {
} else if ( canSelectSavedMetric ) {
this . setState ( { metric : savedMetric } )
} else {
this . setState ( { metric : 'visitors' } )
}
}
isGraphCollapsed ( ) {
return this . state . metric === ""
}
componentWillUnmount ( ) {
document . removeEventListener ( 'tick' , this . fetchGraphData )
document . removeEventListener ( 'tick' , this . fetchTopStatData )
}
updateMetric ( clickedMetric ) {
const newMetric = clickedMetric === this . state . metric ? "" : clickedMetric
if ( this . state . metric == clickedMetric ) return
storage . setItem ( ` metric__ ${ this . props . site . domain } ` , new Metric)
this . setState ( { metric : newMetric } )
storage . setItem ( ` metric__ ${ this . props . site . domain } ` , clicked Metric)
this . setState ( { metric : clickedMetric, graphData : null } )
}
fetchGraphData ( ) {
if ( this . isGraphCollapsed ( ) ) {
this . setState ( { mainGraphLoadingState : LOADING _STATE . loaded , graphData : null } )
return
}
const url = ` /api/stats/ ${ encodeURIComponent ( this . props . site . domain ) } /main-graph `
let params = { metric : this . state . metric }
const interval = this . getIntervalFromStorage ( )
@ -421,19 +400,19 @@ export default class VisitorGraph extends React.Component {
api . get ( url , this . props . query , params )
. then ( ( res ) => {
this . setState ( { mainGraphLoadingState : L OADING_STATE . loaded , graphData : res } )
this . setState ( { mainGraphLoadingState : L oadingState . loaded , graphData : res } )
return res
} )
. catch ( ( err ) => {
console . log ( err )
this . setState ( { mainGraphLoadingState : L OADING_STATE . loaded , graphData : false } )
this . setState ( { mainGraphLoadingState : L oadingState . loaded , graphData : false } )
} )
}
fetchTopStatData ( ) {
api . get ( ` /api/stats/ ${ encodeURIComponent ( this . props . site . domain ) } /top-stats ` , this . props . query )
. then ( ( res ) => {
this . setState ( { topStatsLoadingState : L OADING_STATE . loaded , topStatData : res } , this . resetMetric )
this . setState ( { topStatsLoadingState : L oadingState . loaded , topStatData : res } , this . resetMetric )
return res
} )
}
@ -444,15 +423,13 @@ export default class VisitorGraph extends React.Component {
const theme = document . querySelector ( 'html' ) . classList . contains ( 'dark' ) || false
const topStatsLoadedOrRefreshing = ( topStatsLoadingState === LOADING _STATE . loaded || topStatsLoadingState === LOADING _STATE . refreshing )
const mainGraphLoadedOrRefreshing = ( mainGraphLoadingState === LOADING _STATE . loaded || mainGraphLoadingState === LOADING _STATE . refreshing )
const noMetricOrRefreshing = ( ! metric || mainGraphLoadingState === LOADING _STATE . refreshing )
const mainGraphRefreshing = ( mainGraphLoadingState === LoadingState . refreshing )
const topStatAndGraphLoaded = ! ! ( topStatData && graphData )
const showGraph =
topStatsLoadedOrRefreshing &&
mainGraphLoadedOrRefreshing &&
( topStatData && noMetricOr Refreshing || topStatAndGraphLoaded )
LoadingState . isLoadedOrRefreshing ( topStatsLoadingState ) &&
LoadingState . isLoadedOrRefreshing ( mainGraphLoadingState ) &&
( topStatData && mainGraph Refreshing || topStatAndGraphLoaded )
return (
< FadeIn show = { showGraph } >
@ -462,23 +439,20 @@ export default class VisitorGraph extends React.Component {
}
render ( ) {
const { m etric, m ainGraphLoadingState, topStatsLoadingState } = this . state
const { m ainGraphLoadingState, topStatsLoadingState } = this . state
const loaderClassName = classNames ( 'mx-auto loading' , {
'pt-52 sm:pt-56 md:pt-60' : mainGraphLoadingState == LOADING _STATE . refreshing ,
'pt-32 sm:pt-36 md:pt-48' : mainGraphLoadingState !== LOADING _STATE . refreshing && metric ,
'pt-16 sm:pt-14 md:pt-18 lg:pt-5' : mainGraphLoadingState !== LOADING _STATE . refreshing && ! metric
'pt-52 sm:pt-56 md:pt-60' : mainGraphLoadingState == LoadingState . refreshing ,
'pt-32 sm:pt-36 md:pt-48' : mainGraphLoadingState !== LoadingState . refreshing ,
} )
const loadingOrRefreshing =
mainGraphLoadingState == LOADING _STATE . refreshing ||
mainGraphLoadingState == LOADING _STATE . loading ||
topStatsLoadingState == LOADING _STATE . refreshing ||
topStatsLoadingState == LOADING _STATE . loading
const showLoader =
LoadingState . isLoadingOrRefreshing ( mainGraphLoadingState ) ||
LoadingState . isLoadingOrRefreshing ( topStatsLoadingState )
return (
< LazyLoader onVisible = { this . onVisible } >
< div className = { ` relative w-full mt-2 bg-white rounded shadow-xl dark:bg-gray-825 transition-padding ease-in-out duration-150 ${ metric ? 'main-graph' : 'top-stats-only' } ` } >
{ loadingOrRefreshing && < div className = "graph-inner" > < div className = { loaderClassName } > < div > < / d i v > < / d i v > < / d i v > }
< div className = { "relative w-full mt-2 bg-white rounded shadow-xl dark:bg-gray-825 main-graph" } >
{ showLoader && < div className = "graph-inner" > < div className = { loaderClassName } > < div > < / d i v > < / d i v > < / d i v > }
{ this . renderInner ( ) }
< / d i v >
< / L a z y L o a d e r >