Skip to content

Commit 5f231c7

Browse files
authored
FE: Fix Messages: Produce: "Keep contents" not re-generated (#4008)
1 parent 17cde82 commit 5f231c7

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

kafka-ui-react-app/src/components/Topics/Topic/Messages/getDefaultSerdeName.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { SerdeDescription } from 'generated-sources';
2-
import { getPrefferedDescription } from 'components/Topics/Topic/SendMessage/utils';
2+
import { getPreferredDescription } from 'components/Topics/Topic/SendMessage/utils';
33

44
export const getDefaultSerdeName = (serdes: SerdeDescription[]) => {
5-
const preffered = getPrefferedDescription(serdes);
5+
const preffered = getPreferredDescription(serdes);
66
if (preffered) {
77
return preffered.name || '';
88
}

kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ const SendMessage: React.FC<{ closeSidebar: () => void }> = ({
118118
valueSerde,
119119
});
120120
if (!keepContents) {
121-
setValue('key', '');
122-
setValue('content', '');
121+
setValue('key', defaultValues.key || '');
122+
setValue('content', defaultValues.content || '');
123123
closeSidebar();
124124
}
125125
} catch (e) {

kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jsf.option('fillProperties', false);
1313
jsf.option('alwaysFakeOptionals', true);
1414
jsf.option('failOnInvalidFormat', false);
1515

16-
const generateValueFromSchema = (preffered?: SerdeDescription) => {
17-
if (!preffered?.schema) {
16+
const generateValueFromSchema = (preferred?: SerdeDescription) => {
17+
if (!preferred?.schema) {
1818
return undefined;
1919
}
20-
const parsedSchema = JSON.parse(preffered.schema);
20+
const parsedSchema = JSON.parse(preferred.schema);
2121
const value = jsf.generate(parsedSchema);
2222
return JSON.stringify(value);
2323
};
2424

25-
export const getPrefferedDescription = (serdes: SerdeDescription[]) =>
25+
export const getPreferredDescription = (serdes: SerdeDescription[]) =>
2626
serdes.find((s) => s.preferred);
2727

2828
export const getDefaultValues = (serdes: TopicSerdeSuggestion) => {
29-
const keySerde = getPrefferedDescription(serdes.key || []);
30-
const valueSerde = getPrefferedDescription(serdes.value || []);
29+
const keySerde = getPreferredDescription(serdes.key || []);
30+
const valueSerde = getPreferredDescription(serdes.value || []);
3131

3232
return {
3333
key: generateValueFromSchema(keySerde),
@@ -65,15 +65,15 @@ export const validateBySchema = (
6565
return errors;
6666
}
6767

68-
let parcedSchema;
68+
let parsedSchema;
6969
let parsedValue;
7070

7171
try {
72-
parcedSchema = JSON.parse(schema);
72+
parsedSchema = JSON.parse(schema);
7373
} catch (e) {
7474
return [`Error in parsing the "${type}" field schema`];
7575
}
76-
if (parcedSchema.type === 'string') {
76+
if (parsedSchema.type === 'string') {
7777
return [];
7878
}
7979
try {
@@ -84,7 +84,7 @@ export const validateBySchema = (
8484
try {
8585
const ajv = new Ajv();
8686
addFormats(ajv);
87-
const validate = ajv.compile(parcedSchema);
87+
const validate = ajv.compile(parsedSchema);
8888
validate(parsedValue);
8989
if (validate.errors) {
9090
errors = validate.errors.map(

0 commit comments

Comments
 (0)