Skip to content

Commit

Permalink
Fix bundle size
Browse files Browse the repository at this point in the history
  • Loading branch information
yuliacech committed Sep 9, 2024
1 parent c29ca92 commit 148b48f
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 71 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

import { splitSizeAndUnits } from './data_stream_serialization';
import { splitSizeAndUnits } from './data_stream_utils';

describe('Data stream serialization', () => {
describe('Data stream utils', () => {
test('can split size and units from lifecycle string', () => {
expect(splitSizeAndUnits('1h')).toEqual({ size: '1', unit: 'h' });
expect(splitSizeAndUnits('20micron')).toEqual({ size: '20', unit: 'micron' });
Expand Down
64 changes: 64 additions & 0 deletions x-pack/plugins/index_management/common/lib/data_stream_utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import type { DataStream, DataRetention } from '../types';

export const splitSizeAndUnits = (field: string): { size: string; unit: string } => {
let size = '';
let unit = '';

const result = /(\d+)(\w+)/.exec(field);
if (result) {
size = result[1];
unit = result[2];
}

return {
size,
unit,
};
};

export const serializeAsESLifecycle = (lifecycle?: DataRetention): DataStream['lifecycle'] => {
if (!lifecycle || !lifecycle?.enabled) {
return undefined;
}

const { infiniteDataRetention, value, unit } = lifecycle;

if (infiniteDataRetention) {
return {
enabled: true,
};
}

return {
enabled: true,
data_retention: `${value}${unit}`,
};
};

export const deserializeESLifecycle = (lifecycle?: DataStream['lifecycle']): DataRetention => {
if (!lifecycle || !lifecycle?.enabled) {
return { enabled: false };
}

if (!lifecycle.data_retention) {
return {
enabled: true,
infiniteDataRetention: true,
};
}

const { size, unit } = splitSizeAndUnits(lifecycle.data_retention as string);

return {
enabled: true,
value: Number(size),
unit,
};
};
6 changes: 3 additions & 3 deletions x-pack/plugins/index_management/common/lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
*/

export {
deserializeDataStream,
deserializeDataStreamList,
splitSizeAndUnits,
} from './data_stream_serialization';
serializeAsESLifecycle,
deserializeESLifecycle,
} from './data_stream_utils';

export {
deserializeTemplate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
TemplateListItem,
TemplateType,
} from '../types';
import { deserializeESLifecycle } from './data_stream_serialization';
import { deserializeESLifecycle } from './data_stream_utils';
import { allowAutoCreateRadioValues, allowAutoCreateRadioIds } from '../constants';

const hasEntries = (data: object = {}) => Object.entries(data).length > 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { breadcrumbService, IndexManagementBreadcrumb } from '../../../../servic
import { setupEnvironment } from './helpers';
import { API_BASE_PATH } from './helpers/constants';
import { setup, ComponentTemplateCreateTestBed } from './helpers/component_template_create.helpers';
import { serializeAsESLifecycle } from '../../../../../../common/lib/data_stream_serialization';
import { serializeAsESLifecycle } from '../../../../../../common/lib';

jest.mock('@kbn/code-editor', () => {
const original = jest.requireActual('@kbn/code-editor');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ import {
StepMappingsContainer,
StepAliasesContainer,
} from '../../shared_imports';
import {
serializeAsESLifecycle,
deserializeESLifecycle,
} from '../../../../../../common/lib/data_stream_serialization';
import { serializeAsESLifecycle, deserializeESLifecycle } from '../../../../../../common/lib';
import { useComponentTemplatesContext } from '../../component_templates_context';
import { StepLogisticsContainer, StepReviewContainer } from './steps';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
} from '../shared';
import { documentationService } from '../../services/documentation';
import { SectionError } from '../section_error';
import { serializeAsESLifecycle } from '../../../../common/lib/data_stream_serialization';
import { serializeAsESLifecycle } from '../../../../common/lib';
import {
SimulateTemplateFlyoutContent,
SimulateTemplateProps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
} from '@elastic/eui';
import { reactRouterNavigate } from '../../../../../../shared_imports';
import { useAppContext } from '../../../../../app_context';
import { serializeAsESLifecycle } from '../../../../../../../common/lib/data_stream_serialization';
import { serializeAsESLifecycle } from '../../../../../../../common/lib';
import { getLifecycleValue } from '../../../../../lib/data_streams';
import { TemplateDeserialized } from '../../../../../../../common';
import { ILM_PAGES_POLICY_EDIT } from '../../../../../constants';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { ByteSizeValue } from '@kbn/config-schema';
import { DataStream, EnhancedDataStreamFromEs, Health, DataRetention } from '../types';
import type { DataStream, EnhancedDataStreamFromEs, Health } from '../../common';

export function deserializeDataStream(dataStreamFromEs: EnhancedDataStreamFromEs): DataStream {
const {
Expand Down Expand Up @@ -77,59 +77,3 @@ export function deserializeDataStreamList(
): DataStream[] {
return dataStreamsFromEs.map((dataStream) => deserializeDataStream(dataStream));
}

export const splitSizeAndUnits = (field: string): { size: string; unit: string } => {
let size = '';
let unit = '';

const result = /(\d+)(\w+)/.exec(field);
if (result) {
size = result[1];
unit = result[2];
}

return {
size,
unit,
};
};

export const serializeAsESLifecycle = (lifecycle?: DataRetention): DataStream['lifecycle'] => {
if (!lifecycle || !lifecycle?.enabled) {
return undefined;
}

const { infiniteDataRetention, value, unit } = lifecycle;

if (infiniteDataRetention) {
return {
enabled: true,
};
}

return {
enabled: true,
data_retention: `${value}${unit}`,
};
};

export const deserializeESLifecycle = (lifecycle?: DataStream['lifecycle']): DataRetention => {
if (!lifecycle || !lifecycle?.enabled) {
return { enabled: false };
}

if (!lifecycle.data_retention) {
return {
enabled: true,
infiniteDataRetention: true,
};
}

const { size, unit } = splitSizeAndUnits(lifecycle.data_retention as string);

return {
enabled: true,
value: Number(size),
unit,
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import {
SecurityHasPrivilegesResponse,
} from '@elastic/elasticsearch/lib/api/types';
import type { MeteringStats } from '../../../lib/types';
import { deserializeDataStream, deserializeDataStreamList } from '../../../../common/lib';
import {
deserializeDataStream,
deserializeDataStreamList,
} from '../../../lib/data_stream_serialization';
import { EnhancedDataStreamFromEs } from '../../../../common/types';
import { RouteDependencies } from '../../../types';
import { addBasePath } from '..';
Expand Down

0 comments on commit 148b48f

Please sign in to comment.