Skip to content

Commit

Permalink
Camel case + avoid mutating
Browse files Browse the repository at this point in the history
Signed-off-by: sitbubu <[email protected]>
  • Loading branch information
RoyiSitbon committed Feb 22, 2022
1 parent da10250 commit 7a25121
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 19 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ beforeEach(() => {

test('Render <DocViewerLink/> with 2 different links', () => {
const registry = getDocViewsLinksRegistry();
registry.addDocViewLink({ order: 10, label: 'generateurlcb link', generateurlcb: () => 'aaa' });
registry.addDocViewLink({ order: 10, label: 'generateUrlCb link', generateUrlCb: () => 'aaa' });
registry.addDocViewLink({ order: 20, label: 'href link', href: 'bbb' });

const renderProps = { hit: {} } as DocViewLinkRenderProps;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@

import './doc_viewer_links.scss';
import React from 'react';
import { EuiListGroup } from '@elastic/eui';
import { EuiListGroup, EuiListGroupItemProps } from '@elastic/eui';
import { getDocViewsLinksRegistry } from '../../../opensearch_dashboards_services';
import { DocViewLinkRenderProps } from '../../doc_views_links/doc_views_links_types';

export function DocViewerLinks(renderProps: DocViewLinkRenderProps) {
const listItems = getDocViewsLinksRegistry()
.getDocViewsLinksSorted()
.map((item) => {
if (item.generateurlcb) {
item.href = item.generateurlcb(renderProps);
delete item.generateurlcb;
}
const { generateUrlCb, href, ...props } = item;
const listItem: EuiListGroupItemProps = {
...props,
href: generateUrlCb ? generateUrlCb(renderProps) : href,
};

return item;
return listItem;
});

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { IndexPattern } from '../../../../data/public';
export interface DocViewLink extends EuiListGroupItemProps {
href?: string;
order: number;
generateurlcb?(renderProps: any): string;
generateUrlCb?(renderProps: any): string;
}

export interface DocViewLinkRenderProps {
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/discover/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export class DiscoverPlugin

this.docViewsLinksRegistry.addDocViewLink({
label: 'View surrounding documents',
generateurlcb: (renderProps: any) => {
generateUrlCb: (renderProps: any) => {
const globalFilters: any = getServices().filterManager.getGlobalFilters();
const appFilters: any = getServices().filterManager.getAppFilters();

Expand All @@ -257,7 +257,7 @@ export class DiscoverPlugin

this.docViewsLinksRegistry.addDocViewLink({
label: 'View single document',
generateurlcb: (renderProps) =>
generateUrlCb: (renderProps) =>
`#/doc/${renderProps.indexPattern.id}/${renderProps.hit._index}?id=${encodeURIComponent(
renderProps.hit._id
)}`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ angular.module('myDocViewLink', []).directive('myHit', () => ({
}));

function MyHit(props: { index: string }) {
return <h1 data-test-subj="generateurlcb-docviewlink">{props.index}</h1>;
return <h1 data-test-subj="generateUrlCb-docviewlink">{props.index}</h1>;
}

export class DocViewsLinksPlugin implements Plugin<void, void> {
Expand All @@ -29,9 +29,9 @@ export class DocViewsLinksPlugin implements Plugin<void, void> {
});

discover.docViewsLinks.addDocViewLink({
generateurlcb: () => 'http://some-url/',
generateUrlCb: () => 'http://some-url/',
order: 2,
label: 'generateurlcb doc view link',
label: 'generateUrlCb doc view link',
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide

it('should show href doc views link', async () => {
const hrefLink = await find.byLinkText('href doc view link');
await find.byLinkText('generateurlcb doc view link');
await find.byLinkText('generateUrlCb doc view link');

expect(await hrefLink.isDisplayed()).to.be(true);
});
Expand All @@ -32,9 +32,9 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
expect(await browser.getCurrentUrl()).to.eql('http://some-url/');
});

it('should render react doc view', async () => {
const generateurlcbLink = await find.byLinkText('generateurlcb doc view link');
await generateurlcbLink.click();
it('should render generateUrlCb doc view link', async () => {
const generateUrlCbLink = await find.byLinkText('generateUrlCb doc view link');
await generateUrlCbLink.click();
expect(await browser.getCurrentUrl()).to.eql('http://some-url/');
});
});
Expand Down

0 comments on commit 7a25121

Please sign in to comment.