{
describe('createSchema', () => {
it('creates POST_SCHEMA__SUCCESS when posting new schema', async () => {
- fetchMock.postOnce(`/api/clusters/${clusterName}/schemas/${subject}`, {
+ fetchMock.postOnce(`/api/clusters/${clusterName}/schemas`, {
body: schemaFixtures.schemaVersionsPayload[0],
});
await store.dispatch(
- thunks.createSchema(clusterName, subject, fixtures.schemaPayload)
+ thunks.createSchema(clusterName, fixtures.schemaPayload)
);
expect(store.getActions()).toEqual([
actions.createSchemaAction.request(),
@@ -122,19 +122,19 @@ describe('Thunks', () => {
]);
});
- // it('creates POST_SCHEMA__FAILURE when posting new schema', async () => {
- // fetchMock.postOnce(
- // `/api/clusters/${clusterName}/schemas/${subject}`,
- // 404
- // );
- // await store.dispatch(
- // thunks.createSchema(clusterName, subject, fixtures.schemaPayload)
- // );
- // expect(store.getActions()).toEqual([
- // actions.createSchemaAction.request(),
- // actions.createSchemaAction.failure(),
- // ]);
- // expect(store.getActions()).toThrow();
- // });
+ it('creates POST_SCHEMA__FAILURE when posting new schema', async () => {
+ fetchMock.postOnce(`/api/clusters/${clusterName}/schemas`, 404);
+ try {
+ await store.dispatch(
+ thunks.createSchema(clusterName, fixtures.schemaPayload)
+ );
+ } catch (error) {
+ expect(error.status).toEqual(404);
+ expect(store.getActions()).toEqual([
+ actions.createSchemaAction.request(),
+ actions.createSchemaAction.failure(),
+ ]);
+ }
+ });
});
});
diff --git a/kafka-ui-react-app/src/redux/actions/thunks.ts b/kafka-ui-react-app/src/redux/actions/thunks.ts
index f650d011bf..36e1ccaeb0 100644
--- a/kafka-ui-react-app/src/redux/actions/thunks.ts
+++ b/kafka-ui-react-app/src/redux/actions/thunks.ts
@@ -285,14 +285,12 @@ export const fetchSchemaVersions = (
export const createSchema = (
clusterName: ClusterName,
- subject: SchemaName,
newSchemaSubject: NewSchemaSubject
): PromiseThunkResult => async (dispatch) => {
dispatch(actions.createSchemaAction.request());
try {
const schema: SchemaSubject = await apiClient.createNewSchema({
clusterName,
- subject,
newSchemaSubject,
});
dispatch(actions.createSchemaAction.success(schema));
diff --git a/kafka-ui-react-app/src/redux/reducers/clusters/selectors.ts b/kafka-ui-react-app/src/redux/reducers/clusters/selectors.ts
index e6667fc3e0..a8b06b0f17 100644
--- a/kafka-ui-react-app/src/redux/reducers/clusters/selectors.ts
+++ b/kafka-ui-react-app/src/redux/reducers/clusters/selectors.ts
@@ -24,3 +24,10 @@ export const getOnlineClusters = createSelector(getClusterList, (clusters) =>
export const getOfflineClusters = createSelector(getClusterList, (clusters) =>
clusters.filter(({ status }) => status === ServerStatus.OFFLINE)
);
+
+export const getClustersReadonlyStatus = (clusterName: string) =>
+ createSelector(
+ getClusterList,
+ (clusters): boolean =>
+ clusters.find(({ name }) => name === clusterName)?.readOnly || false
+ );
diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/__snapshots__/reducer.spec.ts.snap b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/__snapshots__/reducer.spec.ts.snap
index bf18ffa14f..61332659b7 100644
--- a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/__snapshots__/reducer.spec.ts.snap
+++ b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/__snapshots__/reducer.spec.ts.snap
@@ -12,6 +12,7 @@ Object {
"compatibilityLevel": "BACKWARD",
"id": 2,
"schema": "{\\"type\\":\\"record\\",\\"name\\":\\"MyRecord2\\",\\"namespace\\":\\"com.mycompany\\",\\"fields\\":[{\\"name\\":\\"id\\",\\"type\\":\\"long\\"}]}",
+ "schemaType": "JSON",
"subject": "test",
"version": "2",
},
@@ -19,6 +20,7 @@ Object {
"compatibilityLevel": "BACKWARD",
"id": 4,
"schema": "{\\"type\\":\\"record\\",\\"name\\":\\"MyRecord4\\",\\"namespace\\":\\"com.mycompany\\",\\"fields\\":[{\\"name\\":\\"id\\",\\"type\\":\\"long\\"}]}",
+ "schemaType": "JSON",
"subject": "test2",
"version": "3",
},
@@ -26,6 +28,7 @@ Object {
"compatibilityLevel": "BACKWARD",
"id": 5,
"schema": "{\\"type\\":\\"record\\",\\"name\\":\\"MyRecord\\",\\"namespace\\":\\"com.mycompany\\",\\"fields\\":[{\\"name\\":\\"id\\",\\"type\\":\\"long\\"}]}",
+ "schemaType": "JSON",
"subject": "test3",
"version": "1",
},
@@ -43,6 +46,7 @@ Object {
"compatibilityLevel": "BACKWARD",
"id": 1,
"schema": "{\\"type\\":\\"record\\",\\"name\\":\\"MyRecord1\\",\\"namespace\\":\\"com.mycompany\\",\\"fields\\":[{\\"name\\":\\"id\\",\\"type\\":\\"long\\"}]}",
+ "schemaType": "JSON",
"subject": "test",
"version": "1",
},
@@ -50,6 +54,7 @@ Object {
"compatibilityLevel": "BACKWARD",
"id": 2,
"schema": "{\\"type\\":\\"record\\",\\"name\\":\\"MyRecord2\\",\\"namespace\\":\\"com.mycompany\\",\\"fields\\":[{\\"name\\":\\"id\\",\\"type\\":\\"long\\"}]}",
+ "schemaType": "JSON",
"subject": "test",
"version": "2",
},
@@ -67,6 +72,7 @@ Object {
"compatibilityLevel": "BACKWARD",
"id": 1,
"schema": "{\\"type\\":\\"record\\",\\"name\\":\\"MyRecord1\\",\\"namespace\\":\\"com.mycompany\\",\\"fields\\":[{\\"name\\":\\"id\\",\\"type\\":\\"long\\"}]}",
+ "schemaType": "JSON",
"subject": "test",
"version": "1",
},
diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
index 5a75ed212b..a53f1dced7 100644
--- a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
@@ -1,5 +1,5 @@
import { SchemasState } from 'redux/interfaces';
-import { SchemaSubject } from 'generated-sources';
+import { SchemaSubject, SchemaType } from 'generated-sources';
export const initialState: SchemasState = {
byName: {},
@@ -15,6 +15,7 @@ export const clusterSchemasPayload: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord4","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
{
subject: 'test3',
@@ -23,6 +24,7 @@ export const clusterSchemasPayload: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
{
subject: 'test',
@@ -31,6 +33,7 @@ export const clusterSchemasPayload: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord2","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
];
@@ -42,6 +45,7 @@ export const schemaVersionsPayload: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord1","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
{
subject: 'test',
@@ -50,6 +54,7 @@ export const schemaVersionsPayload: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord2","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
];
@@ -60,6 +65,7 @@ export const newSchemaPayload: SchemaSubject = {
schema:
'{"type":"record","name":"MyRecord4","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
};
export const clusterSchemasPayloadWithNewSchema: SchemaSubject[] = [
@@ -70,6 +76,7 @@ export const clusterSchemasPayloadWithNewSchema: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord4","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
{
subject: 'test3',
@@ -78,6 +85,7 @@ export const clusterSchemasPayloadWithNewSchema: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
{
subject: 'test',
@@ -86,6 +94,7 @@ export const clusterSchemasPayloadWithNewSchema: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord2","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
{
subject: 'test4',
@@ -94,5 +103,6 @@ export const clusterSchemasPayloadWithNewSchema: SchemaSubject[] = [
schema:
'{"type":"record","name":"MyRecord4","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
compatibilityLevel: 'BACKWARD',
+ schemaType: SchemaType.JSON,
},
];