@gisce/react-ooui 0.18.6 → 0.20.0
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/index.js +2 -2
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/widgets/containers/Notebook.js +2 -2
- package/dist/widgets/containers/Notebook.js.map +1 -1
- package/dist/widgets/views/Graph/useGraphData.js +6 -6
- package/dist/widgets/views/Graph/useGraphData.js.map +1 -1
- package/package.json +3 -3
- package/src/stories/containers/Notebook.stories.tsx +53 -0
- package/src/types/index.ts +1 -1
- package/src/widgets/containers/Notebook.tsx +2 -2
- package/src/widgets/views/Graph/useGraphData.tsx +8 -6
package/dist/types/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AAEjD,aAAK,OAAO,GAAG;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAAC;AAEF,aAAK,MAAM,GAAG;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,aAAK,WAAW,GAAG;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IACnC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,aAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,aAAK,QAAQ,GAAG;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,aAAK,QAAQ,GAAG,QAAQ,GAAG;IACzB,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,aAAK,cAAc,GAAG;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,cAAc,CAAC,EAAE,GAAG,CAAC;CACtB,CAAC;AAEF,aAAK,aAAa,GAAG;IACnB,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,8 @@ var TabPane = antd_1.Tabs.TabPane;
|
|
|
9
9
|
var index_1 = require("@/index");
|
|
10
10
|
function Notebook(props) {
|
|
11
11
|
var ooui = props.ooui, responsiveBehaviour = props.responsiveBehaviour;
|
|
12
|
-
var tabs =
|
|
13
|
-
return (react_1.default.createElement(antd_1.Tabs, { defaultActiveKey: "1" }, tabs
|
|
12
|
+
var tabs = ooui.pages;
|
|
13
|
+
return (react_1.default.createElement(antd_1.Tabs, { defaultActiveKey: "1", tabPosition: ooui.tabPosition }, tabs
|
|
14
14
|
.filter(function (page) { return !page.invisible; })
|
|
15
15
|
.map(function (page) {
|
|
16
16
|
return (react_1.default.createElement(TabPane, { tab: page.label, key: page.label },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notebook.js","sourceRoot":"","sources":["../../../src/widgets/containers/Notebook.tsx"],"names":[],"mappings":";;;;;AAAA,gDAA0B;AAC1B,6BAA4B;AACpB,IAAA,OAAO,GAAK,WAAI,QAAT,CAAU;AAGzB,iCAAgC;AAOhC,SAAS,QAAQ,CAAC,KAAY;IACpB,IAAA,IAAI,GAA0B,KAAK,KAA/B,EAAE,mBAAmB,GAAK,KAAK,oBAAV,CAAW;IAC5C,IAAM,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"Notebook.js","sourceRoot":"","sources":["../../../src/widgets/containers/Notebook.tsx"],"names":[],"mappings":";;;;;AAAA,gDAA0B;AAC1B,6BAA4B;AACpB,IAAA,OAAO,GAAK,WAAI,QAAT,CAAU;AAGzB,iCAAgC;AAOhC,SAAS,QAAQ,CAAC,KAAY;IACpB,IAAA,IAAI,GAA0B,KAAK,KAA/B,EAAE,mBAAmB,GAAK,KAAK,oBAAV,CAAW;IAC5C,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;IACxB,OAAO,CACL,8BAAC,WAAI,IAAC,gBAAgB,EAAC,GAAG,EAAC,WAAW,EAAE,IAAI,CAAC,WAAW,IACrD,IAAI;SACF,MAAM,CAAC,UAAC,IAAS,IAAK,OAAA,CAAC,IAAI,CAAC,SAAS,EAAf,CAAe,CAAC;SACtC,GAAG,CAAC,UAAC,IAAS;QACb,OAAO,CACL,8BAAC,OAAO,IAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK;YACvC,8BAAC,aAAK,IACJ,IAAI,EAAE,IAAiB,EACvB,SAAS,EAAE,KAAK,EAChB,mBAAmB,EAAE,mBAAmB,GACxC,CACM,CACX,CAAC;IACJ,CAAC,CAAC,CACC,CACR,CAAC;AACJ,CAAC;AAED,kBAAe,QAAQ,CAAC"}
|
|
@@ -72,7 +72,7 @@ var useGraphData = function (opts) {
|
|
|
72
72
|
domain: domain,
|
|
73
73
|
context: context,
|
|
74
74
|
limit: limit,
|
|
75
|
-
order: ooui.x.name,
|
|
75
|
+
order: ooui.timerange ? ooui.x.name : null,
|
|
76
76
|
fields: fieldsToRetrieve,
|
|
77
77
|
})];
|
|
78
78
|
case 2:
|
|
@@ -116,19 +116,19 @@ var useGraphData = function (opts) {
|
|
|
116
116
|
};
|
|
117
117
|
exports.useGraphData = useGraphData;
|
|
118
118
|
function getFieldsForModel(_a) {
|
|
119
|
-
var model = _a.model, context = _a.context;
|
|
119
|
+
var model = _a.model, context = _a.context, fields = _a.fields;
|
|
120
120
|
return __awaiter(this, void 0, void 0, function () {
|
|
121
121
|
var viewData;
|
|
122
122
|
return __generator(this, function (_b) {
|
|
123
123
|
switch (_b.label) {
|
|
124
|
-
case 0: return [4 /*yield*/, ConnectionProvider_1.default.getHandler().
|
|
124
|
+
case 0: return [4 /*yield*/, ConnectionProvider_1.default.getHandler().getFields({
|
|
125
125
|
model: model,
|
|
126
126
|
context: context,
|
|
127
|
-
|
|
127
|
+
fields: fields,
|
|
128
128
|
})];
|
|
129
129
|
case 1:
|
|
130
130
|
viewData = _b.sent();
|
|
131
|
-
return [2 /*return*/, viewData
|
|
131
|
+
return [2 /*return*/, viewData];
|
|
132
132
|
}
|
|
133
133
|
});
|
|
134
134
|
});
|
|
@@ -149,7 +149,7 @@ function retrieveData(_a) {
|
|
|
149
149
|
})];
|
|
150
150
|
case 1:
|
|
151
151
|
values = (_b.sent());
|
|
152
|
-
return [4 /*yield*/, getFieldsForModel({ model: model, context: context })];
|
|
152
|
+
return [4 /*yield*/, getFieldsForModel({ model: model, context: context, fields: fields })];
|
|
153
153
|
case 2:
|
|
154
154
|
fieldsDefinition = _b.sent();
|
|
155
155
|
return [2 /*return*/, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGraphData.js","sourceRoot":"","sources":["../../../../src/widgets/views/Graph/useGraphData.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAiC;AACjC,oCAMqB;AACrB,oFAA2D;AAC3D,4EAAsD;AAE9C,IAAA,gBAAgB,GAAK,qBAAc,iBAAnB,CAAoB;AACpC,IAAA,mBAAmB,GAAK,sBAAe,oBAApB,CAAqB;AAczC,IAAM,YAAY,GAAG,UAAC,IAAmB;IAE5C,IAAA,KAAK,GAMH,IAAI,MAND,EACL,KAKE,IAAI,OALK,EAAX,MAAM,mBAAG,EAAE,KAAA,EACX,KAIE,IAAI,QAJM,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,GAAG,GAGD,IAAI,IAHH,EACH,KAAK,GAEH,IAAI,MAFD,EACL,gBAAgB,GACd,IAAI,iBADU,CACT;IACH,IAAA,KAAwB,gBAAQ,CAAC,KAAK,CAAC,EAAtC,OAAO,QAAA,EAAE,UAAU,QAAmB,CAAC;IACxC,IAAA,KAAoB,gBAAQ,EAAO,EAAlC,KAAK,QAAA,EAAE,QAAQ,QAAmB,CAAC;IACpC,IAAA,KAAwC,gBAAQ,EAAO,EAAtD,eAAe,QAAA,EAAE,kBAAkB,QAAmB,CAAC;IACxD,IAAA,KAAkB,gBAAQ,CAAY,MAAM,CAAC,EAA5C,IAAI,QAAA,EAAE,OAAO,QAA+B,CAAC;IAEpD,iCAAoB,CAAC;QACnB,CAAC;;;;;;wBACC,UAAU,CAAC,IAAI,CAAC,CAAC;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAC;wBAGd,IAAI,GAAG,iBAAU,CAAC,GAAG,CAAmB,CAAC;wBAC/C,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC;wBAGvB,gBAAgB,GAAG,mBAAmB,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC;;;;wBAK/B,qBAAM,YAAY,CAAC;gCACvC,KAAK,OAAA;gCACL,MAAM,QAAA;gCACN,OAAO,SAAA;gCACP,KAAK,OAAA;gCACL,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"useGraphData.js","sourceRoot":"","sources":["../../../../src/widgets/views/Graph/useGraphData.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gisce/react-ooui",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.20.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@ant-design/charts": "^1.3.6",
|
|
27
|
-
"@gisce/ooui": "^0.
|
|
28
|
-
"@gisce/react-formiga-table": "^0.
|
|
27
|
+
"@gisce/ooui": "^0.16.1",
|
|
28
|
+
"@gisce/react-formiga-table": "^0.5.0",
|
|
29
29
|
"@monaco-editor/react": "^4.4.5",
|
|
30
30
|
"fiber-diagram": "github:gisce/fiber-diagram",
|
|
31
31
|
"file-type": "^16.5.0",
|
|
@@ -88,3 +88,56 @@ export const Test = (): React.ReactElement => {
|
|
|
88
88
|
</LocaleProvider>
|
|
89
89
|
);
|
|
90
90
|
};
|
|
91
|
+
|
|
92
|
+
export const BottomPosition = (): React.ReactElement => {
|
|
93
|
+
|
|
94
|
+
const arch = `<form>
|
|
95
|
+
<notebook name="notebook" tabpos="bottom">
|
|
96
|
+
<page string="General">
|
|
97
|
+
<field name="name" />
|
|
98
|
+
</page>
|
|
99
|
+
<page string="Secondary">
|
|
100
|
+
<field name="surname" />
|
|
101
|
+
</page>
|
|
102
|
+
</notebook>
|
|
103
|
+
</form>`;
|
|
104
|
+
|
|
105
|
+
const formOoui = new FormOoui(fields);
|
|
106
|
+
formOoui.parse(arch);
|
|
107
|
+
const notebookOoui = formOoui.findById("notebook") as NotebookOoui;
|
|
108
|
+
|
|
109
|
+
return (
|
|
110
|
+
<LocaleProvider lang="en_US">
|
|
111
|
+
<Form>
|
|
112
|
+
<Notebook ooui={notebookOoui} />
|
|
113
|
+
</Form>
|
|
114
|
+
</LocaleProvider>
|
|
115
|
+
);
|
|
116
|
+
};
|
|
117
|
+
|
|
118
|
+
|
|
119
|
+
export const LeftPosition = (): React.ReactElement => {
|
|
120
|
+
|
|
121
|
+
const arch = `<form>
|
|
122
|
+
<notebook name="notebook" tabpos="left">
|
|
123
|
+
<page string="General">
|
|
124
|
+
<field name="name" />
|
|
125
|
+
</page>
|
|
126
|
+
<page string="Secondary">
|
|
127
|
+
<field name="surname" />
|
|
128
|
+
</page>
|
|
129
|
+
</notebook>
|
|
130
|
+
</form>`;
|
|
131
|
+
|
|
132
|
+
const formOoui = new FormOoui(fields);
|
|
133
|
+
formOoui.parse(arch);
|
|
134
|
+
const notebookOoui = formOoui.findById("notebook") as NotebookOoui;
|
|
135
|
+
|
|
136
|
+
return (
|
|
137
|
+
<LocaleProvider lang="en_US">
|
|
138
|
+
<Form>
|
|
139
|
+
<Notebook ooui={notebookOoui} />
|
|
140
|
+
</Form>
|
|
141
|
+
</LocaleProvider>
|
|
142
|
+
);
|
|
143
|
+
};
|
package/src/types/index.ts
CHANGED
|
@@ -12,9 +12,9 @@ type Props = {
|
|
|
12
12
|
|
|
13
13
|
function Notebook(props: Props): React.ReactElement {
|
|
14
14
|
const { ooui, responsiveBehaviour } = props;
|
|
15
|
-
const tabs =
|
|
15
|
+
const tabs = ooui.pages;
|
|
16
16
|
return (
|
|
17
|
-
<Tabs defaultActiveKey="1">
|
|
17
|
+
<Tabs defaultActiveKey="1" tabPosition={ooui.tabPosition}>
|
|
18
18
|
{tabs
|
|
19
19
|
.filter((page: any) => !page.invisible)
|
|
20
20
|
.map((page: any) => {
|
|
@@ -58,7 +58,7 @@ export const useGraphData = (opts: GraphDataOpts) => {
|
|
|
58
58
|
domain,
|
|
59
59
|
context,
|
|
60
60
|
limit,
|
|
61
|
-
order: ooui.x.name,
|
|
61
|
+
order: ooui.timerange ? ooui.x.name : null,
|
|
62
62
|
fields: fieldsToRetrieve,
|
|
63
63
|
}));
|
|
64
64
|
} catch (e) {
|
|
@@ -99,16 +99,18 @@ export const useGraphData = (opts: GraphDataOpts) => {
|
|
|
99
99
|
async function getFieldsForModel({
|
|
100
100
|
model,
|
|
101
101
|
context,
|
|
102
|
+
fields,
|
|
102
103
|
}: {
|
|
103
104
|
model: string;
|
|
104
105
|
context: any;
|
|
106
|
+
fields: string[];
|
|
105
107
|
}) {
|
|
106
|
-
const viewData = await ConnectionProvider.getHandler().
|
|
108
|
+
const viewData = await ConnectionProvider.getHandler().getFields({
|
|
107
109
|
model,
|
|
108
110
|
context,
|
|
109
|
-
|
|
111
|
+
fields,
|
|
110
112
|
});
|
|
111
|
-
return viewData
|
|
113
|
+
return viewData;
|
|
112
114
|
}
|
|
113
115
|
|
|
114
116
|
async function retrieveData({
|
|
@@ -123,7 +125,7 @@ async function retrieveData({
|
|
|
123
125
|
model: string;
|
|
124
126
|
domain: any;
|
|
125
127
|
context: any;
|
|
126
|
-
order: string;
|
|
128
|
+
order: string | null;
|
|
127
129
|
limit: number;
|
|
128
130
|
}) {
|
|
129
131
|
const values: any[] = (await ConnectionProvider.getHandler().search({
|
|
@@ -134,7 +136,7 @@ async function retrieveData({
|
|
|
134
136
|
limit,
|
|
135
137
|
order,
|
|
136
138
|
})) as any;
|
|
137
|
-
const fieldsDefinition = await getFieldsForModel({ model, context });
|
|
139
|
+
const fieldsDefinition = await getFieldsForModel({ model, context, fields });
|
|
138
140
|
return {
|
|
139
141
|
values,
|
|
140
142
|
fields: fieldsDefinition,
|