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

[NP] Use local helper shortenDottedString for discover #60271

Merged
merged 5 commits into from
Mar 18, 2020
Merged

[NP] Use local helper shortenDottedString for discover #60271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7553cc9
Move shortenDottedString into kibana_utils
sulemanof Mar 16, 2020
5eeb28d
Move helper back to data utils
sulemanof Mar 17, 2020
f16568e
Use local helper for discover
sulemanof Mar 17, 2020
44e9a88
Merge remote-tracking branch 'upstream/master' into shim/move_shorten…
sulemanof Mar 17, 2020
0084c91
Clean up
sulemanof Mar 17, 2020
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
2 changes: 0 additions & 2 deletions src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ export { wrapInI18nContext } from 'ui/i18n';
import { search } from '../../../../../plugins/data/public';
export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggResponse } = search;
// @ts-ignore
export { shortenDottedString } from '../../common/utils/shorten_dotted_string';
// @ts-ignore
export { intervalOptions } from 'ui/agg_types';
export { subscribeWithScope } from '../../../../../plugins/kibana_legacy/public';
// @ts-ignore
Expand Down
2 changes: 1 addition & 1 deletion ...core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import classNames from 'classnames';
import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';

import { FieldIcon, FieldIconProps } from '../../../../../../../../../plugins/kibana_react/public';
import { shortenDottedString } from '../../../../kibana_services';
import { shortenDottedString } from '../../../helpers';
import { getFieldTypeName } from './field_type_name';

// property field is provided at discover's field chooser
Expand Down
3 changes: 2 additions & 1 deletion ...ins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
import { IndexPattern, shortenDottedString } from '../../../../../kibana_services';
import { IndexPattern } from '../../../../../kibana_services';
import { shortenDottedString } from '../../../../helpers';

export type SortOrder = [string, string];
export interface ColumnProps {
Expand Down
16 changes: 1 addition & 15 deletions .../utils/__tests__/shorten_dotted_string.js → ...public/discover/np_ready/helpers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,4 @@
* under the License.
*/

import expect from '@kbn/expect';
import { shortenDottedString } from '../shorten_dotted_string';

describe('shortenDottedString', () => {
it('Convert a dot.notated.string into a short string', () => {
expect(shortenDottedString('dot.notated.string')).to.equal('d.n.string');
});

it('Ignores non-string values', () => {
expect(shortenDottedString(true)).to.equal(true);
expect(shortenDottedString(123)).to.equal(123);
const obj = { key: 'val' };
expect(shortenDottedString(obj)).to.equal(obj);
});
});
export { shortenDottedString } from './shorten_dotted_string';
7 changes: 1 addition & 6 deletions ...ana/common/utils/shorten_dotted_string.js → ...np_ready/helpers/shorten_dotted_string.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,5 @@ const DOT_PREFIX_RE = /(.).+?\./g;
/**
* Convert a dot.notated.string into a short
* version (d.n.string)
*
* @param {string} str - the long string to convert
* @return {string}
*/
export function shortenDottedString(input) {
return typeof input !== 'string' ? input : input.replace(DOT_PREFIX_RE, '$1.');
}
export const shortenDottedString = (input: string) => input.replace(DOT_PREFIX_RE, '$1.');