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