Skip to content
Next
Projects
Groups
Snippets
Help
Sign in / Register
Toggle navigation
Minds Frontend
Project
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
814
Merge Requests
63
CI / CD
Security & Compliance
Packages
Wiki
Snippets
Members
Collapse sidebar
Close sidebar
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
3c6a106a
Commit
3c6a106a
authored
3 hours ago
by
Olivia Madrid
Browse files
Options
Download
(feat): fixed timespan filter and changed fake data timespan to 30d
parent
a3641677
analytics-v2-finetune-2089
1 merge request
!614
Analytics v2 finetune
Pipeline
#92916645
passed with stages
in 46 minutes and 54 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
29 deletions
+9
-29
src/app/modules/analytics/v2/components/filter/filter.component.ts
View file @
3c6a106a
...
...
@@ -40,7 +40,7 @@ export class AnalyticsFilterComponent implements OnInit {
updateFilter
(
option
:
Option
)
{
this
.
expanded
=
false
;
if
(
!
option
.
available
)
{
if
(
'
available
'
in
option
&&
!
option
.
available
)
{
return
;
}
this
.
selectedOption
=
option
;
...
...
This diff is collapsed.
src/app/modules/analytics/v2/fake-data.ts
View file @
3c6a106a
...
...
@@ -3,36 +3,16 @@ const fakeData: Array<any> = [
// CHART TESTS
loading
:
false
,
category
:
'
traffic
'
,
description
:
'
imma traffic description imma traffic description imma traffic description imma traffic description imma traffic description
'
,
timespan
:
'
28d
'
,
timespan
:
'
30d
'
,
timespans
:
[
// {
// id: '30d',
// label: 'Last 30 days',
// interval: 'day',
// comparison_interval: 28,
// from_ts_ms: 1567296000000,
// from_ts_iso: '2019-09-01T00:00:00+00:00',
// selected: false,
// },
// {
// id: '1y',
// label: '1 year ago',
// interval: 'month',
// comparison_interval: 365,
// from_ts_ms: 1538352000000,
// from_ts_iso: '2018-10-01T00:00:00+00:00',
// selected: false,
// },
{
id
:
'
28
d
'
,
label
:
'
Last
28 D
ays
'
,
id
:
'
30
d
'
,
label
:
'
Last
30 d
ays
'
,
interval
:
'
day
'
,
comparison_interval
:
3
65
,
from_ts_ms
:
15
38352
000000
,
from_ts_iso
:
'
201
8-10
-01T00:00:00+00:00
'
,
selected
:
tru
e
,
comparison_interval
:
3
0
,
from_ts_ms
:
15
67296
000000
,
from_ts_iso
:
'
201
9-09
-01T00:00:00+00:00
'
,
selected
:
fals
e
,
},
{
id
:
'
12m
'
,
...
...
@@ -54,7 +34,7 @@ const fakeData: Array<any> = [
{
id
:
'
all
'
,
label
:
'
All
'
,
available
:
true
,
selected
:
false
},
{
id
:
'
browser
'
,
label
:
'
Browser
BrowserBrowserBrowserBrowser
'
,
label
:
'
Browser
'
,
available
:
true
,
selected
:
false
,
},
...
...
This diff is collapsed.
Please
register
or
sign in
to comment