@gisce/react-ooui 1.1.2-rc.2 → 1.1.2-rc.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/context/ContentRootContext.d.ts.map +1 -1
- package/dist/hooks/useSearch.d.ts +5 -2
- package/dist/hooks/useSearch.d.ts.map +1 -1
- package/dist/react-ooui.es.js +3962 -3946
- package/dist/react-ooui.es.js.map +1 -1
- package/dist/react-ooui.umd.js +15 -15
- package/dist/react-ooui.umd.js.map +1 -1
- package/dist/views/RootView.d.ts.map +1 -1
- package/dist/views/actionViews/GraphActionView.d.ts.map +1 -1
- package/dist/views/actionViews/TreeActionView.d.ts.map +1 -1
- package/dist/widgets/base/one2many/One2manyInput.d.ts.map +1 -1
- package/dist/widgets/custom/MultiCheckbox.d.ts.map +1 -1
- package/dist/widgets/custom/Tags.d.ts.map +1 -1
- package/dist/widgets/views/Dashboard/DashboardTree.d.ts.map +1 -1
- package/dist/widgets/views/Graph/GraphChart.d.ts.map +1 -1
- package/dist/widgets/views/Graph/useGraphData.d.ts +1 -0
- package/dist/widgets/views/Graph/useGraphData.d.ts.map +1 -1
- package/dist/widgets/views/searchFilter/SearchFilter.d.ts +1 -0
- package/dist/widgets/views/searchFilter/SearchFilter.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/context/ContentRootContext.tsx +5 -1
- package/src/helpers/searchHelper.ts +1 -1
- package/src/hooks/useSearch.ts +107 -106
- package/src/views/RootView.tsx +5 -1
- package/src/views/actionViews/GraphActionView.tsx +60 -50
- package/src/views/actionViews/TreeActionView.tsx +0 -1
- package/src/widgets/base/one2many/One2manyInput.tsx +7 -2
- package/src/widgets/custom/MultiCheckbox.tsx +54 -43
- package/src/widgets/custom/Tags.tsx +8 -5
- package/src/widgets/views/Dashboard/DashboardTree.tsx +1 -27
- package/src/widgets/views/Graph/GraphChart.tsx +4 -1
- package/src/widgets/views/Graph/useGraphData.tsx +9 -1
- package/src/widgets/views/searchFilter/SearchFilter.tsx +5 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RootView.d.ts","sourceRoot":"","sources":["RootView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAKN,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"RootView.d.ts","sourceRoot":"","sources":["RootView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAKN,MAAM,OAAO,CAAC;AAcf,aAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oBAAY,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;;AA0dF,wBAAoC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphActionView.d.ts","sourceRoot":"","sources":["GraphActionView.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO7C,oBAAY,oBAAoB,GAAG;IACjC,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,eAAe,UAAW,oBAAoB,
|
|
1
|
+
{"version":3,"file":"GraphActionView.d.ts","sourceRoot":"","sources":["GraphActionView.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO7C,oBAAY,oBAAoB,GAAG;IACjC,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,eAAe,UAAW,oBAAoB,uBA2H1D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TreeActionView.d.ts","sourceRoot":"","sources":["TreeActionView.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAKnD,oBAAY,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,mBAAmB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,IAAI,EAAE,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,mBAAmB,
|
|
1
|
+
{"version":3,"file":"TreeActionView.d.ts","sourceRoot":"","sources":["TreeActionView.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAKnD,oBAAY,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,mBAAmB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,IAAI,EAAE,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,mBAAmB,uBAsDxD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"One2manyInput.d.ts","sourceRoot":"","sources":["One2manyInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAWvD,OAAO,EAAE,KAAK,EAAY,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"One2manyInput.d.ts","sourceRoot":"","sources":["One2manyInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAWvD,OAAO,EAAE,KAAK,EAAY,MAAM,SAAS,CAAC;AAkB1C,aAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC5B,CAAC;AAQF,aAAK,YAAY,GAAG;IAClB,SAAS,CAAC,EACN,UAAU,GACV,eAAe,GACf,eAAe,GACf,eAAe,GACf,aAAa,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,UAAU,kBAAkB;IAC1B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd;AAWD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA4kB/C,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiCheckbox.d.ts","sourceRoot":"","sources":["MultiCheckbox.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"MultiCheckbox.d.ts","sourceRoot":"","sources":["MultiCheckbox.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO7E,aAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC;AAEF,aAAK,uBAAuB,GAAG,kBAAkB,GAAG;IAClD,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,kBAAkB,gBAQtD,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,uBAAuB,gBAsIhE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["Tags.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO7E,aAAK,SAAS,GAAG,WAAW,GAAG;IAC7B,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,aAAK,cAAc,GAAG,SAAS,GAAG;IAChC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,IAAI,UAAW,SAAS,gBAQpC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,cAAc,
|
|
1
|
+
{"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["Tags.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO7E,aAAK,SAAS,GAAG,WAAW,GAAG;IAC7B,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,aAAK,cAAc,GAAG,SAAS,GAAG;IAChC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,IAAI,UAAW,SAAS,gBAQpC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,cAAc,gBAoI9C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DashboardTree.d.ts","sourceRoot":"","sources":["DashboardTree.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAY,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"DashboardTree.d.ts","sourceRoot":"","sources":["DashboardTree.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAY,QAAQ,EAAE,MAAM,eAAe,CAAC;AAQnD,aAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,aAAK,KAAK,GAAG;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/C,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,iBAAS,aAAa,CAAC,KAAK,EAAE,KAAK,sBA6MlC;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphChart.d.ts","sourceRoot":"","sources":["GraphChart.tsx"],"names":[],"mappings":";AAaA,oBAAY,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,eAAe,
|
|
1
|
+
{"version":3,"file":"GraphChart.d.ts","sourceRoot":"","sources":["GraphChart.tsx"],"names":[],"mappings":";AAaA,oBAAY,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,eAAe,gBAgDhD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGraphData.d.ts","sourceRoot":"","sources":["useGraphData.tsx"],"names":[],"mappings":"AACA,OAAO,EAKL,SAAS,EACV,MAAM,aAAa,CAAC;AAOrB,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,aAAa,GAAG,kBAAkB,GAAG;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,aAAa
|
|
1
|
+
{"version":3,"file":"useGraphData.d.ts","sourceRoot":"","sources":["useGraphData.tsx"],"names":[],"mappings":"AACA,OAAO,EAKL,SAAS,EACV,MAAM,aAAa,CAAC;AAOrB,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,aAAa,GAAG,kBAAkB,GAAG;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,aAAa;;;;;;CA8E/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchFilter.d.ts","sourceRoot":"","sources":["SearchFilter.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"SearchFilter.d.ts","sourceRoot":"","sources":["SearchFilter.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,eAmHjC;AAED,eAAe,YAAY,CAAC"}
|
package/package.json
CHANGED
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
} from "@/context/TabManagerContext";
|
|
18
18
|
import { FormModal } from "@/widgets/modals/FormModal";
|
|
19
19
|
import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
|
|
20
|
+
import { transformPlainMany2Ones } from "@/helpers/formHelper";
|
|
20
21
|
|
|
21
22
|
export type ContentRootContextType = {
|
|
22
23
|
processAction: ({
|
|
@@ -225,7 +226,10 @@ const ContentRootProvider = (
|
|
|
225
226
|
if (actionData.domain) {
|
|
226
227
|
parsedDomain = await ConnectionProvider.getHandler().evalDomain({
|
|
227
228
|
domain: actionData.domain,
|
|
228
|
-
values: {
|
|
229
|
+
values: transformPlainMany2Ones({
|
|
230
|
+
fields,
|
|
231
|
+
values: { ...values, ...globalValues },
|
|
232
|
+
}),
|
|
229
233
|
context: mergedContext,
|
|
230
234
|
});
|
|
231
235
|
}
|
|
@@ -175,7 +175,7 @@ export const getUniqueFieldsForParams = (params: any[]) => {
|
|
|
175
175
|
};
|
|
176
176
|
|
|
177
177
|
export const mergeParams = (searchParams: any[], domainParams: any[]) => {
|
|
178
|
-
const finalParams = searchParams;
|
|
178
|
+
const finalParams = [...searchParams];
|
|
179
179
|
const uniqueParams = getUniqueFieldsForParams(searchParams);
|
|
180
180
|
|
|
181
181
|
domainParams.forEach((element) => {
|
package/src/hooks/useSearch.ts
CHANGED
|
@@ -75,7 +75,6 @@ export const useSearch = (opts: UseSearchOpts) => {
|
|
|
75
75
|
const internalLimit = useRef(limit || DEFAULT_SEARCH_LIMIT);
|
|
76
76
|
|
|
77
77
|
const originalResults = useRef<any[]>([]);
|
|
78
|
-
const actionDomain = useRef<any>([]);
|
|
79
78
|
|
|
80
79
|
const setResults = useCallback((results: any) => {
|
|
81
80
|
setResultsActionView?.([...results]);
|
|
@@ -94,7 +93,7 @@ export const useSearch = (opts: UseSearchOpts) => {
|
|
|
94
93
|
model,
|
|
95
94
|
payload: nameSearch,
|
|
96
95
|
limit: internalLimit.current,
|
|
97
|
-
attrs:
|
|
96
|
+
attrs: domain,
|
|
98
97
|
context,
|
|
99
98
|
});
|
|
100
99
|
|
|
@@ -163,117 +162,119 @@ export const useSearch = (opts: UseSearchOpts) => {
|
|
|
163
162
|
sorter,
|
|
164
163
|
setCurrentItemIndex,
|
|
165
164
|
setActionViewTotalItems,
|
|
166
|
-
actionDomain,
|
|
167
165
|
]);
|
|
168
166
|
|
|
169
|
-
const searchResults = useCallback(
|
|
170
|
-
|
|
171
|
-
|
|
167
|
+
const searchResults = useCallback(
|
|
168
|
+
async (opts?: { params: any; newOffset: number }) => {
|
|
169
|
+
const { params, newOffset } = opts || {};
|
|
172
170
|
|
|
173
|
-
|
|
174
|
-
|
|
171
|
+
const mergedParams = mergeParams(params || searchParams, domain);
|
|
172
|
+
const { colors } = getTree(treeView!);
|
|
175
173
|
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
174
|
+
const { totalItems, results, attrsEvaluated } =
|
|
175
|
+
await ConnectionProvider.getHandler().searchForTree({
|
|
176
|
+
params: mergedParams,
|
|
177
|
+
limit: internalLimit.current,
|
|
178
|
+
offset: newOffset || offset,
|
|
179
|
+
model,
|
|
180
|
+
fields: treeView!.field_parent
|
|
181
|
+
? { ...treeView!.fields, [treeView!.field_parent]: {} }
|
|
182
|
+
: treeView!.fields,
|
|
183
|
+
context,
|
|
184
|
+
attrs: colors && { colors },
|
|
185
|
+
});
|
|
186
|
+
setColorsForResults(getColorMap(attrsEvaluated));
|
|
189
187
|
|
|
190
|
-
|
|
188
|
+
originalResults.current = [...results];
|
|
191
189
|
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
190
|
+
const resultsSorted =
|
|
191
|
+
sorter !== undefined
|
|
192
|
+
? sortResults({
|
|
193
|
+
resultsToSort: results,
|
|
194
|
+
sorter: sorter,
|
|
195
|
+
fields: { ...treeView!.fields, ...formView!.fields },
|
|
196
|
+
})
|
|
197
|
+
: [...originalResults.current];
|
|
200
198
|
|
|
201
|
-
|
|
199
|
+
setResults(resultsSorted);
|
|
202
200
|
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
201
|
+
if (resultsActionView && resultsSorted.length > 0) {
|
|
202
|
+
const newCurrentItemIndex = resultsSorted.findIndex(
|
|
203
|
+
(item) => currentId === item.id
|
|
204
|
+
);
|
|
207
205
|
|
|
208
|
-
|
|
209
|
-
|
|
206
|
+
if (newCurrentItemIndex === -1) {
|
|
207
|
+
setCurrentItemIndex?.(0);
|
|
208
|
+
} else {
|
|
209
|
+
setCurrentItemIndex?.(newCurrentItemIndex);
|
|
210
|
+
}
|
|
210
211
|
} else {
|
|
211
|
-
setCurrentItemIndex?.(
|
|
212
|
+
setCurrentItemIndex?.(undefined);
|
|
212
213
|
}
|
|
213
|
-
} else {
|
|
214
|
-
setCurrentItemIndex?.(undefined);
|
|
215
|
-
}
|
|
216
214
|
|
|
217
|
-
|
|
215
|
+
const totalItemsValue = await totalItems;
|
|
218
216
|
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
217
|
+
setTotalItems(totalItemsValue);
|
|
218
|
+
setActionViewTotalItems?.(totalItemsValue);
|
|
219
|
+
},
|
|
220
|
+
[
|
|
221
|
+
setCurrentItemIndex,
|
|
222
|
+
resultsActionView,
|
|
223
|
+
setResults,
|
|
224
|
+
currentId,
|
|
225
|
+
model,
|
|
226
|
+
context,
|
|
227
|
+
domain,
|
|
228
|
+
treeView,
|
|
229
|
+
formView,
|
|
230
|
+
sorter,
|
|
231
|
+
setActionViewTotalItems,
|
|
232
|
+
limit,
|
|
233
|
+
offset,
|
|
234
|
+
searchParams,
|
|
235
|
+
]
|
|
236
|
+
);
|
|
238
237
|
|
|
239
|
-
const fetchResults = useCallback(
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
238
|
+
const fetchResults = useCallback(
|
|
239
|
+
async (opts?: { params: any; newOffset: number }) => {
|
|
240
|
+
try {
|
|
241
|
+
setTableRefreshing(true);
|
|
242
|
+
setTreeIsLoading?.(true);
|
|
243
|
+
if (nameSearch && !searchNameGetDoneRef.current) {
|
|
244
|
+
await searchByNameSearch();
|
|
245
|
+
} else {
|
|
246
|
+
await searchResults(opts);
|
|
247
|
+
}
|
|
248
|
+
} catch (error) {
|
|
249
|
+
setSearchError(error.message);
|
|
250
|
+
} finally {
|
|
251
|
+
setTableRefreshing(false);
|
|
252
|
+
setSearchFilterLoading(false);
|
|
253
|
+
setTreeIsLoading?.(false);
|
|
247
254
|
}
|
|
248
|
-
}
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
setSearchFilterLoading,
|
|
272
|
-
setTableRefreshing,
|
|
273
|
-
setTreeIsLoading,
|
|
274
|
-
sorter,
|
|
275
|
-
treeView,
|
|
276
|
-
]);
|
|
255
|
+
},
|
|
256
|
+
[
|
|
257
|
+
context,
|
|
258
|
+
currentId,
|
|
259
|
+
domain,
|
|
260
|
+
formView,
|
|
261
|
+
limit,
|
|
262
|
+
model,
|
|
263
|
+
nameSearch,
|
|
264
|
+
offset,
|
|
265
|
+
resultsActionView,
|
|
266
|
+
searchNameGetDoneRef,
|
|
267
|
+
setActionViewTotalItems,
|
|
268
|
+
setCurrentItemIndex,
|
|
269
|
+
setResults,
|
|
270
|
+
setSearchError,
|
|
271
|
+
setSearchFilterLoading,
|
|
272
|
+
setTableRefreshing,
|
|
273
|
+
setTreeIsLoading,
|
|
274
|
+
sorter,
|
|
275
|
+
treeView,
|
|
276
|
+
]
|
|
277
|
+
);
|
|
277
278
|
|
|
278
279
|
const changeSort = useCallback(
|
|
279
280
|
(newSorter: any) => {
|
|
@@ -292,22 +293,19 @@ export const useSearch = (opts: UseSearchOpts) => {
|
|
|
292
293
|
);
|
|
293
294
|
|
|
294
295
|
const submit = useCallback(
|
|
295
|
-
({
|
|
296
|
-
params: newParams,
|
|
297
|
-
limit: newLimit,
|
|
298
|
-
offset: newOffset,
|
|
299
|
-
searchValues,
|
|
300
|
-
}: {
|
|
296
|
+
(opts: {
|
|
301
297
|
params: any;
|
|
302
298
|
limit: number;
|
|
303
299
|
offset: number;
|
|
304
300
|
searchValues: any;
|
|
305
301
|
}) => {
|
|
302
|
+
const { params, searchValues, limit: newLimit, offset: newOffset } = opts;
|
|
303
|
+
|
|
306
304
|
if (tableRefreshing) return;
|
|
307
305
|
setSearchTreeNameSearch?.(undefined);
|
|
308
306
|
setSelectedRowItems?.([]);
|
|
309
307
|
setSearchValues?.(searchValues);
|
|
310
|
-
setSearchParams?.(
|
|
308
|
+
setSearchParams?.(params);
|
|
311
309
|
setSearchVisible?.(false);
|
|
312
310
|
setSearchFilterLoading(true);
|
|
313
311
|
setSearchError(undefined);
|
|
@@ -315,7 +313,10 @@ export const useSearch = (opts: UseSearchOpts) => {
|
|
|
315
313
|
internalLimit.current = newLimit;
|
|
316
314
|
if (newLimit) setLimit?.(newLimit);
|
|
317
315
|
if (newOffset) setOffset(newOffset);
|
|
318
|
-
fetchResults(
|
|
316
|
+
fetchResults({
|
|
317
|
+
params,
|
|
318
|
+
newOffset,
|
|
319
|
+
});
|
|
319
320
|
},
|
|
320
321
|
[
|
|
321
322
|
tableRefreshing,
|
package/src/views/RootView.tsx
CHANGED
|
@@ -15,6 +15,7 @@ import { tForLang } from "@/context/LocaleContext";
|
|
|
15
15
|
import { ShortcutApi } from "@/ui/FavouriteButton";
|
|
16
16
|
import showErrorDialog from "@/ui/ActionErrorDialog";
|
|
17
17
|
import { InitialViewData, ViewType } from "@/types";
|
|
18
|
+
import { transformPlainMany2Ones } from "@/helpers/formHelper";
|
|
18
19
|
|
|
19
20
|
type RootViewProps = {
|
|
20
21
|
children: React.ReactNode;
|
|
@@ -245,7 +246,10 @@ function RootView(props: RootViewProps, ref: any) {
|
|
|
245
246
|
const parsedDomain = domain
|
|
246
247
|
? await ConnectionProvider.getHandler().evalDomain({
|
|
247
248
|
domain: domain,
|
|
248
|
-
values: {
|
|
249
|
+
values: transformPlainMany2Ones({
|
|
250
|
+
fields,
|
|
251
|
+
values: { ...values, ...globalValues },
|
|
252
|
+
}),
|
|
249
253
|
context: { ...rootContext, ...parsedContext },
|
|
250
254
|
})
|
|
251
255
|
: [];
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import GraphActionBar from "@/actionbar/GraphActionBar";
|
|
2
2
|
import TitleHeader from "@/ui/TitleHeader";
|
|
3
3
|
import { Graph } from "@/widgets/views/Graph/Graph";
|
|
4
|
-
import React, { useContext, useRef } from "react";
|
|
4
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
5
5
|
import {
|
|
6
6
|
ActionViewContext,
|
|
7
7
|
ActionViewContextType,
|
|
@@ -11,7 +11,7 @@ import { mergeSearchFields } from "@/helpers/formHelper";
|
|
|
11
11
|
import { useSearch } from "@/hooks/useSearch";
|
|
12
12
|
import SearchFilter from "@/widgets/views/searchFilter/SearchFilter";
|
|
13
13
|
import { Spin } from "antd";
|
|
14
|
-
import {
|
|
14
|
+
import { mergeParams } from "@/helpers/searchHelper";
|
|
15
15
|
|
|
16
16
|
export type GraphActionViewProps = {
|
|
17
17
|
viewData: any;
|
|
@@ -47,43 +47,48 @@ export const GraphActionView = (props: GraphActionViewProps) => {
|
|
|
47
47
|
setTreeIsLoading = undefined,
|
|
48
48
|
limit,
|
|
49
49
|
setLimit,
|
|
50
|
+
searchParams,
|
|
51
|
+
searchValues,
|
|
52
|
+
setSearchValues,
|
|
53
|
+
currentView,
|
|
50
54
|
} = actionViewContext || {};
|
|
51
55
|
|
|
52
|
-
const
|
|
53
|
-
ActionViewContext
|
|
54
|
-
) as ActionViewContextType;
|
|
55
|
-
const { t } = useContext(LocaleContext) as LocaleContextType;
|
|
56
|
+
const [applyLimit, setApplyLimit] = useState(true);
|
|
56
57
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
58
|
+
useEffect(() => {
|
|
59
|
+
(graphRef.current as any)?.refresh();
|
|
60
|
+
}, [searchParams]);
|
|
61
|
+
|
|
62
|
+
useEffect(() => {
|
|
63
|
+
if (viewData.view_id !== currentView.view_id) {
|
|
64
|
+
setApplyLimit(true);
|
|
65
|
+
}
|
|
66
|
+
}, [currentView]);
|
|
67
|
+
|
|
68
|
+
const { clear, searchFilterLoading, searchError, offset, tableRefreshing } =
|
|
69
|
+
useSearch({
|
|
70
|
+
model,
|
|
71
|
+
setSearchTreeNameSearch,
|
|
72
|
+
setSelectedRowItems,
|
|
73
|
+
searchParams,
|
|
74
|
+
setSearchValues,
|
|
75
|
+
setSearchParams,
|
|
76
|
+
setSearchVisible,
|
|
77
|
+
setTreeIsLoading,
|
|
78
|
+
context,
|
|
79
|
+
formView: formView!,
|
|
80
|
+
treeView: treeView!,
|
|
81
|
+
sorter,
|
|
82
|
+
setSorter,
|
|
83
|
+
setCurrentItemIndex,
|
|
84
|
+
setResultsActionView,
|
|
85
|
+
resultsActionView,
|
|
86
|
+
domain,
|
|
87
|
+
currentId,
|
|
88
|
+
setActionViewTotalItems,
|
|
89
|
+
limit,
|
|
90
|
+
setLimit,
|
|
91
|
+
});
|
|
87
92
|
|
|
88
93
|
if (!visible) {
|
|
89
94
|
return null;
|
|
@@ -112,27 +117,32 @@ export const GraphActionView = (props: GraphActionViewProps) => {
|
|
|
112
117
|
onClear={clear}
|
|
113
118
|
offset={offset}
|
|
114
119
|
isSearching={searchFilterLoading}
|
|
115
|
-
onSubmit={
|
|
120
|
+
onSubmit={(opts: {
|
|
121
|
+
params: any;
|
|
122
|
+
limit: number;
|
|
123
|
+
offset: number;
|
|
124
|
+
searchValues: any;
|
|
125
|
+
}) => {
|
|
126
|
+
setApplyLimit(false);
|
|
127
|
+
setSearchParams?.(opts.params);
|
|
128
|
+
setSearchVisible?.(false);
|
|
129
|
+
}}
|
|
116
130
|
searchError={searchError}
|
|
117
131
|
searchVisible={searchVisible}
|
|
118
132
|
searchValues={searchValues}
|
|
133
|
+
showLimitOptions={false}
|
|
119
134
|
/>
|
|
120
135
|
{tableRefreshing ? (
|
|
121
136
|
<Spin />
|
|
122
137
|
) : (
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
context={context}
|
|
132
|
-
domain={searchParams || domain}
|
|
133
|
-
limit={limit}
|
|
134
|
-
/>
|
|
135
|
-
</>
|
|
138
|
+
<Graph
|
|
139
|
+
ref={graphRef}
|
|
140
|
+
view_id={viewData.view_id}
|
|
141
|
+
model={model}
|
|
142
|
+
context={context}
|
|
143
|
+
domain={mergeParams(searchParams || [], domain)}
|
|
144
|
+
limit={applyLimit ? limit : undefined}
|
|
145
|
+
/>
|
|
136
146
|
)}
|
|
137
147
|
</>
|
|
138
148
|
);
|
|
@@ -26,6 +26,7 @@ import { readObjectValues, getNextPendingId } from "@/helpers/one2manyHelper";
|
|
|
26
26
|
import { SearchModal } from "@/widgets/modals/SearchModal";
|
|
27
27
|
import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
|
|
28
28
|
import { sortResults } from "@/helpers/treeHelper";
|
|
29
|
+
import { transformPlainMany2Ones } from "@/helpers/formHelper";
|
|
29
30
|
|
|
30
31
|
type One2manyValue = {
|
|
31
32
|
fields?: any;
|
|
@@ -78,7 +79,8 @@ const One2manyInput: React.FC<One2manyInputProps> = (
|
|
|
78
79
|
) as One2manyContextType;
|
|
79
80
|
|
|
80
81
|
const formContext = useContext(FormContext) as FormContextType;
|
|
81
|
-
const { activeId, getValues, getContext, domain } =
|
|
82
|
+
const { activeId, getFields, getValues, getContext, domain } =
|
|
83
|
+
formContext || {};
|
|
82
84
|
const { lang, t } = useContext(LocaleContext) as LocaleContextType;
|
|
83
85
|
|
|
84
86
|
const formRef = useRef();
|
|
@@ -162,7 +164,10 @@ const One2manyInput: React.FC<One2manyInputProps> = (
|
|
|
162
164
|
transformedDomain.current = transformDomainForChildWidget({
|
|
163
165
|
domain: await ConnectionProvider.getHandler().evalDomain({
|
|
164
166
|
domain: widgetDomain,
|
|
165
|
-
values:
|
|
167
|
+
values: transformPlainMany2Ones({
|
|
168
|
+
fields: getFields(),
|
|
169
|
+
values: getValues(),
|
|
170
|
+
}),
|
|
166
171
|
context: getContext(),
|
|
167
172
|
}),
|
|
168
173
|
widgetFieldName: fieldName,
|