Skip to content

Commit f438178

Browse files
restyled-commitseradman
restyled-commits
authored and
eradman
committed
Restyled by prettier
1 parent 3dffe38 commit f438178

File tree

1 file changed

+39
-44
lines changed

1 file changed

+39
-44
lines changed

‎client/app/services/query.js

Lines changed: 39 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const logger = debug("redash:services:query");
3333
function collectParams(parts) {
3434
let parameters = [];
3535

36-
parts.forEach(part => {
36+
parts.forEach((part) => {
3737
if (part[0] === "name" || part[0] === "&") {
3838
parameters.push(part[1].split(".")[0]);
3939
} else if (part[0] === "#") {
@@ -68,12 +68,7 @@ export class Query {
6868

6969
scheduleInLocalTime() {
7070
const parts = this.schedule.split(":");
71-
return moment
72-
.utc()
73-
.hour(parts[0])
74-
.minute(parts[1])
75-
.local()
76-
.format("HH:mm");
71+
return moment.utc().hour(parts[0]).minute(parts[1]).local().format("HH:mm");
7772
}
7873

7974
hasResult() {
@@ -158,11 +153,11 @@ export class Query {
158153

159154
let params = {};
160155
if (this.getParameters().isRequired()) {
161-
this.getParametersDefs().forEach(param => {
156+
this.getParametersDefs().forEach((param) => {
162157
extend(params, param.toUrlParams());
163158
});
164159
}
165-
Object.keys(params).forEach(key => params[key] == null && delete params[key]);
160+
Object.keys(params).forEach((key) => params[key] == null && delete params[key]);
166161
params = map(params, (value, name) => `${encodeURIComponent(name)}=${encodeURIComponent(value)}`).join("&");
167162

168163
if (params !== "") {
@@ -220,7 +215,7 @@ class Parameters {
220215
}
221216

222217
parseQuery() {
223-
const fallback = () => map(this.query.options.parameters, i => i.name);
218+
const fallback = () => map(this.query.options.parameters, (i) => i.name);
224219

225220
let parameters = [];
226221
if (this.query.query !== undefined) {
@@ -242,26 +237,26 @@ class Parameters {
242237
updateParameters(update) {
243238
if (this.query.query === this.cachedQueryText) {
244239
const parameters = this.query.options.parameters;
245-
const hasUnprocessedParameters = find(parameters, p => !(p instanceof Parameter));
240+
const hasUnprocessedParameters = find(parameters, (p) => !(p instanceof Parameter));
246241
if (hasUnprocessedParameters) {
247-
this.query.options.parameters = map(parameters, p =>
242+
this.query.options.parameters = map(parameters, (p) =>
248243
p instanceof Parameter ? p : createParameter(p, this.query.id)
249244
);
250245
}
251246
return;
252247
}
253248

254249
this.cachedQueryText = this.query.query;
255-
const parameterNames = update ? this.parseQuery() : map(this.query.options.parameters, p => p.name);
250+
const parameterNames = update ? this.parseQuery() : map(this.query.options.parameters, (p) => p.name);
256251

257252
this.query.options.parameters = this.query.options.parameters || [];
258253

259254
const parametersMap = {};
260-
this.query.options.parameters.forEach(param => {
255+
this.query.options.parameters.forEach((param) => {
261256
parametersMap[param.name] = param;
262257
});
263258

264-
parameterNames.forEach(param => {
259+
parameterNames.forEach((param) => {
265260
if (!has(parametersMap, param)) {
266261
this.query.options.parameters.push(
267262
createParameter({
@@ -275,15 +270,15 @@ class Parameters {
275270
}
276271
});
277272

278-
const parameterExists = p => includes(parameterNames, p.name);
273+
const parameterExists = (p) => includes(parameterNames, p.name);
279274
const parameters = this.query.options.parameters;
280275
this.query.options.parameters = parameters
281276
.filter(parameterExists)
282-
.map(p => (p instanceof Parameter ? p : createParameter(p, this.query.id)));
277+
.map((p) => (p instanceof Parameter ? p : createParameter(p, this.query.id)));
283278
}
284279

285280
initFromQueryString(query) {
286-
this.get().forEach(param => {
281+
this.get().forEach((param) => {
287282
param.fromUrlParams(query);
288283
});
289284
}
@@ -294,16 +289,16 @@ class Parameters {
294289
}
295290

296291
add(parameterDef) {
297-
this.query.options.parameters = this.query.options.parameters.filter(p => p.name !== parameterDef.name);
292+
this.query.options.parameters = this.query.options.parameters.filter((p) => p.name !== parameterDef.name);
298293
const param = createParameter(parameterDef);
299294
this.query.options.parameters.push(param);
300295
return param;
301296
}
302297

303298
getMissing() {
304299
return map(
305-
filter(this.get(), p => p.isEmpty),
306-
i => i.title
300+
filter(this.get(), (p) => p.isEmpty),
301+
(i) => i.title
307302
);
308303
}
309304

@@ -314,28 +309,28 @@ class Parameters {
314309
getExecutionValues(extra = {}) {
315310
const params = this.get();
316311
return zipObject(
317-
map(params, i => i.name),
318-
map(params, i => i.getExecutionValue(extra))
312+
map(params, (i) => i.name),
313+
map(params, (i) => i.getExecutionValue(extra))
319314
);
320315
}
321316

322317
hasPendingValues() {
323-
return some(this.get(), p => p.hasPendingValue);
318+
return some(this.get(), (p) => p.hasPendingValue);
324319
}
325320

326321
applyPendingValues() {
327-
each(this.get(), p => p.applyPendingValue());
322+
each(this.get(), (p) => p.applyPendingValue());
328323
}
329324

330325
toUrlParams() {
331326
if (this.get().length === 0) {
332327
return "";
333328
}
334329

335-
const params = Object.assign(...this.get().map(p => p.toUrlParams()));
336-
Object.keys(params).forEach(key => params[key] == null && delete params[key]);
330+
const params = Object.assign(...this.get().map((p) => p.toUrlParams()));
331+
Object.keys(params).forEach((key) => params[key] == null && delete params[key]);
337332
return Object.keys(params)
338-
.map(k => `${encodeURIComponent(k)}=${encodeURIComponent(params[k])}`)
333+
.map((k) => `${encodeURIComponent(k)}=${encodeURIComponent(params[k])}`)
339334
.join("&");
340335
}
341336
}
@@ -374,27 +369,27 @@ export class QueryResultError {
374369
}
375370
}
376371

377-
const getQuery = query => new Query(query);
378-
const saveOrCreateUrl = data => (data.id ? `api/queries/${data.id}` : "api/queries");
379-
const mapResults = data => ({ ...data, results: map(data.results, getQuery) });
372+
const getQuery = (query) => new Query(query);
373+
const saveOrCreateUrl = (data) => (data.id ? `api/queries/${data.id}` : "api/queries");
374+
const mapResults = (data) => ({ ...data, results: map(data.results, getQuery) });
380375

381376
const QueryService = {
382-
query: params => axios.get("api/queries", { params }).then(mapResults),
383-
get: data => axios.get(`api/queries/${data.id}`, data).then(getQuery),
384-
save: data => axios.post(saveOrCreateUrl(data), data).then(getQuery),
385-
delete: data => axios.delete(`api/queries/${data.id}`),
386-
recent: params => axios.get(`api/queries/recent`, { params }).then(data => map(data, getQuery)),
387-
unassigned: params => axios.get(`api/queries/unassigned`, { params }).then(mapResults),
388-
archive: params => axios.get(`api/queries/archive`, { params }).then(mapResults),
389-
myQueries: params => axios.get("api/queries/my", { params }).then(mapResults),
377+
query: (params) => axios.get("api/queries", { params }).then(mapResults),
378+
get: (data) => axios.get(`api/queries/${data.id}`, data).then(getQuery),
379+
save: (data) => axios.post(saveOrCreateUrl(data), data).then(getQuery),
380+
delete: (data) => axios.delete(`api/queries/${data.id}`),
381+
recent: (params) => axios.get(`api/queries/recent`, { params }).then((data) => map(data, getQuery)),
382+
unassigned: (params) => axios.get(`api/queries/unassigned`, { params }).then(mapResults),
383+
archive: (params) => axios.get(`api/queries/archive`, { params }).then(mapResults),
384+
myQueries: (params) => axios.get("api/queries/my", { params }).then(mapResults),
390385
fork: ({ id }) => axios.post(`api/queries/${id}/fork`, { id }).then(getQuery),
391-
resultById: data => axios.get(`api/queries/${data.id}/results.json`),
392-
asDropdown: data => axios.get(`api/queries/${data.id}/dropdown`),
386+
resultById: (data) => axios.get(`api/queries/${data.id}/results.json`),
387+
asDropdown: (data) => axios.get(`api/queries/${data.id}/dropdown`),
393388
associatedDropdown: ({ queryId, dropdownQueryId }) =>
394389
axios.get(`api/queries/${queryId}/dropdowns/${dropdownQueryId}`),
395-
favorites: params => axios.get("api/queries/favorites", { params }).then(mapResults),
396-
favorite: data => axios.post(`api/queries/${data.id}/favorite`),
397-
unfavorite: data => axios.delete(`api/queries/${data.id}/favorite`),
390+
favorites: (params) => axios.get("api/queries/favorites", { params }).then(mapResults),
391+
favorite: (data) => axios.post(`api/queries/${data.id}/favorite`),
392+
unfavorite: (data) => axios.delete(`api/queries/${data.id}/favorite`),
398393
};
399394

400395
QueryService.newQuery = function newQuery() {

0 commit comments

Comments
 (0)