Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Discussion message action meteor removal #33962

Merged
merged 8 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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: 5 additions & 0 deletions .changeset/pink-beers-flow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes issue that could cause multiple discussions to be created when creating it from a message action
2 changes: 0 additions & 2 deletions apps/meteor/app/discussion/client/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import React, { memo, useMemo, useRef } from 'react';

import MessageActionMenu from './MessageActionMenu';
import MessageToolbarStarsActionMenu from './MessageToolbarStarsActionMenu';
import { useNewDiscussionMessageAction } from './useNewDiscussionMessageAction';
import { useWebDAVMessageAction } from './useWebDAVMessageAction';
import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction';
import { MessageAction } from '../../../../app/ui-utils/client/lib/MessageAction';
Expand Down Expand Up @@ -85,6 +86,7 @@ const MessageToolbar = ({

// TODO: move this to another place
useWebDAVMessageAction();
useNewDiscussionMessageAction();

const actionsQueryResult = useQuery(['rooms', room._id, 'messages', message._id, 'actions'] as const, async () => {
const props = { message, room, user, subscription, settings: mapSettings, chat };
Expand Down
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { useSetModal, useSetting } from '@rocket.chat/ui-contexts';
import React, { useEffect } from 'react';

import CreateDiscussion from '../../../client/components/CreateDiscussion/CreateDiscussion';
import { imperativeModal } from '../../../client/lib/imperativeModal';
import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator';
import { hasPermission } from '../../authorization/client';
import { settings } from '../../settings/client';
import { MessageAction } from '../../ui-utils/client';
import { hasPermission } from '../../../../app/authorization/client';
import { MessageAction } from '../../../../app/ui-utils/client/lib/MessageAction';
import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
import CreateDiscussion from '../../CreateDiscussion';

Meteor.startup(() => {
Tracker.autorun(() => {
if (!settings.get('Discussion_enabled')) {
export const useNewDiscussionMessageAction = () => {
const enabled = useSetting('Discussion_enabled', false);

const setModal = useSetModal();

useEffect(() => {
if (!enabled) {
MartinSchoeler marked this conversation as resolved.
Show resolved Hide resolved
return MessageAction.removeButton('start-discussion');
}

MessageAction.addButton({
id: 'start-discussion',
icon: 'discussion',
label: 'Discussion_start',
type: 'communication',
context: ['message', 'message-mobile', 'videoconf'],
async action(_, { message, room }) {
imperativeModal.open({
component: CreateDiscussion,
props: {
defaultParentRoom: room?.prid || room?._id,
onClose: imperativeModal.close,
parentMessageId: message._id,
nameSuggestion: message?.msg?.substr(0, 140),
},
});
setModal(
<CreateDiscussion
defaultParentRoom={room?.prid || room?._id}
onClose={() => setModal(undefined)}
parentMessageId={message._id}
nameSuggestion={message?.msg?.substr(0, 140)}
/>,
);
},
condition({
message: {
Expand Down Expand Up @@ -61,5 +61,5 @@ Meteor.startup(() => {
order: 1,
group: 'menu',
});
});
});
}, [enabled, setModal]);
};
1 change: 0 additions & 1 deletion apps/meteor/client/importPackages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import '../app/tokenpass/client';
import '../app/webrtc/client';
import '../app/wordpress/client';
import '../app/e2e/client';
import '../app/discussion/client';
import '../app/threads/client';
import '../app/utils/client';
import '../app/settings/client';
Expand Down
Loading