2018-07-20 02:33:11 +08:00
|
|
|
{{#if isEnabled}}
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#conditional-loading-section isLoading=isLoading}}
|
|
|
|
|
{{#if showHeader}}
|
|
|
|
|
<div class="header">
|
|
|
|
|
{{#if showTitle}}
|
|
|
|
|
<ul class="breadcrumb">
|
|
|
|
|
{{#if showAllReportsLink}}
|
|
|
|
|
<li class="item all-reports">
|
|
|
|
|
{{#link-to "admin.dashboardReports" class="report-url"}}
|
|
|
|
|
{{i18n "admin.dashboard.all_reports"}}
|
|
|
|
|
{{/link-to}}
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
{{#unless showNotFoundError}}
|
|
|
|
|
<li class="item separator">|</li>
|
|
|
|
|
{{/unless}}
|
|
|
|
|
{{/if}}
|
2018-11-12 20:47:24 +08:00
|
|
|
|
|
|
|
|
{{#unless showNotFoundError}}
|
2020-04-13 23:17:20 +08:00
|
|
|
<li class="item report">
|
|
|
|
|
<a href={{model.reportUrl}} class="report-url">
|
|
|
|
|
{{model.title}}
|
|
|
|
|
</a>
|
2018-08-17 22:19:25 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#if model.description}}
|
|
|
|
|
{{#if model.description_link}}
|
2020-04-17 04:38:10 +08:00
|
|
|
<a target="_blank" rel="noopener noreferrer" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
|
2020-04-13 23:17:20 +08:00
|
|
|
{{d-icon "question-circle"}}
|
|
|
|
|
</a>
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="info" data-tooltip={{model.description}}>
|
|
|
|
|
{{d-icon "question-circle"}}
|
|
|
|
|
</span>
|
|
|
|
|
{{/if}}
|
|
|
|
|
{{/if}}
|
|
|
|
|
</li>
|
|
|
|
|
{{/unless}}
|
|
|
|
|
</ul>
|
|
|
|
|
{{/if}}
|
2018-07-20 02:33:11 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#if shouldDisplayTrend}}
|
|
|
|
|
<div class="trend {{model.trend}}">
|
|
|
|
|
<span class="value" title={{model.trendTitle}}>
|
|
|
|
|
{{#if model.average}}
|
|
|
|
|
{{number model.currentAverage}}{{#if model.percent}}%{{/if}}
|
2020-03-03 03:30:51 +08:00
|
|
|
{{else}}
|
2020-04-13 23:17:20 +08:00
|
|
|
{{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
|
2020-03-03 03:30:51 +08:00
|
|
|
{{/if}}
|
2018-07-20 02:33:11 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#if model.trendIcon}}
|
|
|
|
|
{{d-icon model.trendIcon class="icon"}}
|
|
|
|
|
{{/if}}
|
|
|
|
|
</span>
|
2020-03-09 20:44:34 +08:00
|
|
|
</div>
|
|
|
|
|
{{/if}}
|
2020-04-13 23:17:20 +08:00
|
|
|
</div>
|
|
|
|
|
{{/if}}
|
2020-03-09 20:44:34 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
<div class="body">
|
|
|
|
|
<div class="main">
|
|
|
|
|
{{#if showError}}
|
|
|
|
|
{{#if showTimeoutError}}
|
|
|
|
|
<div class="alert alert-error report-alert timeout">
|
|
|
|
|
{{d-icon "exclamation-triangle"}}
|
|
|
|
|
<span>{{i18n "admin.dashboard.timeout_error"}}</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{/if}}
|
2020-03-09 20:44:34 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#if showExceptionError}}
|
|
|
|
|
<div class="alert alert-error report-alert exception">
|
|
|
|
|
{{d-icon "exclamation-triangle"}}
|
|
|
|
|
<span>{{i18n "admin.dashboard.exception_error"}}</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{/if}}
|
2018-08-17 22:19:25 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#if showNotFoundError}}
|
|
|
|
|
<div class="alert alert-error report-alert not-found">
|
|
|
|
|
{{d-icon "exclamation-triangle"}}
|
|
|
|
|
<span>{{i18n "admin.dashboard.not_found_error"}}</span>
|
|
|
|
|
</div>
|
2018-08-01 09:23:28 +08:00
|
|
|
{{/if}}
|
|
|
|
|
{{else}}
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#if hasData}}
|
|
|
|
|
{{#if currentMode}}
|
|
|
|
|
{{component modeComponent model=model options=options}}
|
|
|
|
|
|
|
|
|
|
{{#if model.relatedReport}}
|
|
|
|
|
{{admin-report showFilteringUI=false dataSourceName=model.relatedReport.type}}
|
2018-08-22 17:25:12 +08:00
|
|
|
{{/if}}
|
2020-04-13 23:17:20 +08:00
|
|
|
{{/if}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{#if rateLimitationString}}
|
|
|
|
|
<div class="alert alert-error report-alert rate-limited">
|
|
|
|
|
{{d-icon "thermometer-three-quarters"}}
|
|
|
|
|
<span>{{rateLimitationString}}</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else}}
|
|
|
|
|
<div class="alert alert-info report-alert no-data">
|
|
|
|
|
{{d-icon "chart-pie"}}
|
|
|
|
|
{{#if model.reportUrl}}
|
|
|
|
|
<a href={{model.reportUrl}} class="report-url">
|
|
|
|
|
<span>
|
|
|
|
|
{{#if model.title}}
|
|
|
|
|
{{model.title}} —
|
|
|
|
|
{{/if}}
|
|
|
|
|
{{i18n "admin.dashboard.reports.no_data"}}
|
|
|
|
|
</span>
|
|
|
|
|
</a>
|
|
|
|
|
{{else}}
|
|
|
|
|
<span>{{i18n "admin.dashboard.reports.no_data"}}</span>
|
|
|
|
|
{{/if}}
|
|
|
|
|
</div>
|
|
|
|
|
{{/if}}
|
2018-08-22 17:25:12 +08:00
|
|
|
{{/if}}
|
2018-07-26 02:28:41 +08:00
|
|
|
{{/if}}
|
2020-04-13 23:17:20 +08:00
|
|
|
</div>
|
2018-08-17 22:19:25 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#if showFilteringUI}}
|
|
|
|
|
<div class="filters">
|
|
|
|
|
{{#if showModes}}
|
|
|
|
|
<div class="modes">
|
|
|
|
|
{{#each displayedModes as |displayedMode|}}
|
|
|
|
|
{{d-button
|
|
|
|
|
action=(action "changeMode")
|
|
|
|
|
actionParam=displayedMode.mode
|
|
|
|
|
class=displayedMode.cssClass
|
|
|
|
|
icon=displayedMode.icon}}
|
|
|
|
|
{{/each}}
|
2018-07-20 02:33:11 +08:00
|
|
|
</div>
|
2020-04-13 23:17:20 +08:00
|
|
|
{{/if}}
|
2018-07-20 02:33:11 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#if showDatesOptions}}
|
|
|
|
|
<div class="control">
|
|
|
|
|
<span class="label">
|
2020-04-23 04:17:53 +08:00
|
|
|
{{i18n "admin.dashboard.reports.dates"}}
|
2020-04-13 23:17:20 +08:00
|
|
|
</span>
|
|
|
|
|
|
|
|
|
|
<div class="input">
|
2020-04-23 04:17:53 +08:00
|
|
|
{{date-time-input-range
|
|
|
|
|
from=startDate
|
|
|
|
|
to=endDate
|
|
|
|
|
onChange=(action "onChangeDateRange")
|
|
|
|
|
showFromTime=false
|
|
|
|
|
showToTime=false
|
2020-04-13 23:17:20 +08:00
|
|
|
}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{/if}}
|
2018-07-20 02:33:11 +08:00
|
|
|
|
2020-04-13 23:17:20 +08:00
|
|
|
{{#each model.available_filters as |filter|}}
|
|
|
|
|
<div class="control">
|
|
|
|
|
<span class="label">
|
|
|
|
|
{{i18n (concat "admin.dashboard.reports.filters." filter.id ".label")}}
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
|
|
<div class="input">
|
|
|
|
|
{{component
|
2020-04-22 16:52:50 +08:00
|
|
|
(concat "report-filters/" filter.type)
|
|
|
|
|
model=model
|
2020-04-13 23:17:20 +08:00
|
|
|
filter=filter
|
|
|
|
|
applyFilter=(action "applyFilter")}}
|
|
|
|
|
</div>
|
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?
## 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
|
|
|
</div>
|
2020-04-13 23:17:20 +08:00
|
|
|
{{/each}}
|
2018-07-26 01:16:35 +08:00
|
|
|
|
2018-08-17 22:19:25 +08:00
|
|
|
<div class="control">
|
|
|
|
|
<div class="input">
|
|
|
|
|
{{d-button
|
2020-04-13 23:17:20 +08:00
|
|
|
class="btn-default export-csv-btn"
|
|
|
|
|
action=(action "exportCsv")
|
|
|
|
|
label="admin.export_csv.button_text"
|
|
|
|
|
icon="download"}}
|
2018-07-20 02:33:11 +08:00
|
|
|
</div>
|
2018-08-17 22:19:25 +08:00
|
|
|
</div>
|
2020-04-13 23:17:20 +08:00
|
|
|
|
|
|
|
|
{{#if showRefresh}}
|
|
|
|
|
<div class="control">
|
|
|
|
|
<div class="input">
|
|
|
|
|
{{d-button
|
|
|
|
|
class="refresh-report-btn btn-primary"
|
|
|
|
|
action=(action "refreshReport")
|
|
|
|
|
label="admin.dashboard.reports.refresh_report"
|
|
|
|
|
icon="sync"}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{/if}}
|
|
|
|
|
</div>
|
|
|
|
|
{{/if}}
|
|
|
|
|
</div>
|
|
|
|
|
{{/conditional-loading-section}}
|
2018-07-20 02:33:11 +08:00
|
|
|
{{else}}
|
|
|
|
|
<div class="alert alert-info">
|
2020-03-11 16:23:10 +08:00
|
|
|
{{html-safe disabledLabel}}
|
2018-07-20 02:33:11 +08:00
|
|
|
</div>
|
|
|
|
|
{{/if}}
|