Skip to content

Commit

Permalink
Revert "refactor: move ChooseCheckGroup to page folder (#1021)"
Browse files Browse the repository at this point in the history
This reverts commit cf67891.
  • Loading branch information
VikaCep committed Dec 19, 2024
1 parent cf67891 commit 0a3259d
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 22 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { GrafanaTheme2 } from '@grafana/data';
import { Icon, Stack, TextLink, useStyles2 } from '@grafana/ui';
import { Badge, Icon, Stack, TextLink, useStyles2 } from '@grafana/ui';
import { css } from '@emotion/css';

import { CheckStatus } from 'types';
Expand Down Expand Up @@ -40,6 +40,14 @@ export const CheckStatusInfo = ({ description, docsLink }: CheckStatusInfoProps)
);
};

export const NewStatusBadge = ({ status, className }: { status: CheckStatus; className?: string }) => {
if (![CheckStatus.EXPERIMENTAL, CheckStatus.PRIVATE_PREVIEW, CheckStatus.PUBLIC_PREVIEW].includes(status)) {
return null;
}

return <Badge text={'NEW'} color={'orange'} className={className} />;
};

const getStyles = (theme: GrafanaTheme2) => ({
infoLink: css({
background: `none`,
Expand Down
7 changes: 5 additions & 2 deletions src/components/CheckForm/FormLayout/FormSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ import { Box, Stack, Text, useStyles2 } from '@grafana/ui';
import { css } from '@emotion/css';

import { CheckFormValues } from 'types';
import { CheckStatusInfo, type CheckStatusInfoProps } from 'components/CheckStatusInfo';
import { NewStatusBadge } from 'components/NewStatusBadge';
import {
CheckStatusInfo,
CheckStatusInfoProps,
NewStatusBadge,
} from 'components/CheckEditor/FormComponents/CheckStatusInfo';

import { FORM_MAX_WIDTH } from './FormLayout';

Expand Down
1 change: 0 additions & 1 deletion src/components/CheckStatusInfo/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ import { getRoute } from 'routing/utils';
import { CheckTypeGroupOption } from 'hooks/useCheckTypeGroupOptions';
import { useCheckTypeOptions } from 'hooks/useCheckTypeOptions';
import { useLimits } from 'hooks/useLimits';
import { Card } from 'components/Card';
import { CheckStatusInfo } from 'components/CheckStatusInfo';
import { NewStatusBadge } from 'components/NewStatusBadge';
import { CheckStatusInfo, NewStatusBadge } from 'components/CheckEditor/FormComponents/CheckStatusInfo';

import { Card } from '../Card';
import { Protocol } from './Protocol';

export const CheckGroupCard = ({ group }: { group: CheckTypeGroupOption }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { DataTestIds } from 'test/dataTestIds';
import { useCheckTypeGroupOptions } from 'hooks/useCheckTypeGroupOptions';
import { OverLimitAlert } from 'components/OverLimitAlert';

import { CheckGroupCard } from './components/CheckGroupCard';
import { CheckGroupCard } from './CheckGroupCard';

export const ChooseCheckGroup = () => {
const styles = useStyles2(getStyles);
Expand Down
File renamed without changes.
12 changes: 0 additions & 12 deletions src/components/NewStatusBadge/NewStatusBadge.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/components/NewStatusBadge/index.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/routing/InitialisedRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { getUserPermissions } from 'data/permissions';
import { useLimits } from 'hooks/useLimits';
import { QueryParamMap, useNavigation } from 'hooks/useNavigation';
import { useQuery } from 'hooks/useQuery';
import { ChooseCheckGroup } from 'components/ChooseCheckGroup';
import { SceneRedirecter } from 'components/SceneRedirecter';
import { AlertingPage } from 'page/AlertingPage';
import { CheckList } from 'page/CheckList';
import { ChooseCheckGroup } from 'page/ChooseCheckGroup';
import { ConfigPageLayout } from 'page/ConfigPageLayout';
import { AccessTokensTab } from 'page/ConfigPageLayout/tabs/AccessTokensTab';
import { GeneralTab } from 'page/ConfigPageLayout/tabs/GeneralTab';
Expand Down

0 comments on commit 0a3259d

Please sign in to comment.