@proteinjs/db-ui 1.0.7 → 1.0.8
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.
- package/CHANGELOG.md +11 -0
- package/dist/src/form/RecordForm.d.ts.map +1 -1
- package/dist/src/form/RecordForm.js +2 -4
- package/dist/src/form/RecordForm.js.map +1 -1
- package/dist/src/table/QueryTableLoader.d.ts.map +1 -1
- package/dist/src/table/QueryTableLoader.js +3 -2
- package/dist/src/table/QueryTableLoader.js.map +1 -1
- package/dist/src/table/RecordTable.d.ts.map +1 -1
- package/dist/src/table/RecordTable.js +0 -2
- package/dist/src/table/RecordTable.js.map +1 -1
- package/package.json +3 -3
- package/src/form/RecordForm.tsx +4 -7
- package/src/table/QueryTableLoader.ts +2 -1
- package/src/table/RecordTable.tsx +1 -4
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.0.8](https://github.com/proteinjs/db/compare/@proteinjs/db-ui@1.0.7...@proteinjs/db-ui@1.0.8) (2024-04-26)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* remove `instanceof` calls in .tsx files; add ui hiding config to corresponding columns ([19c818e](https://github.com/proteinjs/db/commit/19c818eed74197834474231042f51da0a9fe21ed))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [1.0.7](https://github.com/proteinjs/db/compare/@proteinjs/db-ui@1.0.6...@proteinjs/db-ui@1.0.7) (2024-04-26)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecordForm.d.ts","sourceRoot":"","sources":["../../../src/form/RecordForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,EAAE,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"RecordForm.d.ts","sourceRoot":"","sources":["../../../src/form/RecordForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,EAAE,KAAK,EAAE,MAAM,EAAuD,MAAM,eAAe,CAAA;AAKlG,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,MAAM,IAAI;IAC9C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAChB,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CAAA;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC,qBA4KjF"}
|
|
@@ -66,8 +66,6 @@ function RecordForm(_a) {
|
|
|
66
66
|
continue;
|
|
67
67
|
if ((_b = (_a = column.options) === null || _a === void 0 ? void 0 : _a.ui) === null || _b === void 0 ? void 0 : _b.hidden)
|
|
68
68
|
continue;
|
|
69
|
-
if ((column instanceof db_1.StringColumn && column.maxLength === 'MAX') || column instanceof db_1.ReferenceArrayColumn)
|
|
70
|
-
continue;
|
|
71
69
|
columns[columnPropertyName] = column;
|
|
72
70
|
}
|
|
73
71
|
if (!isNewRecord) {
|
|
@@ -211,13 +209,13 @@ function RecordForm(_a) {
|
|
|
211
209
|
fieldValue = record[columnPropertyName];
|
|
212
210
|
if (moment_1.default.isMoment(fieldValue))
|
|
213
211
|
fieldValue = fieldValue.format('ddd, MMM Do YY, h:mm:ss a');
|
|
214
|
-
else if (column
|
|
212
|
+
else if ((0, util_1.isInstanceOf)(column, db_1.BooleanColumn))
|
|
215
213
|
fieldValue = fieldValue == true ? 'True' : 'False';
|
|
216
214
|
field.value = fieldValue;
|
|
217
215
|
if (columnPropertyName == 'created' ||
|
|
218
216
|
columnPropertyName == 'updated' ||
|
|
219
217
|
columnPropertyName == 'id' ||
|
|
220
|
-
column
|
|
218
|
+
(0, util_1.isInstanceOf)(column, db_1.DateTimeColumn)) {
|
|
221
219
|
if (!field.accessibility)
|
|
222
220
|
field.accessibility = {};
|
|
223
221
|
field.accessibility.readonly = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecordForm.js","sourceRoot":"","sources":["../../../src/form/RecordForm.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,kDAAsB;AACtB,kDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"RecordForm.js","sourceRoot":"","sources":["../../../src/form/RecordForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryTableLoader.d.ts","sourceRoot":"","sources":["../../../src/table/QueryTableLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAS,MAAM,eAAe,CAAA;AAC9F,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAEtD,qBAAa,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAErE,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK,CAAC;IACd,OAAO,CAAC,IAAI,CAAC;gBAFL,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EACf,KAAK,CAAC,sBAAU,EAChB,IAAI,CAAC,+BAAmB;IAG5B,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryTableLoader.d.ts","sourceRoot":"","sources":["../../../src/table/QueryTableLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAS,MAAM,eAAe,CAAA;AAC9F,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAEtD,qBAAa,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAErE,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK,CAAC;IACd,OAAO,CAAC,IAAI,CAAC;gBAFL,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EACf,KAAK,CAAC,sBAAU,EAChB,IAAI,CAAC,+BAAmB;IAG5B,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;CAaxE"}
|
|
@@ -46,7 +46,7 @@ var QueryTableLoader = /** @class */ (function () {
|
|
|
46
46
|
}
|
|
47
47
|
QueryTableLoader.prototype.load = function (startIndex, endIndex) {
|
|
48
48
|
return __awaiter(this, void 0, void 0, function () {
|
|
49
|
-
var db, sort, qb, queryPromise, rowCountPromise, _a, rows, totalCount;
|
|
49
|
+
var db, sort, qb, queryPromise, rowcountQb, rowCountPromise, _a, rows, totalCount;
|
|
50
50
|
return __generator(this, function (_b) {
|
|
51
51
|
switch (_b.label) {
|
|
52
52
|
case 0:
|
|
@@ -56,7 +56,8 @@ var QueryTableLoader = /** @class */ (function () {
|
|
|
56
56
|
.sort(sort)
|
|
57
57
|
.paginate({ start: startIndex, end: endIndex });
|
|
58
58
|
queryPromise = db.query(this.table, qb);
|
|
59
|
-
|
|
59
|
+
rowcountQb = new db_1.QueryBuilderFactory().getQueryBuilder(this.table, this.query);
|
|
60
|
+
rowCountPromise = db.getRowCount(this.table, rowcountQb);
|
|
60
61
|
return [4 /*yield*/, Promise.all([queryPromise, rowCountPromise])];
|
|
61
62
|
case 1:
|
|
62
63
|
_a = _b.sent(), rows = _a[0], totalCount = _a[1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryTableLoader.js","sourceRoot":"","sources":["../../../src/table/QueryTableLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA8F;AAG9F;IACE,0BACU,KAAe,EACf,KAAgB,EAChB,IAAwB;QAFxB,UAAK,GAAL,KAAK,CAAU;QACf,UAAK,GAAL,KAAK,CAAW;QAChB,SAAI,GAAJ,IAAI,CAAoB;IAC/B,CAAC;IAEE,+BAAI,GAAV,UAAW,UAAkB,EAAE,QAAgB;;;;;;wBACvC,EAAE,GAAG,IAAA,UAAK,GAAE,CAAC;wBACb,IAAI,GAAQ,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;wBACvE,EAAE,GAAG,IAAI,wBAAmB,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;6BACzE,IAAI,CAAC,IAAI,CAAC;6BACV,QAAQ,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAChD;wBACK,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBACxC,eAAe,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"QueryTableLoader.js","sourceRoot":"","sources":["../../../src/table/QueryTableLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA8F;AAG9F;IACE,0BACU,KAAe,EACf,KAAgB,EAChB,IAAwB;QAFxB,UAAK,GAAL,KAAK,CAAU;QACf,UAAK,GAAL,KAAK,CAAW;QAChB,SAAI,GAAJ,IAAI,CAAoB;IAC/B,CAAC;IAEE,+BAAI,GAAV,UAAW,UAAkB,EAAE,QAAgB;;;;;;wBACvC,EAAE,GAAG,IAAA,UAAK,GAAE,CAAC;wBACb,IAAI,GAAQ,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;wBACvE,EAAE,GAAG,IAAI,wBAAmB,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;6BACzE,IAAI,CAAC,IAAI,CAAC;6BACV,QAAQ,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAChD;wBACK,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBACxC,UAAU,GAAG,IAAI,wBAAmB,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;wBAC/E,eAAe,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;wBACpC,qBAAM,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,EAAA;;wBAAvE,KAAqB,SAAkD,EAAtE,IAAI,QAAA,EAAE,UAAU,QAAA;wBACvB,sBAAO,EAAE,IAAI,MAAA,EAAE,UAAU,YAAA,EAAE,EAAC;;;;KAC7B;IACH,uBAAC;AAAD,CAAC,AApBD,IAoBC;AApBY,4CAAgB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecordTable.d.ts","sourceRoot":"","sources":["../../../src/table/RecordTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,EAAwC,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC7F,OAAO,EAA+B,MAAM,
|
|
1
|
+
{"version":3,"file":"RecordTable.d.ts","sourceRoot":"","sources":["../../../src/table/RecordTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,EAAwC,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC7F,OAAO,EAA+B,MAAM,EAAE,KAAK,EAAS,MAAM,eAAe,CAAA;AAKjF,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI;IAC/C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACnC,kBAAkB,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;IACzD,OAAO,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACnC,qBAAqB,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC;CAChE,CAAA;AAkCD,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,qBAwDvE"}
|
|
@@ -106,8 +106,6 @@ function RecordTable(props) {
|
|
|
106
106
|
var column = props.table.columns[columnProperty];
|
|
107
107
|
if ((_b = (_a = column.options) === null || _a === void 0 ? void 0 : _a.ui) === null || _b === void 0 ? void 0 : _b.hidden)
|
|
108
108
|
continue;
|
|
109
|
-
if ((column instanceof db_1.StringColumn && column.maxLength === 'MAX') || column instanceof db_1.ReferenceArrayColumn)
|
|
110
|
-
continue;
|
|
111
109
|
columnProperties.push(columnProperty);
|
|
112
110
|
}
|
|
113
111
|
columnProperties.push('created');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecordTable.js","sourceRoot":"","sources":["../../../src/table/RecordTable.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,sDAAiD;AACjD,kDAAsB;AACtB,oCAA6F;AAC7F,
|
|
1
|
+
{"version":3,"file":"RecordTable.js","sourceRoot":"","sources":["../../../src/table/RecordTable.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,sDAAiD;AACjD,kDAAsB;AACtB,oCAA6F;AAC7F,oCAAiF;AACjF,uDAAqD;AACrD,0DAA2E;AAC3E,4DAA0D;AAa1D,SAAS,YAAY,CAAmB,KAAe;IAAvD,iBAgBC;IAfC,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,uBAAM;QACZ,UAAU,EAAE;YACV,oBAAoB,EAAE,IAAI;YAC1B,sBAAsB,EAAE,KAAK;SAC9B;QACD,OAAO,EAAE,UAAO,YAAY,EAAE,QAAQ;;;;;wBAC9B,EAAE,GAAG,IAAI,wBAAmB,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;6BACxD,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,EAAE,EAAN,CAAM,CAAiB,EAAE,CAAC,CACpG;wBACD,qBAAM,IAAA,UAAK,GAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,EAAA;;wBAA/B,SAA+B,CAAC;wBAChC,QAAQ,CAAC,IAAA,iCAAe,EAAC,KAAK,CAAC,CAAC,CAAC;;;;aAClC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAmB,KAAe;IAAvD,iBAYC;IAXC,OAAO;QACL,IAAI,EAAE,iBAAU,IAAA,gBAAC,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAE;QAC5C,IAAI,EAAE,oBAAG;QACT,UAAU,EAAE;YACV,oBAAoB,EAAE,KAAK;YAC3B,sBAAsB,EAAE,IAAI;SAC7B;QACD,OAAO,EAAE,UAAO,YAAY,EAAE,QAAQ;;gBACpC,QAAQ,CAAC,IAAA,kCAAiB,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;;;aACzC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,WAAW,CAAmB,KAA0B;IACtE,SAAS,cAAc;;QACrB,IAAM,gBAAgB,GAAgB,EAAE,CAAC;QACzC,IAAK,KAAK,CAAC,KAAK,CAAC,OAAe,CAAC,MAAM,CAAC;YACtC,gBAAgB,CAAC,IAAI,CAAC,MAAiB,CAAC,CAAC;QAE3C,KAA2B,UAAgC,EAAhC,KAAA,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAhC,cAAgC,EAAhC,IAAgC,EAAE;YAAxD,IAAI,cAAc,SAAA;YACrB,IAAI,gBAAgB,CAAC,MAAM,IAAI,CAAC;gBAC9B,MAAM;YAER,IAAI,cAAc,IAAI,MAAM,IAAI,cAAc,IAAI,SAAS,IAAI,cAAc,IAAI,SAAS;gBACxF,SAAS;YAEX,IAAM,MAAM,GAAoB,KAAK,CAAC,KAAK,CAAC,OAAe,CAAC,cAAc,CAAC,CAAC;YAC5E,IAAI,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,EAAE,0CAAE,MAAM;gBAC5B,SAAS;YAEX,gBAAgB,CAAC,IAAI,CAAC,cAAyB,CAAC,CAAC;SAClD;QAED,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEjC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,SAAS,kBAAkB;QACzB,OAAO,IAAI,mCAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,SAAe,4BAA4B,CAAC,GAAM;;;gBAChD,sBAAO,IAAA,+BAAc,EAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,EAAC;;;KACjD;IAED,SAAS,OAAO;QACd,IAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,OAAO;YACf,OAAO,CAAC,IAAI,OAAZ,OAAO,EAAS,KAAK,CAAC,OAAO,EAAE;QAEjC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAExC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,CACL,8BAAC,UAAc,IACb,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,UAAG,IAAA,gBAAC,EAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,WAAQ,EACvF,WAAW,EAAE,KAAK,CAAC,WAAW,EAC9B,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,EAAE,EACzD,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,EAAE,EACzE,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,4BAA4B,EAC/G,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,EAC5C,OAAO,EAAE,OAAO,EAAE,GAClB,CACH,CAAC;AACJ,CAAC;AAxDD,kCAwDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@proteinjs/db-ui",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.8",
|
|
4
4
|
"description": "Db ui components",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"@emotion/styled": "11.11.0",
|
|
26
26
|
"@mui/icons-material": "5.14.11",
|
|
27
27
|
"@mui/material": "5.14.11",
|
|
28
|
-
"@proteinjs/db": "^1.0.
|
|
28
|
+
"@proteinjs/db": "^1.0.9",
|
|
29
29
|
"@proteinjs/reflection": "1.0.7",
|
|
30
30
|
"@proteinjs/ui": "1.0.4",
|
|
31
31
|
"@proteinjs/util": "1.1.0",
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
},
|
|
48
48
|
"main": "./dist/generated/index.js",
|
|
49
49
|
"types": "./dist/generated/index.d.ts",
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "cbf51b74b252657d6d53373059f7674c1c92fdc7"
|
|
51
51
|
}
|
package/src/form/RecordForm.tsx
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import S from 'string'
|
|
3
3
|
import moment from 'moment'
|
|
4
|
-
import { StringUtil } from '@proteinjs/util'
|
|
4
|
+
import { StringUtil, isInstanceOf } from '@proteinjs/util'
|
|
5
5
|
import { Form, Fields, textField, FormButtons } from '@proteinjs/ui'
|
|
6
|
-
import { Table, Record, Column, getDbService, DateTimeColumn,
|
|
6
|
+
import { Table, Record, Column, getDbService, DateTimeColumn, BooleanColumn } from '@proteinjs/db'
|
|
7
7
|
import { recordTableLink } from '../pages/RecordTablePage'
|
|
8
8
|
import { recordFormLink } from '../pages/RecordFormPage'
|
|
9
9
|
import { getRecordFormCustomization } from './RecordFormCustomization'
|
|
@@ -41,9 +41,6 @@ export function RecordForm<T extends Record>({ table, record }: RecordFormProps<
|
|
|
41
41
|
if (column.options?.ui?.hidden)
|
|
42
42
|
continue;
|
|
43
43
|
|
|
44
|
-
if ((column instanceof StringColumn && column.maxLength === 'MAX') || column instanceof ReferenceArrayColumn)
|
|
45
|
-
continue;
|
|
46
|
-
|
|
47
44
|
columns[columnPropertyName] = column;
|
|
48
45
|
}
|
|
49
46
|
|
|
@@ -171,7 +168,7 @@ export function RecordForm<T extends Record>({ table, record }: RecordFormProps<
|
|
|
171
168
|
let fieldValue = (record as any)[columnPropertyName];
|
|
172
169
|
if (moment.isMoment(fieldValue))
|
|
173
170
|
fieldValue = fieldValue.format('ddd, MMM Do YY, h:mm:ss a');
|
|
174
|
-
else if (column
|
|
171
|
+
else if (isInstanceOf(column, BooleanColumn))
|
|
175
172
|
fieldValue = fieldValue == true ? 'True' : 'False';
|
|
176
173
|
|
|
177
174
|
field.value = fieldValue;
|
|
@@ -179,7 +176,7 @@ export function RecordForm<T extends Record>({ table, record }: RecordFormProps<
|
|
|
179
176
|
columnPropertyName == 'created' ||
|
|
180
177
|
columnPropertyName == 'updated' ||
|
|
181
178
|
columnPropertyName == 'id' ||
|
|
182
|
-
column
|
|
179
|
+
isInstanceOf(column, DateTimeColumn)
|
|
183
180
|
) {
|
|
184
181
|
if (!field.accessibility)
|
|
185
182
|
field.accessibility = {};
|
|
@@ -16,7 +16,8 @@ export class QueryTableLoader<T extends Record> implements TableLoader<T> {
|
|
|
16
16
|
.paginate({ start: startIndex, end: endIndex })
|
|
17
17
|
;
|
|
18
18
|
const queryPromise = db.query(this.table, qb);
|
|
19
|
-
const
|
|
19
|
+
const rowcountQb = new QueryBuilderFactory().getQueryBuilder(this.table, this.query);
|
|
20
|
+
const rowCountPromise = db.getRowCount(this.table, rowcountQb);
|
|
20
21
|
const [rows, totalCount] = await Promise.all([queryPromise, rowCountPromise]);
|
|
21
22
|
return { rows, totalCount };
|
|
22
23
|
}
|
|
@@ -2,7 +2,7 @@ import React from 'react'
|
|
|
2
2
|
import { Delete, Add } from '@mui/icons-material'
|
|
3
3
|
import S from 'string'
|
|
4
4
|
import { TableButton, Table as TableComponent, TableLoader, TableProps } from '@proteinjs/ui'
|
|
5
|
-
import { Column, QueryBuilderFactory, Record,
|
|
5
|
+
import { Column, QueryBuilderFactory, Record, Table, getDb } from '@proteinjs/db'
|
|
6
6
|
import { QueryTableLoader } from './QueryTableLoader'
|
|
7
7
|
import { newRecordFormLink, recordFormLink } from '../pages/RecordFormPage'
|
|
8
8
|
import { recordTableLink } from '../pages/RecordTablePage'
|
|
@@ -67,9 +67,6 @@ export function RecordTable<T extends Record>(props: RecordTableProps<T>) {
|
|
|
67
67
|
if (column.options?.ui?.hidden)
|
|
68
68
|
continue;
|
|
69
69
|
|
|
70
|
-
if ((column instanceof StringColumn && column.maxLength === 'MAX') || column instanceof ReferenceArrayColumn)
|
|
71
|
-
continue;
|
|
72
|
-
|
|
73
70
|
columnProperties.push(columnProperty as keyof T);
|
|
74
71
|
}
|
|
75
72
|
|