Skip to content

Commit

Permalink
fixup WeList: trim ID
Browse files Browse the repository at this point in the history
  • Loading branch information
robinlej committed Jun 21, 2024
1 parent ccd48fb commit 44648c4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
20 changes: 17 additions & 3 deletions addons/web_editor/static/src/js/editor/snippets.options.js
Original file line number Diff line number Diff line change
Expand Up @@ -2607,8 +2607,8 @@ class WeList extends UserValueComponent {
const id = newRecord.id || new Date().getTime();
const record = Object.assign({}, newRecord, {
id: this._toComparableId(id),
name: newRecord.name,
display_name: newRecord.display_name || this.props.defaultValue,
name: this._trimmed(newRecord.name),
display_name: this._trimmed(newRecord.display_name) || this.props.defaultValue,
});
this.state.listRecords.push(record);
}
Expand All @@ -2634,6 +2634,16 @@ class WeList extends UserValueComponent {
}
}

/**
* @param {string} str
* @returns {string}
*/
_trimmed(str) {
if (typeof str !== "string") {
return str;
}
return str.trim().replace(/\s+/g, " ");
}
/**
* Cast ids to the right type (number or string) to compare them between
* record / state / DOM.
Expand All @@ -2643,7 +2653,11 @@ class WeList extends UserValueComponent {
* @returns {string|number}
*/
_toComparableId(id) {
return /^-?[0-9]{1,15}$/.test(id) ? parseInt(id) : id;
if (typeof id === "string") {
id = this._trimmed(id);
return /^-?[0-9]{1,15}$/.test(id) ? parseInt(id) : id;
}
return id;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<!-- Try with `hasDefault` = unique/multiple or not set, with/out `addItemTitle`, `inputType` = number, with/out `defaultValue`,
with/out `availableRecords`, with/out `unsortable`, `notEditable`, `allowEmpty`, `newElementsNotToggleable`, `renderOnInputBlur`
-->
<WeList addItemTitle="'Add new item to list'" renderListItems="''" hasDefault="'unique'" availableRecords='`[{"id":1,"title":"delectus aut autem","completed":false,"display_name":"delectus aut autem"},{"id":2,"title":"quis ut nam facilis et officia qui","completed":false,"display_name":"quis ut nam facilis et officia qui"},{"id":3,"title":"fugiat veniam minus","completed":false,"display_name":"fugiat veniam minus"},{"id":4,"title":"et porro tempora","completed":true,"display_name":"et porro tempora"},{"id":5,"title":"laboriosam mollitia et enim quasi adipisci quia provident illum","completed":false,"display_name":"laboriosam mollitia et enim quasi adipisci quia provident illum"},{"id":6,"title":"qui ullam ratione quibusdam voluptatem quia omnis","completed":false,"display_name":"qui ullam ratione quibusdam voluptatem quia omnis"},{"id":7,"title":"illo expedita consequatur quia in","completed":false,"display_name":"illo expedita consequatur quia in"},{"id":8,"title":"quo adipisci enim quam ut ab","completed":true,"display_name":"quo adipisci enim quam ut ab"},{"id":9,"title":"molestiae perspiciatis ipsa","completed":false,"display_name":"molestiae perspiciatis ipsa"},{"id":10,"title":"illo est ratione doloremque quia maiores aut","completed":true,"display_name":"illo est ratione doloremque quia maiores aut"}]`'>
<WeList addItemTitle="'Add new item to list'" renderListItems="''" hasDefault="'unique'" availableRecords='`[{"id":1,"title":"delectus aut autem","completed":false,"display_name":"delectus aut autem"},{"id":2,"title":"quis ut nam facilis et officia qui ","completed":false,"display_name":"quis ut nam facilis et officia qui "},{"id":3,"title":"fugiat veniam minus","completed":false,"display_name":"fugiat veniam minus"},{"id":4,"title":"et porro tempora","completed":true,"display_name":"et porro tempora"},{"id":5,"title":"laboriosam mollitia et enim quasi adipisci quia provident illum","completed":false,"display_name":"laboriosam mollitia et enim quasi adipisci quia provident illum"},{"id":6,"title":"qui ullam ratione quibusdam voluptatem quia omnis","completed":false,"display_name":"qui ullam ratione quibusdam voluptatem quia omnis"},{"id":7,"title":"illo expedita consequatur quia in","completed":false,"display_name":"illo expedita consequatur quia in"},{"id":8,"title":"quo adipisci enim quam ut ab","completed":true,"display_name":"quo adipisci enim quam ut ab"},{"id":9,"title":"molestiae perspiciatis ipsa","completed":false,"display_name":"molestiae perspiciatis ipsa"},{"id":10,"title":"illo est ratione doloremque quia maiores aut","completed":true,"display_name":"illo est ratione doloremque quia maiores aut"}]`'>
<!-- <WeList addItemTitle="'Add new item to list'" renderListItems="''" hasDefault="'multiple'" defaultValue="'Something'"> -->
<t t-set-slot="title">A wonderful WeList</t>
</WeList>
Expand Down

0 comments on commit 44648c4

Please sign in to comment.