adminforth 1.3.2 → 1.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dataConnectors/mongo.ts +3 -4
  2. package/dist/dataConnectors/mongo.js +3 -4
  3. package/package.json +1 -1
package/dataConnectors/mongo.ts CHANGED
@@ -107,13 +107,12 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
107
107
  return value;
108
108
  }
109
109
 
110
- async genQuery({ resource, limit, offset, sort, filters }) {
111
- const collection = this.db.db().collection(resource.table);
110
+ async genQuery({ filters }) {
112
111
  const query = {};
113
112
  for (const filter of filters) {
114
113
  query[filter.field] = this.OperatorsMap[filter.operator](filter.value);
115
114
  }
116
- return { collection, query };
115
+ return query;
117
116
  }
118
117
 
119
118
  async getDataWithOriginalTypes({ resource, limit, offset, sort, filters }:
@@ -130,7 +129,7 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
130
129
  const tableName = resource.table;
131
130
 
132
131
  const collection = this.db.db().collection(tableName);
133
- const query = this.genQuery({ resource, limit, offset, sort, filters });
132
+ const query = await this.genQuery({ filters });
134
133
 
135
134
  const sortArray: any[] = sort.map((s) => {
136
135
  return [s.field, this.SortDirectionsMap[s.direction]];
package/dist/dataConnectors/mongo.js CHANGED
@@ -109,13 +109,12 @@ class MongoConnector extends AdminForthBaseConnector {
109
109
  return value;
110
110
  }
111
111
  genQuery(_a) {
112
- return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters }) {
113
- const collection = this.db.db().collection(resource.table);
112
+ return __awaiter(this, arguments, void 0, function* ({ filters }) {
114
113
  const query = {};
115
114
  for (const filter of filters) {
116
115
  query[filter.field] = this.OperatorsMap[filter.operator](filter.value);
117
116
  }
118
- return { collection, query };
117
+ return query;
119
118
  });
120
119
  }
121
120
  getDataWithOriginalTypes(_a) {
@@ -123,7 +122,7 @@ class MongoConnector extends AdminForthBaseConnector {
123
122
  // const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => col.name).join(', ');
124
123
  const tableName = resource.table;
125
124
  const collection = this.db.db().collection(tableName);
126
- const query = this.genQuery({ resource, limit, offset, sort, filters });
125
+ const query = yield this.genQuery({ filters });
127
126
  const sortArray = sort.map((s) => {
128
127
  return [s.field, this.SortDirectionsMap[s.direction]];
129
128
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "adminforth",
3
- "version": "1.3.2",
3
+ "version": "1.3.4",
4
4
  "description": "OpenSource Vue3 powered forth-generation admin panel",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",