From 5dc11c285d4e2155a3945bc44cbfcf61fe02c5f3 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Fri, 12 Feb 2021 19:06:31 +0100 Subject: [PATCH] RunnersOverview - support should_display_based_on_id search ref #52 --- src/components/RunnersOverview.svelte | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/RunnersOverview.svelte b/src/components/RunnersOverview.svelte index 39f0cdad..9ff8b3c7 100644 --- a/src/components/RunnersOverview.svelte +++ b/src/components/RunnersOverview.svelte @@ -30,6 +30,12 @@ RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { orgs = val; }); + function should_display_based_on_id(id) { + if(searchvalue.toString().slice(-1)==="*"){ + return id.toString().startsWith(searchvalue.replace("*","")) + } + return id.toString()===searchvalue; + } {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:GET')} @@ -88,10 +94,7 @@ {#each current_runners as runner} - {#if Object.values(runner) - .toString() - .toLowerCase() - .includes(searchvalue)} + {#if runner.firstname.toLowerCase().includes(searchvalue.toLowerCase())||runner.middlename.toLowerCase().includes(searchvalue.toLowerCase())||runner.lastname.toLowerCase().includes(searchvalue.toLowerCase())||should_display_based_on_id(runner.id)} {#if filterGroupIDs.includes(runner.group.id)||filterGroupIDs.includes(runner.group.parentGroup?.id)||filterGroupIDs.length===0}