From 3b97fa10c43676e246d0ff283ffbed6c374e8b6c Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Tue, 6 Sep 2022 22:40:42 +0300 Subject: [PATCH 1/9] chore: add error messagein case schema not found --- src/JSONSchemasInterface.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/JSONSchemasInterface.js b/src/JSONSchemasInterface.js index 029178c3..acd8ab35 100644 --- a/src/JSONSchemasInterface.js +++ b/src/JSONSchemasInterface.js @@ -12,6 +12,10 @@ export class JSONSchemasInterface { if (!schemasCache.has(schemaId)) { const originalSchema = schemas.find((schema) => schema.schemaId === schemaId); + if (!originalSchema) { + throw new Error(`Schema not found: ${originalSchema}`); + } + const schema = mergeAllOf(originalSchema, { resolvers: { defaultResolver: mergeAllOf.options.resolvers.title, From 0dc071f356b131073b91ba27baaa04a8cc52e965 Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Tue, 6 Sep 2022 22:51:58 +0300 Subject: [PATCH 2/9] chore: add error messagein case schema not found --- src/JSONSchemasInterface.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/JSONSchemasInterface.js b/src/JSONSchemasInterface.js index acd8ab35..b45f3730 100644 --- a/src/JSONSchemasInterface.js +++ b/src/JSONSchemasInterface.js @@ -13,7 +13,7 @@ export class JSONSchemasInterface { const originalSchema = schemas.find((schema) => schema.schemaId === schemaId); if (!originalSchema) { - throw new Error(`Schema not found: ${originalSchema}`); + throw new Error(`Schema not found: ${schemaId}`); } const schema = mergeAllOf(originalSchema, { From 23cfbdb576ccd82c74758f081a24980fa9838eb6 Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Thu, 8 Sep 2022 14:08:46 +0300 Subject: [PATCH 3/9] update: add Project to schemas definitions --- package.json | 2 +- src/utils/schemas.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 313cbd3d..5c02fbd9 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@babel/preset-react": "7.16.7", "@babel/register": "^7.16.0", "@babel/runtime-corejs3": "7.16.8", - "@exabyte-io/esse.js": "2022.9.6-0", + "@exabyte-io/esse.js": "github:Exabyte-io/esse#e05d28e621cefd683ddb2f8082146da0422463c7", "crypto-js": "^4.1.1", "json-schema-merge-allof": "^0.8.1", "lodash": "^4.17.21", diff --git a/src/utils/schemas.js b/src/utils/schemas.js index b91ce79d..a8b01c76 100644 --- a/src/utils/schemas.js +++ b/src/utils/schemas.js @@ -22,6 +22,7 @@ export const baseSchemas = { ReduceUnit: "workflow/unit/reduce", SubworkflowUnit: "workflow/unit", Unit: "workflow/unit", + Project: "project", }; export const entityMix = [ @@ -54,6 +55,8 @@ export const flavorMix = ["system/is-multi-material"]; export const systemEntityMix = ["system/entity"]; +export const projectMix = ["system/status"]; + export const mixSchemas = { Entity: [...entityMix], Material: [...entityMix], @@ -76,6 +79,7 @@ export const mixSchemas = { ReduceUnit: [...unitMix], SubworkflowUnit: [...unitMix], Unit: [...unitMix], + Project: [...entityMix, ...systemEntityMix, ...projectMix], }; export function getSchemaByClassName(className) { From cc77639219784a13b4ef06b33d579798f89a5b33 Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Thu, 8 Sep 2022 19:29:21 +0300 Subject: [PATCH 4/9] chore: fix package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c02fbd9..5a1d66a3 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@babel/preset-react": "7.16.7", "@babel/register": "^7.16.0", "@babel/runtime-corejs3": "7.16.8", - "@exabyte-io/esse.js": "github:Exabyte-io/esse#e05d28e621cefd683ddb2f8082146da0422463c7", + "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#e05d28e621cefd683ddb2f8082146da0422463c7", "crypto-js": "^4.1.1", "json-schema-merge-allof": "^0.8.1", "lodash": "^4.17.21", From 5dfef312aab7a8a4312c8b7454c9de190707545a Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Fri, 9 Sep 2022 22:05:08 +0300 Subject: [PATCH 5/9] chore: new esse version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a1d66a3..5cf95514 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@babel/preset-react": "7.16.7", "@babel/register": "^7.16.0", "@babel/runtime-corejs3": "7.16.8", - "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#e05d28e621cefd683ddb2f8082146da0422463c7", + "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#f977253d8728582641049763337c3846fd92dc16", "crypto-js": "^4.1.1", "json-schema-merge-allof": "^0.8.1", "lodash": "^4.17.21", From 13af3ec71f6dcd15299a6014c07f3c585373ab00 Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Fri, 9 Sep 2022 22:28:26 +0300 Subject: [PATCH 6/9] chore: new esse version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5cf95514..8630966a 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@babel/preset-react": "7.16.7", "@babel/register": "^7.16.0", "@babel/runtime-corejs3": "7.16.8", - "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#f977253d8728582641049763337c3846fd92dc16", + "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#7341f7c597ba36de52ee04595c1ce590c1fc6f78", "crypto-js": "^4.1.1", "json-schema-merge-allof": "^0.8.1", "lodash": "^4.17.21", From 294bc27f227afe4a32b2073abe31a89247d9004e Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Tue, 13 Sep 2022 00:05:53 +0300 Subject: [PATCH 7/9] chore: update esse --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8630966a..8d38ee3b 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@babel/preset-react": "7.16.7", "@babel/register": "^7.16.0", "@babel/runtime-corejs3": "7.16.8", - "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#7341f7c597ba36de52ee04595c1ce590c1fc6f78", + "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#70f772b5c6f5889cb55a31eebe908adc107a0e7f", "crypto-js": "^4.1.1", "json-schema-merge-allof": "^0.8.1", "lodash": "^4.17.21", From 6e3d9fd1db602641cd5b9def292a98d1ada5e8b1 Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Tue, 13 Sep 2022 16:06:58 +0300 Subject: [PATCH 8/9] chore: update esse --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d38ee3b..e3f336ae 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@babel/preset-react": "7.16.7", "@babel/register": "^7.16.0", "@babel/runtime-corejs3": "7.16.8", - "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#70f772b5c6f5889cb55a31eebe908adc107a0e7f", + "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#96c4ad9543e826fb5691670f15970fb12dedf2b8", "crypto-js": "^4.1.1", "json-schema-merge-allof": "^0.8.1", "lodash": "^4.17.21", From 0279f83d7fe6a3603a50e9e705ecae56002184cf Mon Sep 17 00:00:00 2001 From: Timur Bazhirov Date: Mon, 10 Oct 2022 15:18:33 -0700 Subject: [PATCH 9/9] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3f336ae..c5bfd4f6 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@babel/preset-react": "7.16.7", "@babel/register": "^7.16.0", "@babel/runtime-corejs3": "7.16.8", - "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#96c4ad9543e826fb5691670f15970fb12dedf2b8", + "@exabyte-io/esse.js": "2022.10.10-0", "crypto-js": "^4.1.1", "json-schema-merge-allof": "^0.8.1", "lodash": "^4.17.21",