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

Jump to bottom

[Ingest Manager] Fix create data source from integration #66626

Merged
merged 3 commits into from
May 15, 2020
Merged

[Ingest Manager] Fix create data source from integration #66626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b55305b
Fix add datasource button from integration not responsive
jen-huang May 14, 2020
b5c807d
Fix React key prop warnings
jen-huang May 14, 2020
99d602f
Merge branch 'master' into ingest/fix/ds-from-pkg
elasticmachine May 14, 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
101 changes: 62 additions & 39 deletions ...public/applications/ingest_manager/sections/agent_config/create_datasource_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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, { useState, useEffect } from 'react';
import React, { useState, useEffect, useMemo, useCallback } from 'react';
import { useRouteMatch, useHistory } from 'react-router-dom';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
Expand Down Expand Up @@ -95,32 +95,46 @@ export const CreateDatasourcePage: React.FunctionComponent = () => {
// Datasource validation state
const [validationResults, setValidationResults] = useState<DatasourceValidationResults>();

// Form state
const [formState, setFormState] = useState<DatasourceFormState>('INVALID');

// Update package info method
const updatePackageInfo = (updatedPackageInfo: PackageInfo | undefined) => {
if (updatedPackageInfo) {
setPackageInfo(updatedPackageInfo);
setFormState('VALID');
} else {
setFormState('INVALID');
setPackageInfo(undefined);
}
const updatePackageInfo = useCallback(
(updatedPackageInfo: PackageInfo | undefined) => {
if (updatedPackageInfo) {
setPackageInfo(updatedPackageInfo);
if (agentConfig) {
setFormState('VALID');
}
} else {
setFormState('INVALID');
setPackageInfo(undefined);
}

// eslint-disable-next-line no-console
console.debug('Package info updated', updatedPackageInfo);
};
// eslint-disable-next-line no-console
console.debug('Package info updated', updatedPackageInfo);
},
[agentConfig, setPackageInfo, setFormState]
);

// Update agent config method
const updateAgentConfig = (updatedAgentConfig: AgentConfig | undefined) => {
if (updatedAgentConfig) {
setAgentConfig(updatedAgentConfig);
} else {
setFormState('INVALID');
setAgentConfig(undefined);
}
const updateAgentConfig = useCallback(
(updatedAgentConfig: AgentConfig | undefined) => {
if (updatedAgentConfig) {
setAgentConfig(updatedAgentConfig);
if (packageInfo) {
setFormState('VALID');
}
} else {
setFormState('INVALID');
setAgentConfig(undefined);
}

// eslint-disable-next-line no-console
console.debug('Agent config updated', updatedAgentConfig);
};
// eslint-disable-next-line no-console
console.debug('Agent config updated', updatedAgentConfig);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also use the logger from AppService now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe Logger is only available as a server-side dependency

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 😿

},
[packageInfo, setAgentConfig, setFormState]
);

const hasErrors = validationResults ? validationHasErrors(validationResults) : false;

Expand Down Expand Up @@ -167,7 +181,6 @@ export const CreateDatasourcePage: React.FunctionComponent = () => {
const cancelUrl = from === 'config' ? CONFIG_URL : PACKAGE_URL;

// Save datasource
const [formState, setFormState] = useState<DatasourceFormState>('INVALID');
const saveDatasource = async () => {
setFormState('LOADING');
const result = await sendCreateDatasource(datasource);
Expand Down Expand Up @@ -219,33 +232,43 @@ export const CreateDatasourcePage: React.FunctionComponent = () => {
packageInfo,
};

const stepSelectConfig = useMemo(
() => (
<StepSelectConfig
pkgkey={pkgkey}
updatePackageInfo={updatePackageInfo}
agentConfig={agentConfig}
updateAgentConfig={updateAgentConfig}
/>
),
[pkgkey, updatePackageInfo, agentConfig, updateAgentConfig]
);

const stepSelectPackage = useMemo(
() => (
<StepSelectPackage
agentConfigId={configId}
updateAgentConfig={updateAgentConfig}
packageInfo={packageInfo}
updatePackageInfo={updatePackageInfo}
/>
),
[configId, updateAgentConfig, packageInfo, updatePackageInfo]
);

const steps: EuiStepProps[] = [
from === 'package'
? {
title: i18n.translate('xpack.ingestManager.createDatasource.stepSelectAgentConfigTitle', {
defaultMessage: 'Select an agent configuration',
}),
children: (
<StepSelectConfig
pkgkey={pkgkey}
updatePackageInfo={updatePackageInfo}
agentConfig={agentConfig}
updateAgentConfig={updateAgentConfig}
/>
),
children: stepSelectConfig,
}
: {
title: i18n.translate('xpack.ingestManager.createDatasource.stepSelectPackageTitle', {
defaultMessage: 'Select an integration',
}),
children: (
<StepSelectPackage
agentConfigId={configId}
updateAgentConfig={updateAgentConfig}
packageInfo={packageInfo}
updatePackageInfo={updatePackageInfo}
/>
),
children: stepSelectPackage,
},
{
title: i18n.translate('xpack.ingestManager.createDatasource.stepDefineDatasourceTitle', {
Expand Down
1 change: 1 addition & 0 deletions ...t_manager/sections/agent_config/details_page/components/datasources/datasources_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ export const DatasourcesTable: React.FunctionComponent<Props> = ({
search={{
toolsRight: [
<EuiButton
key="addDatasourceButton"
isDisabled={!hasWriteCapabilities}
iconType="plusInCircle"
href={addDatasourceLink}
Expand Down
7 changes: 6 additions & 1 deletion ...ngest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,12 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
sorting={true}
search={{
toolsRight: [
<EuiButton color="primary" iconType="refresh" onClick={() => sendRequest()}>
<EuiButton
key="reloadButton"
color="primary"
iconType="refresh"
onClick={() => sendRequest()}
>
<FormattedMessage
id="xpack.ingestManager.dataStreamList.reloadDataStreamsButtonText"
defaultMessage="Reload"
Expand Down