Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history 
Signed-off-by: Sandeep Kumawat <[email protected]>
  • Loading branch information
Sandeep Kumawat committed Sep 2, 2024
1 parent af23436 commit 2d53ee1
Show file tree
Hide file tree
Showing 15 changed files with 97 additions and 916 deletions.
56 changes: 24 additions & 32 deletions public/containers/FlushIndexModal/__snapshots__/FlushIndexModal.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ HTMLCollection [
The following aliases will be flushed:
</p>
</div>
<ul
style="list-style-type: disc; list-style-position: inside;"
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
<ul
style="list-style-type: disc; list-style-position: inside;"
>
<li>
alias2
</li>
</div>
</ul>
</ul>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
Expand Down Expand Up @@ -238,17 +238,17 @@ HTMLCollection [
The following data streams will be flushed:
</p>
</div>
<ul
style="list-style-type: disc; list-style-position: inside;"
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
<ul
style="list-style-type: disc; list-style-position: inside;"
>
<li>
ds2
</li>
</div>
</ul>
</ul>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
Expand Down Expand Up @@ -410,24 +410,20 @@ HTMLCollection [
The following indexes will be flushed:
</p>
</div>
<ul
style="list-style-type: disc; list-style-position: inside;"
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
<ul
style="list-style-type: disc; list-style-position: inside;"
>
<li>
test_index2
</li>
</div>
<div
class="euiText euiText--small"
>
<li>
test_index3
</li>
</div>
</ul>
</ul>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
Expand Down Expand Up @@ -736,24 +732,20 @@ HTMLCollection [
The following indexes will be flushed:
</p>
</div>
<ul
style="list-style-type: disc; list-style-position: inside;"
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
<ul
style="list-style-type: disc; list-style-position: inside;"
>
<li>
test_index2
</li>
</div>
<div
class="euiText euiText--small"
>
<li>
test_index3
</li>
</div>
</ul>
</ul>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
Expand Down
40 changes: 18 additions & 22 deletions public/pages/Aliases/containers/AliasActions/__snapshots__/AliasActions.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,19 @@ exports[`<AliasesActions /> spec refresh alias by calling commonService 1`] = `
will be refreshed.
</p>
</div>
<ul
style="list-style-type: disc; list-style-position: inside;"
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
<ul
style="list-style-type: disc; list-style-position: inside;"
>
<li
data-test-subj="UnblockedItem-2"
>
2
</li>
</div>
</ul>
</ul>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
Expand Down Expand Up @@ -392,28 +392,24 @@ exports[`<AliasesActions /> spec refresh multi alias even failed to get index st
will be refreshed.
</p>
</div>
<ul
style="list-style-type: disc; list-style-position: inside;"
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
<ul
style="list-style-type: disc; list-style-position: inside;"
>
<li
data-test-subj="UnblockedItem-1"
>
1
</li>
</div>
<div
class="euiText euiText--small"
>
<li
data-test-subj="UnblockedItem-2"
>
2
</li>
</div>
</ul>
</ul>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
Expand Down Expand Up @@ -558,17 +554,17 @@ HTMLCollection [
The following aliases will be flushed:
</p>
</div>
<ul
style="list-style-type: disc; list-style-position: inside;"
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
<ul
style="list-style-type: disc; list-style-position: inside;"
>
<li>
alias2
</li>
</div>
</ul>
</ul>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
Expand Down
18 changes: 4 additions & 14 deletions ...CreateDataStream/containers/CreateDataStream/__snapshots__/CreateDataStream.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,9 @@ exports[`<CreateDataStream /> spec it goes to data streams page when click cance
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
>
<h1>
Define data stream
<span
class="panel-header-count"
>
</span>
</h1>
</div>
<h2>
Define data stream
</h2>
</div>
</div>
<hr
Expand Down Expand Up @@ -265,7 +255,7 @@ exports[`<CreateDataStream /> spec it goes to data streams page when click cance
class="euiSpacer euiSpacer--l"
/>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
Expand Down
2 changes: 1 addition & 1 deletion public/pages/CreateDataStream/containers/DataStreamDetail/DataStreamDetail.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ const DataStreamDetail = (props: DataStreamDetailProps, ref: Ref<FieldInstance>)
{isEdit ? null : (
<>
<EuiSpacer />
<EuiFlexGroup alignItems="center" justifyContent="flexEnd">
<EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
<EuiFlexItem grow={false}>
<EuiSmallButtonEmpty onClick={onCancel} data-test-subj="CreateDataStreamCancelButton">
Cancel
Expand Down
18 changes: 4 additions & 14 deletions ...CreateDataStream/containers/DataStreamDetail/__snapshots__/DataStreamDetail.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,9 @@ exports[`<DataStreamDetail /> spec render component 1`] = `
<div
class="euiText euiText--small"
>
<div
class="euiText euiText--small"
>
<h1>
Define data stream
<span
class="panel-header-count"
>
</span>
</h1>
</div>
<h2>
Define data stream
</h2>
</div>
</div>
<hr
Expand Down Expand Up @@ -262,7 +252,7 @@ exports[`<DataStreamDetail /> spec render component 1`] = `
class="euiSpacer euiSpacer--l"
/>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
Expand Down
32 changes: 0 additions & 32 deletions ...ges/CreateRollup/containers/CreateRollupForm/__snapshots__/CreateRollupForm.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,25 +170,9 @@ exports[`<CreateRollupForm /> spec renders the component 1`] = `
<div
class="euiText euiText--small"
>
<<<<<<< HEAD
<div
class="euiText euiText--small"
>
<h1>
Job name and description
<span
class="panel-header-count"
>
</span>
</h1>
</div>
=======
<h2>
Job name and description
</h2>
>>>>>>> fba0e6e0 (Makde changes for Rollup page)
</div>
</div>
<hr
Expand Down Expand Up @@ -306,25 +290,9 @@ exports[`<CreateRollupForm /> spec renders the component 1`] = `
<div
class="euiText euiText--small"
>
<<<<<<< HEAD
<div
class="euiText euiText--small"
>
<h1>
Indices
<span
class="panel-header-count"
>
</span>
</h1>
</div>
=======
<h2>
Indices
</h2>
>>>>>>> fba0e6e0 (Makde changes for Rollup page)
</div>
</div>
<hr
Expand Down
55 changes: 1 addition & 54 deletions ...eTransform/containers/CreateTransformForm/__snapshots__/CreateTransformForm.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ exports[`<CreateTransformForm /> spec renders the component 1`] = `
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
style="padding: 0px 16px;"
class="euiText euiText--small"
>
<h2>
Job name and description
Expand Down Expand Up @@ -537,58 +536,6 @@ exports[`<CreateTransformForm /> spec renders the component 1`] = `
</div>
<div
class="euiFormRow__fieldWrapper"
>
<textarea
class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
data-test-subj="description"
id="some_html_id"
rows="3"
/>
</div>
</div>
</div>
</div>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
<div>
<div
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
style="padding: 20px 20px;"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
style="padding: 0px 16px;"
>
<div
class="euiFlexItem"
>
<div
class="euiText euiText--small"
>
<h1>
Indices
<span
class="panel-header-count"
>
</span>
</h1>
</div>
</div>
</div>
<hr
class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginXSmall"
/>
<div
style="padding: 10px;"
>
<div>
<div
class="euiFormRow euiFormRow--compressed"
id="some_html_id-row"
>
<div
aria-describedby="some_html_id-help-0"
Expand Down
Loading

0 comments on commit 2d53ee1

Please sign in to comment.