[Upgrade Assistant] Swapped reindexing flyouts order #115046
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,11 +16,6 @@ import { ChecklistFlyoutStep } from './checklist_step'; | |
| import { WarningsFlyoutStep } from './warnings_step'; | ||
| import { DeprecationBadge } from '../../../../shared'; | ||
|
|
||
| export interface ReindexFlyoutProps extends ReindexStateContext { | ||
| deprecation: EnrichedDeprecationInfo; | ||
| closeFlyout: () => void; | ||
|
|
@@ -36,45 +31,44 @@ export const ReindexFlyout: React.FunctionComponent<ReindexFlyoutProps> = ({ | |
| const { status, reindexWarnings } = reindexState; | ||
| const { index } = deprecation; | ||
|
|
||
| const [showWarningsStep, setShowWarningsStep] = useState(false); | ||
|
|
||
| const startReindexWithWarnings = () => { | ||
| if ( | ||
| reindexWarnings && | ||
| reindexWarnings.length > 0 && | ||
| status !== ReindexStatus.inProgress && | ||
| status !== ReindexStatus.completed | ||
| ) { | ||
| setShowWarningsStep(true); | ||
| } else { | ||
| startReindex(); | ||
| } | ||
| }; | ||
| const flyoutContents = showWarningsStep ? ( | ||
| <WarningsFlyoutStep | ||
| warnings={reindexState.reindexWarnings ?? []} | ||
| hideWarningsStep={() => setShowWarningsStep(false)} | ||
| continueReindex={() => { | ||
| setShowWarningsStep(false); | ||
| startReindex(); | ||
| }} | ||
| /> | ||
| ) : ( | ||
| <ChecklistFlyoutStep | ||
| closeFlyout={closeFlyout} | ||
| startReindex={startReindexWithWarnings} | ||
| reindexState={reindexState} | ||
| cancelReindex={cancelReindex} | ||
| /> | ||
| ); | ||
|
|
||
| return ( | ||
| <> | ||
| <EuiFlyoutHeader hasBorder> | ||
| <DeprecationBadge | ||
| isCritical={deprecation.isCritical} | ||
| isResolved={status === ReindexStatus.completed} | ||
| /> | ||
| <EuiSpacer size="s" /> | ||
| <EuiTitle size="s" data-test-subj="flyoutTitle"> | ||
|
|
@@ -87,6 +81,7 @@ export const ReindexFlyout: React.FunctionComponent<ReindexFlyoutProps> = ({ | |
| </h2> | ||
| </EuiTitle> | ||
| </EuiFlyoutHeader> | ||
|
|
||
| {flyoutContents} | ||
| </> | ||
| ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,10 +34,9 @@ jest.mock('../../../../../app_context', () => { | |
|
|
||
| describe('WarningsFlyoutStep', () => { | ||
| const defaultProps = { | ||
| warnings: [] as ReindexWarning[], | ||
| hideWarningsStep: jest.fn(), | ||
| continueReindex: jest.fn(), | ||
| }; | ||
|
|
||
| it('renders', () => { | ||
|
|
@@ -71,15 +70,15 @@ describe('WarningsFlyoutStep', () => { | |
| const button = wrapper.find('EuiButton'); | ||
|
|
||
| button.simulate('click'); | ||
| expect(defaultPropsWithWarnings.continueReindex).not.toHaveBeenCalled(); | ||
|
|
||
| // first warning (customTypeName) | ||
| wrapper.find(`input#${idForWarning(0)}`).simulate('change'); | ||
| // second warning (indexSetting) | ||
| wrapper.find(`input#${idForWarning(1)}`).simulate('change'); | ||
| button.simulate('click'); | ||
|
|
||
| expect(defaultPropsWithWarnings.continueReindex).toHaveBeenCalled(); | ||
| }); | ||
| } | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not just "consider using a different upgrade strategy", it's more "don't reindex this index through the upgrade assistant". And the "different upgrade strategy" is really wait until you can stop writing to the index. Which is probably too much to try to convey here.
The 7.16 docs don't exist yet, so this should use a short link we can change. In the meantime, https://www.elastic.co/guide/en/elasticsearch/reference/7.15/docs-reindex.html#reindex-from-remote