fix: rebase

ForestAdmin · Jul 27, 2023 · 91a19e3 · 91a19e3
1 parent e264a97
commit 91a19e3
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 25 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/operational-database/README.md b/packages/operational-database/README.md
@@ -8,7 +8,7 @@
 ## Installation
 
 ```bash
-yarn add @forestadmin/plugin-operational-database
+yarn add @forestadmin-experimental/plugin-operational-database
 ```
 
 ## Limits

diff --git a/packages/operational-database/package.json b/packages/operational-database/package.json
@@ -6,13 +6,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {},
   "scripts": {
     "build": "tsc"
   },
   "dependencies": {
-    "@forestadmin/datasource-customizer": "^1.6.1",
-    "@forestadmin/datasource-sequelize": "^1.3.1",
-    "sequelize": "^6.32.0"
+    "sequelize": "^6.32.0",
+    "@forestadmin/datasource-sequelize": "^1.4.0"
+  },
+  "devDependencies": {
+    "@forestadmin/datasource-customizer": "^1.14.0"
   }
 }
diff --git a/packages/operational-database/src/index.ts b/packages/operational-database/src/index.ts
@@ -1,5 +1,5 @@
 import { createSequelizeDataSource } from "@forestadmin/datasource-sequelize";
-import {
+import type {
   CollectionCustomizer,
   DataSourceCustomizer,
 } from "@forestadmin/datasource-customizer";
@@ -23,8 +23,12 @@ async function createOperationalTable(
   await sequelize.sync();
 }
 
-function linkDatabases(collection: CollectionCustomizer, columns: Columns) {
-  //  link main db collection to operational db collection
+function linkDatabases(
+  dataSource: DataSourceCustomizer,
+  collection: CollectionCustomizer,
+  columns: Columns
+) {
+  // link main db collection to operational db collection
   collection.addOneToOneRelation(
     "operational",
     `operational_${collection.name}`,
@@ -42,9 +46,7 @@ function linkDatabases(collection: CollectionCustomizer, columns: Columns) {
   collection.removeField("operational");
 
   // remove operational db collection
-  // This actually does not work... we have a branch implementing this feature that
-  // has been waiting for months to be finished as it was deprioritized.
-  // dataSource.removeCollection(`operational_${collection.name}`);
+  dataSource.removeCollection(`operational_${collection.name}`);
 }
 
 export default async function addOperationalColumns(
@@ -60,5 +62,7 @@ export default async function addOperationalColumns(
   dataSource.addDataSource(createSequelizeDataSource(sequelize));
 
   // Link main db collection to operational db collection
-  linkDatabases(collection, options.columns);
+  linkDatabases(dataSource, collection, options.columns);
 }
+
+export { DataType, DataTypes };