adminforth 1.3.10 → 1.3.12

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.
@@ -57,25 +57,28 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
57
57
  throw new Error('Method not implemented.');
58
58
  }
59
59
 
60
- createRecord({ resource, record, adminUser }: {
60
+ async createRecord({ resource, record, adminUser }: {
61
61
  resource: AdminForthResource; record: any; adminUser: any;
62
- }): Promise<void> {
62
+ }): Promise<any> {
63
63
  // transform value using setFieldValue and call createRecordOriginalValues
64
- const newRecord = {...record};
65
-
64
+ const filledRecord = {...record};
65
+ const recordWithOriginalValues = {...record};
66
+
66
67
  for (const col of resource.dataSourceColumns) {
67
68
  if (col.fillOnCreate) {
68
- if (record[col.name] === undefined) {
69
- record[col.name] = col.fillOnCreate({
70
- initialRecord: record, adminUser
71
- });
69
+ if (filledRecord[col.name] === undefined) {
70
+ filledRecord[col.name] = col.fillOnCreate({
71
+ initialRecord: record,
72
+ adminUser
73
+ });
72
74
  }
73
75
  }
74
-
75
- newRecord[col.name] = this.setFieldValue(col, record[col.name]);
76
+ recordWithOriginalValues[col.name] = this.setFieldValue(col, filledRecord[col.name]);
76
77
  }
77
- process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', newRecord);
78
- return this.createRecordOriginalValues({ resource, record: newRecord });
78
+ process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', recordWithOriginalValues);
79
+ await this.createRecordOriginalValues({ resource, record: recordWithOriginalValues });
80
+
81
+ return recordWithOriginalValues;
79
82
  }
80
83
 
81
84
  updateRecord({ resource, recordId, newValues }: { resource: AdminForthResource; recordId: string; newValues: any; }): Promise<void> {
@@ -50,21 +50,26 @@ export default class AdminForthBaseConnector {
50
50
  createRecordOriginalValues({ resource, record }) {
51
51
  throw new Error('Method not implemented.');
52
52
  }
53
- createRecord({ resource, record, adminUser }) {
54
- // transform value using setFieldValue and call createRecordOriginalValues
55
- const newRecord = Object.assign({}, record);
56
- for (const col of resource.dataSourceColumns) {
57
- if (col.fillOnCreate) {
58
- if (record[col.name] === undefined) {
59
- record[col.name] = col.fillOnCreate({
60
- initialRecord: record, adminUser
61
- });
53
+ createRecord(_a) {
54
+ return __awaiter(this, arguments, void 0, function* ({ resource, record, adminUser }) {
55
+ // transform value using setFieldValue and call createRecordOriginalValues
56
+ const filledRecord = Object.assign({}, record);
57
+ const recordWithOriginalValues = Object.assign({}, record);
58
+ for (const col of resource.dataSourceColumns) {
59
+ if (col.fillOnCreate) {
60
+ if (filledRecord[col.name] === undefined) {
61
+ filledRecord[col.name] = col.fillOnCreate({
62
+ initialRecord: record,
63
+ adminUser
64
+ });
65
+ }
62
66
  }
67
+ recordWithOriginalValues[col.name] = this.setFieldValue(col, filledRecord[col.name]);
63
68
  }
64
- newRecord[col.name] = this.setFieldValue(col, record[col.name]);
65
- }
66
- process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', newRecord);
67
- return this.createRecordOriginalValues({ resource, record: newRecord });
69
+ process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', recordWithOriginalValues);
70
+ yield this.createRecordOriginalValues({ resource, record: recordWithOriginalValues });
71
+ return recordWithOriginalValues;
72
+ });
68
73
  }
69
74
  updateRecord({ resource, recordId, newValues }) {
70
75
  throw new Error('Method not implemented.');
@@ -31,11 +31,19 @@ export default class OperationalResource {
31
31
  }
32
32
  list(filter, limit, offset, sort) {
33
33
  return __awaiter(this, void 0, void 0, function* () {
34
+ let appliedLimit = limit;
35
+ if (limit === null) {
36
+ appliedLimit = 1000000000;
37
+ }
38
+ let appliedOffset = offset;
39
+ if (offset === null) {
40
+ appliedOffset = 0;
41
+ }
34
42
  const { data } = yield this.dataConnector.getData({
35
43
  resource: this.resourceConfig,
36
44
  filters: filtersIfFilter(filter),
37
- limit,
38
- offset,
45
+ limit: appliedLimit,
46
+ offset: appliedOffset,
39
47
  sort: sortsIfSort(sort),
40
48
  getTotals: false,
41
49
  });
@@ -32,15 +32,24 @@ export default class OperationalResource implements IOperationalResource {
32
32
 
33
33
  async list(
34
34
  filter: IAdminForthFilter | IAdminForthFilter[],
35
- limit: number,
36
- offset: number,
35
+ limit: number | null,
36
+ offset: number | null,
37
37
  sort: IAdminForthSort | IAdminForthSort[]
38
38
  ): Promise<any[]> {
39
+ let appliedLimit = limit;
40
+ if (limit === null) {
41
+ appliedLimit = 1000000000;
42
+ }
43
+ let appliedOffset = offset;
44
+ if (offset === null) {
45
+ appliedOffset = 0;
46
+ }
47
+
39
48
  const { data } = await this.dataConnector.getData({
40
49
  resource: this.resourceConfig,
41
50
  filters: filtersIfFilter(filter),
42
- limit,
43
- offset,
51
+ limit: appliedLimit,
52
+ offset: appliedOffset,
44
53
  sort: sortsIfSort(sort),
45
54
  getTotals: false,
46
55
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "adminforth",
3
- "version": "1.3.10",
3
+ "version": "1.3.12",
4
4
  "description": "OpenSource Vue3 powered forth-generation admin panel",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",