namirasoft-site-react 1.4.306 → 1.4.309

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 (12) hide show
  1. package/dist/components/NSID.d.ts +13 -4
  2. package/dist/components/NSID.js +64 -51
  3. package/dist/components/NSID.js.map +1 -1
  4. package/dist/formatter/IDFormatter.d.ts +3 -3
  5. package/dist/formatter/IDFormatter.js +2 -2
  6. package/dist/formatter/IDFormatter.js.map +1 -1
  7. package/package.json +4 -3
  8. package/src/NSBoxBuilder.tsx +1 -1
  9. package/src/components/NSID.tsx +85 -63
  10. package/src/formatter/IDFormatter.tsx +5 -5
  11. package/dist/components/NSID.module.css +0 -18
  12. package/src/components/NSID.module.css +0 -18
package/dist/components/NSID.d.ts CHANGED
@@ -1,13 +1,22 @@
1
+ import React from 'react';
1
2
  import { IBaseComponentProps } from '../main';
2
3
  import { IStorage } from 'namirasoft-core';
3
- import { Globe } from 'namirasoft-site-map';
4
+ import { NamirasoftMap } from 'namirasoft-site-map';
4
5
  export interface NSIDProps extends IBaseComponentProps {
5
6
  id: string;
6
- globe: Globe | null;
7
+ globe: NamirasoftMap | null;
7
8
  storage: IStorage | null;
8
9
  }
9
10
  export interface NSIDState {
10
- tried: boolean;
11
11
  text?: string;
12
12
  }
13
- export declare function NSID(props: NSIDProps): import("react/jsx-runtime").JSX.Element;
13
+ export declare class NSID extends React.Component<NSIDProps, NSIDState> {
14
+ private static mutex;
15
+ private static mutexes;
16
+ private namriasoft;
17
+ private info;
18
+ constructor(props: NSIDProps);
19
+ componentDidMount(): void;
20
+ reload(): Promise<void>;
21
+ render(): import("react/jsx-runtime").JSX.Element;
22
+ }
package/dist/components/NSID.js CHANGED
@@ -7,60 +7,73 @@ 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, jsxs as _jsxs } from "react/jsx-runtime";
11
- import { useEffect, useState } from 'react';
10
+ import { jsx as _jsx } from "react/jsx-runtime";
11
+ import React from 'react';
12
12
  import { BaseURLImageFormatter, NSCopy } from '../main';
13
13
  import { BaseUUID, CacheService } from 'namirasoft-core';
