From 010659c86c262245c2de4c1dc9ac88a5853b2a49 Mon Sep 17 00:00:00 2001 From: frikky Date: Sat, 29 May 2021 14:10:59 +0200 Subject: [PATCH] #368: Added wider app search functionality in /apps view --- frontend/src/views/AngularWorkflow.jsx | 1 + frontend/src/views/Apps.jsx | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 602cec62..d910d9d6 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -5979,6 +5979,7 @@ const AngularWorkflow = (props) => { rows="4" defaultValue={trigger_header_auth} color="primary" + disabled={selectedTrigger.status === "running"} placeholder={"AUTH_HEADER=AUTH_VALUE1"} onBlur={(e) => { const value = e.target.value diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx index 372c901e..ffb8e668 100644 --- a/frontend/src/views/Apps.jsx +++ b/frontend/src/views/Apps.jsx @@ -442,6 +442,17 @@ const Apps = (props) => { label={tag} variant="outlined" color="primary" + onClick={() => { + //console.log("SEARCH: ", event.target.value) + handleSearchChange(tag) + setCursearch(tag) + //id="app_search_field" + const searchfield = document.getElementById("app_search_field") + if (searchfield !== null && searchfield !== undefined) { + console.log("SEARCHFIELD: ", searchfield) + searchfield.value = tag + } + }} /> ) })} @@ -890,8 +901,8 @@ const Apps = (props) => { } const searchfield = search.toLowerCase() - var newapps = apps.filter(data => data.name.toLowerCase().includes(searchfield) || data.description.toLowerCase().includes(searchfield)) - var tmpapps = searchableApps.filter(data => data.name.toLowerCase().includes(searchfield) || data.description.toLowerCase().includes(searchfield)) + var newapps = apps.filter(data => data.name.toLowerCase().includes(searchfield) || data.description.toLowerCase().includes(searchfield) || (data.tags !== null && data.tags.includes(search))) + var tmpapps = searchableApps.filter(data => data.name.toLowerCase().includes(searchfield) || data.description.toLowerCase().includes(searchfield) || (data.tags !== null && data.tags.includes(search))) newapps.push(...tmpapps) //console.log(newapps) @@ -1015,6 +1026,7 @@ const Apps = (props) => { disabled={apps === undefined || apps === null || apps.length === 0} fullWidth color="primary" + id="app_search_field" placeholder={"Search apps"} onChange={(event) => { handleSearchChange(event.target.value)