Skip to content

[6.x] When an index is deleted, and it's selected in the table, then it's removed from the selection. (#22242) #22301

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
cjcenizal merged 1 commit into from
Aug 24, 2018
Merged

[6.x] When an index is deleted, and it's selected in the table, then it's removed from the selection. (#22242) #22301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 24 additions & 2 deletions ...plugins/index_management/public/sections/index_list/components/index_table/index_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,24 @@ const HEADERS = {
};

export class IndexTableUi extends Component {
static getDerivedStateFromProps(props, state) {
// Deselct any indices which no longer exist, e.g. they've been deleted.
const { selectedIndicesMap } = state;
const indexNames = props.indices.map(index => index.name);
const selectedIndexNames = Object.keys(selectedIndicesMap);
const missingIndexNames = selectedIndexNames.filter(selectedIndexName => {
return !indexNames.includes(selectedIndexName);
});

if (missingIndexNames.length) {
const newMap = { ...selectedIndicesMap };
missingIndexNames.forEach(missingIndexName => delete newMap[missingIndexName]);
return { selectedIndicesMap: newMap };
}

return null;
}

constructor(props) {
super(props);

Expand All @@ -82,6 +100,7 @@ export class IndexTableUi extends Component {
const newIsSortAscending = sortField === column ? !isSortAscending : true;
sortChanged(column, newIsSortAscending);
};

toggleAll = () => {
const allSelected = this.areAllItemsSelected();
if (allSelected) {
Expand All @@ -96,6 +115,7 @@ export class IndexTableUi extends Component {
selectedIndicesMap
});
};

toggleItem = name => {
this.setState(({ selectedIndicesMap }) => {
const newMap = { ...selectedIndicesMap };
Expand All @@ -109,6 +129,7 @@ export class IndexTableUi extends Component {
};
});
};

isItemSelected = name => {
return !!this.state.selectedIndicesMap[name];
};
Expand Down Expand Up @@ -159,6 +180,7 @@ export class IndexTableUi extends Component {
}
return value;
}

buildRowCells(index) {
return Object.keys(HEADERS).map(fieldName => {
const { name } = index;
Expand All @@ -174,6 +196,7 @@ export class IndexTableUi extends Component {
);
});
}

buildRows() {
const { indices = [], detailPanelIndexName } = this.props;
return indices.map(index => {
Expand Down Expand Up @@ -221,7 +244,6 @@ export class IndexTableUi extends Component {
};

render() {

const {
filterChanged,
filter,
Expand Down Expand Up @@ -336,4 +358,4 @@ export class IndexTableUi extends Component {
}
}

export const IndexTable = injectI18n(IndexTableUi);
export const IndexTable = injectI18n(IndexTableUi);