namirasoft-account-react 1.5.46 → 1.5.48
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/dist/components/quickfilter/NSAFilterBoxBase.js +4 -3
- package/dist/components/quickfilter/NSAFilterBoxBase.js.map +1 -1
- package/dist/layouts/NSASectionEdit.js +19 -13
- package/dist/layouts/NSASectionEdit.js.map +1 -1
- package/dist/layouts/NSASectionView.js +11 -5
- package/dist/layouts/NSASectionView.js.map +1 -1
- package/package.json +2 -2
- package/src/components/quickfilter/NSAFilterBoxBase.tsx +4 -3
- package/src/layouts/NSASectionEdit.tsx +25 -17
- package/src/layouts/NSASectionView.tsx +11 -4
|
@@ -40,11 +40,12 @@ export class NSAFilterBoxBase extends Component {
|
|
|
40
40
|
}
|
|
41
41
|
getLabel() {
|
|
42
42
|
const { config } = this.props;
|
|
43
|
-
|
|
43
|
+
if (config.title)
|
|
44
|
+
return config.title;
|
|
44
45
|
if (!config.operatorName)
|
|
45
|
-
return
|
|
46
|
+
return config.column.text;
|
|
46
47
|
const sign = FilterItemOperator.getByName(config.operatorName).sign;
|
|
47
|
-
return `${
|
|
48
|
+
return `${config.column.text} ${sign}`;
|
|
48
49
|
}
|
|
49
50
|
getInitialItems() {
|
|
50
51
|
const initial = this.props.initial;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSAFilterBoxBase.js","sourceRoot":"","sources":["../../../src/components/quickfilter/NSAFilterBoxBase.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAUhG,MAAM,OAAgB,gBAClB,SAAQ,SAAe;IAaf,SAAS;QAEb,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC5G,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC7B,CAAC;IAES,eAAe,CAAC,GAAG,MAAgB;;QAEzC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,mCAAI,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,GAAG,IAAI,gBAAgB,CAAC,gBAAgB,CAAC;QACvD,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACzE,MAAM,QAAQ,GAAG,WAAW;YACxB,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,WAAW,CAAC;YAC3C,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC;QACpC,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC;IACrE,CAAC;IAES,sBAAsB,CAAC,GAAG,MAAgB;;QAEhD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,mCAAI,EAAE,CAAC;QACjD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACrE,IAAI,gBAAgB;YAChB,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAChG,MAAM,WAAW,GAAG,GAAG,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC5G,MAAM,QAAQ,GAAG,WAAW;YACxB,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,WAAW,CAAC;YAC3C,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC;QACpC,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC;IACpE,CAAC;IAES,uBAAuB,CAAC,IAAY,EAAE,EAAU;QAEtD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC3C,OAAO;YACH,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC;YAChF,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC;SACjF,CAAC;IACN,CAAC;IAES,QAAQ;QAEd,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,
|
|
1
|
+
{"version":3,"file":"NSAFilterBoxBase.js","sourceRoot":"","sources":["../../../src/components/quickfilter/NSAFilterBoxBase.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
11
11
|
import { IStorageLocal, NamingConvention } from "namirasoft-core";
|
|
12
|
-
import { NSButtonBlue, NSID, NSLine, NSLoading,
|
|
12
|
+
import { NSButtonBlue, NSError, NSID, NSLine, NSLoading, NSPanel, NSSection, NSSpace, NSSpaceSizeType } from "namirasoft-site-react";
|
|
13
13
|
import { Component, createRef } from "react";
|
|
14
14
|
import { NSANavigationGuard } from "../components/NSANavigationGuard";
|
|
15
15
|
import { NSASectionEditTabPage } from "./NSASectionEditTabPage";
|
|
@@ -35,19 +35,25 @@ export class NSASectionEdit extends Component {
|
|
|
35
35
|
this.setState(prev => (Object.assign(Object.assign({}, prev), { isDirty: true })));
|
|
36
36
|
}
|
|
37
37
|
reload() {
|
|
38
|
-
var _a, _b;
|
|
39
38
|
this.setState(prev => (Object.assign(Object.assign({}, prev), { row: null, loading: true, error: null })));
|
|
40
|
-
if (this.props.model.id)
|
|
41
|
-
|
|
42
|
-
this.
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
39
|
+
if (this.props.model.id) {
|
|
40
|
+
if (this.props.entity.server.get)
|
|
41
|
+
this.props.entity.server.get(this.props.model.id).then(row => {
|
|
42
|
+
this.setState(prev => (Object.assign(Object.assign({}, prev), { row, loading: false, isDirty: false, error: null })), () => {
|
|
43
|
+
var _a, _b, _c, _d;
|
|
44
|
+
(_b = (_a = this.props).onLoaded) === null || _b === void 0 ? void 0 : _b.call(_a);
|
|
45
|
+
(_d = (_c = this.props).onRowLoaded) === null || _d === void 0 ? void 0 : _d.call(_c, row);
|
|
46
|
+
});
|
|
47
|
+
}).catch((error) => {
|
|
48
|
+
this.setState(prev => { var _a, _b; return (Object.assign(Object.assign({}, prev), { loading: false, error: (_b = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : String(error)) !== null && _b !== void 0 ? _b : "Unknown error" })); });
|
|
49
|
+
try {
|
|
50
|
+
this.props.notifier.onError(error);
|
|
51
|
+
}
|
|
52
|
+
catch (_a) { }
|
|
46
53
|
});
|
|
47
|
-
|
|
48
|
-
this.
|
|
49
|
-
|
|
50
|
-
});
|
|
54
|
+
else
|
|
55
|
+
this.setState(prev => (Object.assign(Object.assign({}, prev), { loading: false, error: "This entity does not support loading." })));
|
|
56
|
+
}
|
|
51
57
|
}
|
|
52
58
|
getRow() {
|
|
53
59
|
return this.state.row;
|
|
@@ -140,7 +146,7 @@ export class NSASectionEdit extends Component {
|
|
|
140
146
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
141
147
|
return (_jsxs(_Fragment, { children: [_jsx(NSANavigationGuard, { when: this.state.isDirty }), _jsxs(NSSection, { id: this.props.id, classList: [`${(_b = (_a = this.props.classList) === null || _a === void 0 ? void 0 : _a.join(" ")) !== null && _b !== void 0 ? _b : ""}`], style: Object.assign({}, this.props.style), children: [this.state.error
|
|
142
148
|
?
|
|
143
|
-
_jsx(
|
|
149
|
+
_jsx(NSError, { title: "Failed to load", description: this.state.error })
|
|
144
150
|
:
|
|
145
151
|
!this.state.loading
|
|
146
152
|
?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSASectionEdit.js","sourceRoot":"","sources":["../../src/layouts/NSASectionEdit.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAuB,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"NSASectionEdit.js","sourceRoot":"","sources":["../../src/layouts/NSASectionEdit.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import {
|
|
2
|
+
import { NSError, NSLoading } from "namirasoft-site-react";
|
|
3
3
|
import { Component, createRef } from "react";
|
|
4
4
|
import { NSASectionViewTabPage } from "./NSASectionViewTabPage";
|
|
5
5
|
export class NSASectionView extends Component {
|
|
@@ -12,7 +12,7 @@ export class NSASectionView extends Component {
|
|
|
12
12
|
}
|
|
13
13
|
reload() {
|
|
14
14
|
this.setState(prev => (Object.assign(Object.assign({}, prev), { row: null, error: null })));
|
|
15
|
-
if (this.props.model.id)
|
|
15
|
+
if (this.props.model.id) {
|
|
16
16
|
if (this.props.entity.server.get)
|
|
17
17
|
this.props.entity.server.get(this.props.model.id).then(row => {
|
|
18
18
|
this.setState(prev => (Object.assign(Object.assign({}, prev), { row, error: null })), () => {
|
|
@@ -20,9 +20,15 @@ export class NSASectionView extends Component {
|
|
|
20
20
|
(_b = (_a = this.props).onRowLoaded) === null || _b === void 0 ? void 0 : _b.call(_a, row);
|
|
21
21
|
});
|
|
22
22
|
}).catch((error) => {
|
|
23
|
-
this.
|
|
24
|
-
|
|
23
|
+
this.setState(prev => { var _a, _b; return (Object.assign(Object.assign({}, prev), { error: (_b = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : String(error)) !== null && _b !== void 0 ? _b : "Unknown error" })); });
|
|
24
|
+
try {
|
|
25
|
+
this.props.notifier.onError(error);
|
|
26
|
+
}
|
|
27
|
+
catch (_a) { }
|
|
25
28
|
});
|
|
29
|
+
else
|
|
30
|
+
this.setState(prev => (Object.assign(Object.assign({}, prev), { error: "This entity does not support loading." })));
|
|
31
|
+
}
|
|
26
32
|
}
|
|
27
33
|
getRow() {
|
|
28
34
|
return this.state.row;
|
|
@@ -40,7 +46,7 @@ export class NSASectionView extends Component {
|
|
|
40
46
|
row: this.state.row
|
|
41
47
|
}, ui: (_e = this.props.ui) === null || _e === void 0 ? void 0 : _e.tab_page_view })), ((_f = this.props.ui) === null || _f === void 0 ? void 0 : _f.getChildrenAfter) && ((_g = this.props.ui) === null || _g === void 0 ? void 0 : _g.getChildrenAfter(this.props.model.id, this.state.row)), this.props.children] }));
|
|
42
48
|
if (this.state.error)
|
|
43
|
-
return _jsx(
|
|
49
|
+
return _jsx(NSError, { title: "Failed to load", description: this.state.error });
|
|
44
50
|
return _jsx(NSLoading, { title: "Loading row item ..." });
|
|
45
51
|
}
|
|
46
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSASectionView.js","sourceRoot":"","sources":["../../src/layouts/NSASectionView.tsx"],"names":[],"mappings":";AACA,OAAO,EAAuB,
|
|
1
|
+
{"version":3,"file":"NSASectionView.js","sourceRoot":"","sources":["../../src/layouts/NSASectionView.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.5.
|
|
11
|
+
"version": "1.5.48",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/main.js",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"namirasoft-schema": "^1.5.0",
|
|
40
40
|
"namirasoft-secret": "^1.5.4",
|
|
41
41
|
"namirasoft-site-map": "^1.5.3",
|
|
42
|
-
"namirasoft-site-react": "^1.5.
|
|
42
|
+
"namirasoft-site-react": "^1.5.50",
|
|
43
43
|
"namirasoft-workspace": "^1.5.2",
|
|
44
44
|
"os-browserify": "^0.3.0",
|
|
45
45
|
"path-browserify": "^1.0.1",
|
|
@@ -69,11 +69,12 @@ export abstract class NSAFilterBoxBase<P extends NSAFilterBoxBaseProps = NSAFilt
|
|
|
69
69
|
protected getLabel(): string
|
|
70
70
|
{
|
|
71
71
|
const { config } = this.props;
|
|
72
|
-
|
|
72
|
+
if (config.title)
|
|
73
|
+
return config.title;
|
|
73
74
|
if (!config.operatorName)
|
|
74
|
-
return
|
|
75
|
+
return config.column.text;
|
|
75
76
|
const sign = FilterItemOperator.getByName(config.operatorName).sign;
|
|
76
|
-
return `${
|
|
77
|
+
return `${config.column.text} ${sign}`;
|
|
77
78
|
}
|
|
78
79
|
|
|
79
80
|
protected getInitialItems(): FilterItem[]
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IStorageLocal, NamingConvention } from "namirasoft-core";
|
|
2
2
|
import { EntityResolveResponseRow } from "namirasoft-field";
|
|
3
|
-
import { IBaseComponentProps, NSButtonBlue, NSID, NSLine, NSLoading,
|
|
3
|
+
import { IBaseComponentProps, NSButtonBlue, NSError, NSID, NSLine, NSLoading, NSPanel, NSSection, NSSpace, NSSpaceSizeType } from "namirasoft-site-react";
|
|
4
4
|
import { Component, createRef, FormHTMLAttributes, ReactNode } from "react";
|
|
5
5
|
import { NSANavigationGuard } from "../components/NSANavigationGuard";
|
|
6
6
|
import { IEntityInfo } from "../IEntityInfo";
|
|
@@ -79,21 +79,26 @@ export class NSASectionEdit<RowType extends { id: string }, RowTypeInput = RowTy
|
|
|
79
79
|
{
|
|
80
80
|
this.setState(prev => ({ ...prev, row: null, loading: true, error: null }));
|
|
81
81
|
if (this.props.model.id)
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
this.
|
|
85
|
-
|
|
86
|
-
(
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
82
|
+
{
|
|
83
|
+
if (this.props.entity.server.get)
|
|
84
|
+
this.props.entity.server.get(this.props.model.id).then(row =>
|
|
85
|
+
{
|
|
86
|
+
this.setState(
|
|
87
|
+
prev => ({ ...prev, row, loading: false, isDirty: false, error: null }),
|
|
88
|
+
() =>
|
|
89
|
+
{
|
|
90
|
+
this.props.onLoaded?.();
|
|
91
|
+
this.props.onRowLoaded?.(row);
|
|
92
|
+
}
|
|
93
|
+
);
|
|
94
|
+
}).catch((error: any) =>
|
|
95
|
+
{
|
|
96
|
+
this.setState(prev => ({ ...prev, loading: false, error: error?.message ?? String(error) ?? "Unknown error" }));
|
|
97
|
+
try { this.props.notifier.onError(error); } catch { }
|
|
98
|
+
});
|
|
99
|
+
else
|
|
100
|
+
this.setState(prev => ({ ...prev, loading: false, error: "This entity does not support loading." }));
|
|
101
|
+
}
|
|
97
102
|
}
|
|
98
103
|
getRow()
|
|
99
104
|
{
|
|
@@ -215,7 +220,10 @@ export class NSASectionEdit<RowType extends { id: string }, RowTypeInput = RowTy
|
|
|
215
220
|
{
|
|
216
221
|
this.state.error
|
|
217
222
|
?
|
|
218
|
-
<
|
|
223
|
+
<NSError
|
|
224
|
+
title="Failed to load"
|
|
225
|
+
description={this.state.error}
|
|
226
|
+
/>
|
|
219
227
|
:
|
|
220
228
|
!this.state.loading
|
|
221
229
|
?
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EntityResolveResponseRow } from "namirasoft-field";
|
|
2
|
-
import { IBaseComponentProps,
|
|
2
|
+
import { IBaseComponentProps, NSError, NSLoading } from "namirasoft-site-react";
|
|
3
3
|
import { Component, createRef, ReactNode } from "react";
|
|
4
4
|
import { IEntityInfo } from "../IEntityInfo";
|
|
5
5
|
import { NSARouterMakerResult } from "../NSARouterMakerResult";
|
|
@@ -52,6 +52,7 @@ export class NSASectionView<RowType extends { id: string }, RowTypeInput = RowTy
|
|
|
52
52
|
{
|
|
53
53
|
this.setState(prev => ({ ...prev, row: null, error: null }));
|
|
54
54
|
if (this.props.model.id)
|
|
55
|
+
{
|
|
55
56
|
if (this.props.entity.server.get)
|
|
56
57
|
this.props.entity.server.get(this.props.model.id).then(row =>
|
|
57
58
|
{
|
|
@@ -61,9 +62,12 @@ export class NSASectionView<RowType extends { id: string }, RowTypeInput = RowTy
|
|
|
61
62
|
});
|
|
62
63
|
}).catch((error: any) =>
|
|
63
64
|
{
|
|
64
|
-
this.
|
|
65
|
-
this.
|
|
65
|
+
this.setState(prev => ({ ...prev, error: error?.message ?? String(error) ?? "Unknown error" }));
|
|
66
|
+
try { this.props.notifier.onError(error); } catch { }
|
|
66
67
|
});
|
|
68
|
+
else
|
|
69
|
+
this.setState(prev => ({ ...prev, error: "This entity does not support loading." }));
|
|
70
|
+
}
|
|
67
71
|
}
|
|
68
72
|
getRow()
|
|
69
73
|
{
|
|
@@ -100,7 +104,10 @@ export class NSASectionView<RowType extends { id: string }, RowTypeInput = RowTy
|
|
|
100
104
|
);
|
|
101
105
|
|
|
102
106
|
if (this.state.error)
|
|
103
|
-
return <
|
|
107
|
+
return <NSError
|
|
108
|
+
title="Failed to load"
|
|
109
|
+
description={this.state.error}
|
|
110
|
+
/>;
|
|
104
111
|
|
|
105
112
|
return <NSLoading title="Loading row item ..." />;
|
|
106
113
|
}
|