2013-04-17 04:56:18 +08:00
|
|
|
|
require_dependency 'topic_subtype'
|
|
|
|
|
|
2013-02-28 11:39:42 +08:00
|
|
|
|
class Report
|
2018-08-01 05:35:13 +08:00
|
|
|
|
# Change this line each time report format change
|
|
|
|
|
# and you want to ensure cache is reset
|
2018-08-30 20:56:11 +08:00
|
|
|
|
SCHEMA_VERSION = 3
|
2018-08-01 05:35:13 +08:00
|
|
|
|
|
2018-05-03 21:41:41 +08:00
|
|
|
|
attr_accessor :type, :data, :total, :prev30Days, :start_date,
|
FEATURE: Exposing a way to add a generic report filter (#6816)
* FEATURE: Exposing a way to add a generic report filter
## Why do we need this change?
Part of the work discussed [here](https://meta.discourse.org/t/gain-understanding-of-file-uploads-usage/104994), and implemented a first spike [here](https://github.com/discourse/discourse/pull/6809), I am trying to expose a single generic filter selector per report.
## How does this work?
We basically expose a simple, single generic filter that is computed and displayed based on backend values passed into the report.
This would be a simple contract between the frontend and the backend.
**Backend changes:** we simply need to return a list of dropdown / select options, and enable the report's newly introduced `custom_filtering` property.
For example, for our [Top Uploads](https://github.com/discourse/discourse/pull/6809/files#diff-3f97cbb8726f3310e0b0c386dbe89e22R1423) report, it can look like this on the backend:
```ruby
report.custom_filtering = true
report.custom_filter_options = [{ id: "any", name: "Any" }, { id: "jpg", name: "JPEG" } ]
```
In our javascript report HTTP call, it will look like:
```js
{
"custom_filtering": true,
"custom_filter_options": [
{
"id": "any",
"name": "Any"
},
{
"id": "jpg",
"name": "JPG"
}
]
}
```
**Frontend changes:** We introduced a generic `filter` param and a `combo-box` which hooks up into the existing framework for fetching a report.
This works alright, with the limitation of being a single custom filter per report. If we wanted to add, for an instance a `filesize filter`, this will not work for us. _I went through with this approach because it is hard to predict and build abstractions for requirements or problems we don't have yet, or might not have._
## How does it look like?
![a1ktg1odde](https://user-images.githubusercontent.com/45508821/50485875-f17edb80-09ee-11e9-92dd-1454ab041fbb.gif)
## More on the bigger picture
The major concern here I have is the solution I introduced might serve the `think small` version of the reporting work, but I don't think it serves the `think big`, I will try to shed some light into why.
Within the current design, It is hard to maintain QueryParams for dynamically generated params (based on the idea of introducing more than one custom filter per report).
To allow ourselves to have more than one generic filter, we will need to:
a. Use the Route's model to retrieve the report's payload (we are now dependent on changes of the QueryParams via computed properties)
b. After retrieving the payload, we can use the `setupController` to define our dynamic QueryParams based on the custom filters definitions we received from the backend
c. Load a custom filter specific Ember component based on the definitions we received from the backend
2019-03-15 20:15:38 +08:00
|
|
|
|
:end_date, :category_id, :group_id, :filter,
|
|
|
|
|
:labels, :async, :prev_period, :facets, :limit, :processing, :average, :percent,
|
2018-07-20 02:33:11 +08:00
|
|
|
|
:higher_is_better, :icon, :modes, :category_filtering,
|
|
|
|
|
:group_filtering, :prev_data, :prev_start_date, :prev_end_date,
|
FEATURE: Exposing a way to add a generic report filter (#6816)
* FEATURE: Exposing a way to add a generic report filter
## Why do we need this change?
Part of the work discussed [here](https://meta.discourse.org/t/gain-understanding-of-file-uploads-usage/104994), and implemented a first spike [here](https://github.com/discourse/discourse/pull/6809), I am trying to expose a single generic filter selector per report.
## How does this work?
We basically expose a simple, single generic filter that is computed and displayed based on backend values passed into the report.
This would be a simple contract between the frontend and the backend.
**Backend changes:** we simply need to return a list of dropdown / select options, and enable the report's newly introduced `custom_filtering` property.
For example, for our [Top Uploads](https://github.com/discourse/discourse/pull/6809/files#diff-3f97cbb8726f3310e0b0c386dbe89e22R1423) report, it can look like this on the backend:
```ruby
report.custom_filtering = true
report.custom_filter_options = [{ id: "any", name: "Any" }, { id: "jpg", name: "JPEG" } ]
```
In our javascript report HTTP call, it will look like:
```js
{
"custom_filtering": true,
"custom_filter_options": [
{
"id": "any",
"name": "Any"
},
{
"id": "jpg",
"name": "JPG"
}
]
}
```
**Frontend changes:** We introduced a generic `filter` param and a `combo-box` which hooks up into the existing framework for fetching a report.
This works alright, with the limitation of being a single custom filter per report. If we wanted to add, for an instance a `filesize filter`, this will not work for us. _I went through with this approach because it is hard to predict and build abstractions for requirements or problems we don't have yet, or might not have._
## How does it look like?
![a1ktg1odde](https://user-images.githubusercontent.com/45508821/50485875-f17edb80-09ee-11e9-92dd-1454ab041fbb.gif)
## More on the bigger picture
The major concern here I have is the solution I introduced might serve the `think small` version of the reporting work, but I don't think it serves the `think big`, I will try to shed some light into why.
Within the current design, It is hard to maintain QueryParams for dynamically generated params (based on the idea of introducing more than one custom filter per report).
To allow ourselves to have more than one generic filter, we will need to:
a. Use the Route's model to retrieve the report's payload (we are now dependent on changes of the QueryParams via computed properties)
b. After retrieving the payload, we can use the `setupController` to define our dynamic QueryParams based on the custom filters definitions we received from the backend
c. Load a custom filter specific Ember component based on the definitions we received from the backend
2019-03-15 20:15:38 +08:00
|
|
|
|
:dates_filtering, :error, :primary_color, :secondary_color, :filter_options
|
2014-11-05 06:08:39 +08:00
|
|
|
|
|
|
|
|
|
def self.default_days
|
|
|
|
|
30
|
|
|
|
|
end
|
2013-02-28 11:39:42 +08:00
|
|
|
|
|
|
|
|
|
def initialize(type)
|
|
|
|
|
@type = type
|
2018-08-17 22:19:25 +08:00
|
|
|
|
@start_date ||= Report.default_days.days.ago.utc.beginning_of_day
|
|
|
|
|
@end_date ||= Time.now.utc.end_of_day
|
2018-07-20 02:33:11 +08:00
|
|
|
|
@prev_end_date = @start_date
|
2018-05-18 04:44:33 +08:00
|
|
|
|
@average = false
|
|
|
|
|
@percent = false
|
|
|
|
|
@higher_is_better = true
|
2018-07-20 02:33:11 +08:00
|
|
|
|
@category_filtering = false
|
|
|
|
|
@group_filtering = false
|
|
|
|
|
@modes = [:table, :chart]
|
|
|
|
|
@prev_data = nil
|
|
|
|
|
@dates_filtering = true
|
FEATURE: Exposing a way to add a generic report filter (#6816)
* FEATURE: Exposing a way to add a generic report filter
## Why do we need this change?
Part of the work discussed [here](https://meta.discourse.org/t/gain-understanding-of-file-uploads-usage/104994), and implemented a first spike [here](https://github.com/discourse/discourse/pull/6809), I am trying to expose a single generic filter selector per report.
## How does this work?
We basically expose a simple, single generic filter that is computed and displayed based on backend values passed into the report.
This would be a simple contract between the frontend and the backend.
**Backend changes:** we simply need to return a list of dropdown / select options, and enable the report's newly introduced `custom_filtering` property.
For example, for our [Top Uploads](https://github.com/discourse/discourse/pull/6809/files#diff-3f97cbb8726f3310e0b0c386dbe89e22R1423) report, it can look like this on the backend:
```ruby
report.custom_filtering = true
report.custom_filter_options = [{ id: "any", name: "Any" }, { id: "jpg", name: "JPEG" } ]
```
In our javascript report HTTP call, it will look like:
```js
{
"custom_filtering": true,
"custom_filter_options": [
{
"id": "any",
"name": "Any"
},
{
"id": "jpg",
"name": "JPG"
}
]
}
```
**Frontend changes:** We introduced a generic `filter` param and a `combo-box` which hooks up into the existing framework for fetching a report.
This works alright, with the limitation of being a single custom filter per report. If we wanted to add, for an instance a `filesize filter`, this will not work for us. _I went through with this approach because it is hard to predict and build abstractions for requirements or problems we don't have yet, or might not have._
## How does it look like?
![a1ktg1odde](https://user-images.githubusercontent.com/45508821/50485875-f17edb80-09ee-11e9-92dd-1454ab041fbb.gif)
## More on the bigger picture
The major concern here I have is the solution I introduced might serve the `think small` version of the reporting work, but I don't think it serves the `think big`, I will try to shed some light into why.
Within the current design, It is hard to maintain QueryParams for dynamically generated params (based on the idea of introducing more than one custom filter per report).
To allow ourselves to have more than one generic filter, we will need to:
a. Use the Route's model to retrieve the report's payload (we are now dependent on changes of the QueryParams via computed properties)
b. After retrieving the payload, we can use the `setupController` to define our dynamic QueryParams based on the custom filters definitions we received from the backend
c. Load a custom filter specific Ember component based on the definitions we received from the backend
2019-03-15 20:15:38 +08:00
|
|
|
|
@filter_options = nil
|
|
|
|
|
@filter = nil
|
2018-09-13 23:36:39 +08:00
|
|
|
|
|
|
|
|
|
tertiary = ColorScheme.hex_for_name('tertiary') || '0088cc'
|
|
|
|
|
@primary_color = rgba_color(tertiary)
|
|
|
|
|
@secondary_color = rgba_color(tertiary, 0.1)
|
2013-02-28 11:39:42 +08:00
|
|
|
|
end
|
|
|
|
|
|
2018-05-03 21:41:41 +08:00
|
|
|
|
def self.cache_key(report)
|
2018-05-11 11:30:21 +08:00
|
|
|
|
(+"reports:") <<
|
|
|
|
|
[
|
|
|
|
|
report.type,
|
|
|
|
|
report.category_id,
|
|
|
|
|
report.start_date.to_date.strftime("%Y%m%d"),
|
|
|
|
|
report.end_date.to_date.strftime("%Y%m%d"),
|
|
|
|
|
report.group_id,
|
FEATURE: Exposing a way to add a generic report filter (#6816)
* FEATURE: Exposing a way to add a generic report filter
## Why do we need this change?
Part of the work discussed [here](https://meta.discourse.org/t/gain-understanding-of-file-uploads-usage/104994), and implemented a first spike [here](https://github.com/discourse/discourse/pull/6809), I am trying to expose a single generic filter selector per report.
## How does this work?
We basically expose a simple, single generic filter that is computed and displayed based on backend values passed into the report.
This would be a simple contract between the frontend and the backend.
**Backend changes:** we simply need to return a list of dropdown / select options, and enable the report's newly introduced `custom_filtering` property.
For example, for our [Top Uploads](https://github.com/discourse/discourse/pull/6809/files#diff-3f97cbb8726f3310e0b0c386dbe89e22R1423) report, it can look like this on the backend:
```ruby
report.custom_filtering = true
report.custom_filter_options = [{ id: "any", name: "Any" }, { id: "jpg", name: "JPEG" } ]
```
In our javascript report HTTP call, it will look like:
```js
{
"custom_filtering": true,
"custom_filter_options": [
{
"id": "any",
"name": "Any"
},
{
"id": "jpg",
"name": "JPG"
}
]
}
```
**Frontend changes:** We introduced a generic `filter` param and a `combo-box` which hooks up into the existing framework for fetching a report.
This works alright, with the limitation of being a single custom filter per report. If we wanted to add, for an instance a `filesize filter`, this will not work for us. _I went through with this approach because it is hard to predict and build abstractions for requirements or problems we don't have yet, or might not have._
## How does it look like?
![a1ktg1odde](https://user-images.githubusercontent.com/45508821/50485875-f17edb80-09ee-11e9-92dd-1454ab041fbb.gif)
## More on the bigger picture
The major concern here I have is the solution I introduced might serve the `think small` version of the reporting work, but I don't think it serves the `think big`, I will try to shed some light into why.
Within the current design, It is hard to maintain QueryParams for dynamically generated params (based on the idea of introducing more than one custom filter per report).
To allow ourselves to have more than one generic filter, we will need to:
a. Use the Route's model to retrieve the report's payload (we are now dependent on changes of the QueryParams via computed properties)
b. After retrieving the payload, we can use the `setupController` to define our dynamic QueryParams based on the custom filters definitions we received from the backend
c. Load a custom filter specific Ember component based on the definitions we received from the backend
2019-03-15 20:15:38 +08:00
|
|
|
|
report.filter,
|
2018-05-15 13:08:23 +08:00
|
|
|
|
report.facets,
|
2018-08-01 05:35:13 +08:00
|
|
|
|
report.limit,
|
|
|
|
|
SCHEMA_VERSION,
|
|
|
|
|
].compact.map(&:to_s).join(':')
|
2018-05-03 21:41:41 +08:00
|
|
|
|
end
|
|
|
|
|
|
2018-12-15 06:14:46 +08:00
|
|
|
|
def self.clear_cache(type = nil)
|
|
|
|
|
pattern = type ? "reports:#{type}:*" : "reports:*"
|
|
|
|
|
|
|
|
|
|
Discourse.cache.keys(pattern).each do |key|
|
2018-05-03 21:41:41 +08:00
|
|
|
|
Discourse.cache.redis.del(key)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
2018-07-20 02:33:11 +08:00
|
|
|
|
def self.wrap_slow_query(timeout = 20000)
|
2018-08-01 19:39:57 +08:00
|
|
|
|
ActiveRecord::Base.connection.transaction do
|
|
|
|
|
# Set a statement timeout so we can't tie up the server
|
|
|
|
|
DB.exec "SET LOCAL statement_timeout = #{timeout}"
|
|
|
|
|
yield
|
2018-07-20 02:33:11 +08:00
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def prev_start_date
|
|
|
|
|
self.start_date - (self.end_date - self.start_date)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def prev_end_date
|
|
|
|
|
self.start_date
|
|
|
|
|
end
|
|
|
|
|
|
FEATURE: Exposing a way to add a generic report filter (#6816)
* FEATURE: Exposing a way to add a generic report filter
## Why do we need this change?
Part of the work discussed [here](https://meta.discourse.org/t/gain-understanding-of-file-uploads-usage/104994), and implemented a first spike [here](https://github.com/discourse/discourse/pull/6809), I am trying to expose a single generic filter selector per report.
## How does this work?
We basically expose a simple, single generic filter that is computed and displayed based on backend values passed into the report.
This would be a simple contract between the frontend and the backend.
**Backend changes:** we simply need to return a list of dropdown / select options, and enable the report's newly introduced `custom_filtering` property.
For example, for our [Top Uploads](https://github.com/discourse/discourse/pull/6809/files#diff-3f97cbb8726f3310e0b0c386dbe89e22R1423) report, it can look like this on the backend:
```ruby
report.custom_filtering = true
report.custom_filter_options = [{ id: "any", name: "Any" }, { id: "jpg", name: "JPEG" } ]
```
In our javascript report HTTP call, it will look like:
```js
{
"custom_filtering": true,
"custom_filter_options": [
{
"id": "any",
"name": "Any"
},
{
"id": "jpg",
"name": "JPG"
}
]
}
```
**Frontend changes:** We introduced a generic `filter` param and a `combo-box` which hooks up into the existing framework for fetching a report.
This works alright, with the limitation of being a single custom filter per report. If we wanted to add, for an instance a `filesize filter`, this will not work for us. _I went through with this approach because it is hard to predict and build abstractions for requirements or problems we don't have yet, or might not have._
## How does it look like?
![a1ktg1odde](https://user-images.githubusercontent.com/45508821/50485875-f17edb80-09ee-11e9-92dd-1454ab041fbb.gif)
## More on the bigger picture
The major concern here I have is the solution I introduced might serve the `think small` version of the reporting work, but I don't think it serves the `think big`, I will try to shed some light into why.
Within the current design, It is hard to maintain QueryParams for dynamically generated params (based on the idea of introducing more than one custom filter per report).
To allow ourselves to have more than one generic filter, we will need to:
a. Use the Route's model to retrieve the report's payload (we are now dependent on changes of the QueryParams via computed properties)
b. After retrieving the payload, we can use the `setupController` to define our dynamic QueryParams based on the custom filters definitions we received from the backend
c. Load a custom filter specific Ember component based on the definitions we received from the backend
2019-03-15 20:15:38 +08:00
|
|
|
|
def filter_values
|
|
|
|
|
if self.filter.present?
|
|
|
|
|
return self.filter.delete_prefix("[").delete_suffix("]").split("&").map { |param| param.split("=") }.to_h
|
|
|
|
|
end
|
|
|
|
|
{}
|
|
|
|
|
end
|
|
|
|
|
|
2017-07-28 09:20:09 +08:00
|
|
|
|
def as_json(options = nil)
|
2018-05-14 22:34:56 +08:00
|
|
|
|
description = I18n.t("reports.#{type}.description", default: "")
|
2013-02-28 11:39:42 +08:00
|
|
|
|
{
|
2018-08-01 05:35:13 +08:00
|
|
|
|
type: type,
|
2018-12-15 06:14:46 +08:00
|
|
|
|
title: I18n.t("reports.#{type}.title", default: nil),
|
|
|
|
|
xaxis: I18n.t("reports.#{type}.xaxis", default: nil),
|
|
|
|
|
yaxis: I18n.t("reports.#{type}.yaxis", default: nil),
|
2018-08-01 05:35:13 +08:00
|
|
|
|
description: description.presence ? description : nil,
|
|
|
|
|
data: data,
|
|
|
|
|
start_date: start_date&.iso8601,
|
|
|
|
|
end_date: end_date&.iso8601,
|
|
|
|
|
prev_data: self.prev_data,
|
|
|
|
|
prev_start_date: prev_start_date&.iso8601,
|
|
|
|
|
prev_end_date: prev_end_date&.iso8601,
|
|
|
|
|
category_id: category_id,
|
|
|
|
|
group_id: group_id,
|
FEATURE: Exposing a way to add a generic report filter (#6816)
* FEATURE: Exposing a way to add a generic report filter
## Why do we need this change?
Part of the work discussed [here](https://meta.discourse.org/t/gain-understanding-of-file-uploads-usage/104994), and implemented a first spike [here](https://github.com/discourse/discourse/pull/6809), I am trying to expose a single generic filter selector per report.
## How does this work?
We basically expose a simple, single generic filter that is computed and displayed based on backend values passed into the report.
This would be a simple contract between the frontend and the backend.
**Backend changes:** we simply need to return a list of dropdown / select options, and enable the report's newly introduced `custom_filtering` property.
For example, for our [Top Uploads](https://github.com/discourse/discourse/pull/6809/files#diff-3f97cbb8726f3310e0b0c386dbe89e22R1423) report, it can look like this on the backend:
```ruby
report.custom_filtering = true
report.custom_filter_options = [{ id: "any", name: "Any" }, { id: "jpg", name: "JPEG" } ]
```
In our javascript report HTTP call, it will look like:
```js
{
"custom_filtering": true,
"custom_filter_options": [
{
"id": "any",
"name": "Any"
},
{
"id": "jpg",
"name": "JPG"
}
]
}
```
**Frontend changes:** We introduced a generic `filter` param and a `combo-box` which hooks up into the existing framework for fetching a report.
This works alright, with the limitation of being a single custom filter per report. If we wanted to add, for an instance a `filesize filter`, this will not work for us. _I went through with this approach because it is hard to predict and build abstractions for requirements or problems we don't have yet, or might not have._
## How does it look like?
![a1ktg1odde](https://user-images.githubusercontent.com/45508821/50485875-f17edb80-09ee-11e9-92dd-1454ab041fbb.gif)
## More on the bigger picture
The major concern here I have is the solution I introduced might serve the `think small` version of the reporting work, but I don't think it serves the `think big`, I will try to shed some light into why.
Within the current design, It is hard to maintain QueryParams for dynamically generated params (based on the idea of introducing more than one custom filter per report).
To allow ourselves to have more than one generic filter, we will need to:
a. Use the Route's model to retrieve the report's payload (we are now dependent on changes of the QueryParams via computed properties)
b. After retrieving the payload, we can use the `setupController` to define our dynamic QueryParams based on the custom filters definitions we received from the backend
c. Load a custom filter specific Ember component based on the definitions we received from the backend
2019-03-15 20:15:38 +08:00
|
|
|
|
filter: self.filter,
|
2018-08-01 05:35:13 +08:00
|
|
|
|
prev30Days: self.prev30Days,
|
|
|
|
|
dates_filtering: self.dates_filtering,
|
|
|
|
|
report_key: Report.cache_key(self),
|
2018-08-30 20:56:11 +08:00
|
|
|
|
primary_color: self.primary_color,
|
|
|
|
|
secondary_color: self.secondary_color,
|
2018-08-01 05:35:13 +08:00
|
|
|
|
labels: labels || [
|
|
|
|
|
{
|
|
|
|
|
type: :date,
|
|
|
|
|
property: :x,
|
|
|
|
|
title: I18n.t("reports.default.labels.day")
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
type: :number,
|
|
|
|
|
property: :y,
|
|
|
|
|
title: I18n.t("reports.default.labels.count")
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
processing: self.processing,
|
|
|
|
|
average: self.average,
|
|
|
|
|
percent: self.percent,
|
|
|
|
|
higher_is_better: self.higher_is_better,
|
|
|
|
|
category_filtering: self.category_filtering,
|
|
|
|
|
group_filtering: self.group_filtering,
|
FEATURE: Exposing a way to add a generic report filter (#6816)
* FEATURE: Exposing a way to add a generic report filter
## Why do we need this change?
Part of the work discussed [here](https://meta.discourse.org/t/gain-understanding-of-file-uploads-usage/104994), and implemented a first spike [here](https://github.com/discourse/discourse/pull/6809), I am trying to expose a single generic filter selector per report.
## How does this work?
We basically expose a simple, single generic filter that is computed and displayed based on backend values passed into the report.
This would be a simple contract between the frontend and the backend.
**Backend changes:** we simply need to return a list of dropdown / select options, and enable the report's newly introduced `custom_filtering` property.
For example, for our [Top Uploads](https://github.com/discourse/discourse/pull/6809/files#diff-3f97cbb8726f3310e0b0c386dbe89e22R1423) report, it can look like this on the backend:
```ruby
report.custom_filtering = true
report.custom_filter_options = [{ id: "any", name: "Any" }, { id: "jpg", name: "JPEG" } ]
```
In our javascript report HTTP call, it will look like:
```js
{
"custom_filtering": true,
"custom_filter_options": [
{
"id": "any",
"name": "Any"
},
{
"id": "jpg",
"name": "JPG"
}
]
}
```
**Frontend changes:** We introduced a generic `filter` param and a `combo-box` which hooks up into the existing framework for fetching a report.
This works alright, with the limitation of being a single custom filter per report. If we wanted to add, for an instance a `filesize filter`, this will not work for us. _I went through with this approach because it is hard to predict and build abstractions for requirements or problems we don't have yet, or might not have._
## How does it look like?
![a1ktg1odde](https://user-images.githubusercontent.com/45508821/50485875-f17edb80-09ee-11e9-92dd-1454ab041fbb.gif)
## More on the bigger picture
The major concern here I have is the solution I introduced might serve the `think small` version of the reporting work, but I don't think it serves the `think big`, I will try to shed some light into why.
Within the current design, It is hard to maintain QueryParams for dynamically generated params (based on the idea of introducing more than one custom filter per report).
To allow ourselves to have more than one generic filter, we will need to:
a. Use the Route's model to retrieve the report's payload (we are now dependent on changes of the QueryParams via computed properties)
b. After retrieving the payload, we can use the `setupController` to define our dynamic QueryParams based on the custom filters definitions we received from the backend
c. Load a custom filter specific Ember component based on the definitions we received from the backend
2019-03-15 20:15:38 +08:00
|
|
|
|
filter_options: self.filter_options,
|
2018-08-01 05:35:13 +08:00
|
|
|
|
modes: self.modes,
|
2018-03-16 05:10:45 +08:00
|
|
|
|
}.tap do |json|
|
2018-08-07 04:57:40 +08:00
|
|
|
|
json[:icon] = self.icon if self.icon
|
2018-08-01 09:23:28 +08:00
|
|
|
|
json[:error] = self.error if self.error
|
2018-07-20 02:33:11 +08:00
|
|
|
|
json[:total] = self.total if self.total
|
|
|
|
|
json[:prev_period] = self.prev_period if self.prev_period
|
2018-05-11 11:30:21 +08:00
|
|
|
|
json[:prev30Days] = self.prev30Days if self.prev30Days
|
2018-05-15 13:08:23 +08:00
|
|
|
|
json[:limit] = self.limit if self.limit
|
2018-05-11 11:30:21 +08:00
|
|
|
|
|
2018-03-16 05:10:45 +08:00
|
|
|
|
if type == 'page_view_crawler_reqs'
|
|
|
|
|
json[:related_report] = Report.find('web_crawlers', start_date: start_date, end_date: end_date)&.as_json
|
|
|
|
|
end
|
|
|
|
|
end
|
2013-02-28 11:39:42 +08:00
|
|
|
|
end
|
|
|
|
|
|
2015-06-25 08:42:08 +08:00
|
|
|
|
def Report.add_report(name, &block)
|
|
|
|
|
singleton_class.instance_eval { define_method("report_#{name}", &block) }
|
|
|
|
|
end
|
|
|
|
|
|
2018-05-16 14:05:03 +08:00
|
|
|
|
def self._get(type, opts = nil)
|
2014-11-05 06:08:39 +08:00
|
|
|
|
opts ||= {}
|
2015-10-20 04:30:34 +08:00
|
|
|
|
|
2013-02-28 11:39:42 +08:00
|
|
|
|
# Load the report
|
|
|
|
|
report = Report.new(type)
|
2018-05-03 23:39:37 +08:00
|
|
|
|
report.start_date = opts[:start_date] if opts[:start_date]
|
|
|
|
|
report.end_date = opts[:end_date] if opts[:end_date]
|
2015-06-24 21:19:39 +08:00
|
|
|
|
report.category_id = opts[:category_id] if opts[:category_id]
|
2016-02-03 10:29:51 +08:00
|
|
|
|
report.group_id = opts[:group_id] if opts[:group_id]
|
FEATURE: Exposing a way to add a generic report filter (#6816)
* FEATURE: Exposing a way to add a generic report filter
## Why do we need this change?
Part of the work discussed [here](https://meta.discourse.org/t/gain-understanding-of-file-uploads-usage/104994), and implemented a first spike [here](https://github.com/discourse/discourse/pull/6809), I am trying to expose a single generic filter selector per report.
## How does this work?
We basically expose a simple, single generic filter that is computed and displayed based on backend values passed into the report.
This would be a simple contract between the frontend and the backend.
**Backend changes:** we simply need to return a list of dropdown / select options, and enable the report's newly introduced `custom_filtering` property.
For example, for our [Top Uploads](https://github.com/discourse/discourse/pull/6809/files#diff-3f97cbb8726f3310e0b0c386dbe89e22R1423) report, it can look like this on the backend:
```ruby
report.custom_filtering = true
report.custom_filter_options = [{ id: "any", name: "Any" }, { id: "jpg", name: "JPEG" } ]
```
In our javascript report HTTP call, it will look like:
```js
{
"custom_filtering": true,
"custom_filter_options": [
{
"id": "any",
"name": "Any"
},
{
"id": "jpg",
"name": "JPG"
}
]
}
```
**Frontend changes:** We introduced a generic `filter` param and a `combo-box` which hooks up into the existing framework for fetching a report.
This works alright, with the limitation of being a single custom filter per report. If we wanted to add, for an instance a `filesize filter`, this will not work for us. _I went through with this approach because it is hard to predict and build abstractions for requirements or problems we don't have yet, or might not have._
## How does it look like?
![a1ktg1odde](https://user-images.githubusercontent.com/45508821/50485875-f17edb80-09ee-11e9-92dd-1454ab041fbb.gif)
## More on the bigger picture
The major concern here I have is the solution I introduced might serve the `think small` version of the reporting work, but I don't think it serves the `think big`, I will try to shed some light into why.
Within the current design, It is hard to maintain QueryParams for dynamically generated params (based on the idea of introducing more than one custom filter per report).
To allow ourselves to have more than one generic filter, we will need to:
a. Use the Route's model to retrieve the report's payload (we are now dependent on changes of the QueryParams via computed properties)
b. After retrieving the payload, we can use the `setupController` to define our dynamic QueryParams based on the custom filters definitions we received from the backend
c. Load a custom filter specific Ember component based on the definitions we received from the backend
2019-03-15 20:15:38 +08:00
|
|
|
|
report.filter = opts[:filter] if opts[:filter]
|
2018-05-11 11:30:21 +08:00
|
|
|
|
report.facets = opts[:facets] || [:total, :prev30Days]
|
2018-05-15 13:08:23 +08:00
|
|
|
|
report.limit = opts[:limit] if opts[:limit]
|
2018-05-16 02:12:03 +08:00
|
|
|
|
report.processing = false
|
2018-05-18 04:44:33 +08:00
|
|
|
|
report.average = opts[:average] if opts[:average]
|
|
|
|
|
report.percent = opts[:percent] if opts[:percent]
|
|
|
|
|
report.higher_is_better = opts[:higher_is_better] if opts[:higher_is_better]
|
2018-05-16 14:05:03 +08:00
|
|
|
|
report
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def self.find_cached(type, opts = nil)
|
|
|
|
|
report = _get(type, opts)
|
|
|
|
|
Discourse.cache.read(cache_key(report))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def self.cache(report, duration)
|
2018-08-01 21:45:50 +08:00
|
|
|
|
Discourse.cache.write(cache_key(report), report.as_json, force: true, expires_in: duration)
|
2018-05-16 14:05:03 +08:00
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def self.find(type, opts = nil)
|
2019-02-09 00:25:32 +08:00
|
|
|
|
opts ||= {}
|
|
|
|
|
|
2018-08-01 09:23:28 +08:00
|
|
|
|
begin
|
|
|
|
|
report = _get(type, opts)
|
|
|
|
|
report_method = :"report_#{type}"
|
2015-02-05 13:08:52 +08:00
|
|
|
|
|
2018-08-01 19:39:57 +08:00
|
|
|
|
begin
|
|
|
|
|
wrap_slow_query do
|
|
|
|
|
if respond_to?(report_method)
|
|
|
|
|
send(report_method, report)
|
|
|
|
|
elsif type =~ /_reqs$/
|
|
|
|
|
req_report(report, type.split(/_reqs$/)[0].to_sym)
|
|
|
|
|
else
|
|
|
|
|
return nil
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
rescue ActiveRecord::QueryCanceled, PG::QueryCanceled => e
|
|
|
|
|
report.error = :timeout
|
2018-08-01 09:23:28 +08:00
|
|
|
|
end
|
|
|
|
|
rescue Exception => e
|
2019-02-09 00:25:32 +08:00
|
|
|
|
|
|
|
|
|
# In test mode, don't swallow exceptions by default to help debug errors.
|
|
|
|
|
raise if Rails.env.test? && !opts[:wrap_exceptions_in_test]
|
|
|
|
|
|
2018-09-13 23:36:55 +08:00
|
|
|
|
# ensures that if anything unexpected prevents us from
|
|
|
|
|
# creating a report object we fail elegantly and log an error
|
|
|
|
|
if !report
|
|
|
|
|
Rails.logger.error("Couldn’t create report `#{type}`: <#{e.class} #{e.message}>")
|
|
|
|
|
return nil
|
|
|
|
|
end
|
|
|
|
|
|
2018-08-01 09:23:28 +08:00
|
|
|
|
report.error = :exception
|
|
|
|
|
|
|
|
|
|
# given reports can be added by plugins we don’t want dashboard failures
|
|
|
|
|
# on report computation, however we do want to log which report is provoking
|
|
|
|
|
# an error
|
2018-10-10 17:43:27 +08:00
|
|
|
|
Rails.logger.error("Error while computing report `#{report.type}`: #{e.message}\n#{e.backtrace.join("\n")}")
|
2015-02-05 13:08:52 +08:00
|
|
|
|
end
|
2015-06-24 21:19:39 +08:00
|
|
|
|
|
2013-02-28 11:39:42 +08:00
|
|
|
|
report
|
|
|
|
|
end
|
|
|
|
|
|
2017-07-28 09:20:09 +08:00
|
|
|
|
def self.req_report(report, filter = nil)
|
2015-02-06 11:39:04 +08:00
|
|
|
|
data =
|
|
|
|
|
if filter == :page_view_total
|
|
|
|
|
ApplicationRequest.where(req_type: [
|
2017-07-28 09:20:09 +08:00
|
|
|
|
ApplicationRequest.req_types.reject { |k, v| k =~ /mobile/ }.map { |k, v| v if k =~ /page_view/ }.compact
|
2015-09-23 13:24:30 +08:00
|
|
|
|
].flatten)
|
2015-02-06 11:39:04 +08:00
|
|
|
|
else
|
2018-08-01 05:35:13 +08:00
|
|
|
|
ApplicationRequest.where(req_type: ApplicationRequest.req_types[filter])
|
2015-02-06 11:39:04 +08:00
|
|
|
|
end
|
2015-02-05 08:18:11 +08:00
|
|
|
|
|
2018-07-20 02:33:11 +08:00
|
|
|
|
if filter == :page_view_total
|
|
|
|
|
report.icon = 'file'
|
|
|
|
|
end
|
|
|
|
|
|
2015-02-05 08:18:11 +08:00
|
|
|
|
report.data = []
|
2018-05-03 21:41:41 +08:00
|
|
|
|
data.where('date >= ? AND date <= ?', report.start_date, report.end_date)
|
2017-07-28 09:20:09 +08:00
|
|
|
|
.order(date: :asc)
|
|
|
|
|
.group(:date)
|
|
|
|
|
.sum(:count)
|
|
|
|
|
.each do |date, count|
|
2015-06-24 21:19:39 +08:00
|
|
|
|
report.data << { x: date, y: count }
|
2015-02-05 08:18:11 +08:00
|
|
|
|
end
|
|
|
|
|
|
2018-02-02 04:50:41 +08:00
|
|
|
|
report.total = data.sum(:count)
|
|
|
|
|
|
|
|
|
|
report.prev30Days = data.where(
|
|
|
|
|
'date >= ? AND date < ?',
|
2018-05-03 21:41:41 +08:00
|
|
|
|
(report.start_date - 31.days), report.start_date
|
2018-02-02 04:50:41 +08:00
|
|
|
|
).sum(:count)
|
2015-02-05 08:18:11 +08:00
|
|
|
|
end
|
|
|
|
|
|
2013-04-01 21:21:34 +08:00
|
|
|
|
def self.report_about(report, subject_class, report_method = :count_per_day)
|
2014-11-06 02:11:23 +08:00
|
|
|
|
basic_report_about report, subject_class, report_method, report.start_date, report.end_date
|
2014-12-30 22:06:15 +08:00
|
|
|
|
add_counts report, subject_class
|
2013-04-01 21:21:34 +08:00
|
|
|
|
end
|
|
|
|
|
|
2013-04-17 04:56:18 +08:00
|
|
|
|
def self.basic_report_about(report, subject_class, report_method, *args)
|
2013-03-08 00:07:59 +08:00
|
|
|
|
report.data = []
|
2018-05-03 23:39:37 +08:00
|
|
|
|
|
2014-11-05 06:08:39 +08:00
|
|
|
|
subject_class.send(report_method, *args).each do |date, count|
|
2015-06-24 21:19:39 +08:00
|
|
|
|
report.data << { x: date, y: count }
|
2013-03-08 00:07:59 +08:00
|
|
|
|
end
|
2013-04-01 21:21:34 +08:00
|
|
|
|
end
|
|
|
|
|
|
2018-07-20 02:33:11 +08:00
|
|
|
|
def self.add_prev_data(report, subject_class, report_method, *args)
|
|
|
|
|
if report.modes.include?(:chart) && report.facets.include?(:prev_period)
|
|
|
|
|
prev_data = subject_class.send(report_method, *args)
|
|
|
|
|
report.prev_data = prev_data.map { |k, v| { x: k, y: v } }
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
2014-12-30 22:06:15 +08:00
|
|
|
|
def self.add_counts(report, subject_class, query_column = 'created_at')
|
2018-05-11 11:30:21 +08:00
|
|
|
|
if report.facets.include?(:prev_period)
|
2018-07-20 02:33:11 +08:00
|
|
|
|
prev_data = subject_class
|
2018-05-11 11:30:21 +08:00
|
|
|
|
.where("#{query_column} >= ? and #{query_column} < ?",
|
2018-07-20 02:33:11 +08:00
|
|
|
|
report.prev_start_date,
|
|
|
|
|
report.prev_end_date)
|
|
|
|
|
|
|
|
|
|
report.prev_period = prev_data.count
|
2018-05-11 11:30:21 +08:00
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
if report.facets.include?(:total)
|
2019-01-04 01:03:01 +08:00
|
|
|
|
report.total = subject_class.count
|
2018-05-11 11:30:21 +08:00
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
if report.facets.include?(:prev30Days)
|
|
|
|
|
report.prev30Days = subject_class
|
|
|
|
|
.where("#{query_column} >= ? and #{query_column} < ?",
|
|
|
|
|
report.start_date - 30.days,
|
|
|
|
|
report.start_date).count
|
|
|
|
|
end
|
2013-03-08 00:07:59 +08:00
|
|
|
|
end
|
|
|
|
|
|
2013-04-19 02:27:22 +08:00
|
|
|
|
def self.post_action_report(report, post_action_type)
|
2013-03-18 01:53:00 +08:00
|
|
|
|
report.data = []
|
2015-10-20 04:30:34 +08:00
|
|
|
|
PostAction.count_per_day_for_type(post_action_type, category_id: report.category_id, start_date: report.start_date, end_date: report.end_date).each do |date, count|
|
2014-07-29 01:17:37 +08:00
|
|
|
|
report.data << { x: date, y: count }
|
2013-03-18 01:53:00 +08:00
|
|
|
|
end
|
2015-06-24 21:19:39 +08:00
|
|
|
|
countable = PostAction.unscoped.where(post_action_type_id: post_action_type)
|
2018-08-10 08:50:05 +08:00
|
|
|
|
countable = countable.joins(post: :topic).merge(Topic.in_category_and_subcategories(report.category_id)) if report.category_id
|
2015-06-24 21:19:39 +08:00
|
|
|
|
add_counts report, countable, 'post_actions.created_at'
|
2013-03-18 01:53:00 +08:00
|
|
|
|
end
|
2013-04-17 04:56:18 +08:00
|
|
|
|
|
|
|
|
|
def self.private_messages_report(report, topic_subtype)
|
2018-07-20 02:33:11 +08:00
|
|
|
|
report.icon = 'envelope'
|
2018-07-23 22:33:12 +08:00
|
|
|
|
subject = Topic.where('topics.user_id > 0')
|
|
|
|
|
basic_report_about report, subject, :private_message_topics_count_per_day, report.start_date, report.end_date, topic_subtype
|
|
|
|
|
subject = Topic.private_messages.where('topics.user_id > 0').with_subtype(topic_subtype)
|
|
|
|
|
add_counts report, subject, 'topics.created_at'
|
2013-04-17 04:56:18 +08:00
|
|
|
|
end
|
|
|
|
|
|
2018-12-15 06:14:46 +08:00
|
|
|
|
DiscourseEvent.on(:site_setting_saved) do |site_setting|
|
|
|
|
|
if ["backup_location", "s3_backup_bucket"].include?(site_setting.name.to_s)
|
|
|
|
|
clear_cache(:storage_stats)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
2018-08-30 20:56:11 +08:00
|
|
|
|
def rgba_color(hex, opacity = 1)
|
2018-11-16 04:41:05 +08:00
|
|
|
|
if hex.size == 3
|
2018-11-15 07:52:47 +08:00
|
|
|
|
chars = hex.scan(/\w/)
|
2018-11-16 04:41:05 +08:00
|
|
|
|
hex = chars.zip(chars).flatten.join
|
2018-11-15 07:52:47 +08:00
|
|
|
|
end
|
|
|
|
|
|
2018-11-16 04:41:05 +08:00
|
|
|
|
if hex.size < 3
|
2018-11-15 07:52:47 +08:00
|
|
|
|
hex = hex.ljust(6, hex.last)
|
|
|
|
|
end
|
|
|
|
|
|
2018-08-30 20:56:11 +08:00
|
|
|
|
rgbs = hex_to_rgbs(hex)
|
|
|
|
|
|
|
|
|
|
"rgba(#{rgbs.join(',')},#{opacity})"
|
|
|
|
|
end
|
2019-01-21 22:17:04 +08:00
|
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
|
|
def hex_to_rgbs(hex_color)
|
|
|
|
|
hex_color = hex_color.gsub('#', '')
|
|
|
|
|
rgbs = hex_color.scan(/../)
|
|
|
|
|
rgbs
|
|
|
|
|
.map! { |color| color.hex }
|
|
|
|
|
.map! { |rgb| rgb.to_i }
|
|
|
|
|
end
|
2013-02-28 11:39:42 +08:00
|
|
|
|
end
|
2019-03-29 17:54:56 +08:00
|
|
|
|
|
|
|
|
|
require_relative "reports/visits"
|
|
|
|
|
require_relative "reports/visits_mobile"
|
|
|
|
|
require_relative "reports/consolidated_page_views"
|
|
|
|
|
require_relative "reports/top_ignored_users"
|
|
|
|
|
require_relative "reports/top_uploads"
|
|
|
|
|
require_relative "reports/moderators_activity"
|
|
|
|
|
require_relative "reports/signups"
|
|
|
|
|
require_relative "reports/storage_stats"
|
|
|
|
|
require_relative "reports/suspicious_logins"
|
|
|
|
|
require_relative "reports/new_contributors"
|
|
|
|
|
require_relative "reports/users_by_trust_level"
|
|
|
|
|
require_relative "reports/staff_logins"
|
|
|
|
|
require_relative "reports/users_by_type"
|
|
|
|
|
require_relative "reports/user_flagging_ratio"
|
|
|
|
|
require_relative "reports/post_edits"
|
|
|
|
|
require_relative "reports/daily_engaged_users"
|
|
|
|
|
require_relative "reports/flags_status"
|
|
|
|
|
require_relative "reports/trending_search"
|
|
|
|
|
require_relative "reports/top_referrers"
|
|
|
|
|
require_relative "reports/top_traffic_sources"
|
|
|
|
|
require_relative "reports/top_referred_topics"
|
|
|
|
|
require_relative "reports/notify_user_private_messages"
|
|
|
|
|
require_relative "reports/user_to_user_private_messages"
|
|
|
|
|
require_relative "reports/user_to_user_private_messages_with_replies"
|
|
|
|
|
require_relative "reports/system_private_messages"
|
|
|
|
|
require_relative "reports/moderator_warning_private_messages"
|
|
|
|
|
require_relative "reports/notify_moderators_private_messages"
|
|
|
|
|
require_relative "reports/flags"
|
|
|
|
|
require_relative "reports/likes"
|
|
|
|
|
require_relative "reports/bookmarks"
|
|
|
|
|
require_relative "reports/dau_by_mau"
|
|
|
|
|
require_relative "reports/profile_views"
|
|
|
|
|
require_relative "reports/topics"
|
|
|
|
|
require_relative "reports/posts"
|
|
|
|
|
require_relative "reports/time_to_first_response"
|
|
|
|
|
require_relative "reports/topics_with_no_response"
|
|
|
|
|
require_relative "reports/emails"
|