@visns-studio/visns-components 2.8.9 → 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 -210
  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,19 +1119,6 @@ const DataGrid = forwardRef(
1061
1119
  },
1062
1120
  };
1063
1121
  case 'date':
1064
- if (column.filter && column.filter.type) {
1065
- filterEditor = DateFilter;
1066
- filterEditorProps = (props, { index }) => {
1067
- return {
1068
- dateFormat: 'DD-MM-YYYY',
1069
- placeholder: 'All Dates',
1070
- };
1071
- };
1072
- } else {
1073
- filterEditor = null;
1074
- filterEditorProps = null;
1075
- }
1076
-
1077
1122
  return {
1078
1123
  ...commonProps,
1079
1124
  name: column.id,
@@ -1119,19 +1164,6 @@ const DataGrid = forwardRef(
1119
1164
  },
1120
1165
  };
1121
1166
  case 'daterange':
1122
- if (column.filter && column.filter.type) {
1123
- filterEditor = DateFilter;
1124
- filterEditorProps = (props, { index }) => {
1125
- return {
1126
- dateFormat: 'DD-MM-YYYY',
1127
- placeholder: 'All Dates',
1128
- };
1129
- };
1130
- } else {
1131
- filterEditor = null;
1132
- filterEditorProps = null;
1133
- }
1134
-
1135
1167
  return {
1136
1168
  ...commonProps,
1137
1169
  name: `${column.id[0]}.${column.id[1]}.`,
@@ -1168,19 +1200,6 @@ const DataGrid = forwardRef(
1168
1200
  },
1169
1201
  };
1170
1202
  case 'datetime':
