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

[Ingest Pipelines] Add url generator for ingest pipelines app #77872

Merged
merged 12 commits into from
Sep 23, 2020
20 changes: 20 additions & 0 deletions src/plugins/management/common/contants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

export const MANAGEMENT_APP_ID = 'management';
2 changes: 2 additions & 0 deletions src/plugins/management/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ export {
ManagementStart,
DefinedSections,
} from './types';

export { MANAGEMENT_APP_ID } from '../common/contants';
3 changes: 2 additions & 1 deletion src/plugins/management/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
AppNavLinkStatus,
} from '../../../core/public';

import { MANAGEMENT_APP_ID } from '../common/contants';
import {
ManagementSectionsService,
getSectionsServiceStartPrivate,
Expand Down Expand Up @@ -72,7 +73,7 @@ export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart
}

core.application.register({
id: 'management',
id: MANAGEMENT_APP_ID,
title: i18n.translate('management.stackManagement.title', {
defaultMessage: 'Stack Management',
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
*/

import { registerTestBed, TestBedConfig, TestBed } from '../../../../../test_utils';
import { BASE_PATH } from '../../../common/constants';
import { PipelinesClone } from '../../../public/application/sections/pipelines_clone';
import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
import { WithAppDependencies } from './setup_environment';
import { getClonePath, ROUTES } from '../../../public/application/services/navigation';

export type PipelinesCloneTestBed = TestBed<PipelineFormTestSubjects> & {
actions: ReturnType<typeof getFormActions>;
Expand All @@ -29,8 +29,8 @@ export const PIPELINE_TO_CLONE = {

const testBedConfig: TestBedConfig = {
memoryRouter: {
initialEntries: [`${BASE_PATH}create/${PIPELINE_TO_CLONE.name}`],
componentRoutePath: `${BASE_PATH}create/:name`,
initialEntries: [getClonePath({ clonedPipelineName: PIPELINE_TO_CLONE.name })],
componentRoutePath: ROUTES.clone,
},
doMountAsync: true,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
*/

import { registerTestBed, TestBedConfig, TestBed } from '../../../../../test_utils';
import { BASE_PATH } from '../../../common/constants';
import { PipelinesCreate } from '../../../public/application/sections/pipelines_create';
import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
import { WithAppDependencies } from './setup_environment';
import { getCreatePath, ROUTES } from '../../../public/application/services/navigation';

export type PipelinesCreateTestBed = TestBed<PipelineFormTestSubjects> & {
actions: ReturnType<typeof getFormActions>;
};

const testBedConfig: TestBedConfig = {
memoryRouter: {
initialEntries: [`${BASE_PATH}/create`],
componentRoutePath: `${BASE_PATH}/create`,
initialEntries: [getCreatePath()],
componentRoutePath: ROUTES.create,
},
doMountAsync: true,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
*/

import { registerTestBed, TestBedConfig, TestBed } from '../../../../../test_utils';
import { BASE_PATH } from '../../../common/constants';
import { PipelinesEdit } from '../../../public/application/sections/pipelines_edit';
import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
import { WithAppDependencies } from './setup_environment';
import { getEditPath, ROUTES } from '../../../public/application/services/navigation';

export type PipelinesEditTestBed = TestBed<PipelineFormTestSubjects> & {
actions: ReturnType<typeof getFormActions>;
Expand All @@ -29,8 +29,8 @@ export const PIPELINE_TO_EDIT = {

const testBedConfig: TestBedConfig = {
memoryRouter: {
initialEntries: [`${BASE_PATH}edit/${PIPELINE_TO_EDIT.name}`],
componentRoutePath: `${BASE_PATH}edit/:name`,
initialEntries: [getEditPath({ pipelineName: PIPELINE_TO_EDIT.name })],
componentRoutePath: ROUTES.edit,
},
doMountAsync: true,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import { act } from 'react-dom/test-utils';

import { BASE_PATH } from '../../../common/constants';
import {
registerTestBed,
TestBed,
Expand All @@ -16,11 +15,12 @@ import {
} from '../../../../../test_utils';
import { PipelinesList } from '../../../public/application/sections/pipelines_list';
import { WithAppDependencies } from './setup_environment';
import { getListPath, ROUTES } from '../../../public/application/services/navigation';

const testBedConfig: TestBedConfig = {
memoryRouter: {
initialEntries: [BASE_PATH],
componentRoutePath: BASE_PATH,
initialEntries: [getListPath()],
componentRoutePath: ROUTES.list,
},
doMountAsync: true,
};
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/ingest_pipelines/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const basicLicense: LicenseType = 'basic';

export const PLUGIN_ID = 'ingest_pipelines';

export const PLUGIN_MIN_LICENSE_TYPE = basicLicense;
export const MANAGEMENT_APP_ID = 'management';
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems like something the management plugin should define inside a common/constants.ts file and export in https://github.com/elastic/kibana/blob/master/src/plugins/management/public/index.ts. Since the management plugin is already a dependency of this plugin, it seems like it would be straightforward to make that change and consume the constant wherever we need it like this:

import { MANAGEMENT_APP_ID } from 'src/plugins/management/public';

The only slightly invasive change would be you'd have to update the management plugin to consume this constant on this line: https://github.com/elastic/kibana/blob/master/src/plugins/management/public/plugin.ts#L75

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I was looking at the management app for an exported constant but couldn't find any. So I added an export, do you know maybe who would be a code owner for this plugin? @cjcenizal

Copy link
Contributor

Choose a reason for hiding this comment

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

That would be the Kibana App Arch team.


export const BASE_PATH = '/';
export const PLUGIN_MIN_LICENSE_TYPE = basicLicense;

export const API_BASE_PATH = '/api/ingest_pipelines';

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/ingest_pipelines/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "8.0.0",
"server": true,
"ui": true,
"requiredPlugins": ["licensing", "management", "features"],
"requiredPlugins": ["licensing", "management", "features", "share"],
"optionalPlugins": ["security", "usageCollection"],
"configPath": ["xpack", "ingest_pipelines"],
"requiredBundles": ["esUiShared", "kibanaReact"]
Expand Down
9 changes: 5 additions & 4 deletions x-pack/plugins/ingest_pipelines/public/application/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ import {
} from '../shared_imports';

import { PipelinesList, PipelinesCreate, PipelinesEdit, PipelinesClone } from './sections';
import { ROUTES } from './services/navigation';

export const AppWithoutRouter = () => (
<Switch>
<Route exact path="/" component={PipelinesList} />
<Route exact path={`/create/:sourceName`} component={PipelinesClone} />
<Route exact path={`/create`} component={PipelinesCreate} />
<Route exact path={`/edit/:name`} component={PipelinesEdit} />
<Route exact path={ROUTES.list} component={PipelinesList} />
<Route exact path={ROUTES.clone} component={PipelinesClone} />
<Route exact path={ROUTES.create} component={PipelinesCreate} />
<Route exact path={ROUTES.edit} component={PipelinesEdit} />
{/* Catch all */}
<Route component={PipelinesList} />
</Switch>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
EuiSpacer,
} from '@elastic/eui';

import { BASE_PATH } from '../../../../common/constants';
import { getListPath } from '../../services/navigation';
import { Pipeline } from '../../../../common/types';
import { useKibana } from '../../../shared_imports';
import { PipelineForm } from '../../components';
Expand Down Expand Up @@ -50,11 +50,11 @@ export const PipelinesCreate: React.FunctionComponent<RouteComponentProps & Prop
return;
}

history.push(BASE_PATH + `?pipeline=${encodeURIComponent(pipeline.name)}`);
history.push(getListPath({ inspectedPipelineName: pipeline.name }));
};

const onCancel = () => {
history.push(BASE_PATH);
history.push(getListPath());
};

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import {
} from '@elastic/eui';

import { EuiCallOut } from '@elastic/eui';
import { BASE_PATH } from '../../../../common/constants';
import { Pipeline } from '../../../../common/types';
import { useKibana, SectionLoading } from '../../../shared_imports';
import { PipelineForm } from '../../components';

import { getListPath } from '../../services/navigation';
import { PipelineForm } from '../../components';
import { attemptToURIDecode } from '../shared';

interface MatchParams {
Expand Down Expand Up @@ -56,11 +56,11 @@ export const PipelinesEdit: React.FunctionComponent<RouteComponentProps<MatchPar
return;
}

history.push(BASE_PATH + `?pipeline=${encodeURIComponent(updatedPipeline.name)}`);
history.push(getListPath({ inspectedPipelineName: updatedPipeline.name }));
};

const onCancel = () => {
history.push(BASE_PATH);
history.push(getListPath());
};

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { useHistory } from 'react-router-dom';
import { ScopedHistory } from 'kibana/public';
import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
import { useKibana } from '../../../shared_imports';
import { getCreatePath } from '../../services/navigation';

export const EmptyList: FunctionComponent = () => {
const { services } = useKibana();
Expand Down Expand Up @@ -44,7 +45,11 @@ export const EmptyList: FunctionComponent = () => {
</p>
}
actions={
<EuiButton {...reactRouterNavigate(history, '/create')} iconType="plusInCircle" fill>
<EuiButton
{...reactRouterNavigate(history, getCreatePath())}
iconType="plusInCircle"
fill
>
{i18n.translate('xpack.ingestPipelines.list.table.emptyPrompt.createButtonLabel', {
defaultMessage: 'Create a pipeline',
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import {
} from '@elastic/eui';

import { Pipeline } from '../../../../common/types';
import { BASE_PATH } from '../../../../common/constants';
import { useKibana, SectionLoading } from '../../../shared_imports';
import { UIM_PIPELINES_LIST_LOAD } from '../../constants';
import { getEditPath, getClonePath, getListPath } from '../../services/navigation';

import { EmptyList } from './empty_list';
import { PipelineTable } from './table';
Expand Down Expand Up @@ -67,17 +67,17 @@ export const PipelinesList: React.FunctionComponent<RouteComponentProps> = ({
}
}, [pipelineNameFromLocation, data]);

const goToEditPipeline = (name: string) => {
history.push(`${BASE_PATH}/edit/${encodeURIComponent(name)}`);
const goToEditPipeline = (pipelineName: string) => {
history.push(getEditPath({ pipelineName }));
};

const goToClonePipeline = (name: string) => {
history.push(`${BASE_PATH}/create/${encodeURIComponent(name)}`);
const goToClonePipeline = (clonedPipelineName: string) => {
history.push(getClonePath({ clonedPipelineName }));
};

const goHome = () => {
setShowFlyout(false);
history.push(BASE_PATH);
history.push(getListPath());
};

if (data && data.length === 0) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* 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.
*/

const BASE_PATH = '/';

const EDIT_PATH = 'edit';

const CREATE_PATH = 'create';

const _getEditPath = (name: string, encode = true): string => {
return `${BASE_PATH}${EDIT_PATH}/${encode ? encodeURIComponent(name) : name}`;
};

const _getCreatePath = (): string => {
return `${BASE_PATH}${CREATE_PATH}`;
};

const _getClonePath = (name: string, encode = true): string => {
return `${BASE_PATH}${CREATE_PATH}/${encode ? encodeURIComponent(name) : name}`;
};
const _getListPath = (name?: string): string => {
return `${BASE_PATH}${name ? `?pipeline=${encodeURIComponent(name)}` : ''}`;
};

export const ROUTES = {
list: _getListPath(),
edit: _getEditPath(':name', false),
create: _getCreatePath(),
clone: _getClonePath(':sourceName', false),
};

export const getListPath = ({
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: what do we gain by exporting adapter functions instead of the original functions? For example:

// Setting a default for `encode` supports the simpler consumption pattern of not 
// having to specify it, and I don't think we lose anything by allowing the consumer
// to specify `false`.
export const getEditPath = ({ pipelineName, encode = true }: { pipelineName: string, encode?: boolean }): string => {
  return `${BASE_PATH}${EDIT_PATH}/${encode ? encodeURIComponent(name) : name}`;
};

/* snip */

export const ROUTES_CONFIG = {
  edit: getEditPath({ pipelineName: ':name', encode: false }),
  /* snip */
};

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 think that encoding the parameter is an implementation detail and should not be needed for clients using the navigation service, hence a separate ROUTES constant.

inspectedPipelineName,
}: {
inspectedPipelineName?: string;
} = {}): string => _getListPath(inspectedPipelineName);
export const getEditPath = ({ pipelineName }: { pipelineName: string }): string =>
_getEditPath(pipelineName, true);
export const getCreatePath = (): string => _getCreatePath();
export const getClonePath = ({ clonedPipelineName }: { clonedPipelineName: string }): string =>
_getClonePath(clonedPipelineName, true);
7 changes: 7 additions & 0 deletions x-pack/plugins/ingest_pipelines/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,10 @@ import { IngestPipelinesPlugin } from './plugin';
export function plugin() {
return new IngestPipelinesPlugin();
}

export {
INGEST_PIPELINES_APP_ULR_GENERATOR,
IngestPipelinesUrlGenerator,
IngestPipelinesUrlGeneratorState,
INGEST_PIPELINES_PAGES,
} from './url_generator';
5 changes: 4 additions & 1 deletion x-pack/plugins/ingest_pipelines/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import { CoreSetup, Plugin } from 'src/core/public';
import { PLUGIN_ID } from '../common/constants';
import { uiMetricService, apiService } from './application/services';
import { Dependencies } from './types';
import { registerUrlGenerator } from './url_generator';

export class IngestPipelinesPlugin implements Plugin {
public setup(coreSetup: CoreSetup, plugins: Dependencies): void {
const { management, usageCollection } = plugins;
const { management, usageCollection, share } = plugins;
const { http, getStartServices } = coreSetup;

// Initialize services
Expand Down Expand Up @@ -46,6 +47,8 @@ export class IngestPipelinesPlugin implements Plugin {
};
},
});

registerUrlGenerator(coreSetup, management, share);
}

public start() {}
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/ingest_pipelines/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@

import { ManagementSetup } from 'src/plugins/management/public';
import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
import { SharePluginSetup } from '../../../../src/plugins/share/public';

export interface Dependencies {
management: ManagementSetup;
usageCollection: UsageCollectionSetup;
share: SharePluginSetup;
}
Loading