@megha-ui/react 1.2.477 → 1.2.479

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.
@@ -149,85 +149,8 @@ withCard = false, cardClassName, cardHeader, title, headerLeft, headerRight, sub
149
149
  return filterValue.includes(cellValue);
150
150
  })
151
151
  : true);
152
- _filteredData = _filteredData.filter((item) => searchOp === "and"
153
- ? filterColumns.every((column) => {
154
- var _a, _b, _c;
155
- const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
156
- const queryData = query.toLowerCase().split(",");
157
- const value = item[column.key] && item[column.key].value
158
- ? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
159
- : "";
160
- if (query.includes("*") || query.includes("?")) {
161
- const regex = createRegexFromWildcard(query);
162
- return regex.test(value);
163
- }
164
- switch ((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type) {
165
- case "contains":
166
- return value.toLowerCase().includes(query.toLowerCase());
167
- case "doesNotContain":
168
- return !value.toLowerCase().includes(query.toLowerCase());
169
- case "equals":
170
- return queryData.includes(value.toLowerCase());
171
- case "gt":
172
- if (!isNaN(parseFloat(query))) {
173
- return parseFloat(value) > parseFloat(query);
174
- }
175
- return true;
176
- case "gte":
177
- if (!isNaN(parseFloat(query))) {
178
- return parseFloat(value) >= parseFloat(query);
179
- }
180
- return true;
181
- case "lt":
182
- if (!isNaN(parseFloat(query))) {
183
- return parseFloat(value) < parseFloat(query);
184
- }
185
- return true;
186
- case "lte":
187
- if (!isNaN(parseFloat(query))) {
188
- return parseFloat(value) <= parseFloat(query);
189
- }
190
- return true;
191
- case "after":
192
- if (!isNaN(new Date(query).getTime())) {
193
- return new Date(value).getTime() > new Date(query).getTime();
194
- }
195
- return true;
196
- case "before":
197
- if (!isNaN(new Date(query).getTime())) {
198
- return new Date(value).getTime() < new Date(query).getTime();
199
- }
200
- return true;
201
- case "between":
202
- let [start, end] = column.dataType === "date"
203
- ? query.split("to")
204
- : query.split("-");
205
- if (column.dataType === "date" && start && end) {
206
- start = new Date(start).getTime();
207
- end = new Date(end).getTime();
208
- return (start < new Date(value).getTime() &&
209
- new Date(value).getTime() < end);
210
- }
211
- else if (start && end) {
212
- return (parseFloat(start.trim()) < parseFloat(value) &&
213
- parseFloat(value) < parseFloat(end.trim()));
214
- }
215
- return true;
216
- case "doesNotEqual":
217
- return !queryData.includes(value.toLowerCase());
218
- case "startsWith":
219
- return value.toLowerCase().startsWith(query.toLowerCase());
220
- case "endsWith":
221
- return value.toLowerCase().endsWith(query.toLowerCase());
222
- case "blank":
223
- return value === "";
224
- case "notBlank":
225
- return value !== "";
226
- default:
227
- return true;
228
- }
229
- })
230
- : filterColumns.filter(column => { var _a; return (_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text; }).some((column) => {
152
+ _filteredData = _filteredData.filter((item) => {
153
+ console.log(filterColumns.filter(column => { var _a; return (_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text; }).some((column) => {
231
154
  var _a, _b, _c;
232
155
  const query = (_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text;
233
156
  const queryData = query.toLowerCase().split(",");
@@ -238,6 +161,7 @@ withCard = false, cardClassName, cardHeader, title, headerLeft, headerRight, sub
238
161
  const regex = createRegexFromWildcard(query);
239
162
  return regex.test(value);
240
163
  }
164
+ console.log(searchQueries[column.key]);
241
165
  switch ((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type) {
242
166
  case "contains":
243
167
  return value.toLowerCase().includes(query.toLowerCase());
@@ -304,6 +228,162 @@ withCard = false, cardClassName, cardHeader, title, headerLeft, headerRight, sub
304
228
  return true;
305
229
  }
306
230
  }));
231
+ return searchOp === "and"
232
+ ? filterColumns.every((column) => {
233
+ var _a, _b, _c;
234
+ const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
235
+ const queryData = query.toLowerCase().split(",");
236
+ const value = item[column.key] && item[column.key].value
237
+ ? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
238
+ : "";
239
+ if (query.includes("*") || query.includes("?")) {
240
+ const regex = createRegexFromWildcard(query);
241
+ return regex.test(value);
242
+ }
243
+ switch ((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type) {
244
+ case "contains":
245
+ return value.toLowerCase().includes(query.toLowerCase());
246
+ case "doesNotContain":
247
+ return !value.toLowerCase().includes(query.toLowerCase());
248
+ case "equals":
249
+ return queryData.includes(value.toLowerCase());
250
+ case "gt":
251
+ if (!isNaN(parseFloat(query))) {
252
+ return parseFloat(value) > parseFloat(query);
253
+ }
254
+ return true;
255
+ case "gte":
256
+ if (!isNaN(parseFloat(query))) {
257
+ return parseFloat(value) >= parseFloat(query);
258
+ }
259
+ return true;
260
+ case "lt":
261
+ if (!isNaN(parseFloat(query))) {
262
+ return parseFloat(value) < parseFloat(query);
263
+ }
264
+ return true;
265
+ case "lte":
266
+ if (!isNaN(parseFloat(query))) {
267
+ return parseFloat(value) <= parseFloat(query);
268
+ }
269
+ return true;
270
+ case "after":
271
+ if (!isNaN(new Date(query).getTime())) {
272
+ return new Date(value).getTime() > new Date(query).getTime();
273
+ }
274
+ return true;
275
+ case "before":
276
+ if (!isNaN(new Date(query).getTime())) {
277
+ return new Date(value).getTime() < new Date(query).getTime();
278
+ }
279
+ return true;
280
+ case "between":
281
+ let [start, end] = column.dataType === "date"
282
+ ? query.split("to")
283
+ : query.split("-");
284
+ if (column.dataType === "date" && start && end) {
285
+ start = new Date(start).getTime();
286
+ end = new Date(end).getTime();
287
+ return (start < new Date(value).getTime() &&
288
+ new Date(value).getTime() < end);
289
+ }
290
+ else if (start && end) {
291
+ return (parseFloat(start.trim()) < parseFloat(value) &&
292
+ parseFloat(value) < parseFloat(end.trim()));
293
+ }
294
+ return true;
295
+ case "doesNotEqual":
296
+ return !queryData.includes(value.toLowerCase());
297
+ case "startsWith":
298
+ return value.toLowerCase().startsWith(query.toLowerCase());
299
+ case "endsWith":
300
+ return value.toLowerCase().endsWith(query.toLowerCase());
301
+ case "blank":
302
+ return value === "";
303
+ case "notBlank":
304
+ return value !== "";
305
+ default:
306
+ return true;
307
+ }
308
+ })
309
+ : filterColumns.filter(column => { var _a; return (_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text; }).some((column) => {
310
+ var _a, _b, _c;
311
+ const query = (_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text;
312
+ const queryData = query.toLowerCase().split(",");
313
+ const value = item[column.key] && item[column.key].value
314
+ ? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
315
+ : "";
316
+ if (query.includes("*") || query.includes("?")) {
317
+ const regex = createRegexFromWildcard(query);
318
+ return regex.test(value);
319
+ }
320
+ switch ((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type) {
321
+ case "contains":
322
+ return value.toLowerCase().includes(query.toLowerCase());
323
+ case "doesNotContain":
324
+ return !value.toLowerCase().includes(query.toLowerCase());
325
+ case "equals":
326
+ return queryData.includes(value.toLowerCase());
327
+ case "gt":
328
+ if (!isNaN(parseFloat(query))) {
329
+ return parseFloat(value) > parseFloat(query);
330
+ }
331
+ return true;
332
+ case "gte":
333
+ if (!isNaN(parseFloat(query))) {
334
+ return parseFloat(value) >= parseFloat(query);
335
+ }
336
+ return true;
337
+ case "lt":
338
+ if (!isNaN(parseFloat(query))) {
339
+ return parseFloat(value) < parseFloat(query);
340
+ }
341
+ return true;
342
+ case "lte":
343
+ if (!isNaN(parseFloat(query))) {
344
+ return parseFloat(value) <= parseFloat(query);
345
+ }
346
+ return true;
347
+ case "after":
348
+ if (!isNaN(new Date(query).getTime())) {
349
+ return new Date(value).getTime() > new Date(query).getTime();
350
+ }
351
+ return true;
352
+ case "before":
353
+ if (!isNaN(new Date(query).getTime())) {
354
+ return new Date(value).getTime() < new Date(query).getTime();
355
+ }
356
+ return true;
357
+ case "between":
358
+ let [start, end] = column.dataType === "date"
359
+ ? query.split("to")
360
+ : query.split("-");
361
+ if (column.dataType === "date" && start && end) {
362
+ start = new Date(start).getTime();
363
+ end = new Date(end).getTime();
364
+ return (start < new Date(value).getTime() &&
365
+ new Date(value).getTime() < end);
366
+ }
367
+ else if (start && end) {
368
+ return (parseFloat(start.trim()) < parseFloat(value) &&
369
+ parseFloat(value) < parseFloat(end.trim()));
370
+ }
371
+ return true;
372
+ case "doesNotEqual":
373
+ return !queryData.includes(value.toLowerCase());
374
+ case "startsWith":
375
+ return value.toLowerCase().startsWith(query.toLowerCase());
376
+ case "endsWith":
377
+ return value.toLowerCase().endsWith(query.toLowerCase());
378
+ case "blank":
379
+ return value === "";
380
+ case "notBlank":
381
+ return value !== "";
382
+ default:
383
+ return true;
384
+ }
385
+ });
386
+ });
307
387
  _filteredData = _filteredData.filter((item) => {
308
388
  const query = (globalInputSearch || "").toLowerCase().split(",");
309
389
  const rowValues = [];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@megha-ui/react",
3
- "version": "1.2.477",
3
+ "version": "1.2.479",
4
4
  "description": "A collection of reusable UI components for React applications, built with TypeScript.",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.js",