extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2Tree: Get all admin tree leaf actions working

Browse Source
This commit is contained in:
nathan 2024-02-16 08:59:11 -07:00
parent b5342170c9
commit cce0ab57fa
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts
View File

@ -172,14 +172,14 @@ export const Et2WidgetWithSelectMixin = <T extends Constructor<LitElement>>(supe
* *
* @return SelectOption | null * @return SelectOption | null
*/ */
public optionSearch(value : string, options : SelectOption[] = null, childKey : string = "value") : SelectOption | null public optionSearch(value : string, options : SelectOption[] = null, searchKey : string = "value", childKey : string = "value") : SelectOption | null
{ {
let result = null; let result = null;
let search = function(options, value) let search = function(options, value)
{ {
return options.find((option) => return options.find((option) =>
{ {
if(!Array.isArray(option.value) && option.value == value) if(!Array.isArray(option[searchKey]) && option[searchKey] == value)
{ {
result = option; result = option;
} }
@ -187,7 +187,7 @@ export const Et2WidgetWithSelectMixin = <T extends Constructor<LitElement>>(supe
{ {
return search(option[childKey], value); return search(option[childKey], value);
} }
return option.value == value; return option[searchKey] == value;
}); });
} }
search(options ?? this.select_options, value); search(options ?? this.select_options, value);

11
api/js/etemplate/Et2Tree/Et2Tree.ts
View File

@ -405,8 +405,8 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement)
*/ */
public getNode(_id: string): TreeItemData public getNode(_id: string): TreeItemData
{ {
// TODO: Look into this._search(), find out why it doesn't always succeed
return this._search(_id, this._selectOptions) return this._search(_id, this._selectOptions) ?? this.optionSearch(_id, this._selectOptions, 'id', 'item')
} }
/** /**
@ -637,7 +637,7 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement)
this.handleLazyLoading(selectOption).then((result) => { this.handleLazyLoading(selectOption).then((result) => {
// TODO: We already have the right option in context. Look into this.getNode(), find out why it's there. It doesn't do a deep search. // TODO: We already have the right option in context. Look into this.getNode(), find out why it's there. It doesn't do a deep search.
const parentNode = selectOption ?? this.getNode(selectOption.id) ?? this.optionSearch(selectOption.id, this._selectOptions, 'item'); const parentNode = selectOption ?? this.getNode(selectOption.id) ?? this.optionSearch(selectOption.id, this._selectOptions, 'id', 'item');
parentNode.item = [...result.item] parentNode.item = [...result.item]
this.requestUpdate("_selectOptions") this.requestUpdate("_selectOptions")
}) })
@ -660,7 +660,7 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement)
@sl-selection-change=${ @sl-selection-change=${
(event: any) => { (event: any) => {
this._previousOption = this._currentOption ?? (this.value.length ? this.getNode(this.value) : null); this._previousOption = this._currentOption ?? (this.value.length ? this.getNode(this.value) : null);
this._currentOption = this.getNode(event.detail.selection[0].id); this._currentOption = this.getNode(event.detail.selection[0].id) ?? this.optionSearch(event.detail.selection[0].id, this._selectOptions, 'id', 'item');
const ids = event.detail.selection.map(i => i.id); const ids = event.detail.selection.map(i => i.id);
this.value = this.multiple ? ids ?? [] : ids[0] ?? ""; this.value = this.multiple ? ids ?? [] : ids[0] ?? "";
event.detail.previous = this._previousOption?.id; event.detail.previous = this._previousOption?.id;
@ -806,7 +806,8 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement)
{ {
res = value res = value
return res return res
} else if (_id.startsWith(value.id)) }
else if(_id.startsWith(value.id) && typeof value.item !== "undefined")
{ {
res = this._search(_id, value.item) res = this._search(_id, value.item)
} }