@finos/legend-query-builder 4.14.11 → 4.14.12
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/components/fetch-structure/QueryBuilderResultModifierPanel.d.ts.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderResultModifierPanel.js +7 -2
- package/lib/components/fetch-structure/QueryBuilderResultModifierPanel.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/package.json +3 -3
- package/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx +13 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderResultModifierPanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA4BH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0DAA0D,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryBuilderResultModifierPanel.d.ts","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA4BH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0DAA0D,CAAC;AAyLrG,eAAO,MAAM,wBAAwB,WAC3B;IAAE,QAAQ,EAAE,oBAAoB,CAAA;CAAE;;CAwN3C,CAAC"}
|
|
@@ -75,6 +75,11 @@ const ColumnsSortEditor = observer((props) => {
|
|
|
75
75
|
};
|
|
76
76
|
return (_jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Sort and Order" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Choose the column(s) and order direction(s) that the results should be arranged by" }), _jsxs("div", { className: "panel__content__form__section__list", children: [_jsx("div", { className: "panel__content__form__section__list__items", children: sortColumns.map((value) => (_jsx(ColumnSortEditor, { sortColumns: sortColumns, setSortColumns: setSortColumns, sortState: value, tdsColumns: tdsColumns }, value.columnState.uuid))) }), _jsx("div", { className: "panel__content__form__section__list__new-item__add", children: _jsx("button", { className: "panel__content__form__section__list__new-item__add-btn btn btn--dark", disabled: !projectionOptions.length, onClick: addValue, tabIndex: -1, children: "Add Value" }) })] })] }));
|
|
77
77
|
});
|
|
78
|
+
const cloneSortColumnStateArray = (sortColumns) => sortColumns.map((sortColumn) => {
|
|
79
|
+
const newSortColumn = new SortColumnState(sortColumn.columnState);
|
|
80
|
+
newSortColumn.setSortType(sortColumn.sortType);
|
|
81
|
+
return newSortColumn;
|
|
82
|
+
});
|
|
78
83
|
export const QueryResultModifierModal = observer((props) => {
|
|
79
84
|
// Read current state
|
|
80
85
|
const { tdsState } = props;
|
|
@@ -84,13 +89,13 @@ export const QueryResultModifierModal = observer((props) => {
|
|
|
84
89
|
const stateLimitResults = resultSetModifierState.limit;
|
|
85
90
|
const stateSlice = resultSetModifierState.slice;
|
|
86
91
|
// Set up temp state for modal lifecycle
|
|
87
|
-
const [sortColumns, setSortColumns] = useState(
|
|
92
|
+
const [sortColumns, setSortColumns] = useState(cloneSortColumnStateArray(stateSortColumns));
|
|
88
93
|
const [distinct, setDistinct] = useState(stateDistinct);
|
|
89
94
|
const [limitResults, setLimitResults] = useState(stateLimitResults);
|
|
90
95
|
const [slice, setSlice] = useState(stateSlice ?? [undefined, undefined]);
|
|
91
96
|
// Sync temp state with tdsState when modal is opened/closed
|
|
92
97
|
useEffect(() => {
|
|
93
|
-
setSortColumns(
|
|
98
|
+
setSortColumns(cloneSortColumnStateArray(stateSortColumns));
|
|
94
99
|
setDistinct(stateDistinct);
|
|
95
100
|
setLimitResults(stateLimitResults);
|
|
96
101
|
setSlice(stateSlice ?? [undefined, undefined]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderResultModifierPanel.js","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,IAAI,EACJ,MAAM,EACN,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,SAAS,EACT,KAAK,EACL,SAAS,EACT,WAAW,EACX,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,iEAAiE,CAAC;AAClG,OAAO,EACL,cAAc,EACd,WAAW,EACX,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,MAAM,gBAAgB,GAAG,QAAQ,CAC/B,CAAC,KAKA,EAAE,EAAE;IACH,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IACrE,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,iBAAiB,GAAG,UAAU;SACjC,MAAM,CACL,CAAC,aAAa,EAAE,EAAE,CAChB,aAAa,KAAK,SAAS,CAAC,WAAW;QACvC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC,CACxE;SACA,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,aAAa,CAAC,UAAU;QAC/B,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC,CAAC;IACN,MAAM,KAAK,GAAG;QACZ,KAAK,EAAE,SAAS,CAAC,WAAW,CAAC,UAAU;QACvC,KAAK,EAAE,SAAS;KACjB,CAAC;IACF,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;IAEpC,MAAM,QAAQ,GAAG,CACf,GAAgE,EAC1D,EAAE;QACR,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACrC;IACH,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,GAAS,EAAE;QAClC,MAAM,cAAc,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC;QACxC,WAAW,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QACvC,cAAc,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,MAAwB,EAAE,EAAE,CAAC,GAAS,EAAE;QAC5D,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAC,oFAAoF,aACjG,KAAC,mBAAmB,IAClB,SAAS,EAAC,oDAAoD,EAC9D,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EACN,iBAAiB,CAAC,MAAM,GAAG,CAAC;oBAC5B,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,EAEpD,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,QAAQ,EACN,CAAC,gBAAgB,CAAC,aAAa,CAAC,mCAAmC,GAErE,EACF,cAAK,SAAS,EAAC,kDAAkD,YAC9D,QAAQ,CAAC,WAAW,EAAE,GACnB,EACN,KAAC,YAAY,IACX,OAAO,EACL,KAAC,WAAW,cACT,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAC3C,KAAC,eAAe,IAAU,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,YAChD,EAAE,CAAC,WAAW,EAAE,IADG,EAAE,CAEN,CACnB,CAAC,GACU,EAEhB,SAAS,EAAE;oBACT,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE;oBACxD,eAAe,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE;oBACxD,SAAS,EAAE,CAAC;iBACb,YAED,cACE,SAAS,EAAC,uDAAuD,EACjE,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,2BAA2B,YAEjC,KAAC,QAAQ,KAAG,GACR,GACO,EAEf,iBACE,SAAS,EAAC,6EAA6E,EACvF,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,CAAC,CAAC,EACZ,KAAK,EAAC,QAAQ,iBAEZ,qBAAqB,CAAC,mDAAmD,YAG3E,KAAC,SAAS,KAAG,GACN,IACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,iBAAiB,GAAG,QAAQ,CAChC,CAAC,KAKA,EAAE,EAAE;IACH,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,GAClE,KAAK,CAAC;IACR,MAAM,iBAAiB,GAAG,iBAAiB;SACxC,MAAM,CACL,CAAC,aAAa,EAAE,EAAE,CAChB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC,CACxE;SACA,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,aAAa,CAAC,UAAU;QAC/B,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC,CAAC;IACN,MAAM,QAAQ,GAAG,GAAS,EAAE;QAC1B,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,UAAU,GAAG,IAAI,eAAe,CACpC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CACjD,CAAC;YACF,MAAM,cAAc,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC;YACxC,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;YAC3C,cAAc,CAAC,cAAc,CAAC,CAAC;SAChC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAC,+BAA+B,aAC5C,cAAK,SAAS,EAAC,8CAA8C,+BAEvD,EACN,cAAK,SAAS,EAAC,+CAA+C,mGAGxD,EACN,eAAK,SAAS,EAAC,qCAAqC,aAClD,cAAK,SAAS,EAAC,4CAA4C,YAExD,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAC1B,KAAC,gBAAgB,IAEf,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,UAAU,IAJjB,KAAK,CAAC,WAAW,CAAC,IAAI,CAK3B,CACH,CAAC,GACE,EACN,cAAK,SAAS,EAAC,oDAAoD,YACjE,iBACE,SAAS,EAAC,sEAAsE,EAChF,QAAQ,EAAE,CAAC,iBAAiB,CAAC,MAAM,EACnC,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,CAAC,CAAC,0BAGL,GACL,IACF,IACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,QAAQ,CAC9C,CAAC,KAAyC,EAAE,EAAE;IAC5C,qBAAqB;IACrB,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC3B,MAAM,sBAAsB,GAAG,QAAQ,CAAC,sBAAsB,CAAC;IAC/D,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,WAAW,CAAC;IAC5D,MAAM,aAAa,GAAG,sBAAsB,CAAC,QAAQ,CAAC;IACtD,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,KAAK,CAAC;IACvD,MAAM,UAAU,GAAG,sBAAsB,CAAC,KAAK,CAAC;IAEhD,wCAAwC;IACxC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"QueryBuilderResultModifierPanel.js","sourceRoot":"","sources":["../../../src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx"],"names":[],"mappings":"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"}
|
package/lib/index.css
CHANGED
package/lib/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-query-builder",
|
|
3
|
-
"version": "4.14.
|
|
3
|
+
"version": "4.14.12",
|
|
4
4
|
"description": "Legend query builder core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -44,8 +44,8 @@
|
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@finos/legend-application": "15.0.70",
|
|
46
46
|
"@finos/legend-art": "7.1.22",
|
|
47
|
-
"@finos/legend-graph": "31.8.
|
|
48
|
-
"@finos/legend-lego": "1.2.
|
|
47
|
+
"@finos/legend-graph": "31.8.7",
|
|
48
|
+
"@finos/legend-lego": "1.2.12",
|
|
49
49
|
"@finos/legend-server-depot": "6.0.36",
|
|
50
50
|
"@finos/legend-shared": "10.0.32",
|
|
51
51
|
"@finos/legend-storage": "3.0.82",
|
|
@@ -216,6 +216,15 @@ const ColumnsSortEditor = observer(
|
|
|
216
216
|
},
|
|
217
217
|
);
|
|
218
218
|
|
|
219
|
+
const cloneSortColumnStateArray = (
|
|
220
|
+
sortColumns: SortColumnState[],
|
|
221
|
+
): SortColumnState[] =>
|
|
222
|
+
sortColumns.map((sortColumn) => {
|
|
223
|
+
const newSortColumn = new SortColumnState(sortColumn.columnState);
|
|
224
|
+
newSortColumn.setSortType(sortColumn.sortType);
|
|
225
|
+
return newSortColumn;
|
|
226
|
+
});
|
|
227
|
+
|
|
219
228
|
export const QueryResultModifierModal = observer(
|
|
220
229
|
(props: { tdsState: QueryBuilderTDSState }) => {
|
|
221
230
|
// Read current state
|
|
@@ -227,7 +236,9 @@ export const QueryResultModifierModal = observer(
|
|
|
227
236
|
const stateSlice = resultSetModifierState.slice;
|
|
228
237
|
|
|
229
238
|
// Set up temp state for modal lifecycle
|
|
230
|
-
const [sortColumns, setSortColumns] = useState(
|
|
239
|
+
const [sortColumns, setSortColumns] = useState(
|
|
240
|
+
cloneSortColumnStateArray(stateSortColumns),
|
|
241
|
+
);
|
|
231
242
|
const [distinct, setDistinct] = useState(stateDistinct);
|
|
232
243
|
const [limitResults, setLimitResults] = useState(stateLimitResults);
|
|
233
244
|
const [slice, setSlice] = useState<
|
|
@@ -236,7 +247,7 @@ export const QueryResultModifierModal = observer(
|
|
|
236
247
|
|
|
237
248
|
// Sync temp state with tdsState when modal is opened/closed
|
|
238
249
|
useEffect(() => {
|
|
239
|
-
setSortColumns(
|
|
250
|
+
setSortColumns(cloneSortColumnStateArray(stateSortColumns));
|
|
240
251
|
setDistinct(stateDistinct);
|
|
241
252
|
setLimitResults(stateLimitResults);
|
|
242
253
|
setSlice(stateSlice ?? [undefined, undefined]);
|