Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion apps/meteor/server/api/v1/omnichannel/departments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
import { Match, check } from 'meteor/check';

import { API } from '../..';
import { apiDeprecationLogger } from '../../../lib/deprecationWarningLogger';
import {
findDepartments,
findDepartmentById,
Expand Down Expand Up @@ -254,10 +255,16 @@ API.v1.addRoute(
return API.v1.failure("The 'selector' param is required");
}

const parsedSelector = JSON.parse(selector);

if (parsedSelector.conditions && Object.keys(parsedSelector.conditions).length > 0) {
apiDeprecationLogger.parameter(this.route, 'conditions', '9.0.0', this.response);
}

return API.v1.success(
await findDepartmentsToAutocomplete({
uid: this.userId,
selector: JSON.parse(selector),
selector: parsedSelector,
onlyMyDepartments: onlyMyDepartments === 'true',
showArchived: showArchived === 'true',
}),
Expand Down
8 changes: 7 additions & 1 deletion apps/meteor/server/api/v1/omnichannel/visitors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
import { escapeRegExp } from '@rocket.chat/tools';

import { API } from '../..';
import { apiDeprecationLogger } from '../../../lib/deprecationWarningLogger';
import {
findVisitorInfo,
findVisitedPages,
Expand Down Expand Up @@ -120,10 +121,15 @@ API.v1.addRoute(
{
async get() {
const { selector } = this.queryParams;
const parsedSelector = JSON.parse(selector);

if (parsedSelector.conditions && Object.keys(parsedSelector.conditions).length > 0) {
apiDeprecationLogger.parameter(this.route, 'conditions', '9.0.0', this.response);
}

return API.v1.success(
await findVisitorsToAutocomplete({
selector: JSON.parse(selector),
selector: parsedSelector,
}),
);
},
Expand Down
Loading