From d7a3629470606a644c3bcc82f093aa609c6ac29c Mon Sep 17 00:00:00 2001 From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com> Date: Mon, 27 Jun 2022 16:59:00 +0400 Subject: [PATCH] Change the name of path for Schema Compare versions (#2194) --- .../src/components/Schemas/Details/Details.tsx | 4 ++-- kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx | 6 +++--- .../src/components/Schemas/Diff/__test__/Diff.spec.tsx | 6 +++--- kafka-ui-react-app/src/lib/paths.ts | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx index 386fc50590..299b0984b1 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx @@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom'; import { ClusterSubjectParam, clusterSchemaEditPageRelativePath, - clusterSchemaSchemaDiffPageRelativePath, + clusterSchemaSchemaComparePageRelativePath, } from 'lib/paths'; import ClusterContext from 'components/contexts/ClusterContext'; import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal'; @@ -90,7 +90,7 @@ const Details: React.FC = () => { buttonSize="M" buttonType="primary" to={{ - pathname: clusterSchemaSchemaDiffPageRelativePath, + pathname: clusterSchemaSchemaComparePageRelativePath, search: `leftVersion=${versions[0]?.version}&rightVersion=${versions[0]?.version}`, }} > diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx index 4c12bc66fa..94636fa4b8 100644 --- a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { SchemaSubject } from 'generated-sources'; -import { clusterSchemaSchemaDiffPath, ClusterSubjectParam } from 'lib/paths'; +import { clusterSchemaSchemaComparePath, ClusterSubjectParam } from 'lib/paths'; import PageLoader from 'components/common/PageLoader/PageLoader'; import DiffViewer from 'components/common/DiffViewer/DiffViewer'; import { useNavigate, useLocation } from 'react-router-dom'; @@ -86,7 +86,7 @@ const Diff: React.FC = ({ versions, areVersionsFetched }) => { } onChange={(event) => { navigate( - clusterSchemaSchemaDiffPath(clusterName, subject) + clusterSchemaSchemaComparePath(clusterName, subject) ); searchParams.set('leftVersion', event.toString()); searchParams.set( @@ -127,7 +127,7 @@ const Diff: React.FC = ({ versions, areVersionsFetched }) => { } onChange={(event) => { navigate( - clusterSchemaSchemaDiffPath(clusterName, subject) + clusterSchemaSchemaComparePath(clusterName, subject) ); searchParams.set( 'leftVersion', diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx index 418393bb50..029e589b9a 100644 --- a/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx @@ -2,13 +2,13 @@ import React from 'react'; import Diff, { DiffProps } from 'components/Schemas/Diff/Diff'; import { render, WithRoute } from 'lib/testHelpers'; import { screen } from '@testing-library/react'; -import { clusterSchemaSchemaDiffPath } from 'lib/paths'; +import { clusterSchemaSchemaComparePath } from 'lib/paths'; import { versions } from './fixtures'; const defaultClusterName = 'defaultClusterName'; const defaultSubject = 'defaultSubject'; -const defaultPathName = clusterSchemaSchemaDiffPath( +const defaultPathName = clusterSchemaSchemaComparePath( defaultClusterName, defaultSubject ); @@ -30,7 +30,7 @@ describe('Diff', () => { pathname = `${pathname}?${searchParams.toString()}`; return render( - + `${clusterPath(clusterName)}/schemas`; @@ -89,10 +89,10 @@ export const clusterSchemaEditPath = ( clusterName: ClusterName = RouteParams.clusterName, subject: SchemaName = RouteParams.subject ) => `${clusterSchemasPath(clusterName)}/${subject}/edit`; -export const clusterSchemaSchemaDiffPath = ( +export const clusterSchemaSchemaComparePath = ( clusterName: ClusterName = RouteParams.clusterName, subject: SchemaName = RouteParams.subject -) => `${clusterSchemaPath(clusterName, subject)}/diff`; +) => `${clusterSchemaPath(clusterName, subject)}/compare`; export type ClusterSubjectParam = { subject: string;