blixify-ui-web 0.2.63 → 0.2.65

package/lib/components/data/dataTemplate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/data/dataTemplate/index.tsx"],"names":[],"mappings":"AAsBA,OAAO,KAQN,MAAM,OAAO,CAAC;AAwDf,OAAO,EACL,iBAAiB,EAKlB,MAAM,kBAAkB,CAAC;AAO1B,eAAO,MAAM,YAAY,mFAulKvB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/data/dataTemplate/index.tsx"],"names":[],"mappings":"AAsBA,OAAO,KAQN,MAAM,OAAO,CAAC;AAwDf,OAAO,EACL,iBAAiB,EAKlB,MAAM,kBAAkB,CAAC;AAO1B,eAAO,MAAM,YAAY,mFAkmKvB,CAAC"}

package/lib/components/data/dataTemplate/index.js

@@ -413,7 +413,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         return sort;
     };
     var handleReadQueryHocCond = function () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         var query = (_a = renderImpSearchFilterConditions()) !== null && _a !== void 0 ? _a : [];
         if ((_b = props.bareSettings) === null || _b === void 0 ? void 0 : _b.bareListFilterQuery) {
             // INFO - To Replace bareListFilterQuery when they have same queryId
@@ -491,11 +491,18 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     orQuery: true,
                     orQueryGroupId: "3",
                 });
+                query.push({
+                    type: "=",
+                    queryId: (_l = selectedTab.calendarSettings) === null || _l === void 0 ? void 0 : _l.endDate,
+                    value: null,
+                    orQuery: true,
+                    orQueryGroupId: "4",
+                });
             }
             else {
                 query.push({
                     type: "><",
-                    queryId: (_l = selectedTab.calendarSettings) === null || _l === void 0 ? void 0 : _l.startDate,
+                    queryId: (_m = selectedTab.calendarSettings) === null || _m === void 0 ? void 0 : _m.startDate,
                     value: [
                         (0, moment_1.default)(startDate).toISOString(),
                         (0, moment_1.default)(endDate).toISOString(),
@@ -1626,24 +1633,17 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); };
     var handleBatchUpdateData = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var model_1, columnId_1, dataToSubmit_1, isFile, res, res, err_9;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var model_1, columnId_1, dataToSubmit_1, isFile, res, batchUpdateConfig, res, err_9;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
-                    _c.trys.push([0, 7, , 8]);
+                    _a.trys.push([0, 7, , 8]);
                     setLoading(true);
                     setModalVisible(true);
                     model_1 = props.model.find(function (eachModel) { return eachModel.id === batchUpdateData.columnId; });
                     columnId_1 = batchUpdateData.columnId;
                     dataToSubmit_1 = batchUpdateData.columnData;
                     isFile = (model_1 === null || model_1 === void 0 ? void 0 : model_1.type) === "image" || (model_1 === null || model_1 === void 0 ? void 0 : model_1.type) === "file";
-                    if ((model_1 === null || model_1 === void 0 ? void 0 : model_1.optional) && dataToSubmit_1[columnId_1] === undefined) {
-                        if (model_1.type === "address")
-                            dataToSubmit_1 = (_a = {}, _a[columnId_1] = { name: "", lat: 0, lng: 0 }, _a);
-                        else
-                            dataToSubmit_1 = (_b = {}, _b[columnId_1] = "", _b);
-                    }
                     if (!(isFile && dataToSubmit_1[columnId_1])) return [3 /*break*/, 2];
                     return [4 /*yield*/, Promise.all(selectedIds.map(function (eachId) { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
@@ -1654,7 +1654,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             });
                         }); }))];
                 case 1:
-                    res = _c.sent();
+                    res = _a.sent();
                     if (res) {
                         setLoading(false);
                         setSelectedIds([]);
@@ -1679,10 +1679,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             });
                         }); }))];
                 case 3:
-                    _c.sent();
-                    _c.label = 4;
-                case 4: return [4 /*yield*/, writeServerQuery.call("batchUpdate", {
-                        data: dataToSubmit_1,
+                    _a.sent();
+                    _a.label = 4;
+                case 4:
+                    batchUpdateConfig = {
                         query: selectAll
                             ? [
                                 {
@@ -1698,19 +1698,27 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                     value: selectedIds,
                                 },
                             ],
-                    })];
+                    };
+                    if ((model_1 === null || model_1 === void 0 ? void 0 : model_1.optional) && dataToSubmit_1[columnId_1] === undefined) {
+                        batchUpdateConfig["unsetData"] = [columnId_1];
+                        batchUpdateConfig["data"] = {};
+                    }
+                    else {
+                        batchUpdateConfig["data"] = dataToSubmit_1;
+                    }
+                    return [4 /*yield*/, writeServerQuery.call("batchUpdate", batchUpdateConfig)];
                 case 5:
-                    res = _c.sent();
+                    res = _a.sent();
                     if (res) {
                         handleRefresh(false);
                         if (selectedTab.viewType === "map" && mapViewRef.current) {
                             mapViewRef.current.handleClearPolygons();
                         }
                     }
-                    _c.label = 6;
+                    _a.label = 6;
                 case 6: return [3 /*break*/, 8];
                 case 7:
-                    err_9 = _c.sent();
+                    err_9 = _a.sent();
                     if (err_9.response && err_9.response.status === 400) {
                         setNotification({
                             type: false,
@@ -3730,7 +3738,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     };
                     spaceTableData.map(function (eachData) {
                         var _a, _b, _c, _d, _e, _f, _g, _h;
-                        var eachMarkerColor = "red";
+                        var eachMarkerColor = "white";
                         if (mapSettings_1.group) {
                             if (eachData[mapSettings_1.group]) {
                                 eachMarkerColor = markerColorMap_1[eachData[mapSettings_1.group]];