PMM-12741 Rename TemplateStep

percona · Feb 26, 2024 · d0f268b · d0f268b
1 parent 32b83e7
commit d0f268b
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git 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/...pp/percona/integrated-alerting/components/AlertRuleFromTemplate/AlertRuleFromTemplate.tsx b/...pp/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 = () => {
     <FormProvider {...methods}>
       <AppChromeUpdate actions={actionButtons} />
       <Page navId="alert-list" pageNav={PMM_ALERTING_CREATE_ALERT_TEMPLATE}>
-        <TemplateStep />
+        <TemplateForm />
       </Page>
     </FormProvider>
   );

diff --git a/...RuleSection/AdvancedRuleSection.styles.ts → ...RuleSection/AdvancedRuleSection.styles.ts b/...RuleSection/AdvancedRuleSection.styles.ts → ...RuleSection/AdvancedRuleSection.styles.ts
diff --git a/...vancedRuleSection/AdvancedRuleSection.tsx → ...vancedRuleSection/AdvancedRuleSection.tsx b/...vancedRuleSection/AdvancedRuleSection.tsx → ...vancedRuleSection/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/...dRuleSection/AdvancedRuleSection.types.ts → ...dRuleSection/AdvancedRuleSection.types.ts b/...dRuleSection/AdvancedRuleSection.types.ts → ...dRuleSection/AdvancedRuleSection.types.ts
diff --git a/...nts/TemplateStep/TemplateFiltersField.tsx → ...nts/TemplateForm/TemplateFiltersField.tsx b/...nts/TemplateStep/TemplateFiltersField.tsx → ...nts/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/...ts/TemplateStep/TemplateStep.constants.ts → ...ts/TemplateForm/TemplateForm.constants.ts b/...ts/TemplateStep/TemplateStep.constants.ts → ...ts/TemplateForm/TemplateForm.constants.ts
diff --git a/...nts/TemplateStep/TemplateStep.messages.ts → ...nts/TemplateForm/TemplateForm.messages.ts b/...nts/TemplateStep/TemplateStep.messages.ts → ...nts/TemplateForm/TemplateForm.messages.ts
diff --git a/...nents/TemplateStep/TemplateStep.styles.ts → ...nents/TemplateForm/TemplateForm.styles.ts b/...nents/TemplateStep/TemplateStep.styles.ts → ...nents/TemplateForm/TemplateForm.styles.ts
diff --git a/.../components/TemplateStep/TemplateStep.tsx → .../components/TemplateForm/TemplateForm.tsx b/.../components/TemplateStep/TemplateStep.tsx → .../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/...onents/TemplateStep/TemplateStep.types.ts → ...onents/TemplateForm/TemplateForm.types.ts b/...onents/TemplateStep/TemplateStep.types.ts → ...onents/TemplateForm/TemplateForm.types.ts
diff --git a/...onents/TemplateStep/TemplateStep.utils.ts → ...onents/TemplateForm/TemplateForm.utils.ts b/...onents/TemplateStep/TemplateStep.utils.ts → ...onents/TemplateForm/TemplateForm.utils.ts
diff --git 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 {