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.

Sign up for GitHub

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

Jump to bottom

Chore: Remove method meteor call on message action #26213

Merged
merged 16 commits into from
Dec 6, 2022
Merged

Chore: Remove method meteor call on message action #26213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
549e38a
remove method calls for room menu component
ggazzo Jul 6, 2022
0c2a0a6
Merge remote-tracking branch 'origin/develop' into chore/remove-metho…
ggazzo Jul 8, 2022
4200410
Chore: Remove setUserStatus method call (#26186)
yash-rajpal Jul 8, 2022
60ab310
Chore: Remove custom user status method calls (#26191)
yash-rajpal Jul 8, 2022
5ebc759
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into chor…
ggazzo Jul 8, 2022
36ba7de
Merge branch 'chore/remove-method-call' of github.com:RocketChat/Rock…
ggazzo Jul 8, 2022
8b99366
Chore: Remove meteor call on AccountBox (#26202)
Jul 8, 2022
2496430
chore: remove method call on message action
filipemarins Jul 11, 2022
4365601
Merge remote-tracking branch 'origin/develop' into chore/remove-meteo…
ggazzo Aug 17, 2022
045ed02
Merge branch 'develop' into chore/remove-meteor-call-message
ggazzo Aug 17, 2022
c55d8d1
fix type
yash-rajpal Aug 17, 2022
8fcdccc
error handling, error toasts
yash-rajpal Aug 17, 2022
18b9f54
Merge branch 'develop' into chore/remove-meteor-call-message
yash-rajpal Aug 18, 2022
38cc523
Merge branch 'develop' into chore/remove-meteor-call-message
yash-rajpal Aug 19, 2022
e72f74d
Merge branch 'develop' into chore/remove-meteor-call-message
dougfabris Nov 11, 2022
5ead742
Merge branch 'develop' into chore/remove-meteor-call-message
ggazzo Dec 6, 2022
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
12 changes: 8 additions & 4 deletions apps/meteor/app/message-pin/client/actionButton.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,14 @@ Meteor.startup(function () {
// classes: 'clipboard',
context: ['pinned'],
async action(_, props) {
const { message = messageArgs(this).msg } = props;
const permalink = await MessageAction.getPermaLink(message._id);
navigator.clipboard.writeText(permalink);
dispatchToastMessage({ type: 'success', message: TAPi18n.__('Copied') });
try {
const { message = messageArgs(this).msg } = props;
const permalink = await MessageAction.getPermaLink(message._id);
navigator.clipboard.writeText(permalink);
dispatchToastMessage({ type: 'success', message: TAPi18n.__('Copied') });
} catch (e) {
dispatchToastMessage({ type: 'error', message: e });
}
},
condition({ subscription }) {
return !!subscription;
Expand Down
12 changes: 8 additions & 4 deletions apps/meteor/app/message-star/client/actionButton.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,14 @@ Meteor.startup(function () {
// classes: 'clipboard',
context: ['starred', 'threads'],
async action(_, props) {
const { message = messageArgs(this).msg } = props;
const permalink = await MessageAction.getPermaLink(message._id);
navigator.clipboard.writeText(permalink);
dispatchToastMessage({ type: 'success', message: TAPi18n.__('Copied') });
try {
const { message = messageArgs(this).msg } = props;
const permalink = await MessageAction.getPermaLink(message._id);
navigator.clipboard.writeText(permalink);
dispatchToastMessage({ type: 'success', message: TAPi18n.__('Copied') });
} catch (e) {
dispatchToastMessage({ type: 'error', message: e });
}
},
condition({ message, subscription, user }) {
if (subscription == null) {
Expand Down
24 changes: 12 additions & 12 deletions apps/meteor/app/ui-utils/client/lib/MessageAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ 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 } from '@rocket.chat/core-typings';
import type { IMessage, IUser, ISubscription, IRoom, SettingValue, Serialized } from '@rocket.chat/core-typings';
import type { TranslationKey } from '@rocket.chat/ui-contexts';

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';

const call = (method: string, ...args: any[]): Promise<any> =>
new Promise((resolve, reject) => {
Meteor.call(method, ...args, function (err: any, data: any) {
if (err) {
return reject(err);
}
resolve(data);
});
});
import { APIClient } from '../../../utils/client';

const getMessage = async (msgId: string): Promise<Serialized<IMessage> | null> => {
try {
const { message } = await APIClient.get('/v1/chat.getMessage', { msgId });
return message;
} catch {
return null;
}
};

export const addMessageToList = (messagesList: IMessage[], message: IMessage): IMessage[] => {
// checks if the message is not already on the list
Expand Down Expand Up @@ -176,7 +176,7 @@ export const MessageAction = new (class {
throw new Error('invalid-parameter');
}

const msg = Messages.findOne(msgId) || (await call('getSingleMessage', msgId));
const msg = Messages.findOne(msgId) || (await getMessage(msgId));
if (!msg) {
throw new Error('message-not-found');
}
Expand Down
12 changes: 8 additions & 4 deletions apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,14 @@ Meteor.startup(async function () {
// classes: 'clipboard',
context: ['message', 'message-mobile', 'threads', 'federated'],
async action(_, props) {
const { message = messageArgs(this).msg } = props;
const permalink = await MessageAction.getPermaLink(message._id);
navigator.clipboard.writeText(permalink);
dispatchToastMessage({ type: 'success', message: TAPi18n.__('Copied') });
try {
const { message = messageArgs(this).msg } = props;
const permalink = await MessageAction.getPermaLink(message._id);
navigator.clipboard.writeText(permalink);
dispatchToastMessage({ type: 'success', message: TAPi18n.__('Copied') });
} catch (e) {
dispatchToastMessage({ type: 'error', message: e });
}
},
condition({ subscription }) {
return !!subscription;
Expand Down