hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix concurrent loadItems in CatalogEntityStore (#4356)

Browse Source 
* Fix concurrent loadItems in CatalogEntityStore

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>

* Add parameter to loadItems.

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>

* Remove unnecessary overloading.

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>
This commit is contained in:
Panu Horsmalahti 2021-11-17 11:33:42 +02:00 committed by GitHub
parent 0587301cc9
commit 14ab00d017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/item.store.ts
View File

@ -97,13 +97,23 @@ export abstract class ItemStore<Item extends ItemObject> {
} }
protected async loadItems(...args: any[]): Promise<any>; protected async loadItems(...args: any[]): Promise<any>;
/**
* Load items to this.items
* @param request Function to return the items to be loaded.
* @param sortItems If true, items will be sorted.
* @param concurrency If true, concurrent loadItems() calls will all be executed. If false, only the first.
* @returns
*/
@action @action
protected async loadItems(request: () => Promise<Item[] | any>, sortItems = true) { protected async loadItems(request: () => Promise<Item[] | any>, sortItems = true, concurrency = false) {
if (this.isLoading) { if (this.isLoading) {
await when(() => !this.isLoading); await when(() => !this.isLoading);
// If concurrency for loading is disabled, return instead of loading
if (!concurrency) {
return; return;
} }
}
this.isLoading = true; this.isLoading = true;
try { try {

6
src/renderer/api/catalog-entity-registry.ts
View File

@ -171,7 +171,7 @@ export class CatalogEntityRegistry {
* @param fn The function that should return a truthy value if that entity should be sent currently "active" * @param fn The function that should return a truthy value if that entity should be sent currently "active"
* @returns A function to remove that filter * @returns A function to remove that filter
*/ */
addCatalogFilter(fn: EntityFilter): Disposer { @action addCatalogFilter(fn: EntityFilter): Disposer {
this.filters.add(fn); this.filters.add(fn);
return once(() => void this.filters.delete(fn)); return once(() => void this.filters.delete(fn));
@ -182,9 +182,7 @@ export class CatalogEntityRegistry {
* @param onBeforeRun The function that should return a boolean if the onRun of catalog entity should be triggered. * @param onBeforeRun The function that should return a boolean if the onRun of catalog entity should be triggered.
* @returns A function to remove that hook * @returns A function to remove that hook
*/ */
addOnBeforeRun(onBeforeRun: CatalogEntityOnBeforeRun): Disposer { @action addOnBeforeRun(onBeforeRun: CatalogEntityOnBeforeRun): Disposer {
logger.debug(`[CATALOG-ENTITY-REGISTRY]: adding onBeforeRun hook`);
this.onBeforeRunHooks.add(onBeforeRun); this.onBeforeRunHooks.add(onBeforeRun);
return once(() => void this.onBeforeRunHooks.delete(onBeforeRun)); return once(() => void this.onBeforeRunHooks.delete(onBeforeRun));

3
src/renderer/components/+catalog/catalog-entity.store.tsx
View File

@ -65,6 +65,7 @@ export class CatalogEntityStore extends ItemStore<CatalogEntityItem<CatalogEntit
} }
} }
return this.loadItems(() => this.entities); // concurrency is true to fix bug if catalog filter is removed and added at the same time
return this.loadItems(() => this.entities, undefined, true);
} }
} }