Skip to content
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

[7.x] [Workplace Search] Fix Group Prioritization route and clean up design (#80903) #81069

Merged
merged 1 commit into from
Oct 19, 2020
Merged

[7.x] [Workplace Search] Fix Group Prioritization route and clean up design (#80903) #81069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions ...e_search/public/applications/workplace_search/components/layout/kibana_header_actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,25 @@

import React from 'react';
import { i18n } from '@kbn/i18n';
import { EuiButtonEmpty } from '@elastic/eui';
import { EuiButtonEmpty, EuiText } from '@elastic/eui';

import { externalUrl, getWorkplaceSearchUrl } from '../../../shared/enterprise_search_url';

export const WorkplaceSearchHeaderActions: React.FC = () => {
if (!externalUrl.enterpriseSearchUrl) return null;

return (
<EuiButtonEmpty href={getWorkplaceSearchUrl('/search')} target="_blank" iconType="search">
{i18n.translate('xpack.enterpriseSearch.workplaceSearch.headerActions.searchApplication', {
defaultMessage: 'Go to search application',
})}
<EuiButtonEmpty
href={getWorkplaceSearchUrl('/search')}
target="_blank"
iconType="search"
style={{ marginRight: 5 }}
>
<EuiText size="s">
{i18n.translate('xpack.enterpriseSearch.workplaceSearch.headerActions.searchApplication', {
defaultMessage: 'Go to search application',
})}
</EuiText>
</EuiButtonEmpty>
);
};
2 changes: 1 addition & 1 deletion x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const SECURITY_PATH = `${ORG_PATH}/security`;

export const GROUPS_PATH = '/groups';
export const GROUP_PATH = `${GROUPS_PATH}/:groupId`;
export const GROUP_SOURCE_PRIORITIZATION_PATH = `${GROUPS_PATH}/:groupId/source-prioritization`;
export const GROUP_SOURCE_PRIORITIZATION_PATH = `${GROUPS_PATH}/:groupId/source_prioritization`;

export const SOURCES_PATH = '/sources';
export const ORG_SOURCES_PATH = `${ORG_PATH}${SOURCES_PATH}`;
Expand Down
4 changes: 2 additions & 2 deletions ...lic/applications/workplace_search/views/groups/components/group_source_prioritization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export const GroupSourcePrioritization: React.FC = () => {
</EuiFlexItem>
</EuiFlexGroup>
</EuiTableRowCell>
<EuiTableRowCell align="right">
<EuiTableRowCell align="right" style={{ padding: 0 }}>
<EuiFlexGroup gutterSize="none" alignItems="center" justifyContent="spaceAround">
<EuiFlexItem grow={false}>
<EuiRange
Expand All @@ -166,7 +166,7 @@ export const GroupSourcePrioritization: React.FC = () => {
}
/>
</EuiFlexItem>
<EuiFlexItem grow={false} style={{ paddingRight: 1 }}>
<EuiFlexItem grow={false} style={{ paddingLeft: 10 }}>
<div style={{ margin: 0 }} className="input-container--range__count">
{activeSourcePriorities[id]}
</div>
Expand Down