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.

Sign up for GitHub

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

Snapshots title ie11 misalignment #48802

Merged
merged 12 commits into from
Oct 29, 2019
Merged

Snapshots title ie11 misalignment #48802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
490048e
Removed Flexbox around header and link elements.
Oct 21, 2019
c73499d
Removed unused EUI component
Oct 21, 2019
5dff516
Merge branch 'master' into Snapshots_Title_IE11_Misalignment
elasticmachine Oct 21, 2019
ba81215
Added class to include the ellipses when name is truncated.
Oct 21, 2019
9c1c842
Merge branch 'master' into Snapshots_Title_IE11_Misalignment
elasticmachine Oct 24, 2019
2424c0b
Fixed title in policy_details.tsx
Oct 24, 2019
00db5a9
Fixed buttons and title on policy and repository table.
Oct 25, 2019
a79d510
Merge branch 'Snapshots_Title_IE11_Misalignment' of github.com:cuff-l…
Oct 25, 2019
895f325
Linting fixes.
Oct 25, 2019
7d1fe12
Removed unused references.
Oct 25, 2019
752a4fd
Added keys to arrays of elements to resolve React errors.
Oct 29, 2019
37556f6
Merge branch 'master' of github.com:elastic/kibana into Snapshots_Tit…
Oct 29, 2019
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
78 changes: 35 additions & 43 deletions ...s/snapshot_restore/public/app/sections/home/policy_list/policy_details/policy_details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
EuiContextMenu,
EuiButtonIcon,
EuiLink,
EuiSpacer,
} from '@elastic/eui';

