namirasoft-site-react 1.4.310 → 1.4.311
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/NSID.d.ts +2 -3
- package/dist/components/NSID.js +24 -12
- package/dist/components/NSID.js.map +1 -1
- package/package.json +1 -1
- package/src/components/NSID.tsx +25 -13
|
@@ -13,10 +13,9 @@ export interface NSIDState {
|
|
|
13
13
|
export declare class NSID extends React.Component<NSIDProps, NSIDState> {
|
|
14
14
|
private static mutex;
|
|
15
15
|
private static mutexes;
|
|
16
|
-
private
|
|
17
|
-
private info;
|
|
16
|
+
private info?;
|
|
18
17
|
constructor(props: NSIDProps);
|
|
19
18
|
componentDidMount(): void;
|
|
20
19
|
reload(): Promise<void>;
|
|
21
|
-
render(): import("react/jsx-runtime").JSX.Element;
|
|
20
|
+
render(): string | import("react/jsx-runtime").JSX.Element;
|
|
22
21
|
}
|
package/dist/components/NSID.js
CHANGED
|
@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
10
|
+
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
|
11
11
|
import React from 'react';
|
|
12
12
|
import { BaseURLImageFormatter, NSCopy } from '../main';
|
|
13
13
|
import { BaseUUID, CacheService } from 'namirasoft-core';
|
|
@@ -18,27 +18,34 @@ export class NSID extends React.Component {
|
|
|
18
18
|
var _a;
|
|
19
19
|
super(props);
|
|
20
20
|
this.state = {};
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
try {
|
|
22
|
+
let short = BaseUUID.getShort(this.props.id);
|
|
23
|
+
let namriasoft = (_a = this.props.globe) !== null && _a !== void 0 ? _a : new NamirasoftMap();
|
|
24
|
+
this.info = namriasoft.getByShortName(short);
|
|
25
|
+
}
|
|
26
|
+
catch (error) {
|
|
27
|
+
}
|
|
24
28
|
}
|
|
25
29
|
componentDidMount() {
|
|
26
30
|
this.reload();
|
|
27
31
|
}
|
|
28
32
|
reload() {
|
|
29
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
+
if (!this.info)
|
|
35
|
+
return;
|
|
36
|
+
let info = this.info;
|
|
30
37
|
let cache = null;
|
|
31
38
|
if (this.props.storage) {
|
|
32
|
-
cache = new CacheService(
|
|
39
|
+
cache = new CacheService(info.product.id + ":" + info.table.name + ":" + this.props.id, this.props.storage, 60, () => __awaiter(this, void 0, void 0, function* () { return "0.0.0"; }), () => __awaiter(this, void 0, void 0, function* () {
|
|
33
40
|
var _a, _b;
|
|
34
|
-
if (
|
|
41
|
+
if (info.table.back_end.get) {
|
|
35
42
|
try {
|
|
36
43
|
let columns = [];
|
|
37
|
-
|
|
44
|
+
info.table.forEachColumn(column => {
|
|
38
45
|
if (column.name.includes("name"))
|
|
39
46
|
columns.push(column.name);
|
|
40
47
|
});
|
|
41
|
-
let row = yield
|
|
48
|
+
let row = yield info.table.back_end.get(this.props.id);
|
|
42
49
|
let values = columns.map(column => row[column]).filter(x => x);
|
|
43
50
|
if (values.length > 0)
|
|
44
51
|
return values.join(" ");
|
|
@@ -51,9 +58,9 @@ export class NSID extends React.Component {
|
|
|
51
58
|
return "";
|
|
52
59
|
}));
|
|
53
60
|
cache.runGetOn = yield NSID.mutex.runExclusive(() => __awaiter(this, void 0, void 0, function* () {
|
|
54
|
-
if (!NSID.mutexes[
|
|
55
|
-
NSID.mutexes[
|
|
56
|
-
return NSID.mutexes[
|
|
61
|
+
if (!NSID.mutexes[info.product.id])
|
|
62
|
+
NSID.mutexes[info.product.id] = new Mutex();
|
|
63
|
+
return NSID.mutexes[info.product.id];
|
|
57
64
|
}));
|
|
58
65
|
}
|
|
59
66
|
if (cache)
|
|
@@ -63,6 +70,11 @@ export class NSID extends React.Component {
|
|
|
63
70
|
});
|
|
64
71
|
}
|
|
65
72
|
render() {
|
|
73
|
+
var _a;
|
|
74
|
+
if (!this.props.id)
|
|
75
|
+
return _jsx(_Fragment, {});
|
|
76
|
+
if (!this.info)
|
|
77
|
+
return this.props.id;
|
|
66
78
|
let text = this.state.text;
|
|
67
79
|
if (!text)
|
|
68
80
|
text = this.props.id;
|
|
@@ -70,7 +82,7 @@ export class NSID extends React.Component {
|
|
|
70
82
|
return (_jsx(NSCopy, { value: this.props.id, children: formatter.format({
|
|
71
83
|
text,
|
|
72
84
|
href: this.info.table.front_end.getViewLink(this.props.id + ""),
|
|
73
|
-
image: { url: this.info.product.logo, alt: this.info.product.logo }
|
|
85
|
+
image: { url: this.info.product.logo, alt: (_a = this.info) === null || _a === void 0 ? void 0 : _a.product.logo }
|
|
74
86
|
}) }));
|
|
75
87
|
}
|
|
76
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSID.js","sourceRoot":"","sources":["../../src/components/NSID.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAuB,MAAM,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAcpC,MAAM,OAAO,IAAK,SAAQ,KAAK,CAAC,SAA+B;
|
|
1
|
+
{"version":3,"file":"NSID.js","sourceRoot":"","sources":["../../src/components/NSID.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/components/NSID.tsx
CHANGED
|
@@ -21,8 +21,7 @@ export class NSID extends React.Component<NSIDProps, NSIDState>
|
|
|
21
21
|
{
|
|
22
22
|
private static mutex: Mutex = new Mutex();
|
|
23
23
|
private static mutexes: { [product_id: string]: Mutex } = {};
|
|
24
|
-
private
|
|
25
|
-
private info: {
|
|
24
|
+
private info?: {
|
|
26
25
|
product: {
|
|
27
26
|
id: string;
|
|
28
27
|
name: string;
|
|
@@ -37,9 +36,14 @@ export class NSID extends React.Component<NSIDProps, NSIDState>
|
|
|
37
36
|
{
|
|
38
37
|
super(props);
|
|
39
38
|
this.state = {};
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
try
|
|
40
|
+
{
|
|
41
|
+
let short = BaseUUID.getShort(this.props.id);
|
|
42
|
+
let namriasoft = this.props.globe ?? new NamirasoftMap();
|
|
43
|
+
this.info = namriasoft.getByShortName(short);
|
|
44
|
+
} catch (error)
|
|
45
|
+
{
|
|
46
|
+
}
|
|
43
47
|
}
|
|
44
48
|
override componentDidMount(): void
|
|
45
49
|
{
|
|
@@ -47,22 +51,25 @@ export class NSID extends React.Component<NSIDProps, NSIDState>
|
|
|
47
51
|
}
|
|
48
52
|
async reload()
|
|
49
53
|
{
|
|
54
|
+
if (!this.info)
|
|
55
|
+
return;
|
|
56
|
+
let info = this.info;
|
|
50
57
|
let cache = null;
|
|
51
58
|
if (this.props.storage)
|
|
52
59
|
{
|
|
53
|
-
cache = new CacheService<string>(
|
|
60
|
+
cache = new CacheService<string>(info.product.id + ":" + info.table.name + ":" + this.props.id, this.props.storage, 60, async () => "0.0.0", async () =>
|
|
54
61
|
{
|
|
55
|
-
if (
|
|
62
|
+
if (info.table.back_end.get)
|
|
56
63
|
{
|
|
57
64
|
try
|
|
58
65
|
{
|
|
59
66
|
let columns: string[] = [];
|
|
60
|
-
|
|
67
|
+
info.table.forEachColumn(column =>
|
|
61
68
|
{
|
|
62
69
|
if (column.name.includes("name"))
|
|
63
70
|
columns.push(column.name);
|
|
64
71
|
});
|
|
65
|
-
let row = await
|
|
72
|
+
let row = await info.table.back_end.get(this.props.id);
|
|
66
73
|
let values = columns.map(column => row[column]).filter(x => x);
|
|
67
74
|
if (values.length > 0)
|
|
68
75
|
return values.join(" ");
|
|
@@ -76,9 +83,9 @@ export class NSID extends React.Component<NSIDProps, NSIDState>
|
|
|
76
83
|
});
|
|
77
84
|
cache.runGetOn = await NSID.mutex.runExclusive(async () =>
|
|
78
85
|
{
|
|
79
|
-
if (!NSID.mutexes[
|
|
80
|
-
NSID.mutexes[
|
|
81
|
-
return NSID.mutexes[
|
|
86
|
+
if (!NSID.mutexes[info.product.id])
|
|
87
|
+
NSID.mutexes[info.product.id] = new Mutex();
|
|
88
|
+
return NSID.mutexes[info.product.id];
|
|
82
89
|
});
|
|
83
90
|
}
|
|
84
91
|
if (cache)
|
|
@@ -90,6 +97,11 @@ export class NSID extends React.Component<NSIDProps, NSIDState>
|
|
|
90
97
|
|
|
91
98
|
override render()
|
|
92
99
|
{
|
|
100
|
+
if (!this.props.id)
|
|
101
|
+
return <></>;
|
|
102
|
+
if (!this.info)
|
|
103
|
+
return this.props.id;
|
|
104
|
+
|
|
93
105
|
let text = this.state.text;
|
|
94
106
|
if (!text)
|
|
95
107
|
text = this.props.id;
|
|
@@ -103,7 +115,7 @@ export class NSID extends React.Component<NSIDProps, NSIDState>
|
|
|
103
115
|
formatter.format({
|
|
104
116
|
text,
|
|
105
117
|
href: this.info.table.front_end.getViewLink(this.props.id + ""),
|
|
106
|
-
image: { url: this.info.product.logo, alt: this.info
|
|
118
|
+
image: { url: this.info.product.logo, alt: this.info?.product.logo }
|
|
107
119
|
})
|
|
108
120
|
}
|
|
109
121
|
</NSCopy>
|