Skip to content

Commit

Permalink
Merge branch 'main' into overviewCM
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Tackett <[email protected]>
  • Loading branch information
TackAdam authored Aug 20, 2024
2 parents ac0acdc + 69d12ce commit df6ec82
Show file tree
Hide file tree
Showing 218 changed files with 10,165 additions and 8,288 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions public/components/application_analytics/components/app_table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import '../app_analytics.scss';
import {
EuiBadge,
EuiButton,
EuiSmallButton,
EuiContextMenuItem,
EuiContextMenuPanel,
EuiFlexGroup,
Expand Down Expand Up @@ -141,14 +141,14 @@ export function AppTable(props: AppTableProps) {
};

const popoverButton = (
<EuiButton
<EuiSmallButton
data-test-subj="appAnalyticsActionsButton"
iconType="arrowDown"
iconSide="right"
onClick={() => setIsActionsPopoverOpen(!isActionsPopoverOpen)}
>
Actions
</EuiButton>
</EuiSmallButton>
);

const popoverItems: ReactElement[] = [
Expand Down Expand Up @@ -283,9 +283,9 @@ export function AppTable(props: AppTableProps) {
</EuiPopover>
</EuiFlexItem>
<EuiFlexItem>
<EuiButton fill href="#/create">
<EuiSmallButton fill href="#/create">
{createButtonText}
</EuiButton>
</EuiSmallButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPageContentHeaderSection>
Expand Down Expand Up @@ -323,12 +323,12 @@ export function AppTable(props: AppTableProps) {
<EuiSpacer size="m" />
<EuiFlexGroup justifyContent="center">
<EuiFlexItem grow={false}>
<EuiButton fullWidth={false} href={`#/create`}>
<EuiSmallButton fullWidth={false} href={`#/create`}>
{createButtonText}
</EuiButton>
</EuiSmallButton>
</EuiFlexItem>
{/* <EuiFlexItem grow={false}>
<EuiButton fullWidth={false}>Add sample applications</EuiButton>
<EuiSmallButton fullWidth={false}>Add sample applications</EuiSmallButton>
</EuiFlexItem> */}
</EuiFlexGroup>
<EuiSpacer size="xxl" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
EuiText,
EuiSpacer,
EuiButton,
EuiFormRow,
EuiCompressedFormRow,
EuiFlexItem,
EuiBadge,
EuiOverlayMask,
Expand Down Expand Up @@ -127,7 +127,7 @@ export const LogConfig = (props: LogConfigProps) => {
</EuiCallOut>
</EuiFlexItem>
<EuiFlexItem>
<EuiFormRow
<EuiCompressedFormRow
label="Base Query"
helpText="The default logs view in the application will be filtered by this query."
>
Expand Down Expand Up @@ -157,7 +157,7 @@ export const LogConfig = (props: LogConfigProps) => {
PPL
</EuiBadge>
</EuiFlexItem>
</EuiFormRow>
</EuiCompressedFormRow>
</EuiFlexItem>
</EuiFlexGroup>
</EuiAccordion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
EuiAccordion,
EuiBadge,
EuiButton,
EuiComboBox,
EuiFormRow,
EuiCompressedComboBox,
EuiCompressedFormRow,
EuiOverlayMask,
EuiSpacer,
EuiText,
Expand Down Expand Up @@ -167,8 +167,8 @@ export const ServiceConfig = (props: ServiceConfigProps) => {
}}
paddingSize="l"
>
<EuiFormRow label="Services & entities">
<EuiComboBox
<EuiCompressedFormRow label="Services & entities">
<EuiCompressedComboBox
aria-label="Select services and entities"
placeholder="Select services and entities"
options={services}
Expand All @@ -177,7 +177,7 @@ export const ServiceConfig = (props: ServiceConfigProps) => {
isClearable={false}
data-test-subj="servicesEntitiesComboBox"
/>
</EuiFormRow>
</EuiCompressedFormRow>
<EuiSpacer />
<ServiceMap
serviceMap={serviceMap}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
EuiAccordion,
EuiBadge,
EuiButton,
EuiComboBox,
EuiFormRow,
EuiCompressedComboBox,
EuiCompressedFormRow,
EuiOverlayMask,
EuiSpacer,
EuiText,
Expand Down Expand Up @@ -246,11 +246,11 @@ export const TraceConfig = (props: TraceConfigProps) => {
}}
paddingSize="l"
>
<EuiFormRow
<EuiCompressedFormRow
label="Trace Groups"
helpText="Select one or multiple trace groups, or type a custom one"
>
<EuiComboBox
<EuiCompressedComboBox
aria-label="Select trace groups"
placeholder="Select or add trace groups"
options={traceOptions}
Expand All @@ -260,7 +260,7 @@ export const TraceConfig = (props: TraceConfigProps) => {
isClearable={false}
data-test-subj="traceGroupsComboBox"
/>
</EuiFormRow>
</EuiCompressedFormRow>
<EuiSpacer />
<DashboardTable
items={traceItems}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import {
EuiBreadcrumb,
EuiButton,
EuiSmallButton,
EuiCode,
EuiFlexGroup,
EuiFlexItem,
Expand All @@ -17,7 +17,7 @@ import {
EuiPageContentBody,
EuiPageContentHeader,
EuiPageContentHeaderSection,
EuiSelect,
EuiCompressedSelect,
EuiSelectOption,
EuiSpacer,
EuiText,
Expand Down Expand Up @@ -67,15 +67,15 @@ export const Configuration = (props: ConfigProps) => {
<EuiPageContentHeaderSection>
<EuiFlexGroup gutterSize="s">
<EuiFlexItem>
<EuiButton
<EuiSmallButton
fill
data-test-subj="editApplicationButton"
onClick={() => {
window.location.assign(`#/edit/${appId}`);
}}
>
Edit
</EuiButton>
</EuiSmallButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPageContentHeaderSection>
Expand Down Expand Up @@ -124,7 +124,7 @@ export const Configuration = (props: ConfigProps) => {
</EuiText>
<EuiSpacer size="m" />
{visWithAvailability.length > 0 ? (
<EuiSelect
<EuiCompressedSelect
options={visWithAvailability}
value={availabilityVisId}
onChange={onAvailabilityVisChange}
Expand Down
30 changes: 15 additions & 15 deletions public/components/application_analytics/components/create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
/* eslint-disable react-hooks/exhaustive-deps */

import {
EuiButton,
EuiFieldText,
EuiSmallButton,
EuiCompressedFieldText,
EuiFlexGroup,
EuiFlexItem,
EuiForm,
EuiFormRow,
EuiCompressedFormRow,
EuiHorizontalRule,
EuiPage,
EuiPageBody,
Expand Down Expand Up @@ -199,20 +199,20 @@ export const CreateApp = (props: CreateAppProps) => {
</EuiPageContentHeader>
<EuiHorizontalRule />
<EuiForm component="form">
<EuiFormRow label="Name" data-test-subj="nameFormRow">
<EuiFieldText
<EuiCompressedFormRow label="Name" data-test-subj="nameFormRow">
<EuiCompressedFieldText
name="name"
value={name}
onChange={(e) => setNameWithStorage(e.target.value)}
/>
</EuiFormRow>
<EuiFormRow label="Description" data-test-subj="descriptionFormRow">
<EuiFieldText
</EuiCompressedFormRow>
<EuiCompressedFormRow label="Description" data-test-subj="descriptionFormRow">
<EuiCompressedFieldText
name="description"
value={description}
onChange={(e) => setDescriptionWithStorage(e.target.value)}
/>
</EuiFormRow>
</EuiCompressedFormRow>
</EuiForm>
</EuiPageContent>
<EuiSpacer />
Expand Down Expand Up @@ -242,33 +242,33 @@ export const CreateApp = (props: CreateAppProps) => {
<EuiSpacer />
<EuiFlexGroup>
<EuiFlexItem grow={false}>
<EuiButton data-test-subj="cancelCreateButton" onClick={onCancel}>
<EuiSmallButton data-test-subj="cancelCreateButton" onClick={onCancel}>
Cancel
</EuiButton>
</EuiSmallButton>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiToolTip position="top" content={missingField(false)}>
<EuiButton
<EuiSmallButton
data-test-subj="createButton"
isDisabled={isDisabled}
onClick={editMode ? onUpdate : () => onCreate('create')}
fill={editMode ? true : false}
>
{editMode ? 'Save' : 'Create'}
</EuiButton>
</EuiSmallButton>
</EuiToolTip>
</EuiFlexItem>
{editMode || (
<EuiFlexItem grow={false}>
<EuiToolTip position="top" content={missingField(true)}>
<EuiButton
<EuiSmallButton
data-test-subj="createAndSetButton"
fill
isDisabled={isDisabled || !query}
onClick={() => onCreate('createSetAvailability')}
>
Create and Set Availability
</EuiButton>
</EuiSmallButton>
</EuiToolTip>
</EuiFlexItem>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
EuiText,
EuiCodeBlock,
EuiFlyoutFooter,
EuiButton,
EuiSmallButton,
} from '@elastic/eui';
import React from 'react';

Expand Down Expand Up @@ -55,7 +55,7 @@ export function AvailabilityInfoFlyout(props: AvailabilityInfoFlyoutProps) {
</EuiText>
</EuiFlyoutBody>
<EuiFlyoutFooter>
<EuiButton onClick={closeFlyout}>Close</EuiButton>
<EuiSmallButton onClick={closeFlyout}>Close</EuiSmallButton>
</EuiFlyoutFooter>
</EuiFlyout>
);
Expand Down
20 changes: 10 additions & 10 deletions public/components/common/helpers/delete_modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import React, { useState } from 'react';
import {
EuiOverlayMask,
EuiModal,
EuiButton,
EuiButtonEmpty,
EuiFieldText,
EuiSmallButton,
EuiSmallButtonEmpty,
EuiCompressedFieldText,
EuiForm,
EuiFormRow,
EuiCompressedFormRow,
EuiModalBody,
EuiModalFooter,
EuiModalHeader,
Expand Down Expand Up @@ -52,29 +52,29 @@ export const DeleteModal = ({
<EuiText>The action cannot be undone.</EuiText>
<EuiSpacer />
<EuiForm>
<EuiFormRow label={`To confirm deletion, enter "${deletePrompt}" in the text field`}>
<EuiFieldText
<EuiCompressedFormRow label={`To confirm deletion, enter "${deletePrompt}" in the text field`}>
<EuiCompressedFieldText
name="input"
placeholder={deletePrompt}
value={value}
onChange={(e) => onChange(e)}
data-test-subj="popoverModal__deleteTextInput"
/>
</EuiFormRow>
</EuiCompressedFormRow>
</EuiForm>
</EuiModalBody>

<EuiModalFooter>
<EuiButtonEmpty onClick={onCancel}>Cancel</EuiButtonEmpty>
<EuiButton
<EuiSmallButtonEmpty onClick={onCancel}>Cancel</EuiSmallButtonEmpty>
<EuiSmallButton
onClick={() => onConfirm()}
color="danger"
fill
disabled={value !== deletePrompt}
data-test-subj="popoverModal__deleteButton"
>
Delete
</EuiButton>
</EuiSmallButton>
</EuiModalFooter>
</EuiModal>
</EuiOverlayMask>
Expand Down
8 changes: 4 additions & 4 deletions public/components/common/helpers/ppl_reference_flyout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/

import {
EuiButton,
EuiComboBox,
EuiSmallButton,
EuiCompressedComboBox,
EuiComboBoxOptionOption,
EuiFlexGroup,
EuiFlexItem,
Expand Down Expand Up @@ -60,7 +60,7 @@ export const PPLReferenceFlyout = ({ module, closeFlyout }: Props) => {
<EuiFlyoutBody>
<EuiFlexGroup component="span">
<EuiFlexItem>
<EuiComboBox
<EuiCompressedComboBox
placeholder="Refer commands, functions and language structures"
options={allOptionsStatic}
selectedOptions={selectedOptions}
Expand All @@ -84,7 +84,7 @@ export const PPLReferenceFlyout = ({ module, closeFlyout }: Props) => {
<EuiFlyoutFooter>
<EuiFlexGroup gutterSize="s" justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<EuiButton onClick={closeFlyout}>Close</EuiButton>
<EuiSmallButton onClick={closeFlyout}>Close</EuiSmallButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlyoutFooter>
Expand Down
Loading

0 comments on commit df6ec82

Please sign in to comment.