import { SlmPolicy } from '../../../../../../common/types';
Expand Down Expand Up @@ -302,49 +303,40 @@ export const PolicyDetails: React.FunctionComponent<Props> = ({
maxWidth={550}
>
<EuiFlyoutHeader>
<EuiFlexGroup direction="column" gutterSize="none">
<EuiFlexItem>
<EuiTitle size="m">
<EuiFlexGroup alignItems="center" gutterSize="s">
<EuiFlexItem grow={false}>
<h2 id="srPolicyDetailsFlyoutTitle" data-test-subj="title">
{policyName}
</h2>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonIcon
iconType="refresh"
color="subdued"
aria-label={i18n.translate(
'xpack.snapshotRestore.policyDetails.reloadButtonAriaLabel',
{ defaultMessage: 'Reload' }
)}
onClick={() => reload()}
/>
</EuiFlexItem>
</EuiFlexGroup>
</EuiTitle>
</EuiFlexItem>
{policyDetails && policyDetails.policy && policyDetails.policy.inProgress ? (
<EuiFlexItem>
<SectionLoading inline={true} size="s">
<EuiLink
href={linkToSnapshot(
policyDetails.policy.repository,
policyDetails.policy.inProgress.snapshotName
)}
data-test-subj="inProgressSnapshotLink"
>
<FormattedMessage
id="xpack.snapshotRestore.policyDetails.inProgressSnapshotLinkText"
defaultMessage="'{snapshotName}' in progress"
values={{ snapshotName: policyDetails.policy.inProgress.snapshotName }}
/>
</EuiLink>
</SectionLoading>
</EuiFlexItem>
) : null}
</EuiFlexGroup>
<EuiTitle size="m">
<h2 id="srPolicyDetailsFlyoutTitle" data-test-subj="title">
{policyName}{' '}
<EuiButtonIcon
iconType="refresh"
color="subdued"
aria-label={i18n.translate(
'xpack.snapshotRestore.policyDetails.reloadButtonAriaLabel',
{ defaultMessage: 'Reload' }
)}
onClick={() => reload()}
/>
</h2>
</EuiTitle>
{policyDetails && policyDetails.policy && policyDetails.policy.inProgress ? (
<>
<EuiSpacer size="s" />
<SectionLoading inline={true} size="s">
<EuiLink
href={linkToSnapshot(
policyDetails.policy.repository,
policyDetails.policy.inProgress.snapshotName
)}
data-test-subj="inProgressSnapshotLink"
>
<FormattedMessage
id="xpack.snapshotRestore.policyDetails.inProgressSnapshotLinkText"
defaultMessage="'{snapshotName}' in progress"
values={{ snapshotName: policyDetails.policy.inProgress.snapshotName }}
/>
</EuiLink>
</SectionLoading>
</>
) : null}
{renderTabs()}
</EuiFlyoutHeader>

Expand Down
56 changes: 26 additions & 30 deletions ...ugins/snapshot_restore/public/app/sections/home/policy_list/policy_table/policy_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,36 +327,32 @@ export const PolicyTable: React.FunctionComponent<Props> = ({
) : (
undefined
),
toolsRight: (
<EuiFlexGroup gutterSize="m" justifyContent="spaceAround">
<EuiFlexItem>
<EuiButton
color="secondary"
iconType="refresh"
onClick={reload}
data-test-subj="reloadButton"
>
<FormattedMessage
id="xpack.snapshotRestore.policyList.table.reloadPoliciesButton"
defaultMessage="Reload"
/>
</EuiButton>
</EuiFlexItem>
<EuiFlexItem>
<EuiButton
href={linkToAddPolicy()}
fill
iconType="plusInCircle"
data-test-subj="createPolicyButton"
>
<FormattedMessage
id="xpack.snapshotRestore.policyList.table.addPolicyButton"
defaultMessage="Create a policy"
/>
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
),
toolsRight: [
cuff-links marked this conversation as resolved.
Show resolved Hide resolved
<EuiButton
key="reloadPolicies"
color="secondary"
iconType="refresh"
onClick={reload}
data-test-subj="reloadButton"
>
<FormattedMessage
id="xpack.snapshotRestore.policyList.table.reloadPoliciesButton"
defaultMessage="Reload"
/>
</EuiButton>,
<EuiButton
key="createNewPolicy"
href={linkToAddPolicy()}
fill
iconType="plusInCircle"
data-test-subj="createPolicyButton"
>
<FormattedMessage
id="xpack.snapshotRestore.policyList.table.addPolicyButton"
defaultMessage="Create a policy"
/>
</EuiButton>,
],
box: {
incremental: true,
schema: true,
Expand Down
58 changes: 26 additions & 32 deletions ...ot_restore/public/app/sections/home/repository_list/repository_table/repository_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import {
EuiBadge,
EuiButton,
EuiButtonIcon,
EuiFlexGroup,
EuiFlexItem,
EuiInMemoryTable,
EuiLink,
EuiToolTip,
Expand Down Expand Up @@ -235,36 +233,32 @@ export const RepositoryTable: React.FunctionComponent<Props> = ({
) : (
undefined
),
toolsRight: (
<EuiFlexGroup gutterSize="m" justifyContent="spaceAround">
<EuiFlexItem>
<EuiButton
color="secondary"
iconType="refresh"
onClick={reload}
data-test-subj="reloadButton"
>
<FormattedMessage
id="xpack.snapshotRestore.repositoryList.table.reloadRepositoriesButton"
defaultMessage="Reload"
/>
</EuiButton>
</EuiFlexItem>
<EuiFlexItem>
<EuiButton
href={linkToAddRepository()}
fill
iconType="plusInCircle"
data-test-subj="registerRepositoryButton"
>
<FormattedMessage
id="xpack.snapshotRestore.repositoryList.addRepositoryButtonLabel"
defaultMessage="Register a repository"
/>
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
),
toolsRight: [
cuff-links marked this conversation as resolved.
Show resolved Hide resolved
<EuiButton
key="reloadButton"
color="secondary"
iconType="refresh"
onClick={reload}
data-test-subj="reloadButton"
>
<FormattedMessage
id="xpack.snapshotRestore.repositoryList.table.reloadRepositoriesButton"
defaultMessage="Reload"
/>
</EuiButton>,
<EuiButton
key="registerRepo"
href={linkToAddRepository()}
fill
iconType="plusInCircle"
data-test-subj="registerRepositoryButton"
>
<FormattedMessage
id="xpack.snapshotRestore.repositoryList.addRepositoryButtonLabel"
defaultMessage="Register a repository"
/>
</EuiButton>,
],
box: {
incremental: true,
schema: true,
Expand Down
42 changes: 16 additions & 26 deletions ...shot_restore/public/app/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
EuiTab,
EuiTabs,
EuiText,
EuiTitle,
} from '@elastic/eui';
import React, { Fragment, useState, useEffect } from 'react';

Expand Down Expand Up @@ -256,33 +255,24 @@ export const SnapshotDetails: React.FunctionComponent<Props> = ({
maxWidth={550}
>
<EuiFlyoutHeader>
<EuiFlexGroup direction="column" gutterSize="none">
<EuiFlexItem>
<EuiTitle size="m">
<h2 id="srSnapshotDetailsFlyoutTitle" data-test-subj="detailTitle">
{snapshotId}
</h2>
</EuiTitle>
</EuiFlexItem>

<EuiFlexItem>
<EuiText size="s">
<p>
<EuiLink href={linkToRepository(repositoryName)} data-test-subj="repositoryLink">
<FormattedMessage
id="xpack.snapshotRestore.snapshotDetails.repositoryTitle"
defaultMessage="'{repositoryName}' repository"
values={{ repositoryName }}
/>
</EuiLink>
</p>
</EuiText>
</EuiFlexItem>
</EuiFlexGroup>

<EuiText>
<h2 id="srSnapshotDetailsFlyoutTitle" data-test-subj="detailTitle">
{snapshotId}
</h2>
<p>
<small>
<EuiLink href={linkToRepository(repositoryName)} data-test-subj="repositoryLink">
<FormattedMessage
id="xpack.snapshotRestore.snapshotDetails.repositoryTitle"
defaultMessage="'{repositoryName}' repository"
values={{ repositoryName }}
/>
</EuiLink>
</small>
</p>
</EuiText>
{tabs}
</EuiFlyoutHeader>

<EuiFlyoutBody data-test-subj="content">{content}</EuiFlyoutBody>
<EuiFlyoutFooter>{renderFooter()}</EuiFlyoutFooter>
</EuiFlyout>
Expand Down