Skip to content

Commit df02d81

Browse files
ear-devear-dev
authored
Merge pull request RocketChat#217 from Shailesh351/sb_fix_room_search
Fix Room Search Issue
2 parents 2f49926 + b1bc547 commit df02d81

File tree

2 files changed

+133
-119
lines changed

2 files changed

+133
-119
lines changed

‎app/ui/client/views/app/room.html

+123-119
Original file line numberDiff line numberDiff line change
@@ -11,139 +11,143 @@
1111
{{/headerRoom}}
1212
{{/if}}
1313
<div class="messages-container-wrapper">
14-
<div class="messages-container-main dropzone {{dragAndDrop}}">
15-
<div class="dropzone-overlay {{isDropzoneDisabled}} background-transparent-darkest color-content-background-color">{{_ dragAndDropLabel}}</div>
16-
{{#unless embeddedVersion}}
17-
{{#if announcement}}
18-
<div class="fixed-title announcement {{getAnnouncementStyle}}" aria-label="{{RocketChatMarkdownInline announcement}}">
19-
<p>{{{RocketChatMarkdownInline announcement}}}</p>
20-
</div>
21-
{{/if}}
22-
{{/unless}}
23-
<div class="container-bars {{containerBarsShow unreadData uploading}}">
24-
{{#with unreadData}}
25-
{{#if since}}
26-
{{#if count}}
27-
<div class="unread-bar color-primary-action-color background-component-color">
28-
<button class="jump-to">
29-
<span class="jump-to-large">{{_ "Jump_to_first_unread"}}</span>
30-
<span class="jump-to-small">{{_ "Jump"}}</span>
14+
{{#if openSearchPage}}
15+
{{> RocketSearch}}
16+
{{else}}
17+
<div class="messages-container-main dropzone {{dragAndDrop}}">
18+
<div class="dropzone-overlay {{isDropzoneDisabled}} background-transparent-darkest color-content-background-color">{{_ dragAndDropLabel}}</div>
19+
{{#unless embeddedVersion}}
20+
{{#if announcement}}
21+
<div class="fixed-title announcement {{getAnnouncementStyle}}" aria-label="{{RocketChatMarkdownInline announcement}}">
22+
<p>{{{RocketChatMarkdownInline announcement}}}</p>
23+
</div>
24+
{{/if}}
25+
{{/unless}}
26+
<div class="container-bars {{containerBarsShow unreadData uploading}}">
27+
{{#with unreadData}}
28+
{{#if since}}
29+
{{#if count}}
30+
<div class="unread-bar color-primary-action-color background-component-color">
31+
<button class="jump-to">
32+
<span class="jump-to-large">{{_ "Jump_to_first_unread"}}</span>
33+
<span class="jump-to-small">{{_ "Jump"}}</span>
34+
</button>
35+
<span class="unread-count-since">
36+
{{_ "S_new_messages_since_s" count formatUnreadSince}}
37+
</span>
38+
<span class="unread-count">
39+
{{_ "N_new_messages" count}}
40+
</span>
41+
<button class="mark-read">
42+
{{_ "Mark_as_read"}}
43+
</button>
44+
</div>
45+
{{/if}}
46+
{{/if}}
47+
{{/with}}
48+
{{#each uploading}}
49+
<div class="upload-progress color-primary-action-color background-component-color {{#if error}}error-background error-border{{/if}}">
50+
{{#if error}}
51+
<div class="upload-progress-text">
52+
{{error}}
53+
</div>
54+
<button class="upload-progress-close">
55+
{{_ "close"}}
3156
</button>
32-
<span class="unread-count-since">
33-
{{_ "S_new_messages_since_s" count formatUnreadSince}}
34-
</span>
35-
<span class="unread-count">
36-
{{_ "N_new_messages" count}}
37-
</span>
38-
<button class="mark-read">
39-
{{_ "Mark_as_read"}}
57+
{{else}}
58+
<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
59+
<div class="upload-progress-text">
60+
[{{percentage}}%] {{name}}
61+
</div>
62+
<button class="upload-progress-close">
63+
{{_ "Cancel"}}
4064
</button>
65+
{{/if}}
66+
</div>
67+
{{/each}}
68+
</div>
69+
<div class="messages-box {{#if selectable}}selectable{{/if}} {{messageViewMode}} {{hasLeader}}">
70+
<div class="ticks-bar"></div>
71+
<button class="new-message background-primary-action-color color-content-background-color not">
72+
<i class="icon-down-big"></i>
73+
{{_ "New_messages"}}
74+
</button>
75+
<div class="jump-recent background-component-color {{#unless hasMoreNext}}not{{/unless}}">
76+
<button>{{_ "Jump_to_recent_messages"}} <i class="icon-level-down"></i></button>
77+
</div>
78+
{{#unless canPreview}}
79+
<div class="content room-not-found error-color">
80+
<div>
81+
{{_ "You_must_join_to_view_messages_in_this_channel"}}
4182
</div>
42-
{{/if}}
43-
{{/if}}
44-
{{/with}}
45-
{{#each uploading}}
46-
<div class="upload-progress color-primary-action-color background-component-color {{#if error}}error-background error-border{{/if}}">
47-
{{#if error}}
48-
<div class="upload-progress-text">
49-
{{error}}
50-
</div>
51-
<button class="upload-progress-close">
52-
{{_ "close"}}
83+
</div>
84+
{{/unless}}
85+
{{#with roomLeader}}
86+
<div class="room-leader message color-primary-font-color content-background-color border-component-color {{hideLeaderHeader}}">
87+
<button class="thumb user-card-message">
88+
{{> avatar username=username }}
5389
</button>
54-
{{else}}
55-
<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
56-
<div class="upload-progress-text">
57-
[{{percentage}}%] {{name}}
90+
<div class="leader-name">{{name}}</div>
91+
<div class="leader-status userStatus">
92+
<span class="color-ball status-bg-{{status}}"></span>
93+
<span class="status-text leader-status-text">{{statusDisplay}}</span>
5894
</div>
59-
<button class="upload-progress-close">
60-
{{_ "Cancel"}}
61-
</button>
62-
{{/if}}
63-
</div>
64-
{{/each}}
65-
</div>
66-
<div class="messages-box {{#if selectable}}selectable{{/if}} {{messageViewMode}} {{hasLeader}}">
67-
<div class="ticks-bar"></div>
68-
<button class="new-message background-primary-action-color color-content-background-color not">
69-
<i class="icon-down-big"></i>
70-
{{_ "New_messages"}}
71-
</button>
72-
<div class="jump-recent background-component-color {{#unless hasMoreNext}}not{{/unless}}">
73-
<button>{{_ "Jump_to_recent_messages"}} <i class="icon-level-down"></i></button>
74-
</div>
75-
{{#unless canPreview}}
76-
<div class="content room-not-found error-color">
77-
<div>
78-
{{_ "You_must_join_to_view_messages_in_this_channel"}}
95+
<a class="chat-now" href="{{chatNowLink}}">{{_ "Chat_Now"}}</a>
7996
</div>
80-
</div>
81-
{{/unless}}
82-
{{#with roomLeader}}
83-
<div class="room-leader message color-primary-font-color content-background-color border-component-color {{hideLeaderHeader}}">
84-
<button class="thumb user-card-message">
85-
{{> avatar username=username }}
86-
</button>
87-
<div class="leader-name">{{name}}</div>
88-
<div class="leader-status userStatus">
89-
<span class="color-ball status-bg-{{status}}"></span>
90-
<span class="status-text leader-status-text">{{statusDisplay}}</span>
91-
</div>
92-
<a class="chat-now" href="{{chatNowLink}}">{{_ "Chat_Now"}}</a>
93-
</div>
94-
{{/with}}
95-
<div class="wrapper {{#if hasMoreNext}}has-more-next{{/if}} {{hideUsername}} {{hideAvatar}}">
96-
<ul aria-live="polite">
97-
{{#if canPreview}}
98-
{{#if hasMore}}
97+
{{/with}}
98+
<div class="wrapper {{#if hasMoreNext}}has-more-next{{/if}} {{hideUsername}} {{hideAvatar}}">
99+
<ul aria-live="polite">
100+
{{#if canPreview}}
101+
{{#if hasMore}}
102+
<li class="load-more">
103+
{{#if isLoading}}
104+
{{> loading}}
105+
{{/if}}
106+
</li>
107+
{{else}}
108+
<li class="start color-info-font-color">
109+
{{#if hasPurge}}
110+
<div class="start__purge-warning error-background error-border error-color">
111+
{{> icon block="start__purge-warning-icon" icon="warning"}}
112+
{{#unless filesOnly}}
113+
{{#unless excludePinned}}
114+
{{_ "RetentionPolicy_RoomWarning" time=purgeTimeout}}
115+
{{else}}
116+
{{_ "RetentionPolicy_RoomWarning_Unpinned" time=purgeTimeout}}
117+
{{/unless}}
118+
{{else}}
119+
{{#unless excludePinned}}
120+
{{_ "RetentionPolicy_RoomWarning_FilesOnly" time=purgeTimeout}}
121+
{{else}}
122+
{{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" time=purgeTimeout}}
123+
{{/unless}}
124+
{{/unless}}
125+
</div>
126+
{{/if}}
127+
{{_ "Start_of_conversation"}}
128+
</li>
129+
{{/if}}
130+
{{/if}}
131+
132+
{{# with messageContext}}
133+
{{#each msg in messagesHistory}}{{> message index=@index shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/each}}
134+
{{/with}}
135+
136+
{{#if hasMoreNext}}
99137
<li class="load-more">
100138
{{#if isLoading}}
101139
{{> loading}}
102140
{{/if}}
103141
</li>
104-
{{else}}
105-
<li class="start color-info-font-color">
106-
{{#if hasPurge}}
107-
<div class="start__purge-warning error-background error-border error-color">
108-
{{> icon block="start__purge-warning-icon" icon="warning"}}
109-
{{#unless filesOnly}}
110-
{{#unless excludePinned}}
111-
{{_ "RetentionPolicy_RoomWarning" time=purgeTimeout}}
112-
{{else}}
113-
{{_ "RetentionPolicy_RoomWarning_Unpinned" time=purgeTimeout}}
114-
{{/unless}}
115-
{{else}}
116-
{{#unless excludePinned}}
117-
{{_ "RetentionPolicy_RoomWarning_FilesOnly" time=purgeTimeout}}
118-
{{else}}
119-
{{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" time=purgeTimeout}}
120-
{{/unless}}
121-
{{/unless}}
122-
</div>
123-
{{/if}}
124-
{{_ "Start_of_conversation"}}
125-
</li>
126142
{{/if}}
127-
{{/if}}
128-
129-
{{# with messageContext}}
130-
{{#each msg in messagesHistory}}{{> message index=@index shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/each}}
131-
{{/with}}
132-
133-
{{#if hasMoreNext}}
134-
<li class="load-more">
135-
{{#if isLoading}}
136-
{{> loading}}
137-
{{/if}}
138-
</li>
139-
{{/if}}
140-
</ul>
143+
</ul>
144+
</div>
141145
</div>
146+
<footer class="footer border-component-color">
147+
{{> messageBox messageboxData}}
148+
</footer>
142149
</div>
143-
<footer class="footer border-component-color">
144-
{{> messageBox messageboxData}}
145-
</footer>
146-
</div>
150+
{{/if}}
147151
{{#with flexData}}
148152
{{> contextualBar}}
149153
{{/with}}

‎app/ui/client/views/app/room.js

+10
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,14 @@ export const dropzoneHelpers = {
277277

278278
Template.room.helpers({
279279
...dropzoneHelpers,
280+
281+
openSearchPage() {
282+
if (!isMobile()) {
283+
return false;
284+
}
285+
return Session.get('openSearchPage');
286+
},
287+
280288
isTranslated() {
281289
const { state } = Template.instance();
282290
return settings.get('AutoTranslate_Enabled')
@@ -1006,6 +1014,8 @@ Template.room.events({
10061014
Template.room.onCreated(function() {
10071015
// this.scrollOnBottom = true
10081016
// this.typing = new msgTyping this.data._id
1017+
Session.set('openSearchPage', false);
1018+
10091019
const rid = this.data._id;
10101020

10111021
this.onFile = (filesToUpload) => {

0 commit comments

Comments
 (0)