Skip to content

Commit

Permalink
Chore: Move Omnichannel Room Footer to react (RocketChat#26864)
Browse files Browse the repository at this point in the history 
Co-authored-by: Yash Rajpal <[email protected]>
Co-authored-by: Martin Schoeler <[email protected]>
  • Loading branch information
@ggazzo @yash-rajpal @MartinSchoeler
3 people authored Sep 15, 2022
1 parent 6d3b20d commit 34c07d2
Show file tree
Hide file tree
Showing 61 changed files with 2,233 additions and 391 deletions.
3 changes: 0 additions & 3 deletions apps/meteor/app/livechat/client/views/app/livechatNotSubscribed.html
View file

This file was deleted.

28 changes: 0 additions & 28 deletions apps/meteor/app/livechat/client/views/app/livechatReadOnly.html
View file

This file was deleted.

129 changes: 0 additions & 129 deletions apps/meteor/app/livechat/client/views/app/livechatReadOnly.js
View file

This file was deleted.

2 changes: 0 additions & 2 deletions apps/meteor/app/livechat/client/views/regular.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import './app/livechatReadOnly';
import './app/livechatNotSubscribed.html';
import './app/tabbar/contactChatHistory';
import './app/tabbar/contactChatHistoryItem';
import './app/tabbar/contactChatHistoryMessages';
2 changes: 1 addition & 1 deletion apps/meteor/app/models/client/models/Users.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const Users = {
* @param {string} scope the value for the scope (room id)
* @param {any} options
*/
findUsersInRoles(roles, scope, options) {
findUsersInRoles(roles, _scope, options) {
roles = [].concat(roles);

const query = {
Expand Down
150 changes: 68 additions & 82 deletions apps/meteor/app/ui-message/client/messageBox/messageBox.html
View file
Original file line number Diff line number Diff line change
@@ -1,100 +1,86 @@
<template name="messageBox">
<div class="rc-message-box rc-new {{#if isEmbedded}}rc-message-box--embedded{{/if}}">
{{#unless isAnonymousOrMustJoinWithCode}}

{{> userActionIndicator rid=rid tmid=tmid}}
{{> userActionIndicator rid=rid tmid=tmid}}

{{#if isWritable}}
{{#if popupConfig}}
{{> messagePopupConfig popupConfig}}
{{> messagePopupSlashCommandPreview popupConfig}}
{{/if}}
{{#if popupConfig}}
{{> messagePopupConfig popupConfig}}
{{> messagePopupSlashCommandPreview popupConfig}}
{{/if}}

{{#if replyMessageData}}
<div class="reply-preview__wrap message-popup">
{{#each reply in replyMessageData}}
{{> messageBoxReplyPreview input=input replyMessageData=reply}}
{{/each}}
</div>
{{/if}}
{{#if replyMessageData}}
<div class="reply-preview__wrap message-popup">
{{#each reply in replyMessageData}}
{{> messageBoxReplyPreview input=input replyMessageData=reply}}
{{/each}}
</div>
{{/if}}

<label class="rc-message-box__container">
<label class="rc-message-box__container">
{{#unless isFederatedRoom}}
<span class="rc-message-box__icon emoji-picker-icon {{#unless isEmojiEnabled}}emoji-picker-icon--disabled{{/unless}} js-emoji-picker" aria-haspopup="true">
{{> icon block="rc-input__icon-svg" icon="emoji"}}
</span>
{{else}}
<div class="rc-message-box__federation_icon"></div>
{{/unless}}

<textarea aria-label="{{_ 'Message'}}" name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message"></textarea>
<div class="js-input-message-shadow"></div>
{{#if isSendIconVisible}}
<span class="rc-message-box__icon rc-message-box__send js-send" data-desktop>
{{> icon block="rc-input__icon-svg" icon="send"}}
</span>
{{else}}
{{# if customAction }}
{{> Template.dynamic template=customAction.template data=customAction.data }}
{{ else }}
{{#unless isFederatedRoom}}
<span class="rc-message-box__icon emoji-picker-icon {{#unless isEmojiEnabled}}emoji-picker-icon--disabled{{/unless}} js-emoji-picker" aria-haspopup="true">
{{> icon block="rc-input__icon-svg" icon="emoji"}}
</span>
{{else}}
<div class="rc-message-box__federation_icon"></div>
{{/unless}}

<textarea aria-label="{{_ 'Message'}}" name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message"></textarea>
<div class="js-input-message-shadow"></div>
{{#if isSendIconVisible}}
<span class="rc-message-box__icon rc-message-box__send js-send" data-desktop>
{{> icon block="rc-input__icon-svg" icon="send"}}
</span>
{{else}}
{{# if customAction }}
{{> Template.dynamic template=customAction.template data=customAction.data }}
{{ else }}
{{#unless isFederatedRoom}}
{{#if canSend}}
{{> messageBoxAudioMessage rid=rid tmid=tmid}}
<span class="rc-message-box__action-menu js-action-menu" data-desktop aria-haspopup="true" data-qa-id="menu-more-actions">
{{#if actions}}
<span class="rc-message-box__icon">
{{> icon block="rc-input__icon-svg" icon="plus"}}
</span>
{{/if}}
{{#if canSend}}
{{> messageBoxAudioMessage rid=rid tmid=tmid}}
<span class="rc-message-box__action-menu js-action-menu" data-desktop aria-haspopup="true" data-qa-id="menu-more-actions">
{{#if actions}}
<span class="rc-message-box__icon">
{{> icon block="rc-input__icon-svg" icon="plus"}}
</span>
{{else}}
<button class="js-join rc-button rc-button--primary rc-message-box__join-button">
{{_ "join"}}
</button>
{{/if}}
{{/unless}}
</span>
{{else}}
<button class="js-join rc-button rc-button--primary rc-message-box__join-button">
{{_ "join"}}
</button>
{{/if}}
{{/if}}
{{/unless}}
{{/if}}
{{/if}}

<span class="rc-message-box__action-label js-message-actions" data-small>
{{#each action in actions}}
<span class="js-message-action" data-id="{{action.id}}">
{{> icon block="rc-message-box__action" icon=action.icon }}
</span>
{{/each}}
<span class="rc-message-box__action-label js-message-actions" data-small>
{{#each action in actions}}
<span class="js-message-action" data-id="{{action.id}}">
{{> icon block="rc-message-box__action" icon=action.icon }}
</span>
{{/each}}
</span>

<span class="rc-message-box__send js-message-action js-send" disabled="{{isSendIconDisabled}}" data-small>
{{> icon block="rc-message-box__action" icon="send"}}
</span>
</label>
<span class="rc-message-box__send js-message-action js-send" disabled="{{isSendIconDisabled}}" data-small>
{{> icon block="rc-message-box__action" icon="send"}}
</span>
</label>

{{#if showFormattingTips}}
<div class="rc-message-box__toolbar-formatting">
{{#each formattingButton in formattingButtons}}
{{#if formattingButton.icon}}
<button class="rc-message-box__toolbar-formatting-item js-format" data-id="{{formattingButton.label}}" title="{{_ formattingButton.label}}">
{{> icon block="rc-message-box__toolbar-formatting-icon" icon=formattingButton.icon }}
</button>
{{else}}
<span class="rc-message-box__toolbar-formatting-item" title="{{_ formattingButton.label}}">
<a href="{{formattingButton.link}}" target="_blank" rel="noopener noreferrer" class="rc-message-box__toolbar-formatting-link">{{formattingButton.text}}</a>
</span>
{{/if}}
{{/each}}
</div>
{{/if}}
{{else}}
<div class="rc-message-box__cannot-send">
{{#if isBlockedOrBlocker}}
{{_ "room_is_blocked"}}
{{#if showFormattingTips}}
<div class="rc-message-box__toolbar-formatting">
{{#each formattingButton in formattingButtons}}
{{#if formattingButton.icon}}
<button class="rc-message-box__toolbar-formatting-item js-format" data-id="{{formattingButton.label}}" title="{{_ formattingButton.label}}">
{{> icon block="rc-message-box__toolbar-formatting-icon" icon=formattingButton.icon }}
</button>
{{else}}
{{> messageBoxReadOnly rid=rid isSubscribed=isSubscribed onHold=onHold }}
<span class="rc-message-box__toolbar-formatting-item" title="{{_ formattingButton.label}}">
<a href="{{formattingButton.link}}" target="_blank" rel="noopener noreferrer" class="rc-message-box__toolbar-formatting-link">{{formattingButton.text}}</a>
</span>
{{/if}}
</div>
{{/if}}
{{else}}
{{> messageBoxNotSubscribed rid=rid}}
{{/unless}}
{{/each}}
</div>
{{/if}}
</div>
</template>
2 changes: 0 additions & 2 deletions apps/meteor/app/ui-message/client/messageBox/messageBox.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import './messageBoxActions';
import './messageBoxReplyPreview.ts';
import './userActionIndicator.ts';
import './messageBoxAudioMessage.ts';
import './messageBoxNotSubscribed.ts';
import './messageBoxReadOnly.ts';
import './messageBox.html';

type MessageBoxTemplateInstance = Blaze.TemplateInstance<{
Expand Down
26 changes: 0 additions & 26 deletions apps/meteor/app/ui-message/client/messageBox/messageBoxNotSubscribed.html
View file

This file was deleted.

Loading

0 comments on commit 34c07d2

Please sign in to comment.