Skip to content

Commit 7d50077

Browse files
dbbaughebowenlan-amzn
dbbaughe
and
bowenlan-amzn
authored
Backport commits from main (#90)
* Release 1.1.0.0 (#83) * Release 1.1.0.0 Signed-off-by: bowenlan-amzn <[email protected]> * Correct copyright notices * UI fixes for new ISM UI (#84) * Removes X icon from action/transition flyout footer next to cancel Signed-off-by: Drew Baugher <[email protected]> * Adds tooltips to edit/delete icon buttons on the draggable action/transition components Signed-off-by: Drew Baugher <[email protected]> * Removes overlay for flyout so clicking outside doesn't close flyout and removes X close button on top right Signed-off-by: Drew Baugher <[email protected]> * Adds edit/delete tooltips for state component and removes underline from hovering states Signed-off-by: Drew Baugher <[email protected]> * Changes state flyout from X Close to Cancel Signed-off-by: Drew Baugher <[email protected]> * Adds JSON editor for allocation action Signed-off-by: Drew Baugher <[email protected]> * Adds isValid to action interface and implements in actions Signed-off-by: Drew Baugher <[email protected]> * Correctly removes unused rollover keys from rollover object, handles uncontrolled inputs and NaN minDocs Signed-off-by: Drew Baugher <[email protected]> * Adds error for state name already existing in policy Signed-off-by: Drew Baugher <[email protected]> * Fixes duplicated actions when editing as previously we had a new ID and matching logic didn't find an action Signed-off-by: Drew Baugher <[email protected]> * Fixes other action inputs that can return NaN and creates a no conditions option that is the default Signed-off-by: Drew Baugher <[email protected]> * Updates snapshot Signed-off-by: Drew Baugher <[email protected]> * Correctly show danger toast on update/create failures Signed-off-by: Drew Baugher <[email protected]> * Fixes rollup action nesting multiple ism_template keys Signed-off-by: Drew Baugher <[email protected]> * Fixes timeout/retry settings turning into uncontrolled inputs and NaN value Signed-off-by: Drew Baugher <[email protected]> * Removes text transformation on inputs and updates isValid methods and passes to form labels Signed-off-by: Drew Baugher <[email protected]> * Fixes allocation and rollup adding UIAction properties to policy JSON on updates Signed-off-by: Drew Baugher <[email protected]> * Updates release notes w/ new PR changes Signed-off-by: Drew Baugher <[email protected]> * Wraps actions/transitions in states component and updates default rollup to include ism_rollup key Signed-off-by: Drew Baugher <[email protected]> * Fixes some small UI touchups/issues for new ISM UI (#85) * Moves cancel secondary button next to primary on action/transition flyout Signed-off-by: Drew Baugher <[email protected]> * Removes default ISM template and increases width of empty prompt Signed-off-by: Drew Baugher <[email protected]> * Adds punctuation Signed-off-by: Drew Baugher <[email protected]> * Adds back X icon next to cancel for state flyout Signed-off-by: Drew Baugher <[email protected]> * Makes inputs in flyout full width, updates help text, and adds some spacing Signed-off-by: Drew Baugher <[email protected]> * Updates transition default to not include conditions empty object, and on change transition to delete conditions when selecting none Signed-off-by: Drew Baugher <[email protected]> * Moves edit button out of policy settings content panel and on to global page for view policy Signed-off-by: Drew Baugher <[email protected]> * Updates release note Signed-off-by: Drew Baugher <[email protected]> * Fixes broken link Signed-off-by: Drew Baugher <[email protected]> * Fixes small issues on new ISM UI (#88) * Fixes small issues on new ISM UI Signed-off-by: Drew Baugher <[email protected]> * Updates snapshots Signed-off-by: Drew Baugher <[email protected]> * Updates release notes Signed-off-by: Drew Baugher <[email protected]> * Updates workflows to trigger on 1.* branches Signed-off-by: Drew Baugher <[email protected]> Co-authored-by: Bowen Lan <[email protected]>
1 parent b8aa974 commit 7d50077

File tree

70 files changed

+1017
-826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1017
-826
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
### Description
2-
32
[Describe what this change achieves]
43

54
### Issues Resolved
6-
75
[List any issues this PR will resolve]
86

97
### Check List
10-
11-
- [ ] New functionality includes testing.
12-
- [ ] All tests pass
13-
- [ ] New functionality has been documented.
14-
- [ ] Commits are signed per the DCO using `--signoff`
8+
- [ ] Commits are signed per the DCO using --signoff
159

1610
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1711
For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).
18-

‎.github/draft-release-notes-config.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ replacers:
1414
- search: '##'
1515
replace: '###'
1616

17-
# Organizing the tagged PRs into unified ODFE categories
17+
# Organizing the tagged PRs into unified OpenSearch categories
1818
categories:
1919
- title: 'Breaking changes'
2020
labels:
@@ -41,7 +41,6 @@ categories:
4141
- 'documentation'
4242
- title: 'Maintenance'
4343
labels:
44-
- 'security'
4544
- 'version support'
4645
- 'backwards-compatibility'
4746
- title: 'Refactoring'

‎.github/workflows/cypress-workflow.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ on:
33
pull_request:
44
branches:
55
- main
6+
- 1.*
67
push:
78
branches:
89
- main
9-
- development-*
10+
- 1.*
1011
env:
1112
OPENSEARCH_DASHBOARDS_VERSION: '1.x'
1213
OPENSEARCH_VERSION: '1.1.0-SNAPSHOT'

‎.github/workflows/links.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
name: Link Checker
22
on:
33
push:
4-
branches: [ main ]
4+
branches:
5+
- main
6+
- 1.*
57
pull_request:
6-
branches: [ main ]
8+
branches:
9+
- main
10+
- 1.*
711

812
jobs:
913
linkchecker:

‎.github/workflows/unit-tests-workflow.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ on:
33
pull_request:
44
branches:
55
- main
6+
- 1.*
67
push:
78
branches:
89
- main
9-
- development-*
10+
- 1.*
1011

1112
jobs:
1213
tests:

‎NOTICE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
index-management-dashboards-plugin
2-
Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
OpenSearch (https://opensearch.org/)
2+
Copyright OpenSearch Contributors

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ If you discover a potential security issue in this project we ask that you notif
3737

3838
## License
3939

40-
This project is licensed under the [Apache v2.0 License](LICENSE.txt).
40+
This project is licensed under the [Apache v2.0 License](LICENSE).
4141

4242
## Copyright
4343

44-
Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44+
Copyright OpenSearch Contributors. See [NOTICE](NOTICE) for details.

‎models/interfaces.ts‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,15 @@ export interface UIAction<Data> {
150150
id: string;
151151
type: ActionType | string;
152152
render: (uiAction: UIAction<Data>, onChangeAction: (uiAction: UIAction<Data>) => void) => JSX.Element | null;
153+
isValid: () => boolean;
153154
clone: (action: Data) => UIAction<Data>;
154155
content: () => JSX.Element | string | null;
155156
toAction: () => Action;
156157
}
157158

158159
export interface ForceMergeAction extends Action {
159160
force_merge: {
160-
max_num_segments: number;
161+
max_num_segments?: number;
161162
};
162163
}
163164

@@ -171,7 +172,7 @@ export interface ReadWriteAction extends Action {
171172

172173
export interface ReplicaCountAction extends Action {
173174
replica_count: {
174-
number_of_replicas: number;
175+
number_of_replicas?: number;
175176
};
176177
}
177178

@@ -207,7 +208,7 @@ export interface Transition {
207208

208209
export interface Condition {
209210
min_index_age?: string;
210-
min_doc_count?: number;
211+
min_doc_count?: number | undefined;
211212
min_size?: string;
212213
cron?: Cron;
213214
}
@@ -238,22 +239,24 @@ export interface SnapshotAction extends Action {
238239

239240
export interface IndexPriorityAction extends Action {
240241
index_priority: {
241-
priority: number;
242+
priority?: number;
242243
};
243244
}
244245

245246
export interface AllocationAction extends Action {
246247
allocation: {
247-
require: {
248-
[key: string]: string;
249-
};
250-
include: {
251-
[key: string]: string;
252-
};
253-
exclude: {
254-
[key: string]: string;
255-
};
256-
wait_for: boolean;
248+
// TODO: These require a complete UI and we are only supporting JSON editor for allocation for now
249+
// require: {
250+
// [key: string]: string;
251+
// };
252+
// include: {
253+
// [key: string]: string;
254+
// };
255+
// exclude: {
256+
// [key: string]: string;
257+
// };
258+
// wait_for: boolean;
259+
jsonString: string;
257260
};
258261
}
259262

‎opensearch_dashboards.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "indexManagementDashboards",
3-
"version": "1.0.0.0",
3+
"version": "1.1.0.0",
44
"opensearchDashboardsVersion": "1.1.0",
55
"configPath": ["opensearch_index_management"],
66
"requiredPlugins": ["navigation"],

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "opensearch_index_management_dashboards",
3-
"version": "1.0.0.0",
3+
"version": "1.1.0.0",
44
"description": "Opensearch Dashboards plugin for Index Management",
55
"main": "index.js",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)