Rename toolbox actions

apps/meteor/app/ui-message/client/actionButtons/messageAction.ts

@@ -1,7 +1,7 @@
 import type { IUIActionButton } from '@rocket.chat/apps-engine/definition/ui';
 
 import { Utilities } from '../../../../ee/lib/misc/Utilities';
-import { messageToolboxActions } from '../../../ui-utils/client';
+import { messageToolboxActions } from '../../../../client/lib/MessageToolboxActions';
 import { messageArgs } from '../../../../client/lib/utils/messageArgs';
 import { t } from '../../../utils/client';
 import { triggerActionButtonAction } from '../ActionManager';

apps/meteor/app/ui-message/client/actionButtons/tabbar.ts

@@ -1,16 +1,15 @@
 import type { IUIActionButton } from '@rocket.chat/apps-engine/definition/ui';
 
-import { addAction, deleteAction } from '../../../../client/views/room/lib/Toolbox';
+import { roomToolboxActions } from '../../../../client/views/room/lib/Toolbox';
 import { Utilities } from '../../../../ee/lib/misc/Utilities';
 import { t } from '../../../utils/client';
 import { triggerActionButtonAction } from '../ActionManager';
 import { applyButtonFilters } from './lib/applyButtonFilters';
 
 const getIdForActionButton = ({ appId, actionId }: IUIActionButton): string => `${appId}/${actionId}`;
 
-export const onAdded = (button: IUIActionButton): void =>
-	// eslint-disable-next-line no-void
-	void addAction(getIdForActionButton(button), ({ room }) =>
+export const onAdded = (button: IUIActionButton): void => {
+	roomToolboxActions.add(getIdForActionButton(button), ({ room }) =>
 		applyButtonFilters(button, room)
 			? {
 					id: button.actionId,
@@ -30,5 +29,6 @@ export const onAdded = (button: IUIActionButton): void =>
 			  }
 			: null,
 	);
+};
 
-export const onRemoved = (button: IUIActionButton): boolean => deleteAction(getIdForActionButton(button));
+export const onRemoved = (button: IUIActionButton): boolean => roomToolboxActions.remove(getIdForActionButton(button));

apps/meteor/app/ui-utils/client/index.ts

@@ -1,5 +1,4 @@
 export { AccountBox } from './lib/AccountBox';
-export { messageToolboxActions } from './lib/MessageToolboxActions';
 export { messageBox } from './lib/messageBox';
 export { readMessage } from './lib/readMessages';
 export { RoomManager } from './lib/RoomManager';

apps/meteor/client/components/message/ToolboxHolder.tsx

@@ -4,7 +4,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { memo, useRef } from 'react';
 
-import type { MessageToolboxActionContext } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import type { MessageToolboxActionContext } from '../../lib/MessageToolboxActions';
 import { useChat } from '../../views/room/contexts/ChatContext';
 import { useIsVisible } from '../../views/room/hooks/useIsVisible';
 import Toolbox from './toolbox/Toolbox';

apps/meteor/client/components/message/toolbox/MessageActionMenu.tsx

@@ -3,8 +3,8 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, UIEvent, ReactElement } from 'react';
 import React, { useState, Fragment, useRef } from 'react';
 
-import type { MessageToolboxActionConfig } from '../../../../app/ui-utils/client/lib/MessageToolboxActions';
 import { useEmbeddedLayout } from '../../../hooks/useEmbeddedLayout';
