Skip to content

Commit

Permalink
Merge pull request #19 from Exabyte-io/update/SOF-6184
Browse files Browse the repository at this point in the history
SOF-6184: ESSE with fixed schemas
  • Loading branch information
k0stik authored Aug 16, 2022
2 parents bc0dd65 + beeaafe commit 1c1b50e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.28-1",
"@exabyte-io/esse.js": "2022.8.16-0",
"crypto-js": "^4.1.1",
"json-schema-merge-allof": "^0.8.1",
"lodash": "^4.17.21",
Expand Down
23 changes: 14 additions & 9 deletions src/entity/in_memory.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,20 @@ export class InMemoryEntity {
* @returns {Object} schema
*/
static get jsonSchema() {
return mergeAllOf(
{
allOf: [this.baseJSONSchema, ...getMixSchemasByClassName(this.name)],
},
{
resolvers: {
defaultResolver: mergeAllOf.options.resolvers.title,
try {
return mergeAllOf(
{
allOf: [this.baseJSONSchema, ...getMixSchemasByClassName(this.name)],
},
},
);
{
resolvers: {
defaultResolver: mergeAllOf.options.resolvers.title,
},
},
);
} catch (e) {
console.error(e.stack);
throw e;
}
}
}

0 comments on commit 1c1b50e

Please sign in to comment.