{{{_ provider.description}}}
-- {{> icon icon="thread" block="thread-icons"}} - {{# if following }} -- diff --git a/apps/meteor/app/ui-message/client/messageThread.js b/apps/meteor/app/ui-message/client/messageThread.js deleted file mode 100644 index 95c03469f9501..0000000000000 --- a/apps/meteor/app/ui-message/client/messageThread.js +++ /dev/null @@ -1,61 +0,0 @@ -import { ReactiveVar } from 'meteor/reactive-var'; -import { Template } from 'meteor/templating'; -import _ from 'underscore'; - -import { callWithErrorHandling } from '../../../client/lib/utils/callWithErrorHandling'; -import { Messages } from '../../models/client'; -import { normalizeThreadTitle } from '../../threads/client/lib/normalizeThreadTitle'; -import './messageThread.html'; - -export const findParentMessage = (() => { - const waiting = []; - let resolve; - let pending = new Promise((r) => { - resolve = r; - }); - - const getMessages = _.debounce(async function () { - const _tmp = [...waiting]; - waiting.length = 0; - resolve(callWithErrorHandling('getMessages', _tmp)); - pending = new Promise((r) => { - resolve = r; - }); - }, 500); - - const get = async (tmid) => { - getMessages(); - const messages = await pending; - return messages.find(({ _id }) => _id === tmid); - }; - - return async (tmid) => { - const message = Messages.findOne({ _id: tmid }); - - if (message) { - return message; - } - - if (waiting.indexOf(tmid) === -1) { - waiting.push(tmid); - } - return get(tmid); - }; -})(); - -Template.messageThread.helpers({ - parentMessage() { - const { parentMessage } = Template.instance(); - if (parentMessage) { - return normalizeThreadTitle(parentMessage.get()); - } - }, -}); - -Template.messageThread.onCreated(function () { - this.parentMessage = new ReactiveVar(); - this.autorun(async () => { - const { tmid } = Template.currentData(); - this.parentMessage.set(await findParentMessage(tmid)); - }); -}); diff --git a/apps/meteor/app/ui-utils/client/index.ts b/apps/meteor/app/ui-utils/client/index.ts index b83c46e3990e7..b83898b264a79 100644 --- a/apps/meteor/app/ui-utils/client/index.ts +++ b/apps/meteor/app/ui-utils/client/index.ts @@ -15,4 +15,3 @@ export { messageProperties } from '../lib/MessageProperties'; export { MessageTypes, MessageType } from '../lib/MessageTypes'; export { Message } from '../lib/Message'; export { openRoom } from './lib/openRoom'; -export * from './lib/collapseArrow'; diff --git a/apps/meteor/app/ui-utils/client/lib/MessageAction.ts b/apps/meteor/app/ui-utils/client/lib/MessageAction.ts index 1ed1b52532817..7260b6c850121 100644 --- a/apps/meteor/app/ui-utils/client/lib/MessageAction.ts +++ b/apps/meteor/app/ui-utils/client/lib/MessageAction.ts @@ -43,7 +43,8 @@ export type MessageActionContext = | 'starred' | 'mentions' | 'federated' - | 'videoconf'; + | 'videoconf' + | 'search'; type MessageActionConditionProps = { message: IMessage; diff --git a/apps/meteor/app/ui-utils/client/lib/collapseArrow.html b/apps/meteor/app/ui-utils/client/lib/collapseArrow.html deleted file mode 100644 index db848b16ae2cc..0000000000000 --- a/apps/meteor/app/ui-utils/client/lib/collapseArrow.html +++ /dev/null @@ -1,7 +0,0 @@ - - {{#if collapsed}} - - {{else}} - - {{/if}} - \ No newline at end of file diff --git a/apps/meteor/app/ui-utils/client/lib/collapseArrow.js b/apps/meteor/app/ui-utils/client/lib/collapseArrow.js deleted file mode 100644 index be66678548bb7..0000000000000 --- a/apps/meteor/app/ui-utils/client/lib/collapseArrow.js +++ /dev/null @@ -1,31 +0,0 @@ -import { Template } from 'meteor/templating'; -import { ReactiveVar } from 'meteor/reactive-var'; - -import './collapseArrow.html'; - -export const createCollapseable = (template, getInicialFromInstance = () => false) => { - template.onCreated(function () { - this.collapsedMedia = new ReactiveVar(getInicialFromInstance(Template.instance())); - }); - template.helpers({ - collapsed() { - return Template.instance().collapsedMedia.get(); - }, - collapsedMediaVar() { - return Template.instance().collapsedMedia; - }, - }); -}; - -Template.collapseArrow.events({ - 'click .collapse-switch'(e, i) { - e.preventDefault(); - i.data.collapsedMedia.set(!i.data.collapsedMedia.get()); - }, -}); - -Template.collapseArrow.helpers({ - collapsed() { - return this.collapsedMedia.get(); - }, -}); diff --git a/apps/meteor/app/ui-utils/client/lib/messageContext.ts b/apps/meteor/app/ui-utils/client/lib/messageContext.ts index 14f519d7d348f..dec1c6f958f57 100644 --- a/apps/meteor/app/ui-utils/client/lib/messageContext.ts +++ b/apps/meteor/app/ui-utils/client/lib/messageContext.ts @@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { Tracker } from 'meteor/tracker'; import type { IRoom, ISubscription, IUser } from '@rocket.chat/core-typings'; -import type { Blaze } from 'meteor/blaze'; import { Subscriptions, Rooms, Users } from '../../../models/client'; import { hasPermission } from '../../../authorization/client'; @@ -77,8 +76,6 @@ export const createMessageContext = ({ rid?: IRoom['_id']; room?: Omit- {{> icon icon="bell" block="thread-icons"}} -- {{else}} -- {{> icon icon="bell-off" block="thread-icons"}} -- {{/if}} -