Skip to content

Feature/plat-41191 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brandon-bogan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/plat-41191 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a697c05
Merge pull request #103 from attivio/master
brandon-bogan Oct 16, 2019
5948e90
Adding workflow and profile selectors to configuration and SearchUISe…
brandon-bogan Oct 16, 2019
3b580ce
Update configuration.properties.js
brandon-bogan Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions frontend/configuration.properties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions frontend/src/pages/SearchUISearchPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
FacetResults,
Masthead,
MastheadNavTabs,
NavbarProfileSelector,
NavbarWorkflowSelector,
NavbarSort,
PlacementResults,
SearchBar,
Expand Down Expand Up @@ -101,6 +103,10 @@ type SearchUISearchPageProps = {
* location object injected by withRouter.
*/
location: {};
/** List of profiles to populate the profile dropdown with */
profiles: Array<string>;
/** List of workflows to use for executing the query */
searchWorkflows: Array<string>;
};

/**
Expand Down Expand Up @@ -136,6 +142,8 @@ class SearchUISearchPage extends React.Component<SearchUISearchPageProps, Search
maxFacetBuckets: 15,
orderHint: [],
entityColors: new Map(),
profiles: [],
searchWorkflows: [],
};

static contextTypes = {
Expand All @@ -155,14 +163,24 @@ class SearchUISearchPage extends React.Component<SearchUISearchPageProps, Search
baseUri,
relevancyModels,
sortableFields,
profiles,
searchWorkflows,
} = this.props;

const profileSelectorComp = profiles && profiles.length > 0 ?
<NavbarProfileSelector right profiles={profiles} /> : null;

const workflowSelectorComp = searchWorkflows && searchWorkflows.length > 0 ?
<NavbarWorkflowSelector right workflows={searchWorkflows} /> : null;

return (
<SecondaryNavBar>
<SearchResultsCount />
{hideMasthead && <SearchBar />}
<SearchResultsFacetFilters />
<SearchResultsPager right />
{profileSelectorComp}
{workflowSelectorComp}
<SearchRelevancyModel
right
baseUri={baseUri}
Expand Down