14
- import { Globe } from 'namirasoft-site-map';
15
- import Styles from './NSID.module.css';
16
- export function NSID(props) {
17
- var _a;
18
- const [state, setState] = useState({
19
- tried: false,
20
- });
21
- let short = BaseUUID.getShort(props.id);
22
- let namirasoft = (_a = props.globe) !== null && _a !== void 0 ? _a : new Globe();
23
- let info = namirasoft.getByShortName(short);
24
- let cache = null;
25
- if (props.storage)
26
- cache = new CacheService(info.product.id + "-" + info.table.name, props.storage, 30, () => __awaiter(this, void 0, void 0, function* () { return "0.0.0"; }), () => __awaiter(this, void 0, void 0, function* () {
27
- var _a, _b;
28
- if (info.table.back_end.get) {
29
- try {
30
- let columns = [];
31
- info.table.forEachColumn(column => {
32
- if (column.name.includes("name"))
33
- columns.push(column.name);
34
- });
35
- let row = yield info.table.back_end.get(props.id);
36
- let values = columns.map(column => row[column]).filter(x => x);
37
- if (values.length > 0)
38
- return values.join(" ");
39
- return (_b = (_a = row.name) !== null && _a !== void 0 ? _a : row.description) !== null && _b !== void 0 ? _b : "";
40
- }
41
- catch (error) {
42
- console.error(error);
43
- }
14
+ import { NamirasoftMap } from 'namirasoft-site-map';
15
+ import { Mutex } from 'async-mutex';
16
+ export class NSID extends React.Component {
17
+ constructor(props) {
18
+ var _a;
19
+ super(props);
20
+ this.state = {};
21
+ let short = BaseUUID.getShort(this.props.id);
22
+ this.namriasoft = (_a = this.props.globe) !== null && _a !== void 0 ? _a : new NamirasoftMap();
23
+ this.info = this.namriasoft.getByShortName(short);
24
+ }
25
+ componentDidMount() {
26
+ this.reload();
27
+ }
28
+ reload() {
29
+ return __awaiter(this, void 0, void 0, function* () {
30
+ let cache = null;
31
+ if (this.props.storage) {
32
+ cache = new CacheService(this.info.product.id + ":" + this.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
+ var _a, _b;
34
+ if (this.info.table.back_end.get) {
35
+ try {
36
+ let columns = [];
37
+ this.info.table.forEachColumn(column => {
38
+ if (column.name.includes("name"))
39
+ columns.push(column.name);
40
+ });
41
+ let row = yield this.info.table.back_end.get(this.props.id);
42
+ let values = columns.map(column => row[column]).filter(x => x);
43
+ if (values.length > 0)
44
+ return values.join(" ");
45
+ return (_b = (_a = row.name) !== null && _a !== void 0 ? _a : row.description) !== null && _b !== void 0 ? _b : "";
46
+ }
47
+ catch (error) {
48
+ console.error(error);
49
+ }
50
+ }
51
+ return "";
52
+ }));
53
+ cache.runGetOn = yield NSID.mutex.runExclusive(() => __awaiter(this, void 0, void 0, function* () {
54
+ if (!NSID.mutexes[this.info.product.id])
55
+ NSID.mutexes[this.info.product.id] = new Mutex();
56
+ return NSID.mutexes[this.info.product.id];
57
+ }));
44
58
  }
45
- return "";
46
- }));
47
- useEffect(() => {
48
- if (cache)
49
- cache.get().then(text => {
50
- setState({ tried: true, text });
51
- });
52
- else
53
- setState({ tried: true });
54
- }, [props.id]);
55
- let text = state.text;
56
- if (!text)
57
- text = props.id;
58
- let formatter = new BaseURLImageFormatter();
59
- return (_jsxs(NSCopy, { value: props.id, children: [!state.tried &&
60
- _jsx("div", { className: Styles.ns_loader }), formatter.format({
59
+ if (cache)
60
+ cache.get().then(text => {
61
+ this.setState({ text });
62
+ });
63
+ });
64
+ }
65
+ render() {
66
+ let text = this.state.text;
67
+ if (!text)
68
+ text = this.props.id;
69
+ let formatter = new BaseURLImageFormatter();
70
+ return (_jsx(NSCopy, { value: this.props.id, children: formatter.format({
61
71
  text,
62
- href: info.table.front_end.getViewLink(props.id + ""),
63
- image: { url: info.product.logo, alt: info.product.logo }
64
- })] }));
72
+ href: this.info.table.front_end.getViewLink(this.props.id + ""),
73
+ image: { url: this.info.product.logo, alt: this.info.product.logo }
74
+ }) }));
75
+ }
65
76
  }
77
+ NSID.mutex = new Mutex();
78
+ NSID.mutexes = {};
66
79
  //# sourceMappingURL=NSID.js.map
package/dist/components/NSID.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NSID.js","sourceRoot":"","sources":["../../src/components/NSID.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NSID.js","sourceRoot":"","sources":["../../src/components/NSID.tsx"],"names":[],"mappings":"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"}
package/dist/formatter/IDFormatter.d.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  import { IStorage } from "namirasoft-core";
2
2
  import { BaseColumnFormatter } from "./BaseColumnFormatter";
3
3
  import { TableColumnInfo, TableRowInfo } from "../components/NSTable";
4
- import { Globe } from "namirasoft-site-map";
4
+ import { NamirasoftMap } from "namirasoft-site-map";
5
5
  export declare class IDFormatter extends BaseColumnFormatter {
6
- private globe;
6
+ private namirasoft;
7
7
  private storage;
8
- constructor(globe: Globe | null, storage: IStorage | null, width?: string);
8
+ constructor(globe: NamirasoftMap | null, storage: IStorage | null, width?: string);
9
9
  format(value: any, _: TableColumnInfo, __: TableRowInfo<any>, printable: boolean): any;
10
10
  }
