@j2inn/fin5-ui-utils 0.0.1-alpha.1 → 0.0.1-alpha.2
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/fantomProps/fantomPropsToObject.js +7 -2
- package/dist/fantomProps/generateJsonFromFantomPropsFile.js +33 -4
- package/dist/fantomProps/index.js +19 -3
- package/dist/fantomProps/readFantomPropsFile.js +30 -4
- package/dist/fin5Top/fin5Top.d.ts +2 -2
- package/dist/fin5Top/fin5Top.js +9 -6
- package/dist/fin5Top/getFin5BinUrl.js +6 -2
- package/dist/fin5Top/index.js +20 -4
- package/dist/fin5Top/openFin5Alarm.js +10 -7
- package/dist/fin5Top/openFin5Historian.js +10 -6
- package/dist/index.d.ts +3 -3
- package/dist/index.js +19 -3
- package/dist/react/components/DefaultErrorBoundary/index.jsx +23 -15
- package/dist/react/components/LoadingSpinner/index.jsx +11 -6
- package/dist/react/components/index.js +21 -5
- package/dist/react/components/navigation/BasicLayout/index.jsx +49 -22
- package/dist/react/components/navigation/MenuPage/index.jsx +9 -3
- package/dist/react/components/navigation/Router.jsx +39 -9
- package/package.json +1 -1
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseFantomProps = void 0;
|
|
1
4
|
/**
|
|
2
5
|
* Convert the given fantom props as string to JS object (@see https://fantom.org/doc/sys/InStream#readProps)
|
|
3
6
|
*/
|
|
4
|
-
|
|
7
|
+
function fantomPropsToObject(props) {
|
|
5
8
|
let i = 0;
|
|
6
9
|
const readChar = () => {
|
|
7
10
|
if (i < props.length) {
|
|
@@ -18,6 +21,7 @@ export default function fantomPropsToObject(props) {
|
|
|
18
21
|
};
|
|
19
22
|
return parseFantomProps(readChar, unreadChar);
|
|
20
23
|
}
|
|
24
|
+
exports.default = fantomPropsToObject;
|
|
21
25
|
var UTF_8;
|
|
22
26
|
(function (UTF_8) {
|
|
23
27
|
UTF_8[UTF_8["tab"] = 9] = "tab";
|
|
@@ -51,7 +55,7 @@ const hex = function (c) {
|
|
|
51
55
|
* Parse the Fantom props file character by character.
|
|
52
56
|
* Implementation based on https://github.com/fantom-lang/fantom/blob/master/src/sys/js/fan/InStream.js
|
|
53
57
|
*/
|
|
54
|
-
|
|
58
|
+
function parseFantomProps(readChar, unreadChar) {
|
|
55
59
|
const props = {};
|
|
56
60
|
let name = '';
|
|
57
61
|
let value = null;
|
|
@@ -173,3 +177,4 @@ export function parseFantomProps(readChar, unreadChar) {
|
|
|
173
177
|
throw new Error('Invalid name/value pair [Line ' + lineNum + ']');
|
|
174
178
|
return props;
|
|
175
179
|
}
|
|
180
|
+
exports.parseFantomProps = parseFantomProps;
|
|
@@ -1,8 +1,37 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
const fs = __importStar(require("fs"));
|
|
30
|
+
const readFantomPropsFile_1 = __importDefault(require("./readFantomPropsFile"));
|
|
31
|
+
async function generateJsonFromFantomPropsFile(inputPath = '../locale/en.props', outputPath = './src/localeKeys.json') {
|
|
32
|
+
const result = await (0, readFantomPropsFile_1.default)(inputPath);
|
|
5
33
|
fs.writeFile(outputPath, JSON.stringify(result, null, '\t'), () => {
|
|
6
34
|
return;
|
|
7
35
|
});
|
|
8
36
|
}
|
|
37
|
+
exports.default = generateJsonFromFantomPropsFile;
|
|
@@ -1,3 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./fantomPropsToObject"), exports);
|
|
18
|
+
__exportStar(require("./generateJsonFromFantomPropsFile"), exports);
|
|
19
|
+
__exportStar(require("./readFantomPropsFile"), exports);
|
|
@@ -1,9 +1,34 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
const fs = __importStar(require("fs"));
|
|
27
|
+
const fantomPropsToObject_1 = require("./fantomPropsToObject");
|
|
3
28
|
/**
|
|
4
29
|
* Asynchronously read the given Fantom props file to JS object (@see https://fantom.org/doc/sys/InStream#readProps)
|
|
5
30
|
*/
|
|
6
|
-
|
|
31
|
+
function readFantomPropsFile(path) {
|
|
7
32
|
return new Promise((resolve, reject) => {
|
|
8
33
|
const fileStream = fs.createReadStream(path);
|
|
9
34
|
fileStream.once('readable', function () {
|
|
@@ -14,7 +39,7 @@ export default function readFantomPropsFile(path) {
|
|
|
14
39
|
return fileStream.unshift(new Uint8Array([char]));
|
|
15
40
|
};
|
|
16
41
|
try {
|
|
17
|
-
resolve(parseFantomProps(readChar, unreadChar));
|
|
42
|
+
resolve((0, fantomPropsToObject_1.parseFantomProps)(readChar, unreadChar));
|
|
18
43
|
}
|
|
19
44
|
catch (error) {
|
|
20
45
|
reject(error);
|
|
@@ -30,3 +55,4 @@ export default function readFantomPropsFile(path) {
|
|
|
30
55
|
});
|
|
31
56
|
});
|
|
32
57
|
}
|
|
58
|
+
exports.default = readFantomPropsFile;
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { AlarmFilter } from './openFin5Alarm';
|
|
2
2
|
import { HistorianArgs, HistorianType } from './openFin5Historian';
|
|
3
3
|
export declare const getFin5top: (notifyFailure?: () => void) => Fin5Top | null;
|
|
4
|
-
declare const fin5Top: Fin5Top | null;
|
|
5
|
-
export default fin5Top;
|
|
4
|
+
export declare const fin5Top: Fin5Top | null;
|
|
6
5
|
export declare function isWindowTopFin5(notifyFailure?: () => void): boolean;
|
|
7
6
|
export interface Fin5Top {
|
|
8
7
|
app: Fin5App;
|
|
@@ -109,3 +108,4 @@ interface Fin5AppComponent {
|
|
|
109
108
|
set: (value: unknown) => Promise<undefined>;
|
|
110
109
|
}
|
|
111
110
|
export declare type TargetRef = string | null | undefined;
|
|
111
|
+
export {};
|
package/dist/fin5Top/fin5Top.js
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Fin5AppNames = exports.isWindowTopFin5 = exports.fin5Top = exports.getFin5top = void 0;
|
|
1
4
|
class Fin5TopRetriever {
|
|
2
5
|
static _fin5Top;
|
|
3
6
|
static get fin5Top() {
|
|
@@ -12,10 +15,9 @@ class Fin5TopRetriever {
|
|
|
12
15
|
return this._fin5Top;
|
|
13
16
|
};
|
|
14
17
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
export function isWindowTopFin5(notifyFailure) {
|
|
18
|
+
exports.getFin5top = Fin5TopRetriever.getFin5top;
|
|
19
|
+
exports.fin5Top = Fin5TopRetriever.fin5Top;
|
|
20
|
+
function isWindowTopFin5(notifyFailure) {
|
|
19
21
|
try {
|
|
20
22
|
window?.top?.origin;
|
|
21
23
|
if (window.top.finstack) {
|
|
@@ -31,7 +33,8 @@ export function isWindowTopFin5(notifyFailure) {
|
|
|
31
33
|
return false;
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
|
-
|
|
36
|
+
exports.isWindowTopFin5 = isWindowTopFin5;
|
|
37
|
+
var Fin5AppNames;
|
|
35
38
|
(function (Fin5AppNames) {
|
|
36
39
|
Fin5AppNames["EQUIP"] = "equip";
|
|
37
40
|
Fin5AppNames["GRAPHICS"] = "graphics";
|
|
@@ -49,4 +52,4 @@ export var Fin5AppNames;
|
|
|
49
52
|
Fin5AppNames["LOGOUT"] = "logout";
|
|
50
53
|
Fin5AppNames["GENERIC"] = "generic";
|
|
51
54
|
Fin5AppNames["REPORTS"] = "reports";
|
|
52
|
-
})(Fin5AppNames || (Fin5AppNames = {}));
|
|
55
|
+
})(Fin5AppNames = exports.Fin5AppNames || (exports.Fin5AppNames = {}));
|
|
@@ -1,2 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getFin5BinUrl = void 0;
|
|
4
|
+
const fin5Top_1 = require("./fin5Top");
|
|
5
|
+
const getFin5BinUrl = (id) => `/finGetFile/${fin5Top_1.fin5Top?.finstack?.projectName}?fileRef=${id?.toString()}`;
|
|
6
|
+
exports.getFin5BinUrl = getFin5BinUrl;
|
package/dist/fin5Top/index.js
CHANGED
|
@@ -1,4 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./fin5Top"), exports);
|
|
18
|
+
__exportStar(require("./getFin5BinUrl"), exports);
|
|
19
|
+
__exportStar(require("./openFin5Alarm"), exports);
|
|
20
|
+
__exportStar(require("./openFin5Historian"), exports);
|
|
@@ -1,17 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
//////////////////////////////////////////////////////////////////////////
|
|
2
3
|
// Alarms
|
|
3
4
|
//////////////////////////////////////////////////////////////////////////
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.openFin5AlarmsApp = void 0;
|
|
7
|
+
const fin5Top_1 = require("./fin5Top");
|
|
8
|
+
const openFin5AlarmsApp = async ({ targetRef, filter, historical = false, }) => {
|
|
9
|
+
await fin5Top_1.fin5Top?.app.NavigateToApp(fin5Top_1.fin5Top?.app?.APP_NAMES?.ALARMS, targetRef);
|
|
10
|
+
fin5Top_1.fin5Top?.app.ToggleCollapse(false);
|
|
11
|
+
let alarmFilters = fin5Top_1.fin5Top?.app?.GetAlarmFilters() ?? {};
|
|
10
12
|
if (filter) {
|
|
11
13
|
alarmFilters = {
|
|
12
14
|
...alarmFilters,
|
|
13
15
|
...filter,
|
|
14
16
|
};
|
|
15
17
|
}
|
|
16
|
-
|
|
18
|
+
fin5Top_1.fin5Top?.app?.SetAlarmFilters(alarmFilters, historical);
|
|
17
19
|
};
|
|
20
|
+
exports.openFin5AlarmsApp = openFin5AlarmsApp;
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
//////////////////////////////////////////////////////////////////////////
|
|
2
3
|
// Historian
|
|
3
4
|
//////////////////////////////////////////////////////////////////////////
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.openFin5HistorianApp = void 0;
|
|
7
|
+
const fin5Top_1 = require("./fin5Top");
|
|
8
|
+
const openFin5HistorianApp = async (queryType, args) => {
|
|
9
|
+
if (fin5Top_1.fin5Top) {
|
|
7
10
|
queryType && args
|
|
8
|
-
? fin5Top.app.OpenHistorianWithOptions(queryType, args)
|
|
9
|
-
: fin5Top.app.NavigateToApp(fin5Top.app.APP_NAMES.TREND_LIST);
|
|
10
|
-
fin5Top?.app.ToggleCollapse(false);
|
|
11
|
+
? fin5Top_1.fin5Top.app.OpenHistorianWithOptions(queryType, args)
|
|
12
|
+
: fin5Top_1.fin5Top.app.NavigateToApp(fin5Top_1.fin5Top.app.APP_NAMES.TREND_LIST);
|
|
13
|
+
fin5Top_1.fin5Top?.app.ToggleCollapse(false);
|
|
11
14
|
}
|
|
12
15
|
};
|
|
16
|
+
exports.openFin5HistorianApp = openFin5HistorianApp;
|
package/dist/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from 'fantomProps';
|
|
2
|
-
export * from 'fin5Top';
|
|
3
|
-
export * from 'react/components';
|
|
1
|
+
export * from './fantomProps';
|
|
2
|
+
export * from './fin5Top';
|
|
3
|
+
export * from './react/components';
|
package/dist/index.js
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./fantomProps"), exports);
|
|
18
|
+
__exportStar(require("./fin5Top"), exports);
|
|
19
|
+
__exportStar(require("./react/components"), exports);
|
|
@@ -1,6 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ErrorDisplayer = exports.DefaultErrorBoundary = void 0;
|
|
7
|
+
const ui_1 = require("@j2inn/ui");
|
|
8
|
+
const react_1 = __importDefault(require("react"));
|
|
9
|
+
class DefaultErrorBoundary extends react_1.default.Component {
|
|
4
10
|
state = {};
|
|
5
11
|
static getDerivedStateFromError(error) {
|
|
6
12
|
// Update state so the next render will show the fallback UI.
|
|
@@ -13,23 +19,25 @@ export class DefaultErrorBoundary extends React.Component {
|
|
|
13
19
|
render() {
|
|
14
20
|
if (this.state.error) {
|
|
15
21
|
// You can render any custom fallback UI
|
|
16
|
-
return (<ErrorDisplayer error={this.state.error} extra={[
|
|
17
|
-
<Button type='primary' key='refresh' onClick={() => window.location.reload()}>
|
|
22
|
+
return (<exports.ErrorDisplayer error={this.state.error} extra={[
|
|
23
|
+
<ui_1.Button type='primary' key='refresh' onClick={() => window.location.reload()}>
|
|
18
24
|
Refresh The Page
|
|
19
|
-
</Button>,
|
|
25
|
+
</ui_1.Button>,
|
|
20
26
|
]}/>);
|
|
21
27
|
}
|
|
22
28
|
return this.props.children;
|
|
23
29
|
}
|
|
24
30
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
31
|
+
exports.DefaultErrorBoundary = DefaultErrorBoundary;
|
|
32
|
+
const ErrorDisplayer = ({ error, extra, }) => {
|
|
33
|
+
return (<ui_1.Result status='error' title='Ouch... Something Went Wrong' subTitle={<ui_1.Container center>
|
|
34
|
+
<ui_1.Collapse style={{ width: 600, textAlign: 'left' }}>
|
|
35
|
+
<ui_1.Collapse.Panel header={`${error.toString()}`} key='1'>
|
|
36
|
+
<ui_1.Typography.Text style={{ width: 400 }}>
|
|
30
37
|
{error.stack}
|
|
31
|
-
</Typography.Text>
|
|
32
|
-
</Collapse.Panel>
|
|
33
|
-
</Collapse>
|
|
34
|
-
</Container>} extra={extra}/>);
|
|
38
|
+
</ui_1.Typography.Text>
|
|
39
|
+
</ui_1.Collapse.Panel>
|
|
40
|
+
</ui_1.Collapse>
|
|
41
|
+
</ui_1.Container>} extra={extra}/>);
|
|
35
42
|
};
|
|
43
|
+
exports.ErrorDisplayer = ErrorDisplayer;
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const ui_1 = require("@j2inn/ui");
|
|
7
|
+
const react_1 = __importDefault(require("react"));
|
|
8
|
+
const LoadingSpinner = () => (<ui_1.Container center style={{ height: '100%', width: '100%' }}>
|
|
9
|
+
<ui_1.Spin size='large'></ui_1.Spin>
|
|
10
|
+
</ui_1.Container>);
|
|
11
|
+
exports.default = LoadingSpinner;
|
|
@@ -1,5 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./DefaultErrorBoundary"), exports);
|
|
18
|
+
__exportStar(require("./LoadingSpinner"), exports);
|
|
19
|
+
__exportStar(require("./navigation/BasicLayout"), exports);
|
|
20
|
+
__exportStar(require("./navigation/MenuPage"), exports);
|
|
21
|
+
__exportStar(require("./navigation/Router"), exports);
|
|
@@ -1,32 +1,58 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.BasicLayout = void 0;
|
|
27
|
+
const icons_1 = require("@ant-design/icons");
|
|
28
|
+
const ui_1 = require("@j2inn/ui");
|
|
29
|
+
const react_1 = __importStar(require("react"));
|
|
30
|
+
const DefaultErrorBoundary_1 = require("../../DefaultErrorBoundary");
|
|
31
|
+
const MenuPage_1 = require("../MenuPage");
|
|
32
|
+
const Router_1 = require("../Router");
|
|
7
33
|
// Workaround j2inn/ui exporting problem
|
|
8
|
-
const Header = Layout.Sider;
|
|
9
|
-
const Sider = Layout.Sider;
|
|
10
|
-
const Content = Layout.Sider;
|
|
34
|
+
const Header = ui_1.Layout.Sider;
|
|
35
|
+
const Sider = ui_1.Layout.Sider;
|
|
36
|
+
const Content = ui_1.Layout.Sider;
|
|
11
37
|
const DEFAULT_UNCOLLAPSED_MENU_WIDTH = 45;
|
|
12
38
|
const COLLAPSED_MENU_WIDTH = 0;
|
|
13
|
-
|
|
14
|
-
const [currentPage, setCurrentPage] = useState(defaultPage);
|
|
39
|
+
const BasicLayout = ({ pages, defaultPage = pages[0].key, onPageChange, uncollapsedMenuWidth = DEFAULT_UNCOLLAPSED_MENU_WIDTH, menuProps, }) => {
|
|
40
|
+
const [currentPage, setCurrentPage] = (0, react_1.useState)(defaultPage);
|
|
15
41
|
// Fire onChange
|
|
16
|
-
useEffect(() => {
|
|
42
|
+
(0, react_1.useEffect)(() => {
|
|
17
43
|
onPageChange?.(currentPage);
|
|
18
44
|
}, [currentPage]);
|
|
19
45
|
// manage mobile navigation
|
|
20
|
-
const [isMobile, setIsMobile] = useState(false);
|
|
21
|
-
const [hiddenSider, setHiddenSider] = useState(true);
|
|
46
|
+
const [isMobile, setIsMobile] = (0, react_1.useState)(false);
|
|
47
|
+
const [hiddenSider, setHiddenSider] = (0, react_1.useState)(true);
|
|
22
48
|
const actualMenuWidth = hiddenSider && isMobile ? COLLAPSED_MENU_WIDTH : uncollapsedMenuWidth;
|
|
23
|
-
return (<Layout hasSider>
|
|
49
|
+
return (<ui_1.Layout hasSider>
|
|
24
50
|
{isMobile && (<Header style={{
|
|
25
51
|
position: 'fixed',
|
|
26
52
|
width: '100%',
|
|
27
53
|
zIndex: 1000,
|
|
28
54
|
}}>
|
|
29
|
-
{
|
|
55
|
+
{react_1.default.createElement(hiddenSider ? icons_1.MenuUnfoldOutlined : icons_1.MenuFoldOutlined, {
|
|
30
56
|
className: 'antd-menu-custom-header-trigger',
|
|
31
57
|
onClick: () => {
|
|
32
58
|
setHiddenSider(!hiddenSider);
|
|
@@ -48,11 +74,11 @@ export const BasicLayout = ({ pages, defaultPage = pages[0].key, onPageChange, u
|
|
|
48
74
|
? uncollapsedMenuWidth
|
|
49
75
|
: COLLAPSED_MENU_WIDTH,
|
|
50
76
|
}}>
|
|
51
|
-
<Menu mode='inline' {...menuProps} items={pages} selectedKeys={[currentPage]} onSelect={({ key }) => {
|
|
77
|
+
<ui_1.Menu mode='inline' {...menuProps} items={pages} selectedKeys={[currentPage]} onSelect={({ key }) => {
|
|
52
78
|
if (!hiddenSider) {
|
|
53
79
|
setHiddenSider(true);
|
|
54
80
|
}
|
|
55
|
-
const page = getPage(pages, key);
|
|
81
|
+
const page = (0, MenuPage_1.getPage)(pages, key);
|
|
56
82
|
if (page?.component) {
|
|
57
83
|
setCurrentPage(key);
|
|
58
84
|
}
|
|
@@ -64,11 +90,12 @@ export const BasicLayout = ({ pages, defaultPage = pages[0].key, onPageChange, u
|
|
|
64
90
|
? uncollapsedMenuWidth
|
|
65
91
|
: COLLAPSED_MENU_WIDTH,
|
|
66
92
|
}}>
|
|
67
|
-
<Router pages={pages} currentPage={currentPage ?? defaultPage} fallbackComponent={<ErrorDisplayer error={new Error('Page Not Found')} extra={[
|
|
68
|
-
<Button type='primary' key='refresh' onClick={() => setCurrentPage(defaultPage)}>
|
|
93
|
+
<Router_1.Router pages={pages} currentPage={currentPage ?? defaultPage} fallbackComponent={<DefaultErrorBoundary_1.ErrorDisplayer error={new Error('Page Not Found')} extra={[
|
|
94
|
+
<ui_1.Button type='primary' key='refresh' onClick={() => setCurrentPage(defaultPage)}>
|
|
69
95
|
Go Home
|
|
70
|
-
</Button>,
|
|
96
|
+
</ui_1.Button>,
|
|
71
97
|
]}/>}/>
|
|
72
98
|
</Content>
|
|
73
|
-
</Layout>);
|
|
99
|
+
</ui_1.Layout>);
|
|
74
100
|
};
|
|
101
|
+
exports.BasicLayout = BasicLayout;
|
|
@@ -1,23 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getAllSubPages = exports.pageTreeToPageList = exports.getPage = void 0;
|
|
1
4
|
/**
|
|
2
5
|
* Retrieve a specific page or subPage from a root page list
|
|
3
6
|
* @param name the name of the searched page
|
|
4
7
|
* @param pages the list of root pages
|
|
5
8
|
*/
|
|
6
|
-
|
|
9
|
+
function getPage(pages, name) {
|
|
7
10
|
return pageTreeToPageList(pages).find((page) => page.key === name && !page.disabled);
|
|
8
11
|
}
|
|
12
|
+
exports.getPage = getPage;
|
|
9
13
|
/**
|
|
10
14
|
* Expands the list of pages to include all the subpages
|
|
11
15
|
*/
|
|
12
|
-
|
|
16
|
+
function pageTreeToPageList(pages) {
|
|
13
17
|
return pages.flatMap((page) => getAllSubPages(page));
|
|
14
18
|
}
|
|
19
|
+
exports.pageTreeToPageList = pageTreeToPageList;
|
|
15
20
|
/**
|
|
16
21
|
* Recursively get all the subPages of a root page
|
|
17
22
|
* @param page root page
|
|
18
23
|
* @returns the whole tree of subPages as a list
|
|
19
24
|
*/
|
|
20
|
-
|
|
25
|
+
function getAllSubPages(page) {
|
|
21
26
|
if (page.children) {
|
|
22
27
|
return [page].concat(...page.children.map((subPage) => getAllSubPages(subPage)));
|
|
23
28
|
}
|
|
@@ -25,3 +30,4 @@ export function getAllSubPages(page) {
|
|
|
25
30
|
return [page];
|
|
26
31
|
}
|
|
27
32
|
}
|
|
33
|
+
exports.getAllSubPages = getAllSubPages;
|
|
@@ -1,15 +1,45 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.Router = void 0;
|
|
30
|
+
const react_1 = __importStar(require("react"));
|
|
31
|
+
const LoadingSpinner_1 = __importDefault(require("../LoadingSpinner"));
|
|
32
|
+
const MenuPage_1 = require("./MenuPage");
|
|
4
33
|
/**
|
|
5
34
|
* Renders the current selected page from a tree of pages
|
|
6
35
|
*/
|
|
7
|
-
|
|
8
|
-
const page = useMemo(() => getPage(pages, currentPage), [pages, currentPage]);
|
|
9
|
-
useEffect(() => {
|
|
36
|
+
function Router({ pages, currentPage, onPageChange, fallbackComponent, }) {
|
|
37
|
+
const page = (0, react_1.useMemo)(() => (0, MenuPage_1.getPage)(pages, currentPage), [pages, currentPage]);
|
|
38
|
+
(0, react_1.useEffect)(() => {
|
|
10
39
|
onPageChange?.(page);
|
|
11
40
|
}, [page]);
|
|
12
|
-
return page?.component ? (<Suspense fallback={<
|
|
13
|
-
{
|
|
14
|
-
</Suspense>) : (fallbackComponent ?? <div>{currentPage} page not found</div>);
|
|
41
|
+
return page?.component ? (<react_1.Suspense fallback={<LoadingSpinner_1.default />}>
|
|
42
|
+
{react_1.default.createElement(page.component, page?.props)}
|
|
43
|
+
</react_1.Suspense>) : (fallbackComponent ?? <div>{currentPage} page not found</div>);
|
|
15
44
|
}
|
|
45
|
+
exports.Router = Router;
|
package/package.json
CHANGED