Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bugs in history navigation in rollups and transform jobs pages and some UI changes #1166

Merged
merged 7 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/pages/Aliases/containers/AliasActions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default function AliasesActions(props: AliasesActionsProps) {
<>
<SimplePopover
data-test-subj="moreAction"
panelPaddingSize="none"
panelPaddingSize="s"
button={
<EuiSmallButton iconType="arrowDown" iconSide="right">
Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ HTMLCollection [
<span
class="euiButtonContent euiButton__content"
>
EuiIconMock
<span
class="euiButton__text"
>
Expand Down
1 change: 0 additions & 1 deletion public/pages/Aliases/containers/CreateAlias/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ export default function CreateAlias(props: ICreateAliasProps) {
fill
color="primary"
data-test-subj="createAliasButton"
iconType={isEdit ? undefined : "plus"}
onClick={async () => {
const { errors, values } = (await formGenerateRef.current?.validatePromise()) || {};
if (errors) {
Expand Down
9 changes: 1 addition & 8 deletions public/pages/CreateIndex/containers/IndexForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ export class IndexForm extends Component<IndexFormProps & { services: BrowserSer
/>
{hideButtons ? null : (
<>
<EuiSpacer />
<EuiSpacer />
<EuiFlexGroup alignItems="center" justifyContent="flexEnd">
<EuiFlexItem grow={false}>
Expand All @@ -472,13 +471,7 @@ export class IndexForm extends Component<IndexFormProps & { services: BrowserSer
</EuiSmallButtonEmpty>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiSmallButton
fill
onClick={this.onSubmit}
isLoading={isSubmitting}
data-test-subj="createIndexCreateButton"
iconType={isEdit ? undefined : "plus"}
>
<EuiSmallButton fill onClick={this.onSubmit} isLoading={isSubmitting} data-test-subj="createIndexCreateButton">
{isEdit ? "Update" : "Create"}
</EuiSmallButton>
</EuiFlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,33 +402,6 @@ const TemplateDetail = (props: TemplateDetailProps, ref: Ref<FieldInstance>) =>
<EuiSpacer />
</>
) : null}
{/* <EuiPanel>
{
isEdit && selectedTabId === TABS_ENUM.SUMMARY ? (
<EuiText size="s">
<h2>Preview template</h2>
</EuiText>
) : values._meta?.flow === FLOW_ENUM.COMPONENTS ? (
<EuiText size="s">
<h2>Override template definition</h2>
</EuiText>
) : (
<EuiText size="s">
<h2>Template definition</h2>
</EuiText>
)
}
{
(!isEdit || selectedTabId !== TABS_ENUM.SUMMARY) && values._meta?.flow === FLOW_ENUM.COMPONENTS
? <EuiText size="xs">
<EuiTextColor color="subdued">Provide additional configurations such as index aliases, settings, and mappings. Configurations defined in this section will take precedent if they overlap with the associated component templates.</EuiTextColor>
</EuiText>
: undefined
}
{(!isEdit || selectedTabId !== TABS_ENUM.SUMMARY) && values._meta?.flow === FLOW_ENUM.COMPONENTS
? <EuiAccordion id={htmlIdGenerator()()} forceState={isAccordionOpen} onToggle={toggleAccordion} buttonContent={titleContent}></EuiAccordion> : undefined
}
</EuiPanel> */}
<ContentPanel
title={
isEdit && selectedTabId === TABS_ENUM.SUMMARY ? (
Expand Down Expand Up @@ -503,7 +476,6 @@ const TemplateDetail = (props: TemplateDetailProps, ref: Ref<FieldInstance>) =>
}}
isLoading={isSubmitting}
data-test-subj="CreateIndexTemplateCreateButton"
iconType={"plus"}
>
Create template
</EuiSmallButton>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,6 @@ exports[`<TemplateDetail /> spec render component in non-edit-mode 1`] = `
<span
class="euiButtonContent euiButton__content"
>
EuiIconMock
<span
class="euiButton__text"
>
Expand Down
2 changes: 1 addition & 1 deletion public/pages/Indices/containers/IndicesActions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export default function IndicesActions(props: IndicesActionsProps) {
{({ onShow }) => (
<SimplePopover
data-test-subj="moreAction"
panelPaddingSize="none"
panelPaddingSize="s"
button={
<EuiSmallButton iconType="arrowDown" iconSide="right">
Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,14 @@ import {
ArgsWithError,
EuiFlexGroup,
EuiFlexItem,
EuiPagination,
EuiSearchBar,
EuiCompressedSwitch,
EuiButton,
EuiPopover,
EuiContextMenuPanel,
EuiButtonIcon,
EuiButtonEmpty,
EuiSpacer,
} from "@elastic/eui";
import { DataStream } from "../../../../../server/models/interfaces";
import { ManagedIndices } from "../../containers/ManagedIndices/ManagedIndices";
import { ManagedIndexItem } from "plugins/index-management-dashboards-plugin/models/interfaces";
import { getUISettings } from "../../../../services/Services";
import { size } from "lodash";

interface ManagedIndexControlsProps {
search: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ export class ManagedIndices extends MDSEnabledComponent<ManagedIndicesProps, Man
isOpen={isPopoverOpen}
closePopover={this.closePopover}
anchorPosition="downLeft"
panelPaddingSize="none"
panelPaddingSize="s"
>
<EuiContextMenuPanel items={popoverActionItems} size="s" />
</EuiPopover>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,10 @@ export class RollupDetails extends Component<RollupDetailsProps, RollupDetailsSt
? [BREADCRUMBS.ROLLUPS, { text: id }]
: [BREADCRUMBS.INDEX_MANAGEMENT, BREADCRUMBS.ROLLUPS, { text: id }];
this.context.chrome.setBreadcrumbs(newBreadCrumbs);
this.props.history.push(`${ROUTES.ROLLUP_DETAILS}?id=${id}`);
tandonks marked this conversation as resolved.
Show resolved Hide resolved
await this.getRollup(id);
this.forceUpdate();
} else {
this.context.notifications.toasts.addDanger(`Invalid rollup id: ${id}`);
this.props.history.push(ROUTES.ROLLUPS);
}
};

Expand Down
Loading
Loading