From 5948e909d197aaeaa5381d5bc67abca6fe217e4a Mon Sep 17 00:00:00 2001 From: Brandon Bogan Date: Wed, 16 Oct 2019 17:40:19 -0400 Subject: [PATCH 1/2] Adding workflow and profile selectors to configuration and SearchUISearchPage --- frontend/configuration.properties.js | 4 ++++ frontend/src/pages/SearchUISearchPage.js | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/frontend/configuration.properties.js b/frontend/configuration.properties.js index 0b23091..4ea4d42 100755 --- a/frontend/configuration.properties.js +++ b/frontend/configuration.properties.js @@ -391,6 +391,10 @@ 'socialsecurity', 'zipcode', ], + /** List of profiles from which users can select a query to be executed with */ + profiles: [], + /** List of query workflows for which a user can choose to have process their query */ + searchWorkflows: [], }, // These properties configure the SearchUIInsightsPage, which displays facet information diff --git a/frontend/src/pages/SearchUISearchPage.js b/frontend/src/pages/SearchUISearchPage.js index 83e5d70..33f19a1 100755 --- a/frontend/src/pages/SearchUISearchPage.js +++ b/frontend/src/pages/SearchUISearchPage.js @@ -12,6 +12,8 @@ import { FacetResults, Masthead, MastheadNavTabs, + NavbarProfileSelector, + NavbarWorkflowSelector, NavbarSort, PlacementResults, SearchBar, @@ -101,6 +103,10 @@ type SearchUISearchPageProps = { * location object injected by withRouter. */ location: {}; + /** List of profiles to populate the profile dropdown with */ + profiles: Array; + /** List of workflows to use for executing the query */ + searchWorkflows: Array; }; /** @@ -136,6 +142,8 @@ class SearchUISearchPage extends React.Component 0 ? + : null; + + const workflowSelectorComp = searchWorkflows && searchWorkflows.length > 0 ? + : null; + return ( {hideMasthead && } + {profileSelectorComp} + {workflowSelectorComp} Date: Wed, 16 Oct 2019 17:40:23 -0400 Subject: [PATCH 2/2] Update configuration.properties.js --- frontend/configuration.properties.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/configuration.properties.js b/frontend/configuration.properties.js index 4ea4d42..aee6a6e 100755 --- a/frontend/configuration.properties.js +++ b/frontend/configuration.properties.js @@ -16,7 +16,7 @@ // This is the base URI that will be used for making REST API calls to the // Attivio server. When running as a module within the Attivio node, this should - // be the empty string (''). When running in the servlet, it should match the + // be the empty string (''). When running in the servlet, it should match the // baseName property where the servlet is running relative to the machine (without // the hostname or port). @@ -243,7 +243,7 @@ // Whether signal needs to be generated when autocomplete item is selected createAutoCompleteSignal: true, }, - + // These properties configure the default properties for FacetSearchBar components in the UI. // These allow searching among all values of a specific facet, as well as being able to export // the list of all values for that facet to a CSV file.