verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into chore.dehydrate-login-methods-from-rocketchatjs

This commit is contained in:
Gerzon Z 2022-03-08 11:42:15 -04:00 committed by GitHub
parent d6ce877a0d 679a628f75
commit f2a69e4894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/definitions/rest/v1/omnichannel.ts
View File

@ -194,6 +194,10 @@ export type OmnichannelEndpoints = {
}; };
}; };
'livechat/agents/:uid/departments?enabledDepartmentsOnly=true': {
GET: () => { departments: ILivechatDepartment[] };
};
'canned-responses': { 'canned-responses': {
GET: (params: PaginatedRequest<{ scope?: string; departmentId?: string; text?: string }>) => PaginatedResult<{ GET: (params: PaginatedRequest<{ scope?: string; departmentId?: string; text?: string }>) => PaginatedResult<{
cannedResponses: ICannedResponse[]; cannedResponses: ICannedResponse[];

3
app/ee/omnichannel/lib/subscriptions/inquiry.ts
View File

@ -3,7 +3,6 @@ import { store } from '../../../../lib/auxStore';
import RocketChat from '../../../../lib/rocketchat'; import RocketChat from '../../../../lib/rocketchat';
import { inquiryQueueAdd, inquiryQueueRemove, inquiryQueueUpdate, inquiryRequest } from '../../actions/inquiry'; import { inquiryQueueAdd, inquiryQueueRemove, inquiryQueueUpdate, inquiryRequest } from '../../actions/inquiry';
import sdk from '../../../../lib/rocketchat/services/sdk'; import sdk from '../../../../lib/rocketchat/services/sdk';
import { ILivechatDepartment } from '../../../../definitions/ILivechatDepartment';
import { IOmnichannelRoom } from '../../../../definitions'; import { IOmnichannelRoom } from '../../../../definitions';
interface IArgsQueueOmnichannel extends IOmnichannelRoom { interface IArgsQueueOmnichannel extends IOmnichannelRoom {
@ -82,7 +81,7 @@ export default function subscribeInquiry() {
throw new Error('inquiry: @subscribeInquiry user.id not found'); throw new Error('inquiry: @subscribeInquiry user.id not found');
} }
RocketChat.getAgentDepartments(user.id).then((result: { success: boolean; departments: ILivechatDepartment[] }) => { RocketChat.getAgentDepartments(user.id).then(result => {
if (result.success) { if (result.success) {
const { departments } = result; const { departments } = result;

4
app/lib/rocketchat/services/restApi.ts
View File

@ -395,10 +395,8 @@ export const getTagsList = (): Promise<
// RC 2.0.0 // RC 2.0.0
sdk.methodCallWrapper('livechat:getTagsList'); sdk.methodCallWrapper('livechat:getTagsList');
export const getAgentDepartments = (uid: string): any => export const getAgentDepartments = (uid: string) =>
// RC 2.4.0 // RC 2.4.0
// TODO: missing definitions from server
// @ts-ignore
sdk.get(`livechat/agents/${uid}/departments?enabledDepartmentsOnly=true`); sdk.get(`livechat/agents/${uid}/departments?enabledDepartmentsOnly=true`);
export const getCustomFields = () => export const getCustomFields = () =>

2
app/views/LivechatEditView.tsx
View File

@ -146,7 +146,7 @@ const LivechatEditView = ({
const getAgentDepartments = async () => { const getAgentDepartments = async () => {
const result = await RocketChat.getAgentDepartments(visitor?._id); const result = await RocketChat.getAgentDepartments(visitor?._id);
if (result.success) { if (result.success) {
const agentDepartments = result.departments.map((dept: { departmentId: string }) => dept.departmentId); const agentDepartments = result.departments.map(dept => dept.departmentId);
getTagsList(agentDepartments); getTagsList(agentDepartments);
} }
}; };