From d0f268bb1e85d6a8c06bcd4200d7de9478076e60 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Mon, 26 Feb 2024 09:17:06 +0100 Subject: [PATCH] PMM-12741 Rename TemplateStep --- docker-compose.yml | 6 +++--- .../AlertRuleFromTemplate/AlertRuleFromTemplate.tsx | 6 +++--- .../AdvancedRuleSection/AdvancedRuleSection.styles.ts | 0 .../AdvancedRuleSection/AdvancedRuleSection.tsx | 2 +- .../AdvancedRuleSection/AdvancedRuleSection.types.ts | 0 .../TemplateFiltersField.tsx | 4 ++-- .../TemplateForm.constants.ts} | 0 .../TemplateForm.messages.ts} | 0 .../TemplateForm.styles.ts} | 0 .../TemplateStep.tsx => TemplateForm/TemplateForm.tsx} | 8 ++++---- .../TemplateForm.types.ts} | 0 .../TemplateForm.utils.ts} | 0 public/app/percona/integrated-alerting/types.ts | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) rename public/app/percona/integrated-alerting/components/{TemplateStep => TemplateForm}/AdvancedRuleSection/AdvancedRuleSection.styles.ts (100%) rename public/app/percona/integrated-alerting/components/{TemplateStep => TemplateForm}/AdvancedRuleSection/AdvancedRuleSection.tsx (95%) rename public/app/percona/integrated-alerting/components/{TemplateStep => TemplateForm}/AdvancedRuleSection/AdvancedRuleSection.types.ts (100%) rename public/app/percona/integrated-alerting/components/{TemplateStep => TemplateForm}/TemplateFiltersField.tsx (97%) rename public/app/percona/integrated-alerting/components/{TemplateStep/TemplateStep.constants.ts => TemplateForm/TemplateForm.constants.ts} (100%) rename public/app/percona/integrated-alerting/components/{TemplateStep/TemplateStep.messages.ts => TemplateForm/TemplateForm.messages.ts} (100%) rename public/app/percona/integrated-alerting/components/{TemplateStep/TemplateStep.styles.ts => TemplateForm/TemplateForm.styles.ts} (100%) rename public/app/percona/integrated-alerting/components/{TemplateStep/TemplateStep.tsx => TemplateForm/TemplateForm.tsx} (97%) rename public/app/percona/integrated-alerting/components/{TemplateStep/TemplateStep.types.ts => TemplateForm/TemplateForm.types.ts} (100%) rename public/app/percona/integrated-alerting/components/{TemplateStep/TemplateStep.utils.ts => TemplateForm/TemplateForm.utils.ts} (100%) diff --git a/docker-compose.yml b/docker-compose.yml index a1b28407da478..b94446edbeb26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,14 +3,14 @@ version: "3" services: pmm-server: container_name: pmm-server - image: perconalab/pmm-server:dev-container + image: perconalab/pmm-server:3-dev-container volumes: - "./:/workspace" - "./public:/usr/share/grafana/public" - "./conf/grafana.local-dev.ini:/usr/share/grafana/conf/defaults.ini" ports: - - 80:80 - - 443:443 + - 80:8080 + - 443:8443 environment: - PMM_DEBUG=1 - PERCONA_PORTAL_URL=https://portal-dev.percona.com diff --git a/public/app/percona/integrated-alerting/components/AlertRuleFromTemplate/AlertRuleFromTemplate.tsx b/public/app/percona/integrated-alerting/components/AlertRuleFromTemplate/AlertRuleFromTemplate.tsx index 0af0cff68e6a2..1325bb2c4595d 100644 --- a/public/app/percona/integrated-alerting/components/AlertRuleFromTemplate/AlertRuleFromTemplate.tsx +++ b/public/app/percona/integrated-alerting/components/AlertRuleFromTemplate/AlertRuleFromTemplate.tsx @@ -15,8 +15,8 @@ import { logger } from 'app/percona/shared/helpers/logger'; import { AlertRulesService } from 'app/percona/shared/services/AlertRules/AlertRules.service'; import { TemplatedAlertFormValues } from '../../types'; -import { TemplateStep } from '../TemplateStep/TemplateStep'; -import { formatCreateAPIPayload } from '../TemplateStep/TemplateStep.utils'; +import { TemplateForm } from '../TemplateForm/TemplateForm'; +import { formatCreateAPIPayload } from '../TemplateForm/TemplateForm.utils'; import { getStyles } from './AlertRuleFromTemplate.styles'; @@ -91,7 +91,7 @@ export const AlertRuleFromTemplate: FC = () => { - + ); diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/AdvancedRuleSection/AdvancedRuleSection.styles.ts b/public/app/percona/integrated-alerting/components/TemplateForm/AdvancedRuleSection/AdvancedRuleSection.styles.ts similarity index 100% rename from public/app/percona/integrated-alerting/components/TemplateStep/AdvancedRuleSection/AdvancedRuleSection.styles.ts rename to public/app/percona/integrated-alerting/components/TemplateForm/AdvancedRuleSection/AdvancedRuleSection.styles.ts diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/AdvancedRuleSection/AdvancedRuleSection.tsx b/public/app/percona/integrated-alerting/components/TemplateForm/AdvancedRuleSection/AdvancedRuleSection.tsx similarity index 95% rename from public/app/percona/integrated-alerting/components/TemplateStep/AdvancedRuleSection/AdvancedRuleSection.tsx rename to public/app/percona/integrated-alerting/components/TemplateForm/AdvancedRuleSection/AdvancedRuleSection.tsx index 0840ac0b76a9d..bb3478ddff44f 100644 --- a/public/app/percona/integrated-alerting/components/TemplateStep/AdvancedRuleSection/AdvancedRuleSection.tsx +++ b/public/app/percona/integrated-alerting/components/TemplateForm/AdvancedRuleSection/AdvancedRuleSection.tsx @@ -3,7 +3,7 @@ import React, { FC, useState } from 'react'; import { Collapse, useStyles } from '@grafana/ui'; import { Label } from 'app/percona/shared/components/Form/Label'; -import { Messages } from '../TemplateStep.messages'; +import { Messages } from '../TemplateForm.messages'; import { getStyles } from './AdvancedRuleSection.styles'; import { AdvancedRuleSectionProps } from './AdvancedRuleSection.types'; diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/AdvancedRuleSection/AdvancedRuleSection.types.ts b/public/app/percona/integrated-alerting/components/TemplateForm/AdvancedRuleSection/AdvancedRuleSection.types.ts similarity index 100% rename from public/app/percona/integrated-alerting/components/TemplateStep/AdvancedRuleSection/AdvancedRuleSection.types.ts rename to public/app/percona/integrated-alerting/components/TemplateForm/AdvancedRuleSection/AdvancedRuleSection.types.ts diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateFiltersField.tsx b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateFiltersField.tsx similarity index 97% rename from public/app/percona/integrated-alerting/components/TemplateStep/TemplateFiltersField.tsx rename to public/app/percona/integrated-alerting/components/TemplateForm/TemplateFiltersField.tsx index 6b36653c03e66..f012eff0c3fbb 100644 --- a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateFiltersField.tsx +++ b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateFiltersField.tsx @@ -5,8 +5,8 @@ import { SelectableValue } from '@grafana/data'; import { Button, Field, FieldArray, Input, useStyles2, Select, Label } from '@grafana/ui'; import { AlertRuleFilterType } from 'app/percona/shared/core'; -import { Messages } from './TemplateStep.messages'; -import { getStyles } from './TemplateStep.styles'; +import { Messages } from './TemplateForm.messages'; +import { getStyles } from './TemplateForm.styles'; const TemplateFiltersField: FC = () => { const styles = useStyles2(getStyles); diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.constants.ts b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.constants.ts similarity index 100% rename from public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.constants.ts rename to public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.constants.ts diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.messages.ts b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.messages.ts similarity index 100% rename from public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.messages.ts rename to public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.messages.ts diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.styles.ts b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.styles.ts similarity index 100% rename from public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.styles.ts rename to public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.styles.ts diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.tsx b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.tsx similarity index 97% rename from public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.tsx rename to public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.tsx index 354368f7d3ea2..3bdde5c8b00d7 100644 --- a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.tsx +++ b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.tsx @@ -19,11 +19,11 @@ import { TemplatedAlertFormValues } from '../../types'; import { AdvancedRuleSection } from './AdvancedRuleSection/AdvancedRuleSection'; import TemplateFiltersField from './TemplateFiltersField'; -import { SEVERITY_OPTIONS } from './TemplateStep.constants'; -import { Messages } from './TemplateStep.messages'; -import { formatTemplateOptions } from './TemplateStep.utils'; +import { SEVERITY_OPTIONS } from './TemplateForm.constants'; +import { Messages } from './TemplateForm.messages'; +import { formatTemplateOptions } from './TemplateForm.utils'; -export const TemplateStep: FC = () => { +export const TemplateForm: FC = () => { const { register, setValue, diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.types.ts b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.types.ts similarity index 100% rename from public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.types.ts rename to public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.types.ts diff --git a/public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.utils.ts b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.utils.ts similarity index 100% rename from public/app/percona/integrated-alerting/components/TemplateStep/TemplateStep.utils.ts rename to public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.utils.ts diff --git a/public/app/percona/integrated-alerting/types.ts b/public/app/percona/integrated-alerting/types.ts index 7fba624309870..b73631d9ffa60 100644 --- a/public/app/percona/integrated-alerting/types.ts +++ b/public/app/percona/integrated-alerting/types.ts @@ -2,7 +2,7 @@ import { CSSProperties } from 'react'; import { Folder } from 'app/features/alerting/unified/components/rule-editor/RuleFolderPicker'; import { Template } from 'app/percona/integrated-alerting/components/AlertRuleTemplate/AlertRuleTemplate.types'; -import { FiltersForm } from 'app/percona/integrated-alerting/components/TemplateStep/TemplateStep.types'; +import { FiltersForm } from 'app/percona/integrated-alerting/components/TemplateForm/TemplateForm.types'; import { Severity } from 'app/percona/shared/core'; export interface UploadAlertRuleTemplatePayload {