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 1753b11e66..ab0e0b2345 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx @@ -8,6 +8,7 @@ import LatestVersionItem from './LatestVersionItem'; import PageLoader from '../../common/PageLoader/PageLoader'; export interface DetailsProps { + subject: SchemaName; schema: SchemaSubject; clusterName: ClusterName; versions: SchemaSubject[]; @@ -19,6 +20,7 @@ export interface DetailsProps { } const Details: React.FC = ({ + subject, schema, clusterName, fetchSchemaVersions, @@ -26,8 +28,9 @@ const Details: React.FC = ({ isFetched, }) => { React.useEffect(() => { - fetchSchemaVersions(clusterName, schema.subject as SchemaName); + fetchSchemaVersions(clusterName, subject); }, [fetchSchemaVersions, clusterName]); + return (
@@ -39,59 +42,61 @@ const Details: React.FC = ({ }, ]} > - {schema.subject} + {subject}
-
-
-
-
-
- Latest Version + {isFetched ? ( + <> +
+
+
+
+
+ Latest Version +
+
+ #{schema.version} +
+
-
- #{schema.version} +
+ +
+
-
- - +
+ + + + + + + + + + {versions.map((version) => ( + + ))} + +
VersionIDSchema
-
- -
- {isFetched ? ( -
- - - - - - - - - - {versions.map((version) => ( - - ))} - -
VersionIDSchema
-
+ ) : ( )} diff --git a/kafka-ui-react-app/src/components/Schemas/Details/DetailsContainer.ts b/kafka-ui-react-app/src/components/Schemas/Details/DetailsContainer.ts index 072d2a44f8..dbfec5314c 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/DetailsContainer.ts +++ b/kafka-ui-react-app/src/components/Schemas/Details/DetailsContainer.ts @@ -24,6 +24,7 @@ const mapStateToProps = ( }, }: OwnProps ) => ({ + subject, schema: getSchema(state, subject), versions: getSortedSchemaVersions(state), isFetched: getIsSchemaVersionFetched(state), diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/__snapshots__/Details.spec.tsx.snap b/kafka-ui-react-app/src/components/Schemas/Details/__test__/__snapshots__/Details.spec.tsx.snap index 32a8b9d34a..90a54dcebc 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/__snapshots__/Details.spec.tsx.snap +++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/__snapshots__/Details.spec.tsx.snap @@ -16,9 +16,7 @@ exports[`Details View Initial state matches snapshot 1`] = ` }, ] } - > - test - + />
- test - -
-
-
-
-
-
- - Latest Version - -
-
- # - 1 -
-
-
-
- - -
-
-
@@ -209,9 +143,7 @@ exports[`Details View when page with schema versions loaded when schema has vers }, ] } - > - test - + />
- test - + />