Skip to content

Commit 6ba562e

Browse files
chore: bump admin version 0.4.0
1 parent 1197c20 commit 6ba562e

File tree

4 files changed

+1504
-530
lines changed

4 files changed

+1504
-530
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "admin-bro-sequelizejs",
3-
"version": "0.3.4",
3+
"version": "0.4.0",
44
"description": "Sequelize adapter for AdminBro",
55
"main": "index.js",
66
"scripts": {
@@ -16,11 +16,11 @@
1616
"author": "Wojciech Krysiak",
1717
"license": "MIT",
1818
"peerDependencies": {
19-
"admin-bro": ">=1.1.0",
19+
"admin-bro": ">=2.2.0",
2020
"sequelize": ">=4"
2121
},
2222
"devDependencies": {
23-
"admin-bro": "^1.1.4",
23+
"admin-bro": "^2.2.0",
2424
"chai": "^4.2.0",
2525
"eslint": "^5.10.0",
2626
"eslint-config-airbnb-base": "^13.1.0",

src/resource.js

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/* eslint-disable no-param-reassign */
22

3-
const { BaseResource, BaseRecord, ValidationError } = require('admin-bro')
3+
const { BaseResource, BaseRecord } = require('admin-bro')
44
const { Op } = require('sequelize')
55

66
const Property = require('./property')
77
const convertFilter = require('./utils/convert-filter')
8+
const createValidationError = require('./utils/create-validation-error')
89

910
const SEQUELIZE_VALIDATION_ERROR = 'SequelizeValidationError'
1011

@@ -120,7 +121,7 @@ class Resource extends BaseResource {
120121
return record.toJSON()
121122
} catch (error) {
122123
if (error.name === SEQUELIZE_VALIDATION_ERROR) {
123-
throw this.createValidationError(error)
124+
throw createValidationError(error)
124125
}
125126
throw error
126127
}
@@ -138,7 +139,7 @@ class Resource extends BaseResource {
138139
return record.toJSON()
139140
} catch (error) {
140141
if (error.name === SEQUELIZE_VALIDATION_ERROR) {
141-
throw this.createValidationError(error)
142+
throw createValidationError(error)
142143
}
143144
throw error
144145
}
@@ -152,15 +153,6 @@ class Resource extends BaseResource {
152153
})
153154
}
154155

155-
createValidationError(originalError) {
156-
const errors = Object.keys(originalError.errors).reduce((memo, key) => {
157-
const { path, message, validatorKey } = originalError.errors[key]
158-
memo[path] = { message, kind: validatorKey } // eslint-disable-line no-param-reassign
159-
return memo
160-
}, {})
161-
return new ValidationError(`${this.name()} validation failed`, errors)
162-
}
163-
164156
/**
165157
* Check all params against values they hold. In case of wrong value it corrects it.
166158
*

src/utils/create-validation-error.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const { ValidationError } = require('admin-bro')
2+
3+
const createValidationError = (originalError) => {
4+
const errors = Object.keys(originalError.errors).reduce((memo, key) => {
5+
const { path, message, validatorKey } = originalError.errors[key]
6+
memo[path] = { message, kind: validatorKey } // eslint-disable-line no-param-reassign
7+
return memo
8+
}, {})
9+
return new ValidationError(errors)
10+
}
11+
12+
module.exports = createValidationError

0 commit comments

Comments
 (0)