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

Jump to bottom

AnnotationsEditor: Remove deprecated components #84538

Merged
merged 3 commits into from Mar 16, 2024
Merged

AnnotationsEditor: Remove deprecated components #84538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be076e9
AnnotationEditorForm: Remove deprecated components
Clarity-89 Mar 15, 2024
588ec9f
AnnotationEditor2: Remove deprecated components
Clarity-89 Mar 15, 2024
824de6b
Merge branch 'main' into forms/annot-editor
Clarity-89 Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditorForm.tsx
View file
Open in desktop
@@ -1,10 +1,12 @@
import { css, cx } from '@emotion/css';
import React, { HTMLAttributes, useRef } from 'react';
import { Controller } from 'react-hook-form';
import useAsyncFn from 'react-use/lib/useAsyncFn';
import useClickAway from 'react-use/lib/useClickAway';

import { AnnotationEventUIModel, GrafanaTheme2 } from '@grafana/data';
import { Button, Field, Form, HorizontalGroup, InputControl, TextArea, usePanelContext, useStyles2 } from '@grafana/ui';
import { Button, Field, Stack, TextArea, usePanelContext, useStyles2 } from '@grafana/ui';
import { Form } from 'app/core/components/Form/Form';
import { TagFilter } from 'app/core/components/TagFilter/TagFilter';
import { getAnnotationTags } from 'app/features/annotations/api';

Expand Down Expand Up @@ -73,10 +75,10 @@ export const AnnotationEditorForm = React.forwardRef<HTMLDivElement, AnnotationE
{...otherProps}
>
<div className={styles.header}>
<HorizontalGroup justify={'space-between'} align={'center'}>
<Stack justifyContent={'space-between'} alignItems={'center'}>
<div className={styles.title}>Add annotation</div>
<div className={styles.ts}>{ts}</div>
</HorizontalGroup>
</Stack>
</div>
<div className={styles.editorForm}>
<Form<AnnotationEditFormDTO>
Expand All @@ -94,7 +96,7 @@ export const AnnotationEditorForm = React.forwardRef<HTMLDivElement, AnnotationE
/>
</Field>
<Field label={'Tags'}>
<InputControl
<Controller
control={control}
name="tags"
render={({ field: { ref, onChange, ...field } }) => {
Expand All @@ -110,14 +112,14 @@ export const AnnotationEditorForm = React.forwardRef<HTMLDivElement, AnnotationE
}}
/>
</Field>
<HorizontalGroup justify={'flex-end'}>
<Stack justifyContent={'flex-end'}>
<Button size={'sm'} variant="secondary" onClick={onDismiss} fill="outline">
Cancel
</Button>
<Button size={'sm'} type={'submit'} disabled={stateIndicator?.loading}>
{stateIndicator?.loading ? 'Saving' : 'Save'}
</Button>
</HorizontalGroup>
</Stack>
</>
);
}}
Expand Down
14 changes: 8 additions & 6 deletions public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationEditor2.tsx
View file
Open in desktop
@@ -1,9 +1,11 @@
import { css } from '@emotion/css';
import React, { useRef } from 'react';
import { Controller } from 'react-hook-form';
import { useAsyncFn, useClickAway } from 'react-use';

import { AnnotationEventUIModel, GrafanaTheme2, dateTimeFormat, systemDateFormats } from '@grafana/data';
import { Button, Field, Form, HorizontalGroup, InputControl, TextArea, usePanelContext, useStyles2 } from '@grafana/ui';
import { Button, Field, Stack, TextArea, usePanelContext, useStyles2 } from '@grafana/ui';
import { Form } from 'app/core/components/Form/Form';
import { TagFilter } from 'app/core/components/TagFilter/TagFilter';
import { getAnnotationTags } from 'app/features/annotations/api';

Expand Down Expand Up @@ -67,10 +69,10 @@ export const AnnotationEditor2 = ({ annoVals, annoIdx, dismiss, timeZone, ...oth
return (
<div ref={clickAwayRef} className={styles.editor} {...otherProps}>
<div className={styles.header}>
<HorizontalGroup justify={'space-between'} align={'center'}>
<Stack justifyContent={'space-between'} alignItems={'center'}>
<div>{isUpdatingAnnotation ? 'Edit annotation' : 'Add annotation'}</div>
<div>{time}</div>
</HorizontalGroup>
</Stack>
</div>
<Form<AnnotationEditFormDTO>
onSubmit={onSubmit}
Expand All @@ -89,7 +91,7 @@ export const AnnotationEditor2 = ({ annoVals, annoIdx, dismiss, timeZone, ...oth
/>
</Field>
<Field label={'Tags'}>
<InputControl
<Controller
control={control}
name="tags"
render={({ field: { ref, onChange, ...field } }) => {
Expand All @@ -107,14 +109,14 @@ export const AnnotationEditor2 = ({ annoVals, annoIdx, dismiss, timeZone, ...oth
</Field>
</div>
<div className={styles.footer}>
<HorizontalGroup justify={'flex-end'}>
<Stack justifyContent={'flex-end'}>
<Button size={'sm'} variant="secondary" onClick={dismiss} fill="outline">
Cancel
</Button>
<Button size={'sm'} type={'submit'} disabled={stateIndicator?.loading}>
{stateIndicator?.loading ? 'Saving' : 'Save'}
</Button>
</HorizontalGroup>
</Stack>
</div>
</>
);
Expand Down