+import type { MessageToolboxActionConfig } from '../../../lib/MessageToolboxActions';
 import ToolboxDropdown from './ToolboxDropdown';
 
 type MessageActionConfigOption = Omit<MessageToolboxActionConfig, 'condition' | 'context' | 'order' | 'action'> & {

apps/meteor/client/components/message/toolbox/Toolbox.tsx

@@ -6,8 +6,8 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
 
-import type { MessageToolboxActionContext } from '../../../../app/ui-utils/client/lib/MessageToolboxActions';
-import { messageToolboxActions } from '../../../../app/ui-utils/client/lib/MessageToolboxActions';
+import type { MessageToolboxActionContext } from '../../../lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../../lib/MessageToolboxActions';
 import { useIsSelecting } from '../../../views/room/MessageList/contexts/SelectedMessagesContext';
 import { useAutoTranslate } from '../../../views/room/MessageList/hooks/useAutoTranslate';
 import { useChat } from '../../../views/room/contexts/ChatContext';

apps/meteor/client/components/message/variants/RoomMessage.tsx

@@ -5,7 +5,7 @@ import { useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useRef, memo } from 'react';
 
-import type { MessageToolboxActionContext } from '../../../../app/ui-utils/client/lib/MessageToolboxActions';
+import type { MessageToolboxActionContext } from '../../../lib/MessageToolboxActions';
 import { useIsMessageHighlight } from '../../../views/room/MessageList/contexts/MessageHighlightContext';
 import {
 	useIsSelecting,

apps/meteor/app/ui-utils/client/lib/MessageToolboxActions.ts → apps/meteor/client/lib/MessageToolboxActions.ts

@@ -1,18 +1,18 @@
-import type { ComponentProps, ContextType, UIEvent } from 'react';
+import type { IMessage, IUser, ISubscription, IRoom, SettingValue, Serialized, ITranslatedMessage } from '@rocket.chat/core-typings';
+import type { Icon } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import mem from 'mem';
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
-import type { Icon } from '@rocket.chat/fuselage';
-import type { IMessage, IUser, ISubscription, IRoom, SettingValue, Serialized, ITranslatedMessage } from '@rocket.chat/core-typings';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { ComponentProps, ContextType, UIEvent } from 'react';
 
-import { Messages, Rooms, Subscriptions } from '../../../models/client';
-import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
-import type { ToolboxContextValue } from '../../../../client/views/room/contexts/ToolboxContext';
-import type { ChatContext } from '../../../../client/views/room/contexts/ChatContext';
-import { APIClient } from '../../../utils/client';
-import type { AutoTranslateOptions } from '../../../../client/views/room/MessageList/hooks/useAutoTranslate';
+import { Messages, Rooms, Subscriptions } from '../../app/models/client';
+import { APIClient } from '../../app/utils/client';
+import type { AutoTranslateOptions } from '../views/room/MessageList/hooks/useAutoTranslate';
+import type { ChatContext } from '../views/room/contexts/ChatContext';
+import type { ToolboxContextValue } from '../views/room/contexts/ToolboxContext';
+import { roomCoordinator } from './rooms/roomCoordinator';
 
 const findMessage = async (msgId: string): Promise<Serialized<IMessage> | null> => {
 	try {
@@ -132,10 +132,10 @@ class MessageToolboxActions {
 	}
 
 	private getButtonsByGroup = mem(
-		function (
+		(
 			group: MessageToolboxActionGroup,
 			arr: MessageToolboxActionConfigList = messageToolboxActions._getButtons(),
-		): MessageToolboxActionConfigList {
+		): MessageToolboxActionConfigList => {
 			return arr.filter((button) => !button.group || (Array.isArray(button.group) ? button.group.includes(group) : button.group === group));
 		},
 		{ maxAge: 1000 },

apps/meteor/client/views/room/lib/QuickActions/index.tsx → apps/meteor/client/lib/QuickActions.ts

@@ -3,9 +3,9 @@ import type { Box, Option } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactNode } from 'react';
 
-import type { ToolboxActionConfig } from '../Toolbox';
-import type { Events as GeneratorEvents } from '../Toolbox/generator';
-import { generator } from '../Toolbox/generator';
+import type { ToolboxActionConfig } from '../views/room/lib/Toolbox';
+import type { Events as GeneratorEvents } from '../views/room/lib/Toolbox/generator';
+import { generator } from '../views/room/lib/Toolbox/generator';
 
 type QuickActionsHook = ({ room }: { room: IRoom }) => QuickActionsActionConfig | null;
 
@@ -37,13 +37,13 @@ export type QuickActionsActionConfig = ToolboxActionConfig & {
 
 export type QuickActionsAction = QuickActionsHook | QuickActionsActionConfig;
 
-const { listen, add: addAction, remove: deleteAction, store: actions } = generator<QuickActionsAction>();
+const { listen, add, remove, store: actions } = generator<QuickActionsAction>();
 
 export type Events = GeneratorEvents<QuickActionsAction>;
 
-export { listen, addAction, deleteAction, actions };
+export { listen, actions };
 
-export enum QuickActionsEnum {
+export const enum QuickActionsEnum {
 	MoveQueue = 'rocket-move-to-queue',
 	ChatForward = 'rocket-chat-forward',
 	Transcript = 'rocket-transcript',
@@ -52,3 +52,8 @@ export enum QuickActionsEnum {
 	CloseChat = 'rocket-close-chat',
 	OnHoldChat = 'rocket-on-hold-chat',
 }
+
+export const quickActions = {
+	add,
+	remove,
+};

apps/meteor/client/lib/chats/data.ts

@@ -5,7 +5,8 @@ import moment from 'moment';
 import { hasAtLeastOnePermission, hasPermission } from '../../../app/authorization/client';
 import { Messages, ChatRoom, ChatSubscription } from '../../../app/models/client';
 import { settings } from '../../../app/settings/client';
-import { readMessage, MessageTypes, messageToolboxActions } from '../../../app/ui-utils/client';
+import { readMessage, MessageTypes } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../MessageToolboxActions';
 import { onClientBeforeSendMessage } from '../onClientBeforeSendMessage';
 import { call } from '../utils/call';
 import type { DataAPI } from './ChatAPI';

apps/meteor/client/startup/index.ts

@@ -5,7 +5,6 @@ import './afterLogoutCleanUp';
 import './appRoot';
 import './cachedCollections';
 import './callbacks';
-import './contextualBarActions';
 import './customEmoji';
 import './customOAuth';
 import './customTranslations';
@@ -41,12 +40,14 @@ import './oauth';
 import './openedRoom';
 import './otr';
 import './otrMessageTypes';
+import './quickActions';
 import './readMessage';
 import './reloadRoomAfterLogin';
 import './renderMessage';
 import './renderNotification';
 import './roles';
 import './roomObserve';
+import './roomToolboxActions';
 import './rootUrlChange';
 import './routes';
 import './settingsOnLoadSiteUrl';

apps/meteor/client/startup/messageToolboxActions/autotranslate.ts

@@ -6,7 +6,7 @@ import { hasAtLeastOnePermission } from '../../../app/authorization/client';
 import { AutoTranslate } from '../../../app/autotranslate/client/lib/autotranslate';
 import { Messages } from '../../../app/models/client';
 import { settings } from '../../../app/settings/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { call } from '../../lib/utils/call';
 import { messageArgs } from '../../lib/utils/messageArgs';

apps/meteor/client/startup/messageToolboxActions/copy.ts

@@ -2,7 +2,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { dispatchToastMessage } from '../../lib/toast';
 import { messageArgs } from '../../lib/utils/messageArgs';
 

apps/meteor/client/startup/messageToolboxActions/deleteMessage.ts

@@ -1,7 +1,7 @@
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { messageArgs } from '../../lib/utils/messageArgs';
 

apps/meteor/client/startup/messageToolboxActions/editMessage.ts

@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 
 import { hasAtLeastOnePermission, hasPermission } from '../../../app/authorization/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { messageArgs } from '../../lib/utils/messageArgs';
 
 Meteor.startup(() => {

apps/meteor/client/startup/messageToolboxActions/followMessage.ts

@@ -4,7 +4,7 @@ import { Tracker } from 'meteor/tracker';
 
 import { Messages } from '../../../app/models/client';
 import { settings } from '../../../app/settings/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { dispatchToastMessage } from '../../lib/toast';
 import { callWithErrorHandling } from '../../lib/utils/callWithErrorHandling';

apps/meteor/client/startup/messageToolboxActions/jumpToMessage.ts

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { messageArgs } from '../../lib/utils/messageArgs';
 import { setMessageJumpQueryStringParameter } from '../../lib/utils/setMessageJumpQueryStringParameter';
 

apps/meteor/client/startup/messageToolboxActions/jumpToPinMessage.ts

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { messageArgs } from '../../lib/utils/messageArgs';
 import { setMessageJumpQueryStringParameter } from '../../lib/utils/setMessageJumpQueryStringParameter';
 

apps/meteor/client/startup/messageToolboxActions/jumpToSearchMessage.ts

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { messageArgs } from '../../lib/utils/messageArgs';
 import { setMessageJumpQueryStringParameter } from '../../lib/utils/setMessageJumpQueryStringParameter';
 

apps/meteor/client/startup/messageToolboxActions/jumpToStarMessage.ts

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
 import { settings } from '../../../app/settings/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { messageArgs } from '../../lib/utils/messageArgs';
 import { setMessageJumpQueryStringParameter } from '../../lib/utils/setMessageJumpQueryStringParameter';
 

apps/meteor/client/startup/messageToolboxActions/messageMarkAsUnread.ts

@@ -2,7 +2,8 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Meteor } from 'meteor/meteor';
 
 import { ChatSubscription } from '../../../app/models/client';
-import { RoomManager, messageToolboxActions } from '../../../app/ui-utils/client';
+import { RoomManager } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { dispatchToastMessage } from '../../lib/toast';
 import { call } from '../../lib/utils/call';

apps/meteor/client/startup/messageToolboxActions/permalink.ts

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { dispatchToastMessage } from '../../lib/toast';
 import { messageArgs } from '../../lib/utils/messageArgs';
 

apps/meteor/client/startup/messageToolboxActions/permalinkPinned.ts

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client';
 import { t } from '../../../app/utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { dispatchToastMessage } from '../../lib/toast';
 import { messageArgs } from '../../lib/utils/messageArgs';
 

apps/meteor/client/startup/messageToolboxActions/permalinkStar.ts

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client';
 import { t } from '../../../app/utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { dispatchToastMessage } from '../../lib/toast';
 import { messageArgs } from '../../lib/utils/messageArgs';
 

apps/meteor/client/startup/messageToolboxActions/pinMessage.ts

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasAtLeastOnePermission } from '../../../app/authorization/client';
 import { settings } from '../../../app/settings/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { queryClient } from '../../lib/queryClient';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { dispatchToastMessage } from '../../lib/toast';

apps/meteor/client/startup/messageToolboxActions/quoteMessage.ts

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { messageArgs } from '../../lib/utils/messageArgs';
 
 Meteor.startup(() => {

apps/meteor/client/startup/messageToolboxActions/reactionList.ts

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { imperativeModal } from '../../lib/imperativeModal';
 import { messageArgs } from '../../lib/utils/messageArgs';
 import ReactionList from '../../views/room/modals/ReactionListModal';

apps/meteor/client/startup/messageToolboxActions/reactionMessage.ts

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
 import { EmojiPicker } from '../../../app/emoji/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { call } from '../../lib/utils/call';
 import { messageArgs } from '../../lib/utils/messageArgs';

apps/meteor/client/startup/messageToolboxActions/readReceipt.ts

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { settings } from '../../../app/settings/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { imperativeModal } from '../../lib/imperativeModal';
 import { messageArgs } from '../../lib/utils/messageArgs';
 import ReadReceiptsModal from '../../views/room/modals/ReadReceiptsModal';

apps/meteor/client/startup/messageToolboxActions/replyDirectly.ts

@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../app/authorization/client';
 import { Rooms, Subscriptions } from '../../../app/models/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { messageArgs } from '../../lib/utils/messageArgs';
 

apps/meteor/client/startup/messageToolboxActions/replyInThread.ts

@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { settings } from '../../../app/settings/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { messageArgs } from '../../lib/utils/messageArgs';
 

apps/meteor/client/startup/messageToolboxActions/reportMessage.ts

@@ -1,7 +1,7 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { imperativeModal } from '../../lib/imperativeModal';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { messageArgs } from '../../lib/utils/messageArgs';

apps/meteor/client/startup/messageToolboxActions/starMessage.ts

@@ -2,7 +2,7 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { settings } from '../../../app/settings/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { queryClient } from '../../lib/queryClient';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { dispatchToastMessage } from '../../lib/toast';

apps/meteor/client/startup/messageToolboxActions/startDiscussion.ts

@@ -3,8 +3,8 @@ import { Tracker } from 'meteor/tracker';
 
 import { hasPermission } from '../../../app/authorization/client';
 import { settings } from '../../../app/settings/client';
-import { messageToolboxActions } from '../../../app/ui-utils/client/lib/MessageToolboxActions';
 import CreateDiscussion from '../../components/CreateDiscussion/CreateDiscussion';
+import { messageToolboxActions } from '../../lib/MessageToolboxActions';
 import { imperativeModal } from '../../lib/imperativeModal';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { messageArgs } from '../../lib/utils/messageArgs';