scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-02 03:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: inconsistent usage of snake_case and camelCase (#6824)

Browse Source
This commit is contained in:
Shivam Mishra
2023-04-04 16:22:45 +05:30
committed by GitHub
parent a0eafc94d7
commit b7d0016d99
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/dashboard/api/reports.js
View File

@@ -14,8 +14,8 @@ class ReportsAPI extends ApiClient {
to, to,
type = 'account', type = 'account',
id, id,
group_by, groupBy,
business_hours, businessHours,
}) { }) {
return axios.get(`${this.url}`, { return axios.get(`${this.url}`, {
params: { params: {
@@ -24,22 +24,22 @@ class ReportsAPI extends ApiClient {
until: to, until: to,
type, type,
id, id,
group_by, group_by: groupBy,
business_hours, business_hours: businessHours,
timezone_offset: getTimeOffset(), timezone_offset: getTimeOffset(),
}, },
}); });
} }
getSummary(since, until, type = 'account', id, group_by, business_hours) { getSummary(since, until, type = 'account', id, groupBy, businessHours) {
return axios.get(`${this.url}/summary`, { return axios.get(`${this.url}/summary`, {
params: { params: {
since, since,
until, until,
type, type,
id, id,
group_by, group_by: groupBy,
business_hours, business_hours: businessHours,
}, },
}); });
} }

4
app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
View File

@@ -254,8 +254,8 @@ export default {
reportType: 'conversations', reportType: 'conversations',
}); });
}, },
fetchFilterItems(group_by) { fetchFilterItems(groupBy) {
switch (group_by) { switch (groupBy) {
case GROUP_BY_FILTER[2].period: case GROUP_BY_FILTER[2].period:
return this.$t('REPORT.GROUP_BY_WEEK_OPTIONS'); return this.$t('REPORT.GROUP_BY_WEEK_OPTIONS');
case GROUP_BY_FILTER[3].period: case GROUP_BY_FILTER[3].period:

4
app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
View File

@@ -308,8 +308,8 @@ export default {
reportType: this.type, reportType: this.type,
}); });
}, },
fetchFilterItems(group_by) { fetchFilterItems(groupBy) {
switch (group_by) { switch (groupBy) {
case GROUP_BY_FILTER[2].period: case GROUP_BY_FILTER[2].period:
return this.$t('REPORT.GROUP_BY_WEEK_OPTIONS'); return this.$t('REPORT.GROUP_BY_WEEK_OPTIONS');
case GROUP_BY_FILTER[3].period: case GROUP_BY_FILTER[3].period:

2
app/javascript/dashboard/store/modules/reports.js
View File

@@ -70,7 +70,7 @@ export const actions = {
}, },
fetchAccountConversationHeatmap({ commit }, reportObj) { fetchAccountConversationHeatmap({ commit }, reportObj) {
commit(types.default.TOGGLE_HEATMAP_LOADING, true); commit(types.default.TOGGLE_HEATMAP_LOADING, true);
Report.getReports({ ...reportObj, group_by: 'hour' }).then(heatmapData => { Report.getReports({ ...reportObj, groupBy: 'hour' }).then(heatmapData => {
let { data } = heatmapData; let { data } = heatmapData;
data = clampDataBetweenTimeline(data, reportObj.from, reportObj.to); data = clampDataBetweenTimeline(data, reportObj.from, reportObj.to);