@visns-studio/visns-components 2.8.10 → 2.8.11

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.
Files changed (2) hide show
  1. package/components/crm/DataGrid.jsx +71 -235
  2. package/package.json +1 -1
package/components/crm/DataGrid.jsx CHANGED
@@ -878,6 +878,77 @@ const DataGrid = forwardRef(
878
878
  },
879
879
  };
880
880
 
881
+ switch (column.type) {
882
+ case 'relation':
883
+ case 'relationArray':
884
+ relationName = column.id.reduce(
885
+ (acc, id) => acc + `${id}.`,
886
+ ''
887
+ );
888
+ relationName += column.nameFrom;
889
+
890
+ selectedDataSource = filterDataSource.reduce(
891
+ (acc, fds) => {
892
+ if (fds.id === relationName) {
893
+ return fds.dataset;
894
+ }
895
+ return acc;
896
+ },
897
+ null
898
+ );
899
+ break;
900
+ default:
901
+ selectedDataSource = filterDataSource.reduce(
902
+ (acc, fds) => {
903
+ if (fds.id === column.id) {
904
+ return fds.dataset;
905
+ }
906
+ return acc;
907
+ },
908
+ null
909
+ );
910
+ break;
911
+ }
912
+
913
+ if (column.filter && column.filter.type) {
914
+ switch (column.filter.type) {
915
+ case 'date':
916
+ filterEditor = DateFilter;
917
+ filterEditorProps = (props, { index }) => {
918
+ return {
919
+ dateFormat: 'DD-MM-YYYY',
920
+ placeholder: 'All Dates',
921
+ };
922
+ };
923
+ break;
924
+ case 'number':
925
+ filterEditor = NumberFilter;
926
+ break;
927
+ case 'select':
928
+ filterEditor = SelectFilter;
929
+ filterEditorProps = {
930
+ multiple: column.filter.operator === 'inlist',
931
+ wrapMultiple:
932
+ column.filter.operator !== 'inlist',
933
+ placeholder: column.filter.placeholder
934
+ ? column.filter.placeholder
935
+ : 'All Options',
936
+ dataSource: selectedDataSource,
937
+ };
938
+ break;
939
+ case 'number':
940
+ filterEditor = NumberFilter;
941
+ break;
942
+ default:
943
+ filterEditor = null;
944
+ filterEditorProps = null;
945
+ break;
946
+ }
947
+ } else {
948
+ filterEditor = null;
949
+ filterEditorProps = null;
950
+ }
951
+
881
952
  switch (column.type) {
882
953
  case 'address':
883
954
  return {
@@ -905,19 +976,6 @@ const DataGrid = forwardRef(
905
976
  },
906
977
  };
907
978
  case 'age':
908
- if (column.filter && column.filter.type) {
909
- switch (column.filter.type) {
910
- case 'number':
911
- filterEditor = NumberFilter;
912
- break;
913
- default:
914
- filterEditor = null;
915
- break;
916
- }
917
- } else {
918
- filterEditor = null;
919
- }
920
-
921
979
  return {
922
980
  ...commonProps,
923
981
  type: 'number',
@@ -1061,44 +1119,6 @@ const DataGrid = forwardRef(
1061
1119
  },
1062
1120
  };
1063
1121
  case 'date':
1064
- if (column.filter && column.filter.type) {
1065
- switch (column.filter.type) {
1066
- case 'select':
1067
- filterEditor = SelectFilter;
1068
- filterEditorProps = {
1069
- multiple:
1070
- column.filter.operator ===
1071
- 'inlist',
1072
- wrapMultiple:
1073
- column.filter.operator !==
1074
- 'inlist',
1075
- placeholder: column.filter.placeholder
1076
- ? column.filter.placeholder
1077
- : 'All Options',
1078
- dataSource: selectedDataSource,
1079
- };
1080
- break;
1081
- case 'date':
1082
- filterEditor = DateFilter;
1083
- filterEditorProps = (props, { index }) => {
1084
- return {
1085
- dateFormat: 'DD-MM-YYYY',
1086
- placeholder: 'All Dates',
1087
- };
1088
- };
1089
- case 'number':
1090
- filterEditor = NumberFilter;
1091
- break;
1092
- default:
1093
- filterEditor = null;
1094
- filterEditorProps = null;
1095
- break;
1096
- }
1097
- } else {
1098
- filterEditor = null;
1099
- filterEditorProps = null;
1100
- }
1101
-
1102
1122
  return {
1103
1123
  ...commonProps,
1104
1124
  name: column.id,
@@ -1144,19 +1164,6 @@ const DataGrid = forwardRef(
1144
1164
  },
1145
1165
  };
1146
1166
  case 'daterange':
1147
- if (column.filter && column.filter.type) {
1148
- filterEditor = DateFilter;
1149
- filterEditorProps = (props, { index }) => {
1150
- return {
1151
- dateFormat: 'DD-MM-YYYY',
1152
- placeholder: 'All Dates',
1153
- };
1154
- };
1155
- } else {
1156
- filterEditor = null;
1157
- filterEditorProps = null;
1158
- }
1159
-
1160
1167
  return {
1161
1168
  ...commonProps,
1162
1169
  name: `${column.id[0]}.${column.id[1]}.`,
@@ -1193,19 +1200,6 @@ const DataGrid = forwardRef(
1193
1200
  },
1194
1201
  };
1195
1202
  case 'datetime':
1196
- if (column.filter && column.filter.type) {
1197
- filterEditor = DateFilter;
1198
- filterEditorProps = (props, { index }) => {
1199
- return {
1200
- dateFormat: 'DD-MM-YYYY',
1201
- placeholder: 'All Dates',
1202
- };
1203
- };
1204
- } else {
1205
- filterEditor = null;
1206
- filterEditorProps = null;
1207
- }
1208
-
1209
1203
  return {
1210
1204
  ...commonProps,
1211
1205
  name: column.id,
@@ -1332,33 +1326,6 @@ const DataGrid = forwardRef(
1332
1326
  type: 'number',
1333
1327
  };
1334
1328
  case 'option':
1335
- selectedDataSource = filterDataSource.reduce(
1336
- (acc, fds) => {
1337
- if (fds.id === column.id) {
1338
- return fds.dataset;
1339
- }
1340
- return acc;
1341
- },
1342
- null
1343
- );
1344
-
1345
- if (
1346
- column.filter &&
1347
- column.filter.type &&
1348
- column.filter.type === 'select'
1349
- ) {
1350
- filterEditor = SelectFilter;
1351
- filterEditorProps = {
1352
- placeholder: column.filter.placeholder
1353
- ? column.filter.placeholder
1354
- : 'All Options',
1355
- dataSource: selectedDataSource,
1356
- };
1357
- } else {
1358
- filterEditor = null;
1359
- filterEditorProps = null;
1360
- }
1361
-
1362
1329
  return {
1363
1330
  ...commonProps,
1364
1331
  name: column.id,
@@ -1392,57 +1359,6 @@ const DataGrid = forwardRef(
1392
1359
  },
1393
1360
  };
1394
1361
  case 'relation':
1395
- relationName = column.id.reduce(
1396
- (acc, id) => acc + `${id}.`,
1397
- ''
1398
- );
1399
- relationName += column.nameFrom;
1400
-
1401
- selectedDataSource = filterDataSource.reduce(
1402
- (acc, fds) => {
1403
- if (fds.id === relationName) {
1404
- return fds.dataset;
1405
- }
1406
- return acc;
1407
- },
1408
- null
1409
- );
1410
-
1411
- if (column.filter && column.filter.type) {
1412
- switch (column.filter.type) {
1413
- case 'select':
1414
- filterEditor = SelectFilter;
1415
- filterEditorProps = {
1416
- multiple:
1417
- column.filter.operator === 'inlist'
1418
- ? true
1419
- : false,
1420
- wrapMultiple:
1421
- column.filter.operator === 'inlist'
1422
- ? false
1423
- : true,
1424
- placeholder: column.filter.placeholder
1425
- ? column.filter.placeholder
1426
- : 'All Options',
1427
- dataSource: selectedDataSource,
1428
- };
1429
- break;
1430
- case 'date':
1431
- filterEditor = DateFilter;
1432
- filterEditorProps = (props, { index }) => {
1433
- return {
1434
- dateFormat: 'DD-MM-YYYY',
1435
- placeholder: 'All Dates',
1436
- };
1437
- };
1438
- break;
1439
- default:
1440
- filterEditor = null;
1441
- filterEditorProps = null;
1442
- break;
1443
- }
1444
- }
1445
-
1446
1362
  return {
1447
1363
  ...commonProps,
1448
1364
  name: relationName,
@@ -1507,40 +1423,6 @@ const DataGrid = forwardRef(
1507
1423
  },
1508
1424
  };
1509
1425
  case 'relationArray':
1510
- relationName =
1511
- column.id.reduce((acc, id) => acc + `${id}.`, '') +
1512
- column.nameFrom;
1513
-
1514
- selectedDataSource = filterDataSource.reduce(
1515
- (acc, fds) => {
1516
- if (fds.id === relationName) {
1517
- return fds.dataset;
1518
- }
1519
- return acc;
1520
- },
1521
- null
1522
- );
1523
-
1524
- if (
1525
- column.filter &&
1526
- column.filter.type &&
1527
- column.filter.type === 'select'
1528
- ) {
1529
- filterEditor = SelectFilter;
1530
- filterEditorProps = {
1531
- multiple: column.filter.operator === 'inlist',
1532
- wrapMultiple:
1533
- column.filter.operator !== 'inlist',
1534
- placeholder: column.filter.placeholder
1535
- ? column.filter.placeholder
1536
- : 'All Options',
1537
- dataSource: selectedDataSource,
1538
- };
1539
- } else {
1540
- filterEditor = null;
1541
- filterEditorProps = null;
1542
- }
1543
-
1544
1426
  return {
1545
1427
  ...commonProps,
1546
1428
  name: relationName,
@@ -1851,52 +1733,6 @@ const DataGrid = forwardRef(
1851
1733
  },
1852
1734
  };
1853
1735
  default:
1854
- selectedDataSource = filterDataSource.reduce(
1855
- (acc, fds) => {
1856
- if (fds.id === column.id) {
1857
- return fds.dataset;
1858
- }
1859
- return acc;
1860
- },
1861
- null
1862
- );
1863
-
1864
- if (column.filter && column.filter.type) {
1865
- switch (column.filter.type) {
1866
- case 'select':
1867
- filterEditor = SelectFilter;
1868
- filterEditorProps = {
1869
- multiple:
1870
- column.filter.operator === 'inlist',
1871
- wrapMultiple:
1872
- column.filter.operator !== 'inlist',
1873
- placeholder: column.filter.placeholder
1874
- ? column.filter.placeholder
1875
- : 'All Options',
1876
- dataSource: selectedDataSource,
1877
- };
1878
- break;
1879
- case 'date':
1880
- filterEditor = DateFilter;
1881
- filterEditorProps = (props, { index }) => {
1882
- return {
1883
- dateFormat: 'DD-MM-YYYY',
1884
- placeholder: 'All Dates',
1885
- };
1886
- };
1887
- case 'number':
1888
- filterEditor = NumberFilter;
1889
- break;
1890
- default:
1891
- filterEditor = null;
1892
- filterEditorProps = null;
1893
- break;
1894
- }
1895
- } else {
1896
- filterEditor = null;
1897
- filterEditorProps = null;
1898
- }
1899
-
1900
1736
  return {
1901
1737
  ...commonProps,
1902
1738
  name: column.id,
package/package.json CHANGED
@@ -44,7 +44,7 @@
44
44
  "react-dom": "^17.0.1"
45
45
  },
46
46
  "name": "@visns-studio/visns-components",
47
- "version": "2.8.10",
47
+ "version": "2.8.11",
48
48
  "description": "Various packages to assist in the development of our Custom Applications.",
49
49
  "main": "index.js",
50
50
  "scripts": {