From aecd50deccf738e3894f648e15e51db1170bd1b9 Mon Sep 17 00:00:00 2001 From: xluo-aws Date: Wed, 4 Jan 2023 21:46:18 +0800 Subject: [PATCH] Merge/index operation (#535) * Feature/common 2.5 (#519) * feat: split to common change Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * Feature/index management 2.5 (#520) * Feature/common 2.5 (#506) * feat: split to common change Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * feat: update Signed-off-by: suzhou * fix: detail of data stream Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * Temp/template management 2.5 (#523) * Feature/common 2.5 (#506) * feat: split to common change Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * feat: update Signed-off-by: suzhou * feat: update Signed-off-by: suzhou * feat: fix template error Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * Temp/alias management 2.5 (#524) * Feature/common 2.5 (#506) * feat: split to common change Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * feat: update Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * Feature/unittest fix 2.5 (#525) * Feature/common 2.5 (#506) * feat: split to common change Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * feat: update Signed-off-by: suzhou * feat: update Signed-off-by: suzhou * feat: update Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * Merge/index operation reindex (#526) * Feature/common 2.5 (#506) * feat: split to common change Signed-off-by: suzhou * feat: update Signed-off-by: suzhou Signed-off-by: suzhou * enable fullwidth for JSON editor (#479) * enable fullwidth for JSON editor Signed-off-by: Hailong Cui * update width of import settings & mappings Signed-off-by: Hailong Cui * wording change Signed-off-by: Hailong Cui Signed-off-by: Hailong Cui * advanced settings Signed-off-by: Hailong Cui * fix integration test Signed-off-by: Hailong Cui * wording change Signed-off-by: Hailong Cui * filter system index and alias from destination Signed-off-by: Hailong Cui * fix code merge issue Signed-off-by: Hailong Cui Signed-off-by: suzhou Signed-off-by: Hailong Cui Co-authored-by: suzhou * Add split index operation Signed-off-by: Xuesong Luo * Add split index operation Signed-off-by: Xuesong Luo * Return if exception is thrown when calling backend API Signed-off-by: Xuesong Luo * Remove replica props that's not taking effect. Signed-off-by: Xuesong Luo Signed-off-by: suzhou Signed-off-by: Hailong Cui Signed-off-by: Xuesong Luo Co-authored-by: suzhou Co-authored-by: Hailong-amzn --- .../SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx | 1 - public/pages/SplitIndex/container/SplitIndex/SplitIndex.tsx | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/public/pages/SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx b/public/pages/SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx index acb493a00..0caf5cb5b 100644 --- a/public/pages/SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx +++ b/public/pages/SplitIndex/components/SplitIndexForm/SplitIndexForm.tsx @@ -140,7 +140,6 @@ export default class SplitIndexForm extends Component "data-test-subj": "numberOfReplicasInput", placeholder: "Specify number of replica", min: 0, - value: 1, }, }, }, diff --git a/public/pages/SplitIndex/container/SplitIndex/SplitIndex.tsx b/public/pages/SplitIndex/container/SplitIndex/SplitIndex.tsx index 146f0b32b..e59995511 100644 --- a/public/pages/SplitIndex/container/SplitIndex/SplitIndex.tsx +++ b/public/pages/SplitIndex/container/SplitIndex/SplitIndex.tsx @@ -67,11 +67,9 @@ export class SplitIndex extends Component { } catch (err) { // no need to log anything since getIndexSettings will log the error this.onCancel(); + return; } - if (!sourceIndex) { - this.onCancel(); - } this.setState({ sourceIndex, }); @@ -87,6 +85,7 @@ export class SplitIndex extends Component { } catch (err) { // no need to log anything since getIndexSettings will log the error this.onCancel(); + return; } const reasons = []; const sourceSettings = get(sourceIndexSettings, [sourceIndex.index, "settings"]);