package/dist/formatter/IDFormatter.js CHANGED
@@ -4,7 +4,7 @@ import { NSID } from "../components/NSID";
4
4
  export class IDFormatter extends BaseColumnFormatter {
5
5
  constructor(globe, storage, width = "224px") {
6
6
  super();
7
- this.globe = globe;
7
+ this.namirasoft = globe;
8
8
  this.storage = storage;
9
9
  this.onclick_overrided = true;
10
10
  this.width = width;
@@ -12,7 +12,7 @@ export class IDFormatter extends BaseColumnFormatter {
12
12
  format(value, _, __, printable) {
13
13
  try {
14
14
  if (!printable)
15
- return _jsx(NSID, { id: value, globe: this.globe, storage: this.storage });
15
+ return _jsx(NSID, { id: value, globe: this.namirasoft, storage: this.storage });
16
16
  }
17
17
  catch (error) {
18
18
  }
package/dist/formatter/IDFormatter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IDFormatter.js","sourceRoot":"","sources":["../../src/formatter/IDFormatter.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAG1C,MAAM,OAAO,WAAY,SAAQ,mBAAmB;IAKhD,YAAY,KAAmB,EAAE,OAAwB,EAAE,QAAgB,OAAO;QAE9E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IACQ,MAAM,CAAC,KAAU,EAAE,CAAkB,EAAE,EAAqB,EAAE,SAAkB;QAErF,IACA,CAAC;YACG,IAAI,CAAC,SAAS;gBACV,OAAO,KAAC,IAAI,IAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,GAAS,CAAC;QAClF,CAAC;QAAC,OAAO,KAAK,EACd,CAAC;QACD,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
1
+ {"version":3,"file":"IDFormatter.js","sourceRoot":"","sources":["../../src/formatter/IDFormatter.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAG1C,MAAM,OAAO,WAAY,SAAQ,mBAAmB;IAKhD,YAAY,KAA2B,EAAE,OAAwB,EAAE,QAAgB,OAAO;QAEtF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IACQ,MAAM,CAAC,KAAU,EAAE,CAAkB,EAAE,EAAqB,EAAE,SAAkB;QAErF,IACA,CAAC;YACG,IAAI,CAAC,SAAS;gBACV,OAAO,KAAC,IAAI,IAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,GAAS,CAAC;QACvF,CAAC;QAAC,OAAO,KAAK,EACd,CAAC;QACD,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.306",
11
+ "version": "1.4.309",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/main.js",
@@ -28,16 +28,17 @@
28
28
  "@types/react-bootstrap": "^0.32.37",
29
29
  "@types/react-dom": "^18.3.1",
30
30
  "antd": "^5.24.3",
31
+ "async-mutex": "^0.5.0",
31
32
  "bootstrap": "^5.3.3",
32
33
  "chart.js": "^4.4.8",
33
34
  "copyfiles": "^2.4.1",
34
35
  "link-react": "^3.0.0",
35
36
  "namirasoft-api-link": "^1.4.13",
36
37
  "namirasoft-api-product": "^1.4.19",
37
- "namirasoft-core": "^1.4.53",
38
+ "namirasoft-core": "^1.4.54",
38
39
  "namirasoft-schema": "^1.4.25",
39
40
  "namirasoft-site": "^1.4.24",
40
- "namirasoft-site-map": "^1.4.15",
41
+ "namirasoft-site-map": "^1.4.16",
41
42
  "os-browserify": "^0.3.0",
42
43
  "path-browserify": "^1.0.1",
43
44
  "react": "^18.3.1",
package/src/NSBoxBuilder.tsx CHANGED
@@ -760,7 +760,7 @@ export class NSBoxBuilder extends BaseTypeBuilder<React.JSX.Element | null>
760
760
 
761
761
  getItems={async () =>
762
762
  {
763
- // let product = Globe.namirasoft.getByProductID(schema.product);
763
+ // let product = NamirasoftMap.namirasoft.getByProductID(schema.product);
764
764
  // product.meta.tables[schema.table];
765
765
  // product.server.List;
766
766
  // todo
package/src/components/NSID.tsx CHANGED
@@ -1,90 +1,112 @@
1
- import { useEffect, useState } from 'react';
1
+ import React from 'react';
2
2
  import { BaseURLImageFormatter, IBaseComponentProps, NSCopy } from '../main';
3
3
  import { BaseUUID, CacheService, IStorage } from 'namirasoft-core';
4
- import { Globe } from 'namirasoft-site-map';
5
- import Styles from './NSID.module.css';
4
+ import { NamirasoftMap } from 'namirasoft-site-map';
5
+ import { NSBaseMetaTable, NSBaseServer } from 'namirasoft-site';
6
+ import { Mutex } from 'async-mutex';
6
7
 
7
8
  export interface NSIDProps extends IBaseComponentProps
8
9
  {
9
10
  id: string;
10
- globe: Globe | null;
11
+ globe: NamirasoftMap | null;
11
12
  storage: IStorage | null;
12
13
  }
13
14
 
14
15
  export interface NSIDState
15
16
  {
16
- tried: boolean;
17
17
  text?: string;
18
18
  }
19
19
 
20
- export function NSID(props: NSIDProps)
20
+ export class NSID extends React.Component<NSIDProps, NSIDState>
21
21
  {
22
- const [state, setState] = useState<NSIDState>({
23
- tried: false,
24
- });
25
-
26
- let short = BaseUUID.getShort(props.id);
27
- let namirasoft = props.globe ?? new Globe();
28
- let info = namirasoft.getByShortName(short);
29
- let cache = null;
30
- if (props.storage)
31
- cache = new CacheService<string>(info.product.id + "-" + info.table.name, props.storage, 30, async () => "0.0.0", async () =>
22
+ private static mutex: Mutex = new Mutex();
23
+ private static mutexes: { [product_id: string]: Mutex } = {};
24
+ private namriasoft: NamirasoftMap;
25
+ private info: {
26
+ product: {
27
+ id: string;
28
+ name: string;
29
+ headline: string;
30
+ description: string;
31
+ logo: string;
32
+ link: string;
33
+ };
34
+ table: NSBaseMetaTable<NSBaseServer, any>;
35
+ };
36
+ constructor(props: NSIDProps)
37
+ {
38
+ super(props);
39
+ this.state = {};
40
+ let short = BaseUUID.getShort(this.props.id);
41
+ this.namriasoft = this.props.globe ?? new NamirasoftMap();
42
+ this.info = this.namriasoft.getByShortName(short);
43
+ }
44
+ override componentDidMount(): void
45
+ {
46
+ this.reload();
47
+ }
48
+ async reload()
49
+ {
50
+ let cache = null;
51
+ if (this.props.storage)
32
52
  {
33
- if (info.table.back_end.get)
53
+ cache = new CacheService<string>(this.info.product.id + ":" + this.info.table.name + ":" + this.props.id, this.props.storage, 60, async () => "0.0.0", async () =>
34
54
  {
35
- try
55
+ if (this.info.table.back_end.get)
36
56
  {
37
- let columns: string[] = [];
38
- info.table.forEachColumn(column =>
57
+ try
39
58
  {
40
- if (column.name.includes("name"))
41
- columns.push(column.name);
42
- });
43
- let row = await info.table.back_end.get(props.id);
44
- let values = columns.map(column => row[column]).filter(x => x);
45
- if (values.length > 0)
46
- return values.join(" ");
47
- return row.name ?? row.description ?? "";
48
- } catch (error)
49
- {
50
- console.error(error);
59
+ let columns: string[] = [];
60
+ this.info.table.forEachColumn(column =>
61
+ {
62
+ if (column.name.includes("name"))
63
+ columns.push(column.name);
64
+ });
65
+ let row = await this.info.table.back_end.get(this.props.id);
66
+ let values = columns.map(column => row[column]).filter(x => x);
67
+ if (values.length > 0)
68
+ return values.join(" ");
69
+ return row.name ?? row.description ?? "";
70
+ } catch (error)
71
+ {
72
+ console.error(error);
73
+ }
51
74
  }
52
- }
53
- return "";
54
- });
55
-
56
- useEffect(() =>
57
- {
75
+ return "";
76
+ });
77
+ cache.runGetOn = await NSID.mutex.runExclusive(async () =>
78
+ {
79
+ if (!NSID.mutexes[this.info.product.id])
80
+ NSID.mutexes[this.info.product.id] = new Mutex();
81
+ return NSID.mutexes[this.info.product.id];
82
+ });
83
+ }
58
84
  if (cache)
59
85
  cache.get().then(text =>
60
86
  {
61
- setState({ tried: true, text });
87
+ this.setState({ text });
62
88
  });
63
- else
64
- setState({ tried: true });
65
- }, [props.id]);
89
+ }
66
90
 
67
- let text = state.text;
68
- if (!text)
69
- text = props.id;
91
+ override render()
92
+ {
93
+ let text = this.state.text;
94
+ if (!text)
95
+ text = this.props.id;
70
96
 
71
- let formatter = new BaseURLImageFormatter();
72
- return (
73
- <NSCopy
74
- value={props.id}
75
- >
76
- {
77
- !state.tried &&
78
- <div className={Styles.ns_loader}>
79
- </div>
80
- }
81
- {
82
- formatter.format({
83
- text,
84
- href: info.table.front_end.getViewLink(props.id + ""),
85
- image: { url: info.product.logo, alt: info.product.logo }
86
- })
87
- }
88
- </NSCopy>
89
- );
97
+ let formatter = new BaseURLImageFormatter();
98
+ return (
99
+ <NSCopy
100
+ value={this.props.id}
101
+ >
102
+ {
103
+ formatter.format({
104
+ text,
105
+ href: this.info.table.front_end.getViewLink(this.props.id + ""),
106
+ image: { url: this.info.product.logo, alt: this.info.product.logo }
107
+ })
108
+ }
109
+ </NSCopy>
110
+ );
111
+ }
90
112
  }
package/src/formatter/IDFormatter.tsx CHANGED
@@ -2,17 +2,17 @@ import { IStorage } from "namirasoft-core";
2
2
  import { BaseColumnFormatter } from "./BaseColumnFormatter";
3
3
  import { TableColumnInfo, TableRowInfo } from "../components/NSTable";
4
4
  import { NSID } from "../components/NSID";
5
- import { Globe } from "namirasoft-site-map";
5
+ import { NamirasoftMap } from "namirasoft-site-map";
6
6
 
7
7
  export class IDFormatter extends BaseColumnFormatter
8
8
  {
9
- private globe: Globe | null;
9
+ private namirasoft: NamirasoftMap | null;
10
10
  private storage: IStorage | null;
11
11
 
12
- constructor(globe: Globe | null, storage: IStorage | null, width: string = "224px")
12
+ constructor(globe: NamirasoftMap | null, storage: IStorage | null, width: string = "224px")
13
13
  {
14
14
  super();
15
- this.globe = globe;
15
+ this.namirasoft = globe;
16
16
  this.storage = storage;
17
17
  this.onclick_overrided = true;
18
18
  this.width = width;
@@ -22,7 +22,7 @@ export class IDFormatter extends BaseColumnFormatter
22
22
  try
23
23
  {
24
24
  if (!printable)
25
- return <NSID id={value} globe={this.globe} storage={this.storage}></NSID>;
25
+ return <NSID id={value} globe={this.namirasoft} storage={this.storage}></NSID>;
26
26
  } catch (error)
27
27
  {
28
28
  }
package/dist/components/NSID.module.css DELETED
@@ -1,18 +0,0 @@
1
- .ns_id_loader {
2
- margin: 0;
3
- width: 24px;
4
- height: 24px;
5
- border-radius: 50%;
6
- background: conic-gradient(#0000 10%, #001664) content-box;
7
- -webkit-mask:
8
- repeating-conic-gradient(#0000 0deg, #000 1deg 20deg, #0000 21deg 36deg),
9
- radial-gradient(farthest-side, #0000 calc(100% - 9px), #000 calc(100% - 8px));
10
- -webkit-mask-composite: destination-in;
11
- animation: rotate 1s infinite steps(10);
12
- }
13
-
14
- @keyframes rotate {
15
- to {
16
- transform: rotate(1turn)
17
- }
18
- }
package/src/components/NSID.module.css DELETED
@@ -1,18 +0,0 @@
1
- .ns_id_loader {
2
- margin: 0;
3
- width: 24px;
4
- height: 24px;
5
- border-radius: 50%;
6
- background: conic-gradient(#0000 10%, #001664) content-box;
7
- -webkit-mask:
8
- repeating-conic-gradient(#0000 0deg, #000 1deg 20deg, #0000 21deg 36deg),
9
- radial-gradient(farthest-side, #0000 calc(100% - 9px), #000 calc(100% - 8px));
10
- -webkit-mask-composite: destination-in;
11
- animation: rotate 1s infinite steps(10);
12
- }
13
-
14
- @keyframes rotate {
15
- to {
16
- transform: rotate(1turn)
17
- }
18
- }