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

[Workplace Search] Add sub nav and fix rendering bugs in Personal dashboard #96100

Merged
merged 4 commits into from
Apr 5, 2021
Merged

[Workplace Search] Add sub nav and fix rendering bugs in Personal dashboard #96100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dffe9a0
Fix route for private deferated source summary
scottybollinger Mar 31, 2021
0400208
Make schema types nullable
scottybollinger Apr 1, 2021
efc56f2
Add SourceSubNav to Personal dashboard
scottybollinger Apr 1, 2021
47ab631
Merge branch 'master' into scottybollinger/pd-updates
kibanamachine Apr 5, 2021
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
4 changes: 2 additions & 2 deletions .../public/applications/workplace_search/views/content_sources/components/source_sub_nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const SourceSubNav: React.FC = () => {
const isCustom = serviceType === CUSTOM_SERVICE_TYPE;

return (
<>
<div className="sourcesSubNav">
<SideNavLink to={getContentSourcePath(SOURCE_DETAILS_PATH, id, isOrganization)}>
{NAV.OVERVIEW}
</SideNavLink>
Expand All @@ -53,6 +53,6 @@ export const SourceSubNav: React.FC = () => {
<SideNavLink to={getContentSourcePath(SOURCE_SETTINGS_PATH, id, isOrganization)}>
{NAV.SETTINGS}
</SideNavLink>
</>
</div>
);
};
3 changes: 3 additions & 0 deletions ...ublic/applications/workplace_search/views/content_sources/private_sources_layout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { EuiCallOut } from '@elastic/eui';

import { ViewContentHeader } from '../../components/shared/view_content_header';

import { SourceSubNav } from './components/source_sub_nav';

import {
PRIVATE_CAN_CREATE_PAGE_TITLE,
PRIVATE_VIEW_ONLY_PAGE_TITLE,
Expand All @@ -40,6 +42,7 @@ describe('PrivateSourcesLayout', () => {
const wrapper = shallow(<PrivateSourcesLayout>{children}</PrivateSourcesLayout>);

expect(wrapper.find('[data-test-subj="TestChildren"]')).toHaveLength(1);
expect(wrapper.find(SourceSubNav)).toHaveLength(1);
});

it('uses correct title and description when private sources are enabled', () => {
Expand Down
3 changes: 3 additions & 0 deletions ...rch/public/applications/workplace_search/views/content_sources/private_sources_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import { EuiPage, EuiPageSideBar, EuiPageBody, EuiCallOut } from '@elastic/eui';
import { AppLogic } from '../../app_logic';
import { ViewContentHeader } from '../../components/shared/view_content_header';

import { SourceSubNav } from './components/source_sub_nav';

import {
PRIVATE_DASHBOARD_READ_ONLY_MODE_WARNING,
PRIVATE_CAN_CREATE_PAGE_TITLE,
Expand Down Expand Up @@ -49,6 +51,7 @@ export const PrivateSourcesLayout: React.FC<LayoutProps> = ({
<EuiPage className="enterpriseSearchLayout privateSourcesLayout">
<EuiPageSideBar className="enterpriseSearchLayout__sideBar privateSourcesLayout__sideBar">
<ViewContentHeader title={PAGE_TITLE} description={PAGE_DESCRIPTION} />
<SourceSubNav />
</EuiPageSideBar>
<EuiPageBody className="enterpriseSearchLayout__body" restrictWidth={restrictWidth}>
{readOnlyMode && (
Expand Down
2 changes: 1 addition & 1 deletion ...se_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ describe('SourceLogic', () => {
SourceLogic.actions.initializeFederatedSummary(contentSource.id);

expect(http.get).toHaveBeenCalledWith(
'/api/workplace_search/org/sources/123/federated_summary'
'/api/workplace_search/account/sources/123/federated_summary'
);
await promise;
expect(onUpdateSummarySpy).toHaveBeenCalledWith(contentSource.summary);
Expand Down
2 changes: 1 addition & 1 deletion ...erprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
}
},
initializeFederatedSummary: async ({ sourceId }) => {
const route = `/api/workplace_search/org/sources/${sourceId}/federated_summary`;
const route = `/api/workplace_search/account/sources/${sourceId}/federated_summary`;
try {
const response = await HttpLogic.values.http.get(route);
actions.onUpdateSummary(response.summary);
Expand Down
6 changes: 6 additions & 0 deletions ...enterprise_search/public/applications/workplace_search/views/content_sources/sources.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@
margin-left: -$sideBarWidth;
}
}

.sourcesSubNav {
li {
display: block;
}
}
6 changes: 3 additions & 3 deletions x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ const schemaValuesSchema = schema.recordOf(
);

const pageSchema = schema.object({
current: schema.number(),
size: schema.number(),
total_pages: schema.number(),
current: schema.nullable(schema.number()),
size: schema.nullable(schema.number()),
total_pages: schema.nullable(schema.number()),
total_results: schema.number(),
});

Expand Down