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.

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

[IM] Move common step containers to shared #69713

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@

export { TabAliases, TabMappings, TabSettings } from './details_panel';

export { StepAliases, StepMappings, StepSettings } from './wizard_steps';
export {
StepAliasesContainer,
StepMappingsContainer,
StepSettingsContainer,
CommonWizardSteps,
} from './wizard_steps';
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/

export { StepAliases } from './step_aliases';
export { StepMappings } from './step_mappings';
export { StepSettings } from './step_settings';
export { StepAliasesContainer } from './step_aliases_container';
export { StepMappingsContainer } from './step_mappings_container';
export { StepSettingsContainer } from './step_settings_container';

export { CommonWizardSteps } from './types';
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';

import { Forms } from '../../../../../shared_imports';
import { CommonWizardSteps } from './types';
import { StepAliases } from './step_aliases';

interface Props {
esDocsBase: string;
}

export const StepAliasesContainer: React.FunctionComponent<Props> = ({ esDocsBase }) => {
const { defaultValue, updateContent } = Forms.useContent<CommonWizardSteps>('aliases');

return (
<StepAliases defaultValue={defaultValue} onChange={updateContent} esDocsBase={esDocsBase} />
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@
*/
import React from 'react';

import { Forms } from '../../../../shared_imports';
import { documentationService } from '../../../services/documentation';
import { StepMappings } from '../../shared';
import { WizardContent } from '../template_form';
import { Forms } from '../../../../../shared_imports';
import { CommonWizardSteps } from './types';
import { StepMappings } from './step_mappings';

export const StepMappingsContainer = () => {
const { defaultValue, updateContent, getData } = Forms.useContent<WizardContent>('mappings');
interface Props {
esDocsBase: string;
}

export const StepMappingsContainer: React.FunctionComponent<Props> = ({ esDocsBase }) => {
const { defaultValue, updateContent, getData } = Forms.useContent<CommonWizardSteps>('mappings');

return (
<StepMappings
defaultValue={defaultValue}
onChange={updateContent}
indexSettings={getData().settings}
esDocsBase={documentationService.getEsDocsBase()}
esDocsBase={esDocsBase}
/>
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';

import { Forms } from '../../../../../shared_imports';
import { CommonWizardSteps } from './types';
import { StepSettings } from './step_settings';

interface Props {
esDocsBase: string;
}

export const StepSettingsContainer = React.memo(({ esDocsBase }: Props) => {
const { defaultValue, updateContent } = Forms.useContent<CommonWizardSteps>('settings');

return (
<StepSettings defaultValue={defaultValue} onChange={updateContent} esDocsBase={esDocsBase} />
);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import { Mappings, IndexSettings, Aliases } from '../../../../../../common';

export interface CommonWizardSteps {
settings?: IndexSettings;
mappings?: Mappings;
aliases?: Aliases;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ export {
TabAliases,
TabMappings,
TabSettings,
StepAliases,
StepMappings,
StepSettings,
StepAliasesContainer,
StepMappingsContainer,
StepSettingsContainer,
CommonWizardSteps,
} from './components';
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@
*/

export { StepLogisticsContainer } from './step_logistics_container';
export { StepAliasesContainer } from './step_aliases_container';
export { StepMappingsContainer } from './step_mappings_container';
export { StepSettingsContainer } from './step_settings_container';
export { StepReviewContainer } from './step_review_container';

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ import { EuiSpacer } from '@elastic/eui';
import { TemplateDeserialized, CREATE_LEGACY_TEMPLATE_BY_DEFAULT } from '../../../../common';
import { serializers, Forms } from '../../../shared_imports';
import { SectionError } from '../section_error';
import { StepLogisticsContainer, StepReviewContainer } from './steps';
import {
StepLogisticsContainer,
CommonWizardSteps,
StepSettingsContainer,
StepMappingsContainer,
StepAliasesContainer,
StepReviewContainer,
} from './steps';
} from '../shared';
import { documentationService } from '../../services/documentation';

const { stripEmptyFields } = serializers;
const { FormWizard, FormWizardStep } = Forms;
Expand All @@ -31,11 +32,8 @@ interface Props {
isEditing?: boolean;
}

export interface WizardContent {
export interface WizardContent extends CommonWizardSteps {
logistics: Omit<TemplateDeserialized, '_kbnMeta' | 'template'>;
settings: TemplateDeserialized['template']['settings'];
mappings: TemplateDeserialized['template']['mappings'];
aliases: TemplateDeserialized['template']['aliases'];
}

export type WizardSection = keyof WizardContent | 'review';
Expand Down Expand Up @@ -183,15 +181,15 @@ export const TemplateForm = ({
</FormWizardStep>

<FormWizardStep id={wizardSections.settings.id} label={wizardSections.settings.label}>
<StepSettingsContainer />
<StepSettingsContainer esDocsBase={documentationService.getEsDocsBase()} />
</FormWizardStep>

<FormWizardStep id={wizardSections.mappings.id} label={wizardSections.mappings.label}>
<StepMappingsContainer />
<StepMappingsContainer esDocsBase={documentationService.getEsDocsBase()} />
</FormWizardStep>

<FormWizardStep id={wizardSections.aliases.id} label={wizardSections.aliases.label}>
<StepAliasesContainer />
<StepAliasesContainer esDocsBase={documentationService.getEsDocsBase()} />
</FormWizardStep>

<FormWizardStep id={wizardSections.review.id} label={wizardSections.review.label}>
Expand Down