Skip to content

reload full index list when reload hits missing index #27197

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

Merged
bmcconaghy merged 3 commits into from
Dec 14, 2018
Merged

reload full index list when reload hits missing index #27197

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
b6cbd86
reload full index list when reload hits missing index
bmcconaghy Dec 14, 2018
5b8793c
handling open detail panel for deleted index
bmcconaghy Dec 14, 2018
2eda04b
copy edit
bmcconaghy Dec 14, 2018
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
4 changes: 2 additions & 2 deletions ...x_management/public/sections/index_list/components/detail_panel/detail_panel.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { DetailPanel as PresentationComponent } from './detail_panel';
import {
getDetailPanelType,
getDetailPanelIndexName,
getIndexStatusByIndexName
getIndexByIndexName
} from '../../../../store/selectors';
import {
openDetailPanel,
Expand All @@ -28,7 +28,7 @@ const mapStateToProps = (state) => {
return {
panelType: getDetailPanelType(state),
indexName,
indexStatus: getIndexStatusByIndexName(state, indexName)
index: getIndexByIndexName(state, indexName)
};
};

Expand Down
78 changes: 54 additions & 24 deletions ...ugins/index_management/public/sections/index_list/components/detail_panel/detail_panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,25 @@
* you may not use this file except in compliance with the Elastic License.
*/

import React, { Component } from 'react';
import React, { Component, Fragment } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { Route } from 'react-router-dom';
import { ShowJson } from './show_json';
import { Summary } from './summary';
import { EditSettingsJson } from './edit_settings_json';

import {
EuiCallOut,
EuiFlexGroup,
EuiFlexItem,
EuiFlyout,
EuiFlyoutBody,
EuiFlyoutFooter,
EuiFlyoutHeader,
EuiSpacer,
EuiTabs,
EuiTab,
EuiTitle
EuiTitle,
} from '@elastic/eui';
import { IndexActionsContextMenu } from '../../components';
import { INDEX_OPEN } from '../../../../../common/constants';
Expand All @@ -32,17 +34,16 @@ function capitalizeFirstLetter(string) {
const tabs = ['Summary', 'Settings', 'Mapping', 'Stats', 'Edit settings'];
export class DetailPanel extends Component {
renderTabs() {
const { panelType, indexName, indexStatus, openDetailPanel } = this.props;

return tabs.map((tab, index) => {
const { panelType, indexName, index, openDetailPanel } = this.props;
return tabs.map((tab, i) => {
const isSelected = tab === panelType;
return (
<EuiTab
onClick={() => openDetailPanel({ panelType: tab, indexName })}
isSelected={isSelected}
data-test-subj={`detailPanelTab${isSelected ? "Selected" : ""}`}
disabled={tab === 'stats' && indexStatus !== INDEX_OPEN}
key={index}
data-test-subj={`detailPanelTab${isSelected ? 'Selected' : ''}`}
disabled={tab === 'Stats' && index.status !== INDEX_OPEN}
key={i}
>
{capitalizeFirstLetter(tab)}
</EuiTab>
Expand All @@ -51,7 +52,7 @@ export class DetailPanel extends Component {
}

render() {
const { panelType, indexName, closeDetailPanel } = this.props;
const { panelType, indexName, index, closeDetailPanel } = this.props;
if (!panelType) {
return null;
}
Expand All @@ -68,21 +69,9 @@ export class DetailPanel extends Component {
default:
component = <Summary />;
}
return (
<EuiFlyout
data-test-subj="indexDetailFlyout"
onClose={closeDetailPanel}
aria-labelledby="indexDetailsFlyoutTitle"
>
<EuiFlyoutHeader>
<EuiTitle size="l" id="indexDetailsFlyoutTitle">
<h2>{indexName}</h2>
</EuiTitle>
<EuiTabs>{this.renderTabs()}</EuiTabs>
</EuiFlyoutHeader>

const content = index ? (
<Fragment>
<EuiFlyoutBody>{component}</EuiFlyoutBody>

<EuiFlyoutFooter>
<EuiFlexGroup justifyContent="flexEnd">
<EuiFlexItem grow={false}>
Expand All @@ -95,13 +84,54 @@ export class DetailPanel extends Component {
anchorPosition="upRight"
detailPanel={true}
iconType="arrowUp"
label={<FormattedMessage id="xpack.idxMgmt.detailPanel.manageContextMenuLabel" defaultMessage="Manage" />}
label={
<FormattedMessage
id="xpack.idxMgmt.detailPanel.manageContextMenuLabel"
defaultMessage="Manage"
/>
}
/>
)}
/>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlyoutFooter>
\
</Fragment>
) : (
<EuiFlyoutBody>
<EuiSpacer size="l" />
<EuiCallOut
title={
<FormattedMessage
id="xpack.idxMgmt.detailPanel.missingIndexTitle"
defaultMessage="Missing index"
/>
}
color="danger"
iconType="cross"
>
<FormattedMessage
id="xpack.idxMgmt.detailPanel.missingIndexMessage"
defaultMessage="This index does not exist.
It might have been deleted by a running job or another system."
/>
</EuiCallOut>
</EuiFlyoutBody>
);
return (
<EuiFlyout
data-test-subj="indexDetailFlyout"
onClose={closeDetailPanel}
aria-labelledby="indexDetailsFlyoutTitle"
>
<EuiFlyoutHeader>
<EuiTitle size="l" id="indexDetailsFlyoutTitle">
<h2>{indexName}</h2>
</EuiTitle>
{index ? <EuiTabs>{this.renderTabs()}</EuiTabs> : null }
</EuiFlyoutHeader>
{content}
</EuiFlyout>
);
}
Expand Down
5 changes: 5 additions & 0 deletions x-pack/plugins/index_management/public/store/actions/reload_indices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { createAction } from 'redux-actions';
import { i18n } from '@kbn/i18n';
import { getIndexNamesForCurrentPage } from '../selectors';
import { reloadIndices as request } from '../../services';
import { loadIndices } from './load_indices';
import { toastNotifications } from 'ui/notify';

export const reloadIndicesSuccess = createAction('INDEX_MANAGEMENT_RELOAD_INDICES_SUCCESS');
Expand All @@ -17,6 +18,10 @@ export const reloadIndices = (indexNames) => async (dispatch, getState) => {
try {
indices = await request(indexNames);
} catch (error) {
// an index has been deleted, reload the full list
if (error.status === 404) {
return dispatch(loadIndices());
}
return toastNotifications.addDanger(error.data.message);
}
if (indices && indices.length > 0) {
Expand Down