Skip to content

Commit

Permalink
Merge branch 'opensearch-project:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jackiehanyang authored Apr 4, 2024
2 parents 8258d5c + e5cf2d8 commit c21d6c7
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 2,779 deletions.
7 changes: 0 additions & 7 deletions .eslintrc.yml

This file was deleted.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
]
},
"devDependencies": {
"@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
"@testing-library/user-event": "^12.1.6",
"@types/react-plotly.js": "^2.6.0",
"@types/redux-mock-store": "^1.0.1",
Expand Down
10 changes: 6 additions & 4 deletions public/pages/DetectorsList/containers/List/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
EuiBasicTable,
EuiButton,
EuiComboBoxOptionProps,
EuiHorizontalRule,
EuiPage,
EuiPageBody,
EuiSpacer,
Expand Down Expand Up @@ -191,11 +190,14 @@ export const DetectorList = (props: ListProps) => {
const visibleAliases = get(opensearchState, 'aliases', []) as IndexAlias[];
const indexOptions = getVisibleOptions(visibleIndices, visibleAliases);

const queryParams = getURLQueryParams(props.location);
const [state, setState] = useState<ListState>({
page: 0,
queryParams: getURLQueryParams(props.location),
queryParams,
selectedDetectorStates: ALL_DETECTOR_STATES,
selectedIndices: ALL_INDICES,
selectedIndices: queryParams.indices
? queryParams.indices.split(',')
: ALL_INDICES,
});

// Set breadcrumbs on page initialization
Expand All @@ -211,7 +213,7 @@ export const DetectorList = (props: ListProps) => {
const { history, location } = props;
const updatedParams = {
...state.queryParams,
indices: state.selectedIndices.join(' '),
indices: state.selectedIndices.join(','),
from: state.page * state.queryParams.size,
};

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## Version 2.13.0.0 Release Notes

Compatible with OpenSearch Dashboards 2.13.0

### Maintenance

* Increment version to 2.13.0.0 ([#695](https://github.com/opensearch-project/anomaly-detection-dashboards-plugin/pull/695))
Loading

0 comments on commit c21d6c7

Please sign in to comment.