paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

dropdown-list-widget: Use null-value when no value is specified.

Browse Source 
Previously, we tried to read the value from page_params, which was just
a hack to make the calling code look cleaner. We now remove that hack
and thus, our dependency on page_params existing. Now, if the caller
does not specify a default value, we'll use the null-value.

This also creates a new init() function to cleanly wrap the code that
makes changes to the opts passed to the widget.
This commit is contained in:
Rohitt Vashishtha
2020-05-19 03:46:34 +05:30
committed by Tim Abbott
parent aeb247f528
commit 96638f5bd4
4 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
frontend_tests/node_tests/dropdown_list_widget.js
View File

@@ -10,6 +10,16 @@ const _list_render = {
};
set_global('list_render', _list_render);
const setup_zjquery_data = (name) => {
$.clear_all_elements();
const input_group = $(".input_group");
const reset_button = $('.dropdown_list_reset_button');
input_group.set_find_results('.dropdown_list_reset_button', reset_button);
$(`#${name}_widget #${name}_name`).closest = () => input_group;
const $widget = $(`#${name}_widget #${name}_name`);
return {reset_button, $widget};
};
run_test('basic_functions', () => {
let updated_value;
const opts = {
@@ -21,11 +31,7 @@ run_test('basic_functions', () => {
render_text: (text) => `rendered: ${text}`,
};
const input_group = $(".input_group");
const reset_button = $('.dropdown_list_reset_button');
input_group.set_find_results('.dropdown_list_reset_button', reset_button);
$("#my_setting_widget #my_setting_name").closest = () => input_group;
const $widget = $("#my_setting_widget #my_setting_name");
const {reset_button, $widget} = setup_zjquery_data(opts.widget_name);
const widget = dropdown_list_widget(opts);
@@ -45,3 +51,18 @@ run_test('basic_functions', () => {
assert.equal(updated_value, null);
assert(!reset_button.visible());
});
run_test('no_default_value', () => {
const opts = {
widget_name: 'my_setting',
data: ['one', 'two', 'three'].map(x => ({name: x, value: x})),
default_text: i18n.t("not set"),
render_text: (text) => `rendered: ${text}`,
null_value: 'null-value',
};
blueslip.expect('warn', 'dropdown-list-widget: Called without a default value; using null value');
setup_zjquery_data(opts.widget_name);
const widget = dropdown_list_widget(opts);
assert.equal(widget.value(), 'null-value');
});

2
frontend_tests/node_tests/settings_org.js
View File

@@ -1035,6 +1035,8 @@ run_test('misc', () => {
};
});
// We do not define any settings we need in page_params yet, but we don't need to for this test.
blueslip.expect('warn', 'dropdown-list-widget: Called without a default value; using null value', 3);
settings_org.init_dropdown_widgets();
let setting_name = 'realm_notifications_stream_id';