chore(force-release): release the version 7

Author: ghusse

CHANGELOG.md

@@ -1,3 +1,23 @@
+# [7.0.0-beta.12](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.11...v7.0.0-beta.12) (2021-02-22)
+
+
+### Bug Fixes
+
+* fix error when no foreign key is found but foreign and primary key is detected ([#632](https://github.com/ForestAdmin/forest-express-sequelize/issues/632)) ([6f06512](https://github.com/ForestAdmin/forest-express-sequelize/commit/6f0651264e28cb8259589f04f4c0a3eabcb59bb6))
+
+# [7.0.0-beta.11](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.10...v7.0.0-beta.11) (2021-02-22)
+
+
+### Bug Fixes
+
+* fix record creation with unconventional pk field acting as a fk ([#598](https://github.com/ForestAdmin/forest-express-sequelize/issues/598)) ([d3779b7](https://github.com/ForestAdmin/forest-express-sequelize/commit/d3779b75f553830574c51850dfdec5c6ab3eabc6))
+* support foreign and primary key column ([#630](https://github.com/ForestAdmin/forest-express-sequelize/issues/630)) ([2a289b8](https://github.com/ForestAdmin/forest-express-sequelize/commit/2a289b805727d51d112719ee29af28b7745bff73))
+* **search:** don't convert float values to bigint ([75c1517](https://github.com/ForestAdmin/forest-express-sequelize/commit/75c151720bb9c260272325f1f2c088b0c9050ac7))
+* **search:** handle large numbers in search queries ([c0c1c70](https://github.com/ForestAdmin/forest-express-sequelize/commit/c0c1c70686ecdaab9c9e6bbf432f44a414cf8c2e))
+* **search:** handle large numbers in search queries ([#621](https://github.com/ForestAdmin/forest-express-sequelize/issues/621)) ([ec6ab89](https://github.com/ForestAdmin/forest-express-sequelize/commit/ec6ab8989cde26af379f814fa7ee4bd28a1cddd6))
+* **search:** handle tables that contain floats and bigints ([7ac2fe1](https://github.com/ForestAdmin/forest-express-sequelize/commit/7ac2fe152ae01af98484d88e8c98c612bcb50573))
+* **search:** revert changes when numbers are below MAX_SAFE_INTEGER ([1d95021](https://github.com/ForestAdmin/forest-express-sequelize/commit/1d95021f55a64a519d71c301ceb810196abfdd34))
+
 ## [6.7.11](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.7.10...v6.7.11) (2021-02-22)
 
 
@@ -30,12 +50,44 @@
 * **search:** handle tables that contain floats and bigints ([7ac2fe1](https://github.com/ForestAdmin/forest-express-sequelize/commit/7ac2fe152ae01af98484d88e8c98c612bcb50573))
 * **search:** revert changes when numbers are below MAX_SAFE_INTEGER ([1d95021](https://github.com/ForestAdmin/forest-express-sequelize/commit/1d95021f55a64a519d71c301ceb810196abfdd34))
 
+# [7.0.0-beta.10](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.9...v7.0.0-beta.10) (2021-02-09)
+
+### Bug Fixes
+
+* array display with smart field ([#575](https://github.com/ForestAdmin/forest-express-sequelize/issues/575)) ([e0698d3](https://github.com/ForestAdmin/forest-express-sequelize/commit/e0698d30f9ae1a792a51b61bb74a8a29753d1317))
+* correctly set fields holding  belongsTo relationships to null when updated with a null value ([#607](https://github.com/ForestAdmin/forest-express-sequelize/issues/607)) ([374151f](https://github.com/ForestAdmin/forest-express-sequelize/commit/374151fcfa7d3e70ce5817039749656250131e2f))
+* display correct reference field when it is a smartfield ([#584](https://github.com/ForestAdmin/forest-express-sequelize/issues/584)) ([50aef31](https://github.com/ForestAdmin/forest-express-sequelize/commit/50aef319977555c31f853d4436fcfa6694f85b26))
+* fix belongsTo relationships creation when creating a record ([#602](https://github.com/ForestAdmin/forest-express-sequelize/issues/602)) ([e06dbc8](https://github.com/ForestAdmin/forest-express-sequelize/commit/e06dbc831dddeffed8d13a8a942b3998ef2982bf))
+* fix related data list display ([#578](https://github.com/ForestAdmin/forest-express-sequelize/issues/578)) ([370dba7](https://github.com/ForestAdmin/forest-express-sequelize/commit/370dba7c0c60a64dad6688a54e62cc508e44b9b5))
+* fix unconventional pk when referenced as null on creation ([#608](https://github.com/ForestAdmin/forest-express-sequelize/issues/608)) ([af70d62](https://github.com/ForestAdmin/forest-express-sequelize/commit/af70d62d36052ab0b77295a581d82ae69068ccda))
+* handle foreign key toward non primary key ([#585](https://github.com/ForestAdmin/forest-express-sequelize/issues/585)) ([64c78c7](https://github.com/ForestAdmin/forest-express-sequelize/commit/64c78c7545bc03fa03984572b39cf6977e927f17))
+* secure sql queries generated by leaderboard stats ([#611](https://github.com/ForestAdmin/forest-express-sequelize/issues/611)) ([f41d79c](https://github.com/ForestAdmin/forest-express-sequelize/commit/f41d79c979b01a9d15e8354df94918e27faf9187))
+* **forestadmin-schema:** regenerate forestadmin schema only when files are valid ([#597](https://github.com/ForestAdmin/forest-express-sequelize/issues/597)) ([a24abbd](https://github.com/ForestAdmin/forest-express-sequelize/commit/a24abbdfd91c24aff87fc649e9889e5d88cef61d))
+* **leaderboard:** fix an error when use "user" table ([#565](https://github.com/ForestAdmin/forest-express-sequelize/issues/565)) ([0cbbc32](https://github.com/ForestAdmin/forest-express-sequelize/commit/0cbbc326b0f8ff686ed1e6b37dc719005e06866a))
+* **smart-action-hook:** value injected to an enum field of type  is now correctly handled ([#600](https://github.com/ForestAdmin/forest-express-sequelize/issues/600)) ([c0a3b58](https://github.com/ForestAdmin/forest-express-sequelize/commit/c0a3b58dc272f91d1802fa00dca3b3c79ca56e01))
+
+
+### Features
+
+* **filter:** add possibility to filter on smart field ([eaead56](https://github.com/ForestAdmin/forest-express-sequelize/commit/eaead56004a67edd4d266dc1583c43146ca393c3))
+* **filter:** add possibility to filter on smart field ([#583](https://github.com/ForestAdmin/forest-express-sequelize/issues/583)) ([dbf136a](https://github.com/ForestAdmin/forest-express-sequelize/commit/dbf136a2f8b1fd7b3694769792e9e15b4a93a6e4))
+* **smart actions:** introduce smart action forms hooks ([#569](https://github.com/ForestAdmin/forest-express-sequelize/issues/569)) ([cd13029](https://github.com/ForestAdmin/forest-express-sequelize/commit/cd13029551e6b6cbee0ecaed4c51d0bf44794e0a))
+
 ## [6.7.7](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.7.6...v6.7.7) (2021-02-05)
 
 
 ### Bug Fixes
 
-* secure sql queries generated by leaderboard stats ([#611](https://github.com/ForestAdmin/forest-express-sequelize/issues/611)) ([f41d79c](https://github.com/ForestAdmin/forest-express-sequelize/commit/f41d79c979b01a9d15e8354df94918e27faf9187))
+* secure sql queries generated by leaderboard stats ([#611](https://github.com/ForestAdmin/forest-express-sequelize/issues/611)) ([f41d79c](https://github.com/ForestAdmin/forest-express-sequelize/commit/f41d79c979b01a9d15e8354df94918e27faf9187
+))
+
+# [7.0.0-beta.9](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.8...v7.0.0-beta.9) (2021-02-02)
+
+
+### Features
+
+* return correct errors when the user needs to configure the 2FA ([#609](https://github.com/ForestAdmin/forest-express-sequelize/issues/609)) ([08b64a0](https://github.com/ForestAdmin/forest-express-sequelize/commit/08b64a038f2d9aef206710234d16d6e877274967))
+
 
 ## [6.7.6](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.7.5...v6.7.6) (2021-02-02)
 
@@ -87,6 +139,31 @@
 * **filter:** add possibility to filter on smart field ([eaead56](https://github.com/ForestAdmin/forest-express-sequelize/commit/eaead56004a67edd4d266dc1583c43146ca393c3))
 * **filter:** add possibility to filter on smart field ([#583](https://github.com/ForestAdmin/forest-express-sequelize/issues/583)) ([dbf136a](https://github.com/ForestAdmin/forest-express-sequelize/commit/dbf136a2f8b1fd7b3694769792e9e15b4a93a6e4))
 
+# [7.0.0-beta.8](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.7...v7.0.0-beta.8) (2021-01-08)
+
+
+### Bug Fixes
+
+* **authentication:** error when authenticating with an invalid token in cookies ([#593](https://github.com/ForestAdmin/forest-express-sequelize/issues/593)) ([405feb4](https://github.com/ForestAdmin/forest-express-sequelize/commit/405feb439e34746b385203eb995aec92e955eeab))
+
+# [7.0.0-beta.7](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.6...v7.0.0-beta.7) (2021-01-06)
+
+
+### Bug Fixes
+
+* user being disconnected after 33min instead of 14 days ([#591](https://github.com/ForestAdmin/forest-express-sequelize/issues/591)) ([2e2dc81](https://github.com/ForestAdmin/forest-express-sequelize/commit/2e2dc811f497acb0d771497c55b75349480e46a5))
+
+# [7.0.0-beta.6](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.5...v7.0.0-beta.6) (2021-01-06)
+
+
+### Bug Fixes
+
+* connect to liana through safari ([#590](https://github.com/ForestAdmin/forest-express-sequelize/issues/590)) ([6a0fcb3](https://github.com/ForestAdmin/forest-express-sequelize/commit/6a0fcb346c71f561e80b7d691f38774eaa8c24b9))
+
+# [7.0.0-beta.5](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.4...v7.0.0-beta.5) (2020-12-30)
+
+# [7.0.0-beta.4](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.3...v7.0.0-beta.4) (2020-12-23)
+
 ## [6.6.3](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.6.2...v6.6.3) (2020-12-21)
 
 
@@ -113,6 +190,7 @@
 
 ### Features
 
+* **smart actions:** endpoint that handle forms' load hooks ([0902ef4](https://github.com/ForestAdmin/forest-express-sequelize/commit/0902ef458abf41efb25f0dc024549702a50645fe))
 * **smart actions:** introduce smart action forms hooks ([#569](https://github.com/ForestAdmin/forest-express-sequelize/issues/569)) ([cd13029](https://github.com/ForestAdmin/forest-express-sequelize/commit/cd13029551e6b6cbee0ecaed4c51d0bf44794e0a))
 
 ## [6.5.1](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.5.0...v6.5.1) (2020-12-09)
@@ -122,6 +200,21 @@
 
 * **leaderboard:** fix an error when use "user" table ([#565](https://github.com/ForestAdmin/forest-express-sequelize/issues/565)) ([0cbbc32](https://github.com/ForestAdmin/forest-express-sequelize/commit/0cbbc326b0f8ff686ed1e6b37dc719005e06866a))
 
+# [7.0.0-beta.3](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.2...v7.0.0-beta.3) (2020-12-02)
+
+
+### Bug Fixes
+
+* always return primary keys of associated records ([#550](https://github.com/ForestAdmin/forest-express-sequelize/issues/550)) ([57bd84b](https://github.com/ForestAdmin/forest-express-sequelize/commit/57bd84bc992bbe5fd703b2e36c02bb431885535d))
+* export error handler middleware ([#552](https://github.com/ForestAdmin/forest-express-sequelize/issues/552)) ([a87591b](https://github.com/ForestAdmin/forest-express-sequelize/commit/a87591b8d5cffc5041fedcb654be2fadfb6dd78f))
+
+# [7.0.0-beta.2](https://github.com/ForestAdmin/forest-express-sequelize/compare/v7.0.0-beta.1...v7.0.0-beta.2) (2020-11-30)
+
+
+### Bug Fixes
+
+* fix incorrect usage of the new connections parameter ([#557](https://github.com/ForestAdmin/forest-express-sequelize/issues/557)) ([2840e41](https://github.com/ForestAdmin/forest-express-sequelize/commit/2840e418bb782a83b861dda217d45b3d70175253))
+
 # [6.5.0](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.4.2...v6.5.0) (2020-11-27)
 
 
@@ -143,6 +236,20 @@
 
 * always return primary keys of associated records ([#550](https://github.com/ForestAdmin/forest-express-sequelize/issues/550)) ([57bd84b](https://github.com/ForestAdmin/forest-express-sequelize/commit/57bd84bc992bbe5fd703b2e36c02bb431885535d))
 
+# [7.0.0-beta.1](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.4.0...v7.0.0-beta.1) (2020-11-24)
+
+
+### Features
+
+* init function now uses connections & objectMapping instead of sequelize as parameter ([#539](https://github.com/ForestAdmin/forest-express-sequelize/issues/539)) ([74262ac](https://github.com/ForestAdmin/forest-express-sequelize/commit/74262acfc7d77ce1e0aa1b2f44d3e69b7fce470a))
+
+
+### BREAKING CHANGES
+
+* sequelize options is not supported anymore by Liana.init()
+connections and objectMapping is now required on Liana.init().
+Update forest-express dependency to 8.0.0-beta.1 (See https://github.com/ForestAdmin/forest-express/tree/v8.0.0-beta.1)
+
 # [6.4.0](https://github.com/ForestAdmin/forest-express-sequelize/compare/v6.3.15...v6.4.0) (2020-11-17)
 
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "forest-express-sequelize",
   "description": "Official Express/Sequelize Liana for Forest",
-  "version": "6.7.11",
+  "version": "7.0.0-beta.12",
   "author": "Sandro Munda <[email protected]>",
   "contributors": [
     "Arnaud Besnier <[email protected]>",
@@ -27,7 +27,7 @@
     "@babel/runtime": "7.10.1",
     "bluebird": "2.9.25",
     "core-js": "3.6.5",
-    "forest-express": "7.10.1",
+    "forest-express": "8.0.0",
     "http-errors": "1.6.1",
     "lodash": "4.17.19",
     "moment": "2.19.4",

src/index.js

@@ -1,4 +1,3 @@
-const _ = require('lodash');
 const P = require('bluebird');
 const Interface = require('forest-express');
 const orm = require('./utils/orm');
@@ -54,12 +53,18 @@ exports.PUBLIC_ROUTES = Interface.PUBLIC_ROUTES;
 exports.init = function init(opts) {
   exports.opts = opts;
 
-  // NOTICE: Ensure compatibility with the old middleware configuration.
-  if (opts.sequelize && !('connections' in opts)) {
-    opts.connections = [opts.sequelize];
-    opts.sequelize = opts.sequelize.Sequelize;
+  if (!opts.objectMapping) {
+    Interface.logger.error('The objectMapping option appears to be missing. Please make sure it is set correctly.');
+    return Promise.resolve(() => {});
   }
 
+  if (opts.sequelize) {
+    Interface.logger.warn('The sequelize option is not supported anymore. Please remove this option.');
+  }
+
+  opts.Sequelize = opts.objectMapping;
+  opts.useMultipleDatabases = Object.keys(opts.connections).length > 1;
+
   exports.getLianaName = function getLianaName() {
     return 'forest-express-sequelize';
   };
@@ -73,41 +78,17 @@ exports.init = function init(opts) {
   };
 
   exports.getOrmVersion = function getOrmVersion() {
-    if (!opts.sequelize) { return null; }
-
-    return orm.getVersion(opts.sequelize);
+    return orm.getVersion(opts.Sequelize);
   };
 
   exports.getDatabaseType = function getDatabaseType() {
-    if (!opts.connections) { return null; }
+    if (opts.useMultipleDatabases) return 'multiple';
 
-    return opts.connections[0].options.dialect;
+    return Object.values(opts.connections)[0].options.dialect;
   };
 
   exports.SchemaAdapter = SchemaAdapter;
 
-  exports.getModels = function getModels() {
-    // NOTICE: The default Forest configuration detects all models.
-    const detectAllModels = _.isEmpty(opts.includedModels) && _.isEmpty(opts.excludedModels);
-    const models = {};
-
-    _.each(opts.connections, (connection) => {
-      _.each(connection.models, (model) => {
-        if (detectAllModels) {
-          models[model.name] = model;
-        } else if (!_.isEmpty(opts.includedModels)
-          && _.includes(opts.includedModels, model.name)) {
-          models[model.name] = model;
-        } else if (!_.isEmpty(opts.excludedModels)
-          && !_.includes(opts.excludedModels, model.name)) {
-          models[model.name] = model;
-        }
-      });
-    });
-
-    return models;
-  };
-
   exports.getModelName = function getModelName(model) {
     return model.name;
   };

src/services/apimap-field-builder.js

@@ -2,7 +2,7 @@ const _ = require('lodash');
 const ApimapFieldTypeDetector = require('./apimap-field-type-detector');
 
 function ApimapFieldBuilder(model, column, options) {
-  const DataTypes = options.sequelize;
+  const DataTypes = options.Sequelize;
 
   function isRequired() {
     // eslint-disable-next-line

src/services/apimap-field-type-detector.js

@@ -1,5 +1,5 @@
 function ApimapFieldTypeDetector(column, options) {
-  const DataTypes = options.sequelize;
+  const DataTypes = options.Sequelize;
 
   this.perform = () => {
     if (column.type instanceof DataTypes.STRING

src/services/filters-parser.js

@@ -11,9 +11,9 @@ function FiltersParser(modelSchema, timezone, options) {
   this.perform = async (filtersString) =>
     BaseFiltersParser.perform(filtersString, this.formatAggregation, this.formatCondition);
 
-  this.formatAggregation = async (aggregator, formatedConditions) => {
+  this.formatAggregation = async (aggregator, formattedConditions) => {
     const aggregatorOperator = this.formatAggregatorOperator(aggregator);
-    return { [aggregatorOperator]: formatedConditions };
+    return { [aggregatorOperator]: formattedConditions };
   };
 
   this.formatCondition = async (condition) => {
@@ -32,16 +32,19 @@ function FiltersParser(modelSchema, timezone, options) {
       return formattedCondition;
     }
 
-    const formatedField = this.formatField(condition.field);
+    const formattedField = this.formatField(condition.field);
 
     if (this.operatorDateParser.isDateOperator(condition.operator)) {
       return {
-        [formatedField]: this.operatorDateParser.getDateFilter(condition.operator, condition.value),
+        [formattedField]: this.operatorDateParser.getDateFilter(
+          condition.operator,
+          condition.value,
+        ),
       };
     }
 
     return {
-      [formatedField]: this.formatOperatorValue(condition.operator, condition.value, isTextField),
+      [formattedField]: this.formatOperatorValue(condition.operator, condition.value, isTextField),
     };
   };
 

src/services/leaderboard-stat-getter.js

@@ -21,9 +21,8 @@ function getAggregateField({
  *  aggregate: string;
  *  aggregate_field: string;
  * }} params
- * @param {*} options
  */
-function LeaderboardStatGetter(model, modelRelationship, params, options) {
+function LeaderboardStatGetter(model, modelRelationship, params) {
   const labelField = params.label_field;
   const aggregate = params.aggregate.toUpperCase();
   const { limit } = params;
@@ -57,8 +56,8 @@ function LeaderboardStatGetter(model, modelRelationship, params, options) {
       .unscoped()
       .findAll({
         attributes: [
-          [options.sequelize.col(groupBy), 'key'],
-          [options.sequelize.fn(aggregate, options.sequelize.col(aggregateField)), 'value'],
+          [model.sequelize.col(groupBy), 'key'],
+          [model.sequelize.fn(aggregate, model.sequelize.col(aggregateField)), 'value'],
         ],
         includeIgnoreAttributes: false,
         include: [{
@@ -69,7 +68,7 @@ function LeaderboardStatGetter(model, modelRelationship, params, options) {
         }],
         subQuery: false,
         group: groupBy,
-        order: [[options.sequelize.literal('value'), 'DESC']],
+        order: [[model.sequelize.literal('value'), 'DESC']],
         limit,
         raw: true,
       });