1171
- if (column.filter && column.filter.type) {
1172
- filterEditor = DateFilter;
1173
- filterEditorProps = (props, { index }) => {
1174
- return {
1175
- dateFormat: 'DD-MM-YYYY',
1176
- placeholder: 'All Dates',
1177
- };
1178
- };
1179
- } else {
1180
- filterEditor = null;
1181
- filterEditorProps = null;
1182
- }
1183
-
1184
1203
  return {
1185
1204
  ...commonProps,
1186
1205
  name: column.id,
@@ -1307,33 +1326,6 @@ const DataGrid = forwardRef(
1307
1326
  type: 'number',
1308
1327
  };
1309
1328
  case 'option':
1310
- selectedDataSource = filterDataSource.reduce(
1311
- (acc, fds) => {
1312
- if (fds.id === column.id) {
1313
- return fds.dataset;
1314
- }
1315
- return acc;
1316
- },
1317
- null
1318
- );
1319
-
1320
- if (
1321
- column.filter &&
1322
- column.filter.type &&
1323
- column.filter.type === 'select'
1324
- ) {
1325
- filterEditor = SelectFilter;
1326
- filterEditorProps = {
1327
- placeholder: column.filter.placeholder
1328
- ? column.filter.placeholder
1329
- : 'All Options',
1330
- dataSource: selectedDataSource,
1331
- };
1332
- } else {
1333
- filterEditor = null;
1334
- filterEditorProps = null;
1335
- }
1336
-
1337
1329
  return {
1338
1330
  ...commonProps,
1339
1331
  name: column.id,
@@ -1367,57 +1359,6 @@ const DataGrid = forwardRef(
1367
1359
  },
1368
1360
  };
1369
1361
  case 'relation':
1370
- relationName = column.id.reduce(
1371
- (acc, id) => acc + `${id}.`,
1372
- ''
1373
- );
1374
- relationName += column.nameFrom;
1375
-
1376
- selectedDataSource = filterDataSource.reduce(
1377
- (acc, fds) => {
1378
- if (fds.id === relationName) {
1379
- return fds.dataset;
1380
- }
1381
- return acc;
1382
- },
1383
- null
1384
- );
1385
-
1386
- if (column.filter && column.filter.type) {
1387
- switch (column.filter.type) {
1388
- case 'select':
1389
- filterEditor = SelectFilter;
1390
- filterEditorProps = {
1391
- multiple:
1392
- column.filter.operator === 'inlist'
1393
- ? true
1394
- : false,
1395
- wrapMultiple:
1396
- column.filter.operator === 'inlist'
1397
- ? false
1398
- : true,
1399
- placeholder: column.filter.placeholder
1400
- ? column.filter.placeholder
1401
- : 'All Options',
1402
- dataSource: selectedDataSource,
1403
- };
1404
- break;
1405
- case 'date':
1406
- filterEditor = DateFilter;
1407
- filterEditorProps = (props, { index }) => {
1408
- return {
1409
- dateFormat: 'DD-MM-YYYY',
1410
- placeholder: 'All Dates',
1411
- };
1412
- };
1413
- break;
1414
- default:
1415
- filterEditor = null;
1416
- filterEditorProps = null;
1417
- break;
1418
- }
1419
- }
1420
-
1421
1362
  return {
1422
1363
  ...commonProps,
1423
1364
  name: relationName,
@@ -1482,40 +1423,6 @@ const DataGrid = forwardRef(
1482
1423
  },
1483
1424
  };
1484
1425
  case 'relationArray':
1485
- relationName =
1486
- column.id.reduce((acc, id) => acc + `${id}.`, '') +
1487
- column.nameFrom;
1488
-
1489
- selectedDataSource = filterDataSource.reduce(
1490
- (acc, fds) => {
1491
- if (fds.id === relationName) {
1492
- return fds.dataset;
1493
- }
1494
- return acc;
1495
- },
1496
- null
1497
- );
1498
-
1499
- if (
1500
- column.filter &&
1501
- column.filter.type &&
1502
- column.filter.type === 'select'
1503
- ) {
1504
- filterEditor = SelectFilter;
1505
- filterEditorProps = {
1506
- multiple: column.filter.operator === 'inlist',
1507
- wrapMultiple:
1508
- column.filter.operator !== 'inlist',
1509
- placeholder: column.filter.placeholder
1510
- ? column.filter.placeholder
1511
- : 'All Options',
1512
- dataSource: selectedDataSource,
1513
- };
1514
- } else {
1515
- filterEditor = null;
1516
- filterEditorProps = null;
1517
- }
1518
-
1519
1426
  return {
1520
1427
  ...commonProps,
1521
1428
  name: relationName,
@@ -1826,52 +1733,6 @@ const DataGrid = forwardRef(
1826
1733
  },
1827
1734
  };
1828
1735
  default:
1829
- selectedDataSource = filterDataSource.reduce(
1830
- (acc, fds) => {
1831
- if (fds.id === column.id) {
1832
- return fds.dataset;
1833
- }
1834
- return acc;
1835
- },
1836
- null
1837
- );
1838
-
1839
- if (column.filter && column.filter.type) {
1840
- switch (column.filter.type) {
1841
- case 'select':
1842
- filterEditor = SelectFilter;
1843
- filterEditorProps = {
1844
- multiple:
1845
- column.filter.operator === 'inlist',
1846
- wrapMultiple:
1847
- column.filter.operator !== 'inlist',
1848
- placeholder: column.filter.placeholder
1849
- ? column.filter.placeholder
1850
- : 'All Options',
1851
- dataSource: selectedDataSource,
1852
- };
1853
- break;
1854
- case 'date':
1855
- filterEditor = DateFilter;
1856
- filterEditorProps = (props, { index }) => {
1857
- return {
1858
- dateFormat: 'DD-MM-YYYY',
1859
- placeholder: 'All Dates',
1860
- };
1861
- };
1862
- case 'number':
1863
- filterEditor = NumberFilter;
1864
- break;
1865
- default:
1866
- filterEditor = null;
1867
- filterEditorProps = null;
1868
- break;
1869
- }
1870
- } else {
1871
- filterEditor = null;
1872
- filterEditorProps = null;
1873
- }
1874
-
1875
1736
  return {
1876
1737
  ...commonProps,
1877
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.9",
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": {