bruce-models 1.8.7 → 1.9.0

package/dist/bruce-models.umd.js

@@ -1973,7 +1973,9 @@
             const end = str.indexOf("}");
             if (end > -1) {
                 if (start < end) {
-                    return { path: str.substring(start + 2, end), text: str.substring(start, end) };
+                    const path = str.substring(start + 2, end);
+                    const txt = str.substring(start, end + 1);
+                    return { path: path, text: txt };
                 }
             }
         }
@@ -2881,8 +2883,8 @@
     })(exports.EntityAttachmentType || (exports.EntityAttachmentType = {}));
 
     (function (EntityAttachment) {
-        function GetCacheKey(entityId, typeId, fileId) {
-            return exports.Api.ECacheKey.Attachment + exports.Api.ECacheKey.Id + entityId + exports.Api.ECacheKey.Id + typeId + exports.Api.ECacheKey.Id + fileId;
+        function GetCacheKey(id) {
+            return exports.Api.ECacheKey.Attachment + exports.Api.ECacheKey.Id + id;
         }
         EntityAttachment.GetCacheKey = GetCacheKey;
         function GetListCacheKey(entityId) {
@@ -2891,33 +2893,40 @@
         EntityAttachment.GetListCacheKey = GetListCacheKey;
         function Update(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { api, attachment: data, req: reqParams } = params;
-                if (!(data === null || data === void 0 ? void 0 : data["Entity.ID"]) || !(data === null || data === void 0 ? void 0 : data["EntityAttachmentType.ID"]) || !(data === null || data === void 0 ? void 0 : data["ClientFile.ID"])) {
-                    throw ("Entity ID, Type ID, and File ID are required.");
+                const { api, attachments, req, entityId } = params;
+                if (!(attachments === null || attachments === void 0 ? void 0 : attachments.length)) {
+                    return {
+                        attachments: []
+                    };
+                }
+                const res = yield api.POST(`entity/${entityId}/attachments`, {
+                    attachments
+                }, exports.Api.PrepReqParams(req));
+                for (let i = 0; i < attachments.length; i++) {
+                    if (attachments[i].ID) {
+                        api.Cache.Remove(GetCacheKey(attachments[i].ID));
+                    }
                 }
-                const url = `entity/${data["Entity.ID"]}/attachment/${data.oldAttachmentTypeId}/${data["ClientFile.ID"]}`;
-                const res = yield api.PUT(url, data, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Remove(GetCacheKey(data["Entity.ID"], data["EntityAttachmentType.ID"], data["ClientFile.ID"]));
-                api.Cache.RemoveByStartsWith(GetListCacheKey(data["Entity.ID"]));
+                api.Cache.Remove(GetListCacheKey(entityId));
                 return {
-                    attachment: res
+                    attachments: res.attachments
                 };
             });
         }
         EntityAttachment.Update = Update;
         function UpdateOrder(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { api, entityId, attachmentTypeId: typeId, fileIds, req: reqParams } = params;
-                if (!entityId || !typeId || !(fileIds === null || fileIds === void 0 ? void 0 : fileIds.length)) {
-                    throw ("Entity ID, Type ID, and File IDs are required.");
+                const { api, entityId, attachmentTypeId: typeId, attachments, req: reqParams } = params;
+                if (!entityId || !typeId || !(attachments === null || attachments === void 0 ? void 0 : attachments.length)) {
+                    throw ("Entity ID, Type ID, and Attachments are required.");
                 }
                 const reqData = {
                     "DisplayOrder.Start": 0,
-                    "ClientFile.ID": fileIds
+                    "ClientFile.ID": attachments.map(x => x["ClientFile.ID"])
                 };
                 yield api.POST(`entity/${entityId}/attachments/${typeId}/setOrder`, reqData, exports.Api.PrepReqParams(reqParams));
-                for (let i = 0; i < fileIds.length; i++) {
-                    api.Cache.Remove(GetCacheKey(entityId, typeId, fileIds[i]));
+                for (let i = 0; i < attachments.length; i++) {
+                    api.Cache.Remove(GetCacheKey(attachments[i].ID));
                 }
                 api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
             });
@@ -2925,36 +2934,15 @@
         EntityAttachment.UpdateOrder = UpdateOrder;
         function Delete(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { api, attachment: data, req: reqParams } = params;
-                if (!(data === null || data === void 0 ? void 0 : data["Entity.ID"]) || !(data === null || data === void 0 ? void 0 : data["EntityAttachmentType.ID"]) || !(data === null || data === void 0 ? void 0 : data["ClientFile.ID"])) {
-                    throw ("Entity ID, Type ID, and File ID are required.");
+                const { api, attachmentId, entityId, req } = params;
+                if (!attachmentId || !entityId) {
+                    throw ("Entity id and attachment id.");
                 }
-                const reqData = {
-                    "ClientFile.ID": [data["ClientFile.ID"]]
-                };
-                yield api.POST(`entity/${data["Entity.ID"]}/attachments/${data["EntityAttachmentType.ID"]}/delete`, reqData, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Remove(GetCacheKey(data["Entity.ID"], data["EntityAttachmentType.ID"], data["ClientFile.ID"]));
-                api.Cache.RemoveByStartsWith(GetListCacheKey(data["Entity.ID"]));
+                yield api.DELETE(`entity/${entityId}/attachments/${attachmentId}`, exports.Api.PrepReqParams(req));
+                api.Cache.Remove(GetCacheKey(attachmentId));
             });
         }
         EntityAttachment.Delete = Delete;
-        function DeleteByFileIds(params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const { api, entityId, attachmentTypeId: typeId, fileIds, req: reqParams } = params;
-                if (!entityId || !typeId || !(fileIds === null || fileIds === void 0 ? void 0 : fileIds.length)) {
-                    throw ("Entity ID, Type ID, and File IDs are required.");
-                }
-                const reqData = {
-                    "ClientFile.ID": fileIds
-                };
-                yield api.POST(`entity/${entityId}/attachments/${typeId}/delete`, reqData, exports.Api.PrepReqParams(reqParams));
-                for (let i = 0; i < fileIds.length; i++) {
-                    api.Cache.Remove(GetCacheKey(entityId, typeId, fileIds[i]));
-                }
-                api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
-            });
-        }
-        EntityAttachment.DeleteByFileIds = DeleteByFileIds;
         function GetListByEntityId(params) {
             return __awaiter(this, void 0, void 0, function* () {
                 const { api, entityId, req: reqParams } = params;
@@ -2969,7 +2957,7 @@
                     try {
                         const data = yield api.GET(`entity/${entityId}/attachments`, exports.Api.PrepReqParams(reqParams));
                         res({
-                            attachments: data.Items
+                            attachments: (data.attachments ? data.attachments : data.Items)
                         });
                     }
                     catch (e) {
@@ -2989,7 +2977,7 @@
                 }
                 const url = `entity/${entityId}/attachment/${typeId}`;
                 const res = yield api.UPLOAD(url, file, exports.Api.PrepReqParams(reqParams));
-                api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
+                api.Cache.Remove(GetListCacheKey(entityId));
                 return {
                     attachment: res
                 };