Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 0 additions & 5 deletions app/definitions/ITagsOmnichannel.ts

This file was deleted.

8 changes: 7 additions & 1 deletion app/lib/rocketchat/services/restApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,13 @@ export const getRoutingConfig = (): Promise<{
// RC 2.0.0
sdk.methodCallWrapper('livechat:getRoutingConfig');

export const getTagsList = () =>
export const getTagsList = (): Promise<
{
_id: string;
name: string;
departments: string[];
}[]
> =>
// RC 2.0.0
sdk.methodCallWrapper('livechat:getTagsList');

Expand Down
3 changes: 1 addition & 2 deletions app/views/LivechatEditView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import Button from '../containers/Button';
import SafeAreaView from '../containers/SafeAreaView';
import { MultiSelect } from '../containers/UIKit/MultiSelect';
import { ILivechatVisitor } from '../definitions/ILivechatVisitor';
import { ITagsOmnichannel } from '../definitions/ITagsOmnichannel';
import { IApplicationState, ISubscription } from '../definitions';
import { ChatsStackParamList } from '../stacks/types';
import sharedStyles from './Styles';
Expand Down Expand Up @@ -142,7 +141,7 @@ const LivechatEditView = ({
}, [availableUserTags]);

const getTagsList = async (agentDepartments: string[]) => {
const tags: ITagsOmnichannel[] = await RocketChat.getTagsList();
const tags = await RocketChat.getTagsList();
const isAdmin = ['admin', 'livechat-manager'].find(role => user.roles.includes(role));
const availableTags = tags
.filter(({ departments }) => isAdmin || departments.length === 0 || departments.some(i => agentDepartments.indexOf(i) > -1))
Expand Down