@licklist/design 0.48.0-dev.1 → 0.48.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/events/event-card/utils.d.ts.map +1 -1
- package/dist/events/event-card/utils.js +1 -1
- package/dist/static/switch/BooleanSwitch.d.ts +1 -3
- package/dist/static/switch/BooleanSwitch.d.ts.map +1 -1
- package/dist/static/switch/BooleanSwitch.js +1 -1
- package/dist/styles/sales/BookingFilter.scss +1 -3
- package/dist/styles/sales/BookingResults.scss +1 -1
- package/dist/styles/static/Switch.scss +0 -1
- package/dist/table/TableHelperComponent.d.ts +1 -2
- package/dist/table/TableHelperComponent.d.ts.map +1 -1
- package/dist/table/TableHelperComponent.js +1 -1
- package/package.json +3 -3
- package/src/events/event-card/utils.ts +9 -4
- package/src/static/switch/BooleanSwitch.tsx +2 -6
- package/src/styles/sales/BookingFilter.scss +1 -3
- package/src/styles/sales/BookingResults.scss +1 -1
- package/src/styles/static/Switch.scss +0 -1
- package/src/table/TableHelperComponent.tsx +21 -78
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAGlG,wBAAgB,aAAa,CAAC,OAAO,KAAA,EAAE,UAAU,KAAA,OAIhD;AAED,eAAO,MAAM,wBAAwB,2CAepC,CAAC;AAEF,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAE1C;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,UACvB,MAAM,EAAE,kBACC,cAAc,KAC7B,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAGlG,wBAAgB,aAAa,CAAC,OAAO,KAAA,EAAE,UAAU,KAAA,OAIhD;AAED,eAAO,MAAM,wBAAwB,2CAepC,CAAC;AAEF,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAE1C;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,UACvB,MAAM,EAAE,kBACC,cAAc,KAC7B,MAUF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,UAC/B,MAAM,EAAE,kBACC,cAAc,KAC7B,CAAC,MAAM,EAAE,MAAM,CAejB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,mBACX,cAAc,GAAG,IAAI,QAC/B,MAAM;gBAEA,MAAM;eACP,MAAM;iBACJ,MAAM;CA2BpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("@licklist/core/dist/Config"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("@licklist/core/dist/Config"),e=require("luxon");var o=300,n=function(t,r){return t.reduce((function(t,e){var o;return t+Object.values(null!==(o=r.views[e])&&void 0!==o?o:{}).reduce((function(t,r){return t+(r.pageViews||0)}),0)}),0)},u=function(t,r){var e=0,o=0;return t.forEach((function(t){var n;return Object.values(null!==(n=r.productCategorySummary[t])&&void 0!==n?n:{}).forEach((function(t){var r,n=t.totalPerCategory,u=t.productsSummary;o+=n||0,e+=null!==(r=null==u?void 0:u.reduce((function(t,r){return t+r.productsSold}),0))&&void 0!==r?r:0}))})),[e,o]};exports.EVENT_DESCRIPTION_SIZE=o,exports.calculateTotalSoldAndAmount=u,exports.calculateTotalViews=n,exports.formatContent=function(t,r){return t?t.length>r?"".concat(t.slice(0,r),"..."):t:""},exports.formatContentWithoutTags=function(t,r){if(void 0===r&&(r=o),!t)return"";if(t<r)return t;var e=t.replace(/<[^>]*>/g,"").trim().replace(/ |[^a-zA-Z0-9\s]/g,"").replace(/\s\s+/g," ").slice(0,r).split(" "),n=String(t).indexOf(e[e.length-2]);return t.slice(0,n).concat("...")},exports.getStatisticInfo=function(o,a){var i,l;if(!o)return{totalViews:0,totalSold:0,totalAmount:0};var c=e.DateTime.fromISO(a).toUTC().toFormat(r.DATE_FORMAT),s=e.DateTime.fromISO(a).toUTC().toFormat(r.DATE_FORMAT),d=null!==(l=null===(i=Object.keys(null==o?void 0:o.productCategorySummary))||void 0===i?void 0:i.filter((function(t){return e.DateTime.fromFormat(t,r.DATE_TIME_FULL_FORMAT).toFormat(r.DATE_FORMAT)===s})))&&void 0!==l?l:[],f=n([c],o),m=t.__read(u(d,o),2);return{totalViews:f,totalSold:m[0],totalAmount:m[1]}};
|
|
@@ -4,8 +4,6 @@ export interface BooleanSwitchProps {
|
|
|
4
4
|
value?: boolean;
|
|
5
5
|
disabled?: boolean;
|
|
6
6
|
onChange: (value: boolean) => void;
|
|
7
|
-
firstValueTitle?: string;
|
|
8
|
-
secondValueTitle?: string;
|
|
9
7
|
}
|
|
10
|
-
export declare function BooleanSwitch({ name, value, disabled, onChange,
|
|
8
|
+
export declare function BooleanSwitch({ name, value, disabled, onChange, }: BooleanSwitchProps): JSX.Element;
|
|
11
9
|
//# sourceMappingURL=BooleanSwitch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BooleanSwitch.d.ts","sourceRoot":"","sources":["../../../src/static/switch/BooleanSwitch.tsx"],"names":[],"mappings":";AAKA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"BooleanSwitch.d.ts","sourceRoot":"","sources":["../../../src/static/switch/BooleanSwitch.tsx"],"names":[],"mappings":";AAKA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;AAED,wBAAgB,aAAa,CAAC,EAC5B,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,QAAQ,GACT,EAAE,kBAAkB,eAwBpB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,a=require("tslib"),t=require("react"),i=(e=t)&&"object"==typeof e&&"default"in e?e.default:e,n=require("react-i18next"),r=require("./Switch.js");exports.BooleanSwitch=function(e){var o=e.name,u=e.value,l=e.disabled,s=e.onChange,c=n.useTranslation("Design").t,d=[{id:1,value:c("yes")},{id:0,value:c("no")}],v=t.useCallback((function(e){s(Boolean(e))}),[s]);return i.createElement(r.Switch,a.__assign({name:o},void 0!==u&&{value:Number(u)},{options:d,disabled:l,onChange:v}))};
|
|
@@ -164,12 +164,10 @@
|
|
|
164
164
|
|
|
165
165
|
@include media-breakpoint-down(md) {
|
|
166
166
|
flex-wrap: wrap;
|
|
167
|
-
|
|
168
167
|
.date-container {
|
|
169
168
|
width: 100%;
|
|
170
169
|
flex: 1;
|
|
171
170
|
}
|
|
172
|
-
|
|
173
171
|
.btn-primary {
|
|
174
172
|
margin-top: 1rem;
|
|
175
173
|
}
|
|
@@ -232,4 +230,4 @@
|
|
|
232
230
|
}
|
|
233
231
|
}
|
|
234
232
|
}
|
|
235
|
-
}
|
|
233
|
+
}
|
|
@@ -27,7 +27,6 @@ $btn-switch-option-padding-y: calc(#{$btn-padding-y} - #{sp(1)}) !default;
|
|
|
27
27
|
border-radius: $btn-switch-option-border-radius;
|
|
28
28
|
margin: 0;
|
|
29
29
|
padding: $btn-switch-option-padding-y $btn-switch-option-padding-x;
|
|
30
|
-
min-width: 4.25rem;
|
|
31
30
|
|
|
32
31
|
&:hover,
|
|
33
32
|
&:active,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="react" />
|
|
2
2
|
import ILengthAwarePaginator from "@licklist/plugins/dist/types/services/Table/ILengthAwarePaginator";
|
|
3
3
|
import ITableHeader from "@licklist/plugins/dist/types/services/Table/ITableHeader";
|
|
4
4
|
import ITableProps from "@licklist/plugins/dist/types/services/Table/ITableProps";
|
|
@@ -18,7 +18,6 @@ export interface TableHelperComponentProps {
|
|
|
18
18
|
[key: string]: any;
|
|
19
19
|
};
|
|
20
20
|
initialOptions?: Partial<ITableProps>;
|
|
21
|
-
filteredOrdersOptions?: (value: SetStateAction<ITableProps>) => void;
|
|
22
21
|
}
|
|
23
22
|
/**
|
|
24
23
|
* TableHelperComponent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableHelperComponent.d.ts","sourceRoot":"","sources":["../../src/table/TableHelperComponent.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TableHelperComponent.d.ts","sourceRoot":"","sources":["../../src/table/TableHelperComponent.tsx"],"names":[],"mappings":";AAQA,OAAO,qBAAqB,MAAM,mEAAmE,CAAC;AACtG,OAAO,YAAY,MAAM,0DAA0D,CAAC;AACpF,OAAO,WAAW,MAAM,yDAAyD,CAAC;AAQlF,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,QAAQ,CAAC;IACvB,SAAS,CAAC,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CACvC;AAUD;;;;;;GAMG;AACH,iBAAS,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,eAsP7D;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("react"),n=e(r),i=require("react-router-dom"),a=e(require("@licklist/plugins/dist/services/Route/RouteService")),o=require("../static/loader/LoaderIndicator.js"),
|
|
1
|
+
"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("react"),n=e(r),i=require("react-router-dom"),a=e(require("@licklist/plugins/dist/services/Route/RouteService")),o=require("../static/loader/LoaderIndicator.js"),l=require("react-bootstrap"),s=e(require("@licklist/plugins/dist/hooks/Query/useQuery")),u=require("lodash"),c=require("./FilterHelperComponent.js"),p=require("./PaginationHelperComponent.js"),d=e(require("@licklist/plugins/dist/services/Table/TableService")),g=require("./PerPageHelperComponent.js"),f=require("./utils/index.js");exports.TableHelperComponent=function(e){var _,m,v=e.paginator,E=e.headers,y=e.renderItemFn,S=e.isLoading,h=e.onRefreshFn,C=e.refreshAt,P=e.striped,b=void 0===P||P,q=e.bordered,F=void 0===q||q,j=e.displaySearchBar,D=void 0===j||j,k=e.displayPerPageSelect,L=void 0===k||k,w=e.displayShowingSection,H=void 0===w||w,O=e.externalFilters,R=void 0===O?{}:O,T=e.initialOptions,N=void 0===T?{}:T,V=s(),K=i.useLocation().pathname,I=Number(f.getFilterOptionsValue(V,N,"page")),x=Number(f.getFilterOptionsValue(V,N,"perPage")),A=String(f.getFilterOptionsValue(V,N,"sortKey")),U=String(f.getFilterOptionsValue(V,N,"sortDirection")),Q=String(f.getFilterOptionsValue(V,N,"filter")),B=t.__read(r.useState(),2),G=B[0],M=B[1],z=t.__read(r.useState({page:I,perPage:x,sortKey:A,sortDirection:U,filter:Q}),2),J=z[0],W=z[1],X=t.__read(r.useState(0),2),Y=X[0],Z=X[1],$=t.__read(r.useState(R),2),ee=$[0],te=$[1];r.useEffect((function(){u.isEqual(G,J)&&u.isEqual(ee,R)||(M(J),te(R),h&&h(J),a.redirectTo([K,["page=".concat(J.page),"perPage=".concat(J.perPage),"sortKey=".concat(escape(J.sortKey)),"sortDirection=".concat(escape(J.sortDirection)),"filter=".concat(escape(J.filter)),new URLSearchParams(R).toString()].join("&")].join("?")))}),[K,J,h,R]),r.useEffect((function(){Y!==C&&(Z((function(e){return null!=C?C:e})),h&&h(J))}),[h,J,C,Y]);var re=function(e){var r,i;if("string"==typeof e)return n.createElement("th",{key:e.toLowerCase(),className:d.getHeaderClasses(e,A,U)},e);if("object"==typeof e){var a={width:null!==(r=e.width)&&void 0!==r?r:"auto"};return n.createElement("th",{key:null!==(i=e.key)&&void 0!==i?i:e.title.toLowerCase(),className:d.getHeaderClasses(e,A,U),style:a,onClick:function(){return e.isSortable&&(r=e.key,n=d.DEFAULT_SORT_DIRECTION,void W(A===r?function(e){return n=d.getSortDirection(e.sortDirection,n),t.__assign(t.__assign({},e),{sortKey:r,sortDirection:n})}:function(e){return t.__assign(t.__assign({},e),{sortKey:r,sortDirection:n})}));var r,n}},e.title)}return null};return n.createElement("div",{className:["table-helper",S?"py-5":"py-1"].join(" ")},n.createElement(o.LoaderIndicator,{isLoaded:!S},n.createElement(l.Row,null,n.createElement(l.Col,null,L&&n.createElement(g.PerPageHelperComponent,{onChangeFn:function(e){W((function(r){return t.__assign(t.__assign({},r),{perPage:e})}))},defaultValue:null!==(_=null==v?void 0:v.per_page)&&void 0!==_?_:d.DEFAULT_PER_PAGE})),n.createElement(l.Col,null,D&&n.createElement(c.FilterHelperComponent,{onClickFn:function(e){W((function(r){var n=r.page,i=t.__rest(r,["page"]),a=n;return(!e&&i.filter||e&&!i.filter)&&(a=1),t.__assign(t.__assign({},i),{page:a,filter:e})}))},defaultValue:null!==(m=J.filter)&&void 0!==m?m:""}))),n.createElement(l.Row,null,n.createElement(l.Col,null,n.createElement("div",{className:"table-responsive"},n.createElement(l.Table,{striped:b,bordered:F,hover:!0},n.createElement("thead",null,n.createElement("tr",null,E.map((function(e){return re(e)})))),n.createElement("tbody",null,v?v.data.map((function(e,t){return y(e,t)})):null))))),n.createElement(p.PaginationHelperComponent,{displayShowingSection:H,paginator:v,onPageChangeFn:function(e){W((function(r){return t.__assign(t.__assign({},r),{page:e})}))}})))};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@licklist/design",
|
|
3
|
-
"version": "0.48.0
|
|
3
|
+
"version": "0.48.0",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
|
|
@@ -53,9 +53,9 @@
|
|
|
53
53
|
"@fortawesome/free-brands-svg-icons": "5.15.2",
|
|
54
54
|
"@fortawesome/free-solid-svg-icons": "5.15.2",
|
|
55
55
|
"@fortawesome/react-fontawesome": "0.1.9",
|
|
56
|
-
"@licklist/core": "
|
|
56
|
+
"@licklist/core": "0.15.x",
|
|
57
57
|
"@licklist/eslint-config": "0.3.4",
|
|
58
|
-
"@licklist/plugins": "
|
|
58
|
+
"@licklist/plugins": "0.21.x",
|
|
59
59
|
"@mdx-js/react": "1.6.22",
|
|
60
60
|
"@popperjs/core": "2.11.8",
|
|
61
61
|
"@react-aria/utils": "3.9.0",
|
|
@@ -37,11 +37,17 @@ export const EVENT_DESCRIPTION_SIZE = 300;
|
|
|
37
37
|
export const calculateTotalViews = (
|
|
38
38
|
dates: string[],
|
|
39
39
|
eventStatistic: EventStatistic
|
|
40
|
-
): number =>
|
|
41
|
-
dates.reduce(
|
|
42
|
-
(
|
|
40
|
+
): number => {
|
|
41
|
+
return dates.reduce(
|
|
42
|
+
(rootAcc, date) =>
|
|
43
|
+
rootAcc +
|
|
44
|
+
Object.values(eventStatistic.views[date] ?? {}).reduce(
|
|
45
|
+
(acc, view) => acc + (view.pageViews || 0),
|
|
46
|
+
0
|
|
47
|
+
),
|
|
43
48
|
0
|
|
44
49
|
);
|
|
50
|
+
};
|
|
45
51
|
|
|
46
52
|
/**
|
|
47
53
|
* Calculates the total number of products sold and the total amount sold
|
|
@@ -95,7 +101,6 @@ export const getStatisticInfo = (
|
|
|
95
101
|
const viewsFormattedDate = DateTime.fromISO(date)
|
|
96
102
|
.toUTC()
|
|
97
103
|
.toFormat(DATE_FORMAT);
|
|
98
|
-
|
|
99
104
|
const summaryFormattedDate = DateTime.fromISO(date)
|
|
100
105
|
.toUTC()
|
|
101
106
|
.toFormat(DATE_FORMAT);
|
|
@@ -8,8 +8,6 @@ export interface BooleanSwitchProps {
|
|
|
8
8
|
value?: boolean;
|
|
9
9
|
disabled?: boolean;
|
|
10
10
|
onChange: (value: boolean) => void;
|
|
11
|
-
firstValueTitle?: string;
|
|
12
|
-
secondValueTitle?: string;
|
|
13
11
|
}
|
|
14
12
|
|
|
15
13
|
export function BooleanSwitch({
|
|
@@ -17,14 +15,12 @@ export function BooleanSwitch({
|
|
|
17
15
|
value,
|
|
18
16
|
disabled,
|
|
19
17
|
onChange,
|
|
20
|
-
firstValueTitle,
|
|
21
|
-
secondValueTitle,
|
|
22
18
|
}: BooleanSwitchProps) {
|
|
23
19
|
const { t } = useTranslation("Design");
|
|
24
20
|
|
|
25
21
|
const options: SelectItem[] = [
|
|
26
|
-
{ id: 1, value:
|
|
27
|
-
{ id: 0, value:
|
|
22
|
+
{ id: 1, value: t("yes") },
|
|
23
|
+
{ id: 0, value: t("no") },
|
|
28
24
|
];
|
|
29
25
|
|
|
30
26
|
const handleChange = useCallback(
|
|
@@ -164,12 +164,10 @@
|
|
|
164
164
|
|
|
165
165
|
@include media-breakpoint-down(md) {
|
|
166
166
|
flex-wrap: wrap;
|
|
167
|
-
|
|
168
167
|
.date-container {
|
|
169
168
|
width: 100%;
|
|
170
169
|
flex: 1;
|
|
171
170
|
}
|
|
172
|
-
|
|
173
171
|
.btn-primary {
|
|
174
172
|
margin-top: 1rem;
|
|
175
173
|
}
|
|
@@ -232,4 +230,4 @@
|
|
|
232
230
|
}
|
|
233
231
|
}
|
|
234
232
|
}
|
|
235
|
-
}
|
|
233
|
+
}
|
|
@@ -27,7 +27,6 @@ $btn-switch-option-padding-y: calc(#{$btn-padding-y} - #{sp(1)}) !default;
|
|
|
27
27
|
border-radius: $btn-switch-option-border-radius;
|
|
28
28
|
margin: 0;
|
|
29
29
|
padding: $btn-switch-option-padding-y $btn-switch-option-padding-x;
|
|
30
|
-
min-width: 4.25rem;
|
|
31
30
|
|
|
32
31
|
&:hover,
|
|
33
32
|
&:active,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/ban-types */
|
|
2
|
-
import React, {
|
|
2
|
+
import React, { useEffect, useState } from "react";
|
|
3
3
|
import { Col, Row, Table } from "react-bootstrap";
|
|
4
4
|
import { useLocation } from "react-router-dom";
|
|
5
5
|
import { isEqual } from "lodash";
|
|
@@ -30,7 +30,6 @@ export interface TableHelperComponentProps {
|
|
|
30
30
|
displayShowingSection?: boolean;
|
|
31
31
|
externalFilters?: { [key: string]: any };
|
|
32
32
|
initialOptions?: Partial<ITableProps>;
|
|
33
|
-
filteredOrdersOptions?: (value: SetStateAction<ITableProps>) => void;
|
|
34
33
|
}
|
|
35
34
|
|
|
36
35
|
// @TODO Refactor? component to get less complexity
|
|
@@ -63,7 +62,6 @@ function TableHelperComponent(props: TableHelperComponentProps) {
|
|
|
63
62
|
displayShowingSection = true,
|
|
64
63
|
externalFilters = {},
|
|
65
64
|
initialOptions = {},
|
|
66
|
-
filteredOrdersOptions,
|
|
67
65
|
} = props;
|
|
68
66
|
|
|
69
67
|
const query = useQuery();
|
|
@@ -99,9 +97,8 @@ function TableHelperComponent(props: TableHelperComponentProps) {
|
|
|
99
97
|
useEffect(
|
|
100
98
|
() => {
|
|
101
99
|
if (
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
!!filteredOrdersOptions
|
|
100
|
+
isEqual(optionsCache, options) &&
|
|
101
|
+
isEqual(cachedExtFilters, externalFilters)
|
|
105
102
|
)
|
|
106
103
|
return;
|
|
107
104
|
|
|
@@ -127,12 +124,12 @@ function TableHelperComponent(props: TableHelperComponentProps) {
|
|
|
127
124
|
);
|
|
128
125
|
},
|
|
129
126
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
130
|
-
[pathname, options, onRefreshFn,
|
|
127
|
+
[pathname, options, onRefreshFn, externalFilters]
|
|
131
128
|
);
|
|
132
129
|
|
|
133
130
|
// Refresh table's content on manual trigger
|
|
134
131
|
useEffect(() => {
|
|
135
|
-
if (refreshedAt === refreshAt
|
|
132
|
+
if (refreshedAt === refreshAt) {
|
|
136
133
|
return;
|
|
137
134
|
}
|
|
138
135
|
|
|
@@ -141,63 +138,34 @@ function TableHelperComponent(props: TableHelperComponentProps) {
|
|
|
141
138
|
if (onRefreshFn) {
|
|
142
139
|
onRefreshFn(options);
|
|
143
140
|
}
|
|
144
|
-
}, [onRefreshFn, options, refreshAt,
|
|
141
|
+
}, [onRefreshFn, options, refreshAt, refreshedAt]);
|
|
145
142
|
|
|
146
143
|
const onSort = (key: string) => {
|
|
147
144
|
let nextDirection = TableService.DEFAULT_SORT_DIRECTION;
|
|
148
|
-
if (sortKey === key) {
|
|
149
|
-
if (filteredOrdersOptions) {
|
|
150
|
-
filteredOrdersOptions((prevOptions) => {
|
|
151
|
-
nextDirection = TableService.getSortDirection(
|
|
152
|
-
prevOptions.sortDirection,
|
|
153
|
-
nextDirection
|
|
154
|
-
);
|
|
155
145
|
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
} else {
|
|
163
|
-
setOptions((prevOptions) => {
|
|
164
|
-
nextDirection = TableService.getSortDirection(
|
|
165
|
-
prevOptions.sortDirection,
|
|
166
|
-
nextDirection
|
|
167
|
-
);
|
|
146
|
+
if (sortKey === key) {
|
|
147
|
+
setOptions((prevOptions) => {
|
|
148
|
+
nextDirection = TableService.getSortDirection(
|
|
149
|
+
prevOptions.sortDirection,
|
|
150
|
+
nextDirection
|
|
151
|
+
);
|
|
168
152
|
|
|
169
|
-
|
|
170
|
-
...prevOptions,
|
|
171
|
-
sortKey: key,
|
|
172
|
-
sortDirection: nextDirection,
|
|
173
|
-
};
|
|
174
|
-
});
|
|
175
|
-
}
|
|
176
|
-
} else {
|
|
177
|
-
if (filteredOrdersOptions) {
|
|
178
|
-
filteredOrdersOptions((prevOptions) => ({
|
|
179
|
-
...prevOptions,
|
|
180
|
-
sortKey: key,
|
|
181
|
-
sortDirection: nextDirection,
|
|
182
|
-
}));
|
|
183
|
-
} else {
|
|
184
|
-
setOptions((prevOptions) => ({
|
|
153
|
+
return {
|
|
185
154
|
...prevOptions,
|
|
186
155
|
sortKey: key,
|
|
187
156
|
sortDirection: nextDirection,
|
|
188
|
-
}
|
|
189
|
-
}
|
|
157
|
+
};
|
|
158
|
+
});
|
|
159
|
+
} else {
|
|
160
|
+
setOptions((prevOptions) => ({
|
|
161
|
+
...prevOptions,
|
|
162
|
+
sortKey: key,
|
|
163
|
+
sortDirection: nextDirection,
|
|
164
|
+
}));
|
|
190
165
|
}
|
|
191
166
|
};
|
|
192
167
|
|
|
193
168
|
const onPerPageChange = (nextPerPage: number) => {
|
|
194
|
-
if (filteredOrdersOptions) {
|
|
195
|
-
filteredOrdersOptions((prevOptions) => ({
|
|
196
|
-
...prevOptions,
|
|
197
|
-
page: nextPerPage,
|
|
198
|
-
}));
|
|
199
|
-
return;
|
|
200
|
-
}
|
|
201
169
|
setOptions((prevOptions) => ({
|
|
202
170
|
...prevOptions,
|
|
203
171
|
perPage: nextPerPage,
|
|
@@ -205,13 +173,6 @@ function TableHelperComponent(props: TableHelperComponentProps) {
|
|
|
205
173
|
};
|
|
206
174
|
|
|
207
175
|
const onPageChange = (nextPage: number) => {
|
|
208
|
-
if (filteredOrdersOptions) {
|
|
209
|
-
filteredOrdersOptions((prevOptions) => ({
|
|
210
|
-
...prevOptions,
|
|
211
|
-
page: nextPage,
|
|
212
|
-
}));
|
|
213
|
-
return;
|
|
214
|
-
}
|
|
215
176
|
setOptions((prevOptions) => ({
|
|
216
177
|
...prevOptions,
|
|
217
178
|
page: nextPage,
|
|
@@ -219,24 +180,6 @@ function TableHelperComponent(props: TableHelperComponentProps) {
|
|
|
219
180
|
};
|
|
220
181
|
|
|
221
182
|
const onFilterChange = (nextFilter: string) => {
|
|
222
|
-
if (filteredOrdersOptions) {
|
|
223
|
-
filteredOrdersOptions(({ page: prevPage, ...prevOptions }) => {
|
|
224
|
-
let nextPage = prevPage;
|
|
225
|
-
|
|
226
|
-
if (
|
|
227
|
-
(!nextFilter && prevOptions.filter) ||
|
|
228
|
-
(nextFilter && !prevOptions.filter)
|
|
229
|
-
) {
|
|
230
|
-
nextPage = 1;
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
return {
|
|
234
|
-
...prevOptions,
|
|
235
|
-
page: nextPage,
|
|
236
|
-
filter: nextFilter,
|
|
237
|
-
};
|
|
238
|
-
});
|
|
239
|
-
}
|
|
240
183
|
setOptions(({ page: prevPage, ...prevOptions }) => {
|
|
241
184
|
let nextPage = prevPage;
|
|
242
185
|
|