mirror of
https://github.com/zulip/zulip.git
synced 2025-11-10 17:07:07 +00:00
activity: Delete render_empty_user_list_message_if_needed.
This was added in b387ca4, before we had
`buddy_list.update_empty_list_placeholders`
Now it's not only duplicating that functionality, but will soon
maybe run at the wrong time once the buddy list `populate` starts
making `void` calls to `async` empty list placeholder code.
This commit is contained in:
@@ -2,8 +2,6 @@ import $ from "jquery";
|
|||||||
import _ from "lodash";
|
import _ from "lodash";
|
||||||
import assert from "minimalistic-assert";
|
import assert from "minimalistic-assert";
|
||||||
|
|
||||||
import render_empty_list_widget_for_list from "../templates/empty_list_widget_for_list.hbs";
|
|
||||||
|
|
||||||
import * as activity from "./activity.ts";
|
import * as activity from "./activity.ts";
|
||||||
import * as blueslip from "./blueslip.ts";
|
import * as blueslip from "./blueslip.ts";
|
||||||
import * as buddy_data from "./buddy_data.ts";
|
import * as buddy_data from "./buddy_data.ts";
|
||||||
@@ -120,17 +118,6 @@ export function searching(): boolean {
|
|||||||
return user_filter?.searching() ?? false;
|
return user_filter?.searching() ?? false;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function render_empty_user_list_message_if_needed($container: JQuery): void {
|
|
||||||
const empty_list_message = $container.attr("data-search-results-empty");
|
|
||||||
|
|
||||||
if (!empty_list_message || $container.children().length > 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const empty_list_widget_html = render_empty_list_widget_for_list({empty_list_message});
|
|
||||||
$container.append($(empty_list_widget_html));
|
|
||||||
}
|
|
||||||
|
|
||||||
export let build_user_sidebar = (): number[] | undefined => {
|
export let build_user_sidebar = (): number[] | undefined => {
|
||||||
if (realm.realm_presence_disabled) {
|
if (realm.realm_presence_disabled) {
|
||||||
return undefined;
|
return undefined;
|
||||||
@@ -143,9 +130,6 @@ export let build_user_sidebar = (): number[] | undefined => {
|
|||||||
|
|
||||||
buddy_list.populate({all_user_ids});
|
buddy_list.populate({all_user_ids});
|
||||||
|
|
||||||
render_empty_user_list_message_if_needed(buddy_list.$users_matching_view_list);
|
|
||||||
render_empty_user_list_message_if_needed(buddy_list.$other_users_list);
|
|
||||||
|
|
||||||
return all_user_ids; // for testing
|
return all_user_ids; // for testing
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -469,29 +469,6 @@ test("first/prev/next", ({override, override_rewire, mock_template}) => {
|
|||||||
assert.equal(buddy_list.next_key(fred.user_id), undefined);
|
assert.equal(buddy_list.next_key(fred.user_id), undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("render_empty_user_list_message", ({override, mock_template}) => {
|
|
||||||
const empty_list_message = "No matching users.";
|
|
||||||
mock_template("empty_list_widget_for_list.hbs", false, (data) => {
|
|
||||||
assert.equal(data.empty_list_message, empty_list_message);
|
|
||||||
return "<empty-list-stub>";
|
|
||||||
});
|
|
||||||
|
|
||||||
let $appended_data;
|
|
||||||
override(buddy_list, "$container", {
|
|
||||||
append($data) {
|
|
||||||
$appended_data = $data;
|
|
||||||
},
|
|
||||||
attr(name) {
|
|
||||||
assert.equal(name, "data-search-results-empty");
|
|
||||||
return empty_list_message;
|
|
||||||
},
|
|
||||||
children: () => [],
|
|
||||||
});
|
|
||||||
|
|
||||||
activity_ui.render_empty_user_list_message_if_needed(buddy_list.$container);
|
|
||||||
assert.equal($appended_data.selector, "<empty-list-stub>");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("insert_one_user_into_empty_list", ({override, mock_template}) => {
|
test("insert_one_user_into_empty_list", ({override, mock_template}) => {
|
||||||
override(user_settings, "user_list_style", 2);
|
override(user_settings, "user_list_style", 2);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user