From a27df1deab4c7f44dc9d8bc1511ebaa7f33989aa Mon Sep 17 00:00:00 2001
From: fedorseliankin <fedor_seliankin@epam.com>
Date: Wed, 2 Mar 2022 11:13:24 +0300
Subject: [PATCH 1/2] fix schema files

---
 .../src/domain/serializers/ket/schema.json            | 11 +++++++++++
 .../src/script/ui/data/schema/struct-schema.js        |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/packages/ketcher-core/src/domain/serializers/ket/schema.json b/packages/ketcher-core/src/domain/serializers/ket/schema.json
index db42ac2897..d5791a6583 100644
--- a/packages/ketcher-core/src/domain/serializers/ket/schema.json
+++ b/packages/ketcher-core/src/domain/serializers/ket/schema.json
@@ -48,10 +48,21 @@
     },
     "^mol\\d+": {
       "$ref": "#/definitions/molecule"
+    },
+    "^header$": {
+      "$ref": "#/definitions/header"
     }
   },
   "additionalProperties": false,
   "definitions": {
+    "header": {
+      "type": "object",
+      "properties": {
+        "moleculeName": {
+          "type": "string"
+        }
+      }
+    },
     "rsite": {
       "type": "object",
       "required": ["type", "location"],
diff --git a/packages/ketcher-react/src/script/ui/data/schema/struct-schema.js b/packages/ketcher-react/src/script/ui/data/schema/struct-schema.js
index d361f653ce..cc71d315fc 100644
--- a/packages/ketcher-react/src/script/ui/data/schema/struct-schema.js
+++ b/packages/ketcher-react/src/script/ui/data/schema/struct-schema.js
@@ -125,6 +125,7 @@ export const labelEdit = {
     label: {
       title: 'Atom',
       default: '',
+      type: 'string',
       invalidMessage: 'Wrong atom symbol'
     }
   }
@@ -217,6 +218,7 @@ const sgroup = {
     {
       key: 'GEN',
       title: 'Generic',
+      type: 'object',
       properties: {
         type: { enum: ['GEN'] }
       }
@@ -241,6 +243,7 @@ const sgroup = {
     {
       key: 'SRU',
       title: 'SRU polymer',
+      type: 'object',
       properties: {
         type: { enum: ['SRU'] },
         subscript: {

From 5f308438c0d7c37b76e839d9e37744f06a058051 Mon Sep 17 00:00:00 2001
From: fedorseliankin <fedor_seliankin@epam.com>
Date: Wed, 2 Mar 2022 15:30:03 +0300
Subject: [PATCH 2/2] fix 'uniqueItems' and 'required' keywords

---
 .../src/domain/serializers/ket/schema.json    | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/packages/ketcher-core/src/domain/serializers/ket/schema.json b/packages/ketcher-core/src/domain/serializers/ket/schema.json
index d5791a6583..65e73b4060 100644
--- a/packages/ketcher-core/src/domain/serializers/ket/schema.json
+++ b/packages/ketcher-core/src/domain/serializers/ket/schema.json
@@ -48,21 +48,10 @@
     },
     "^mol\\d+": {
       "$ref": "#/definitions/molecule"
-    },
-    "^header$": {
-      "$ref": "#/definitions/header"
     }
   },
   "additionalProperties": false,
   "definitions": {
-    "header": {
-      "type": "object",
-      "properties": {
-        "moleculeName": {
-          "type": "string"
-        }
-      }
-    },
     "rsite": {
       "type": "object",
       "required": ["type", "location"],
@@ -209,10 +198,10 @@
           "type": "array",
           "minItems": 2,
           "maxItems": 2,
+          "uniqueItems": true,
           "items": {
             "type": "integer",
-            "minimum": 0,
-            "uniqueItems": true
+            "minimum": 0
           }
         },
         "stereo": {
@@ -350,10 +339,10 @@
               },
               "items": {
                 "type": "array",
+                "uniqueItems": true,
                 "items": {
                   "type": "integer",
-                  "minimum": 0,
-                  "uniqueItems": true
+                  "minimum": 0
                 }
               }
             }
@@ -368,10 +357,10 @@
               },
               "items": {
                 "type": "array",
+                "uniqueItems": true,
                 "items": {
                   "type": "integer",
-                  "minimum": 0,
-                  "uniqueItems": true
+                  "minimum": 0
                 }
               }
             }
@@ -383,6 +372,7 @@
       "type": "array",
       "items": {
         "required": ["atoms", "type"],
+        "type": "object",
         "properties": {
           "atoms": {
             "type": "array",