Merge pull request #44 from SoftwareBrothers/beta

Beta

Author: wojtek-krysiak

.github/workflows/push.yml

@@ -90,8 +90,8 @@ jobs:
           fields: repo,message,commit,author,action,eventName,ref,workflow # selectable (default: repo,message)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-        if: always()
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+        if: failure()
 
   publish:
     name: Publish
@@ -120,6 +120,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
           JIRA_EMAIL: ${{ secrets.JIRA_EMAIL }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
         run: yarn release
 
 

.npmrc

@@ -0,0 +1 @@
+access=public

.releaserc

@@ -22,6 +22,13 @@
       "ticketPrefixes": [ "AB" ],
       "released": true,
       "setReleaseDate": true
-    }]
+    }],
+    [
+      "semantic-release-slack-bot",
+      {
+        "notifyOnSuccess": true,
+        "notifyOnFail": true
+      }
+    ]
   ]
 }

README.md

@@ -8,7 +8,7 @@ The plugin can be registered using standard `AdminBro.registerAdapter` method.
 
 ```javascript
 const AdminBro = require('admin-bro')
-const AdminBroSequelize = require('admin-bro-sequelizejs')
+const AdminBroSequelize = require('@admin-bro/sequelize')
 
 AdminBro.registerAdapter(AdminBroSequelize)
 ```

index.js

@@ -1,5 +1,5 @@
 /**
- * @module admin-bro-sequelizejs
+ * @module @admin-bro/sequelize
  *
  * @description
  * ### A Sequelize database adapter for AdminBro.
@@ -9,7 +9,7 @@
  * To install the adapter run
  *
  * ```
- * yarn add admin-bro-sequelizejs
+ * yarn add @admin-bro/sequelize
  * ```
  *
  * ### Usage
@@ -18,7 +18,7 @@
  *
  * ```javascript
  * const AdminBro = require('admin-bro')
- * const AdminBroSequelize = require('admin-bro-sequelizejs')
+ * const AdminBroSequelize = require('@admin-bro/sequelize')
  *
  * AdminBro.registerAdapter(AdminBroSequelize)
  * ```
@@ -72,6 +72,7 @@
 /**
  * Implementation of {@link BaseDatabase} for Sequelize Adapter
  *
+ * @memberof module:@admin-bro/sequelize
  * @type {typeof BaseDatabase}
  * @static
  */
@@ -80,6 +81,7 @@ const Database = require('./src/database')
 /**
  * Implementation of {@link BaseResource} for Sequelize Adapter
  *
+ * @memberof module:@admin-bro/sequelize
  * @type {typeof BaseResource}
  * @static
  */

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "admin-bro-sequelizejs",
-  "version": "0.5.1",
+  "name": "@admin-bro/sequelize",
+  "version": "1.0.0-beta.3",
   "description": "Sequelize adapter for AdminBro",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   "author": "Wojciech Krysiak",
   "license": "MIT",
   "peerDependencies": {
-    "admin-bro": ">=2.2.0",
+    "admin-bro": ">=3.0.0",
     "sequelize": ">=4"
   },
   "husky": {
@@ -30,7 +30,7 @@
     "@commitlint/config-conventional": "^8.3.4",
     "@semantic-release/git": "^9.0.0",
     "@types/mocha": "^7.0.2",
-    "admin-bro": "^2.2.0",
+    "admin-bro": "^3.0.0",
     "chai": "^4.2.0",
     "eslint": "^5.10.0",
     "eslint-config-airbnb-base": "^13.1.0",
@@ -44,6 +44,7 @@
     "pg": "^7.7.1",
     "semantic-release": "^17.0.7",
     "semantic-release-jira-releases-sb": "^0.7.2",
+    "semantic-release-slack-bot": "^1.6.2",
     "sequelize": "^4.42.0",
     "sequelize-cli": "^5.4.0",
     "sinon": "^7.1.1",

src/property.js

@@ -1,10 +1,7 @@
 const { BaseProperty } = require('admin-bro')
 
-/**
- * @type {Array<[string, import('admin-bro').PropertyType]>}
- *
- * @var {[type]}
- */
+/** @typedef {import('admin-bro').PropertyType} PropertyType */
+
 const TYPES_MAPPING = [
   ['STRING', 'string'],
   ['TEXT', 'string'],
@@ -68,7 +65,7 @@ class Property extends BaseProperty {
   }
 
   /**
-   * @returns {import('admin-bro').PropertyType}
+   * @returns {PropertyType}
    */
   type() {
     let sequelizeType = this.sequelizePath.type

src/resource.js

@@ -8,6 +8,7 @@ const convertFilter = require('./utils/convert-filter')
 const createValidationError = require('./utils/create-validation-error')
 
 const SEQUELIZE_VALIDATION_ERROR = 'SequelizeValidationError'
+const SEQUELIZE_UNIQUE_ERROR = 'SequelizeUniqueConstraintError'
 
 class Resource extends BaseResource {
   static isAdapterFor(rawResource) {
@@ -134,6 +135,9 @@ class Resource extends BaseResource {
       if (error.name === SEQUELIZE_VALIDATION_ERROR) {
         throw createValidationError(error)
       }
+      if (error.name === SEQUELIZE_UNIQUE_ERROR) {
+        throw createValidationError(error)
+      }
       throw error
     }
   }
@@ -153,6 +157,9 @@ class Resource extends BaseResource {
       if (error.name === SEQUELIZE_VALIDATION_ERROR) {
         throw createValidationError(error)
       }
+      if (error.name === SEQUELIZE_UNIQUE_ERROR) {
+        throw createValidationError(error)
+      }
       throw error
     }
   }

src/utils/convert-filter.js

@@ -21,9 +21,9 @@ const convertFilter = (filter) => {
         [Op.and]: [
           ...(memo[Op.and] || []),
           where(
-            fn('LOWER', col(`${property.sequelizePath.Model.name}.${property.name()}`)),
-            Op.like,
-            fn('LOWER', `%${escape(value)}%`),
+            fn('LOWER', col(`${property.sequelizePath.Model.name}.${property.name()}`)), {
+              [Op.like]: fn('LOWER', `%${escape(value)}%`),
+            },
           ),
         ],
         ...memo,