@megha-ui/react 1.2.409 → 1.2.411

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.
@@ -136,177 +136,177 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
136
136
  })
137
137
  : true);
138
138
  console.log(searchQueries, "searchQueries");
139
- const _searchAvailableColumns = filterColumns.filter((column) => searchQueries[column.key]);
140
- if (_searchAvailableColumns.length > 0) {
141
- console.log(_searchAvailableColumns, "_searchAvailableColumns");
142
- _filteredData = _filteredData.filter((item) => searchOp === "and"
143
- ? _searchAvailableColumns.every((column) => {
144
- var _a, _b, _c, _d;
145
- const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
146
- const queryData = query.toLowerCase().split(",");
147
- const value = item[column.key] && item[column.key].value
148
- ? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
149
- : "";
150
- console.log("Coming here");
151
- if (query.includes("*") || query.includes("?")) {
152
- const regex = createRegexFromWildcard(query);
153
- return regex.test(value);
154
- }
155
- if (query === "") {
139
+ console.log(filterColumns, "filterColumns");
140
+ const _searchAvailableColumns = filterColumns.filter((column) => {
141
+ return searchQueries[column.key] && searchQueries[column.key].text !== "";
142
+ });
143
+ console.log(_searchAvailableColumns, "_searchAvailableColumns");
144
+ _filteredData = _filteredData.filter((item) => searchOp === "and"
145
+ ? filterColumns.every((column) => {
146
+ var _a, _b, _c, _d;
147
+ const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
148
+ const queryData = query.toLowerCase().split(",");
149
+ const value = item[column.key] && item[column.key].value
150
+ ? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
151
+ : "";
152
+ console.log("Coming here");
153
+ if (query.includes("*") || query.includes("?")) {
154
+ const regex = createRegexFromWildcard(query);
155
+ return regex.test(value);
156
+ }
157
+ if (query === "") {
158
+ return true;
159
+ }
160
+ console.log((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type, "type");
161
+ switch ((_d = searchQueries[column.key]) === null || _d === void 0 ? void 0 : _d.type) {
162
+ case "contains":
163
+ return value.toLowerCase().includes(query.toLowerCase());
164
+ case "doesNotContain":
165
+ return !value.toLowerCase().includes(query.toLowerCase());
166
+ case "equals":
167
+ return queryData.includes(value.toLowerCase());
168
+ case "gt":
169
+ if (!isNaN(parseFloat(query))) {
170
+ return parseFloat(value) > parseFloat(query);
171
+ }
156
172
  return true;
157
- }
158
- console.log((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type, "type");
159
- switch ((_d = searchQueries[column.key]) === null || _d === void 0 ? void 0 : _d.type) {
160
- case "contains":
161
- return value.toLowerCase().includes(query.toLowerCase());
162
- case "doesNotContain":
163
- return !value.toLowerCase().includes(query.toLowerCase());
164
- case "equals":
165
- return queryData.includes(value.toLowerCase());
166
- case "gt":
167
- if (!isNaN(parseFloat(query))) {
168
- return parseFloat(value) > parseFloat(query);
169
- }
170
- return true;
171
- case "gte":
172
- if (!isNaN(parseFloat(query))) {
173
- return parseFloat(value) >= parseFloat(query);
174
- }
175
- return true;
176
- case "lt":
177
- if (!isNaN(parseFloat(query))) {
178
- return parseFloat(value) < parseFloat(query);
179
- }
180
- return true;
181
- case "lte":
182
- if (!isNaN(parseFloat(query))) {
183
- return parseFloat(value) <= parseFloat(query);
184
- }
185
- return true;
186
- case "after":
187
- if (!isNaN(new Date(query).getTime())) {
188
- return (new Date(value).getTime() > new Date(query).getTime());
189
- }
190
- return true;
191
- case "before":
192
- if (!isNaN(new Date(query).getTime())) {
193
- return (new Date(value).getTime() < new Date(query).getTime());
194
- }
195
- return true;
196
- case "between":
197
- let [start, end] = column.dataType === "date"
198
- ? query.split("to")
199
- : query.split("-");
200
- if (column.dataType === "date" && start && end) {
201
- start = new Date(start).getTime();
202
- end = new Date(end).getTime();
203
- return (start < new Date(value).getTime() &&
204
- new Date(value).getTime() < end);
205
- }
206
- else if (start && end) {
207
- return (parseFloat(start.trim()) < parseFloat(value) &&
208
- parseFloat(value) < parseFloat(end.trim()));
209
- }
210
- return true;
211
- case "doesNotEqual":
212
- return !queryData.includes(value.toLowerCase());
213
- case "startsWith":
214
- return value.toLowerCase().startsWith(query.toLowerCase());
215
- case "endsWith":
216
- return value.toLowerCase().endsWith(query.toLowerCase());
217
- case "blank":
218
- return value === "";
219
- case "notBlank":
220
- return value !== "";
221
- default:
222
- return true;
223
- }
224
- })
225
- : _searchAvailableColumns.some((column) => {
226
- var _a, _b, _c, _d;
227
- const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
228
- const queryData = query.toLowerCase().split(",");
229
- const value = item[column.key] && item[column.key].value
230
- ? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
231
- : "";
232
- console.log("Coming here2");
233
- if (query.includes("*") || query.includes("?")) {
234
- const regex = createRegexFromWildcard(query);
235
- return regex.test(value);
236
- }
237
- console.log(column, "column");
238
- if (query === "") {
173
+ case "gte":
174
+ if (!isNaN(parseFloat(query))) {
175
+ return parseFloat(value) >= parseFloat(query);
176
+ }
239
177
  return true;
240
- }
241
- console.log((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type, "type");
242
- switch ((_d = searchQueries[column.key]) === null || _d === void 0 ? void 0 : _d.type) {
243
- case "contains":
244
- return value.toLowerCase().includes(query.toLowerCase());
245
- case "doesNotContain":
246
- return !value.toLowerCase().includes(query.toLowerCase());
247
- case "equals":
248
- return !queryData.includes(value.toLowerCase());
249
- case "gt":
250
- if (!isNaN(parseFloat(query))) {
251
- return parseFloat(value) > parseFloat(query);
252
- }
253
- return true;
254
- case "gte":
255
- if (!isNaN(parseFloat(query))) {
256
- return parseFloat(value) >= parseFloat(query);
257
- }
258
- return true;
259
- case "lt":
260
- if (!isNaN(parseFloat(query))) {
261
- return parseFloat(value) < parseFloat(query);
262
- }
263
- return true;
264
- case "lte":
265
- if (!isNaN(parseFloat(query))) {
266
- return parseFloat(value) <= parseFloat(query);
267
- }
268
- return true;
269
- case "after":
270
- if (!isNaN(new Date(query).getTime())) {
271
- return (new Date(value).getTime() > new Date(query).getTime());
272
- }
273
- return true;
274
- case "before":
275
- if (!isNaN(new Date(query).getTime())) {
276
- return (new Date(value).getTime() < new Date(query).getTime());
277
- }
278
- return true;
279
- case "between":
280
- let [start, end] = column.dataType === "date"
281
- ? query.split("to")
282
- : query.split("-");
283
- if (column.dataType === "date" && start && end) {
284
- start = new Date(start).getTime();
285
- end = new Date(end).getTime();
286
- return (start < new Date(value).getTime() &&
287
- new Date(value).getTime() < end);
288
- }
289
- else if (start && end) {
290
- return (parseFloat(start.trim()) < parseFloat(value) &&
291
- parseFloat(value) < parseFloat(end.trim()));
292
- }
293
- return true;
294
- case "doesNotEqual":
295
- return !queryData.includes(value.toLowerCase());
296
- case "startsWith":
297
- return value.toLowerCase().startsWith(query.toLowerCase());
298
- case "endsWith":
299
- return value.toLowerCase().endsWith(query.toLowerCase());
300
- case "blank":
301
- return value === "";
302
- case "notBlank":
303
- return value !== "";
304
- default:
305
- return true;
306
- }
307
- }));
308
- }
309
- console.log(_filteredData, "After search");
178
+ case "lt":
179
+ if (!isNaN(parseFloat(query))) {
180
+ return parseFloat(value) < parseFloat(query);
181
+ }
182
+ return true;
183
+ case "lte":
184
+ if (!isNaN(parseFloat(query))) {
185
+ return parseFloat(value) <= parseFloat(query);
186
+ }
187
+ return true;
188
+ case "after":
189
+ if (!isNaN(new Date(query).getTime())) {
190
+ return new Date(value).getTime() > new Date(query).getTime();
191
+ }
192
+ return true;
193
+ case "before":
194
+ if (!isNaN(new Date(query).getTime())) {
195
+ return new Date(value).getTime() < new Date(query).getTime();
196
+ }
197
+ return true;
198
+ case "between":
199
+ let [start, end] = column.dataType === "date"
200
+ ? query.split("to")
201
+ : query.split("-");
202
+ if (column.dataType === "date" && start && end) {
203
+ start = new Date(start).getTime();
204
+ end = new Date(end).getTime();
205
+ return (start < new Date(value).getTime() &&
206
+ new Date(value).getTime() < end);
207
+ }
208
+ else if (start && end) {
209
+ return (parseFloat(start.trim()) < parseFloat(value) &&
210
+ parseFloat(value) < parseFloat(end.trim()));
211
+ }
212
+ return true;
213
+ case "doesNotEqual":
214
+ return !queryData.includes(value.toLowerCase());
215
+ case "startsWith":
216
+ return value.toLowerCase().startsWith(query.toLowerCase());
217
+ case "endsWith":
218
+ return value.toLowerCase().endsWith(query.toLowerCase());
219
+ case "blank":
220
+ return value === "";
221
+ case "notBlank":
222
+ return value !== "";
223
+ default:
224
+ return true;
225
+ }
226
+ })
227
+ : filterColumns.some((column) => {
228
+ var _a, _b, _c, _d;
229
+ const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
230
+ const queryData = query.toLowerCase().split(",");
231
+ const value = item[column.key] && item[column.key].value
232
+ ? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
233
+ : "";
234
+ console.log("Coming here2");
235
+ if (query.includes("*") || query.includes("?")) {
236
+ const regex = createRegexFromWildcard(query);
237
+ return regex.test(value);
238
+ }
239
+ console.log(column, "column");
240
+ if (query === "") {
241
+ return true;
242
+ }
243
+ console.log((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type, "type");
244
+ switch ((_d = searchQueries[column.key]) === null || _d === void 0 ? void 0 : _d.type) {
245
+ case "contains":
246
+ return value.toLowerCase().includes(query.toLowerCase());
247
+ case "doesNotContain":
248
+ return !value.toLowerCase().includes(query.toLowerCase());
249
+ case "equals":
250
+ return !queryData.includes(value.toLowerCase());
251
+ case "gt":
252
+ if (!isNaN(parseFloat(query))) {
253
+ return parseFloat(value) > parseFloat(query);
254
+ }
255
+ return true;
256
+ case "gte":
257
+ if (!isNaN(parseFloat(query))) {
258
+ return parseFloat(value) >= parseFloat(query);
259
+ }
260
+ return true;
261
+ case "lt":
262
+ if (!isNaN(parseFloat(query))) {
263
+ return parseFloat(value) < parseFloat(query);
264
+ }
265
+ return true;
266
+ case "lte":
267
+ if (!isNaN(parseFloat(query))) {
268
+ return parseFloat(value) <= parseFloat(query);
269
+ }
270
+ return true;
271
+ case "after":
272
+ if (!isNaN(new Date(query).getTime())) {
273
+ return new Date(value).getTime() > new Date(query).getTime();
274
+ }
275
+ return true;
276
+ case "before":
277
+ if (!isNaN(new Date(query).getTime())) {
278
+ return new Date(value).getTime() < new Date(query).getTime();
279
+ }
280
+ return true;
281
+ case "between":
282
+ let [start, end] = column.dataType === "date"
283
+ ? query.split("to")
284
+ : query.split("-");
285
+ if (column.dataType === "date" && start && end) {
286
+ start = new Date(start).getTime();
287
+ end = new Date(end).getTime();
288
+ return (start < new Date(value).getTime() &&
289
+ new Date(value).getTime() < end);
290
+ }
291
+ else if (start && end) {
292
+ return (parseFloat(start.trim()) < parseFloat(value) &&
293
+ parseFloat(value) < parseFloat(end.trim()));
294
+ }
295
+ return true;
296
+ case "doesNotEqual":
297
+ return !queryData.includes(value.toLowerCase());
298
+ case "startsWith":
299
+ return value.toLowerCase().startsWith(query.toLowerCase());
300
+ case "endsWith":
301
+ return value.toLowerCase().endsWith(query.toLowerCase());
302
+ case "blank":
303
+ return value === "";
304
+ case "notBlank":
305
+ return value !== "";
306
+ default:
307
+ return true;
308
+ }
309
+ }));
310
310
  _filteredData = _filteredData.filter((item) => {
311
311
  const query = (globalInputSearch || "").toLowerCase().split(",");
312
312
  const rowValues = [];
@@ -324,9 +324,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
324
324
  return query.some((term) => rowValues.some((value) => value.includes(term)));
325
325
  }
326
326
  });
327
- _filteredData = _filteredData.filter((item) => filterColumns
328
- .filter((item) => searchQueries[item.key])
329
- .some((column) => {
327
+ _filteredData = _filteredData.filter((item) => filterColumns.filter(item => searchQueries[item.key]).some((column) => {
330
328
  var _a;
331
329
  const query = inputValue || "";
332
330
  const value = item[column.key] && item[column.key].value
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@megha-ui/react",
3
- "version": "1.2.409",
3
+ "version": "1.2.411",
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",