maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix Data Streams and Rollups Jobs deep-link bugs (#70903) (#70949)

Browse source 
* Add extractQueryParams to es_ui_shared/public/url. Update CCR, Remote Clusters, and Rollup to consume this service via shared_imports.
* Fix Data Streams bug in which clicking a data stream would apply a deep-link filter to the table.
* Fix Rollup Job deep-link bug.
This commit is contained in:
CJ Cenizal 2020-07-07 07:30:21 -07:00 committed by GitHub
parent 54c106a280
commit c495d1fa21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 89 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/es_ui_shared/public/index.ts
View file

@ -68,6 +68,8 @@ export {
export { Monaco, Forms };
export { extractQueryParams } from './url';
/** dummy plugin, we just want esUiShared to have its own bundle */
export function plugin() {
return new (class EsUiSharedPlugin {

29
src/plugins/es_ui_shared/public/url/extract_query_params.ts Normal file
View file

@ -0,0 +1,29 @@
/*
* 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.
*/
import { parse, ParsedQuery } from 'query-string';
export function extractQueryParams(queryString: string = ''): ParsedQuery<string> {
const hrefSplit = queryString.split('?');
if (!hrefSplit.length) {
return {};
}
return parse(hrefSplit[1], { sort: false });
}

20
src/plugins/es_ui_shared/public/url/index.ts Normal file
View file

@ -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 { extractQueryParams } from './extract_query_params';

3
x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
View file

@ -29,11 +29,10 @@ import {
EuiTitle,
} from '@elastic/eui';
import { indices } from '../../../../../../src/plugins/es_ui_shared/public';
import { indexPatterns } from '../../../../../../src/plugins/data/public';
import { extractQueryParams, indices } from '../../shared_imports';
import { routing } from '../services/routing';
import { extractQueryParams } from '../services/query_params';
import { getRemoteClusterName } from '../services/get_remote_cluster_name';
import { API_STATUS } from '../constants';
import { SectionError } from './section_error';

7
x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.js
View file

@ -28,12 +28,14 @@ import {
EuiTitle,
} from '@elastic/eui';
import { indices } from '../../../../../../../src/plugins/es_ui_shared/public';
import { extractQueryParams, indices } from '../../../shared_imports';
import { indexNameValidator, leaderIndexValidator } from '../../services/input_validation';
import { routing } from '../../services/routing';
import { getFatalErrors } from '../../services/notifications';
import { loadIndices } from '../../services/api';
import { API_STATUS } from '../../constants';
import { getRemoteClusterName } from '../../services/get_remote_cluster_name';
import { RemoteClustersFormField } from '../remote_clusters_form_field';
import { SectionError } from '../section_error';
import { FormEntryRow } from '../form_entry_row';
import {
@ -41,9 +43,6 @@ import {
emptyAdvancedSettings,
areAdvancedSettingsEdited,
} from './advanced_settings_fields';
import { extractQueryParams } from '../../services/query_params';
import { getRemoteClusterName } from '../../services/get_remote_cluster_name';
import { RemoteClustersFormField } from '../remote_clusters_form_field';
import { FollowerIndexRequestFlyout } from './follower_index_request_flyout';

2
x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js
View file

@ -18,7 +18,7 @@ import {
} from '@elastic/eui';
import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
import { extractQueryParams } from '../../../services/query_params';
import { extractQueryParams } from '../../../../shared_imports';
import { trackUiMetric, METRIC_TYPE } from '../../../services/track_ui_metric';
import { API_STATUS, UIM_AUTO_FOLLOW_PATTERN_LIST_LOAD } from '../../../constants';
import { SectionLoading, SectionError, SectionUnauthorized } from '../../../components';

2
x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js
View file

@ -18,7 +18,7 @@ import {
} from '@elastic/eui';
import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
import { extractQueryParams } from '../../../services/query_params';
import { extractQueryParams } from '../../../../shared_imports';
import { trackUiMetric, METRIC_TYPE } from '../../../services/track_ui_metric';
import { API_STATUS, UIM_FOLLOWER_INDEX_LIST_LOAD } from '../../../constants';
import { SectionLoading, SectionError, SectionUnauthorized } from '../../../components';

2
x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
View file

@ -8,8 +8,8 @@ import React from 'react';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { indices } from '../../../../../../src/plugins/es_ui_shared/public';
import { indexPatterns } from '../../../../../../src/plugins/data/public';
import { indices } from '../../shared_imports';
const {
indexNameBeginsWithPeriod,

3
x-pack/plugins/cross_cluster_replication/public/app/services/input_validation.js
View file

@ -6,7 +6,8 @@
import React from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { indices } from '../../../../../../src/plugins/es_ui_shared/public';
import { indices } from '../../shared_imports';
const isEmpty = (value) => {
return !value || !value.trim().length;

11
x-pack/plugins/cross_cluster_replication/public/app/services/query_params.js → x-pack/plugins/cross_cluster_replication/public/shared_imports.ts
View file

@ -4,13 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { parse } from 'query-string';
export function extractQueryParams(queryString) {
const hrefSplit = queryString.split('?');
if (!hrefSplit.length) {
return {};
}
return parse(hrefSplit[1], { sort: false });
}
export { extractQueryParams, indices } from '../../../../src/plugins/es_ui_shared/public';

9
x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx
View file

@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
import { EuiTitle, EuiText, EuiSpacer, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
import { ScopedHistory } from 'kibana/public';
import { reactRouterNavigate } from '../../../../shared_imports';
import { reactRouterNavigate, extractQueryParams } from '../../../../shared_imports';
import { useAppContext } from '../../../app_context';
import { SectionError, SectionLoading, Error } from '../../../components';
import { useLoadDataStreams } from '../../../services/api';
@ -28,8 +28,11 @@ export const DataStreamList: React.FunctionComponent<RouteComponentProps<MatchPa
match: {
params: { dataStreamName },
},
location: { search },
history,
}) => {
const { isDeepLink } = extractQueryParams(search);
const {
core: { getUrlForApp },
plugins: { ingestManager },
@ -144,7 +147,9 @@ export const DataStreamList: React.FunctionComponent<RouteComponentProps<MatchPa
<DataStreamTable
filters={
dataStreamName !== undefined ? `name=${decodePathFromReactRouter(dataStreamName)}` : ''
isDeepLink && dataStreamName !== undefined
? `name=${decodePathFromReactRouter(dataStreamName)}`
: ''
}
dataStreams={dataStreams}
reload={reload}

1
x-pack/plugins/index_management/public/application/sections/home/index_list/index_table/index_table.js
View file

@ -277,6 +277,7 @@ export class IndexTable extends Component {
data-test-subj="dataStreamLink"
{...reactRouterNavigate(history, {
pathname: `/data_streams/${encodePathForReactRouter(value)}`,
search: '?isDeepLink=true',
})}
>
{value}

1
x-pack/plugins/index_management/public/shared_imports.ts
View file

@ -11,6 +11,7 @@ export {
sendRequest,
useRequest,
Forms,
extractQueryParams,
} from '../../../../src/plugins/es_ui_shared/public/';
export {

3
x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.js
View file

@ -10,7 +10,8 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { EuiPageContent } from '@elastic/eui';
import { getRouter, redirect, extractQueryParams } from '../../services';
import { extractQueryParams } from '../../../shared_imports';
import { getRouter, redirect } from '../../services';
import { setBreadcrumbs } from '../../services/breadcrumb';
import { RemoteClusterPageTitle, RemoteClusterForm } from '../components';

3
x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
View file

@ -21,7 +21,8 @@ import {
} from '@elastic/eui';
import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
import { extractQueryParams, getRouter, redirect } from '../../services';
import { extractQueryParams } from '../../../shared_imports';
import { getRouter, redirect } from '../../services';
import { setBreadcrumbs } from '../../services/breadcrumb';
import { RemoteClusterPageTitle, RemoteClusterForm, ConfiguredByNodeWarning } from '../components';

2
x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
View file

@ -29,7 +29,7 @@ import {
} from '@elastic/eui';
import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
import { extractQueryParams } from '../../services';
import { extractQueryParams } from '../../../shared_imports';
import { setBreadcrumbs } from '../../services/breadcrumb';
import { RemoteClusterTable } from './remote_cluster_table';

2
x-pack/plugins/remote_clusters/public/application/services/index.js
View file

@ -12,8 +12,6 @@ export { initRedirect, redirect } from './redirect';
export { isAddressValid, isPortValid } from './validate_address';
export { extractQueryParams } from './query_params';
export { setUserHasLeftApp, getUserHasLeftApp, registerRouter, getRouter } from './routing';
export { trackUiMetric, METRIC_TYPE } from './ui_metric';

8
x-pack/plugins/remote_clusters/public/application/store/actions/add_cluster.js
View file

@ -6,12 +6,8 @@
import { i18n } from '@kbn/i18n';
import {
addCluster as sendAddClusterRequest,
getRouter,
extractQueryParams,
redirect,
} from '../../services';
import { extractQueryParams } from '../../../shared_imports';
import { addCluster as sendAddClusterRequest, getRouter, redirect } from '../../services';
import { fatalError, toasts } from '../../services/notification';
import {

3
x-pack/plugins/remote_clusters/public/application/store/actions/detail_panel.js
View file

@ -4,7 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { extractQueryParams, getRouter } from '../../services';
import { extractQueryParams } from '../../../shared_imports';
import { getRouter } from '../../services';
import { OPEN_DETAIL_PANEL, CLOSE_DETAIL_PANEL } from '../action_types';
export const openDetailPanel = ({ name }) => (dispatch) => {

8
x-pack/plugins/remote_clusters/public/application/store/actions/edit_cluster.js
View file

@ -9,12 +9,8 @@ import { i18n } from '@kbn/i18n';
import { toasts, fatalError } from '../../services/notification';
import { loadClusters } from './load_clusters';
import {
editCluster as sendEditClusterRequest,
extractQueryParams,
getRouter,
redirect,
} from '../../services';
import { extractQueryParams } from '../../../shared_imports';
import { editCluster as sendEditClusterRequest, getRouter, redirect } from '../../services';
import {
EDIT_CLUSTER_START,

11
x-pack/plugins/remote_clusters/public/application/services/query_params.js → x-pack/plugins/remote_clusters/public/shared_imports.ts
View file

@ -4,13 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { parse } from 'query-string';
export function extractQueryParams(queryString) {
const hrefSplit = queryString.split('?');
if (!hrefSplit.length) {
return {};
}
return parse(hrefSplit[1], { sort: false });
}
export { extractQueryParams, indices } from '../../../../src/plugins/es_ui_shared/public';

5
x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
View file

@ -27,10 +27,9 @@ import {
import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
import { getRouterLinkProps, extractQueryParams, listBreadcrumb } from '../../services';
import { extractQueryParams } from '../../../shared_imports';
import { getRouterLinkProps, listBreadcrumb } from '../../services';
import { JobTable } from './job_table';
import { DetailPanel } from './detail_panel';
const REFRESH_RATE_MS = 30000;

2
x-pack/plugins/rollup/public/crud_app/sections/job_list/job_table/job_table.js
View file

@ -265,7 +265,7 @@ export class JobTable extends Component {
<EuiLink
onClick={() => {
trackUiMetric(METRIC_TYPE.CLICK, UIM_SHOW_DETAILS_CLICK);
openDetailPanel(job.id);
openDetailPanel(encodeURIComponent(job.id));
}}
>
{value}

2
x-pack/plugins/rollup/public/crud_app/services/index.js
View file

@ -33,8 +33,6 @@ export { serializeJob, deserializeJob, deserializeJobs } from './jobs';
export { createNoticeableDelay } from './noticeable_delay';
export { extractQueryParams } from './query_params';
export {
setUserHasLeftApp,
getUserHasLeftApp,

23
x-pack/plugins/rollup/public/crud_app/services/query_params.js
View file

@ -1,23 +0,0 @@
/*
* 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.
*/
export function extractQueryParams(queryString) {
if (!queryString || queryString.trim().length === 0) {
return {};
}
const extractedQueryParams = {};
const queryParamPairs = queryString
.split('?')[1]
.split('&')
.map((paramString) => paramString.split('='));
queryParamPairs.forEach(([key, value]) => {
extractedQueryParams[key] = decodeURIComponent(value);
});
return extractedQueryParams;
}

2
x-pack/plugins/rollup/public/crud_app/store/actions/create_job.js
View file

@ -102,7 +102,7 @@ export const createJob = (jobConfig) => async (dispatch) => {
// here, because it would partially obscure the detail panel.
getRouter().history.push({
pathname: `/job_list`,
search: `?job=${jobConfig.id}`,
search: `?job=${encodeURIComponent(jobConfig.id)}`,
});
};

3
x-pack/plugins/rollup/public/crud_app/store/actions/detail_panel.js
View file

@ -4,7 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { extractQueryParams, getRouter } from '../../services';
import { extractQueryParams } from '../../../shared_imports';
import { getRouter } from '../../services';
import { OPEN_DETAIL_PANEL, CLOSE_DETAIL_PANEL } from '../action_types';
export const openDetailPanel = ({ panelType, jobId }) => (dispatch) => {

2
x-pack/plugins/rollup/public/shared_imports.ts
View file

@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
export { indices } from '../../../../src/plugins/es_ui_shared/public';
export { extractQueryParams, indices } from '../../../../src/plugins/es_ui_shared/public';