@c8y/ngx-components 1018.0.191 → 1018.0.194

package/fesm2015/c8y-ngx-components-repository-shared.mjs

@@ -124,7 +124,7 @@ const PRODUCT_EXPERIENCE = {
 };
 
 class RepositoryService {
-    constructor(inventory, inventoryBinary, operation, alert, event, operationRealtime, eventBinary, advancedSoftwareService) {
+    constructor(inventory, inventoryBinary, operation, alert, event, operationRealtime, eventBinary, advancedSoftwareService, globalConfigService) {
         this.inventory = inventory;
         this.inventoryBinary = inventoryBinary;
         this.operation = operation;
@@ -133,6 +133,7 @@ class RepositoryService {
         this.operationRealtime = operationRealtime;
         this.eventBinary = eventBinary;
         this.advancedSoftwareService = advancedSoftwareService;
+        this.globalConfigService = globalConfigService;
         this.dateFrom = new Date(0);
         this.dateTo = new Date(Date.now() + 86400000); // 1 day in the future
         this.queriesUtil = new QueriesUtil();
@@ -167,54 +168,38 @@ class RepositoryService {
         filters = Object.assign({ query: this.queriesUtil.buildQuery(fullQuery), pageSize: 50, withTotalPages: true }, ((options && options.params) || {}));
         return this.inventory.list(filters);
     }
-    // TODO: merge with create()
-    save(data, type, mo = {}) {
+    create(modal, type, mo = {}) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             switch (type) {
-                case RepositoryType.CONFIGURATION: {
-                    Object.assign(mo, {
-                        type: RepositoryType.CONFIGURATION,
-                        configurationType: data.selected ? data.selected.configurationType : undefined,
-                        name: data.version,
-                        description: data.description,
-                        deviceType: data.deviceType,
-                        c8y_Global: {}
+                case RepositoryType.FIRMWARE:
+                case RepositoryType.SOFTWARE:
+                    return this.createRepositoryObject(modal, type);
+                case RepositoryType.CONFIGURATION:
+                    Object.assign(modal, {
+                        selected: {
+                            id: ((_a = modal.selected) === null || _a === void 0 ? void 0 : _a.id) || mo.id,
+                            name: modal.version || ((_b = modal.selected) === null || _b === void 0 ? void 0 : _b.name)
+                        },
+                        configurationType: modal.selected ? modal.selected.configurationType : undefined,
+                        name: modal.version
                     });
-                    if (!data.deviceType && mo.id) {
-                        mo.deviceType = null;
+                    if (!modal.deviceType && mo.id) {
+                        modal.deviceType = null;
                     }
-                    if (!data.selected && mo.id) {
-                        mo.configurationType = null;
+                    if (!modal.selected && mo.id) {
+                        modal.configurationType = null;
                     }
-                    break;
-                }
-            }
-            const existingUrl = mo.url;
-            if (data.binary.url) {
-                mo.url = data.binary.url;
-            }
-            else if (data.binary.file) {
-                const response = yield this.inventoryBinary.create(data.binary.file, {
-                    c8y_Global: {}
-                });
-                mo.url = response.data.self;
-            }
-            if (mo.id) {
-                return this.updateEntry(mo, existingUrl);
-            }
-            return this.createEntry(mo);
-        });
-    }
-    create(modal, type) {
-        return __awaiter(this, void 0, void 0, function* () {
-            switch (type) {
-                case RepositoryType.FIRMWARE:
-                case RepositoryType.SOFTWARE:
-                    return this.createFirmwareOrSoftware(modal, type);
+                    const repositoryObject = this.createRepositoryObject(modal, type);
+                    if (mo.url) {
+                        const newBinaryUrl = (yield repositoryObject).url;
+                        this.removeOutdatedBinary(newBinaryUrl, mo.url);
+                    }
+                    return repositoryObject;
             }
         });
     }
-    createFirmwareOrSoftware(modal, type) {
+    createRepositoryObject(modal, type) {
         return __awaiter(this, void 0, void 0, function* () {
             let binary;
             let binaryURL;
@@ -223,22 +208,28 @@ class RepositoryService {
             const mos = [];
             const { selected: { id: selectedId }, binary: { file, url } } = modal;
             try {
+                const globalParam = yield this.getGlobalFragment(type);
                 if (file) {
-                    ({ data: binary } = yield this.saveBinary(file));
+                    ({ data: binary } = yield this.saveBinary(file, globalParam));
                     ({ self: binaryURL } = binary);
+                    if (type === RepositoryType.CONFIGURATION) {
+                        modal.binary.url = binaryURL;
+                    }
                     mos.push(binary);
                 }
                 else {
                     binaryURL = url;
                 }
-                ({ data: repositoryEntry } = yield this.createOrUpdateRepositoryEntry(modal, type));
+                ({ data: repositoryEntry } = yield this.createOrUpdateRepositoryEntry(Object.assign(Object.assign({}, modal), globalParam), type));
                 if (isNil(selectedId)) {
                     mos.push(repositoryEntry);
                 }
-                ({ data: repositoryBinary } = yield this.createRepositoryBinary(modal, binaryURL, type, repositoryEntry));
-                mos.push(repositoryBinary);
+                if (type !== RepositoryType.CONFIGURATION) {
+                    ({ data: repositoryBinary } = yield this.createRepositoryBinary(Object.assign(Object.assign({}, modal), globalParam), binaryURL, type, repositoryEntry));
+                    mos.push(repositoryBinary);
+                }
                 if (file) {
-                    yield this.linkBinary(repositoryBinary, binary);
+                    yield this.linkBinary(repositoryBinary, binary, repositoryEntry);
                 }
                 return repositoryEntry;
             }
@@ -250,40 +241,51 @@ class RepositoryService {
             }
         });
     }
-    saveBinary(file) {
-        return this.inventoryBinary.create(file, { c8y_Global: {} });
+    saveBinary(file, global) {
+        return this.inventoryBinary.create(file, global);
     }
     createOrUpdateRepositoryEntry(modal, type) {
-        const { selected: { id, name }, description, deviceType } = modal;
-        const mo = {
-            id,
-            name: id ? undefined : name,
-            description,
-            type: id ? undefined : type,
-            c8y_Global: {}
-        };
-        if (deviceType) {
-            set(mo, 'c8y_Filter.type', deviceType);
-        }
-        if (modal.softwareType) {
-            set(mo, 'softwareType', modal.softwareType.softwareType);
-        }
-        return id
-            ? this.inventory.update(mo)
-            : this.inventory.create(mo);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { selected: { id, name }, description, deviceType, c8y_Global, binary } = modal;
+            const mo = {
+                id,
+                name,
+                description,
+                type,
+                c8y_Global
+            };
+            if (deviceType && type !== RepositoryType.CONFIGURATION) {
+                set(mo, 'c8y_Filter.type', deviceType);
+            }
+            if (deviceType && type === RepositoryType.CONFIGURATION) {
+                set(mo, 'deviceType', deviceType);
+            }
+            if (modal.softwareType) {
+                set(mo, 'softwareType', modal.softwareType.softwareType);
+            }
+            if (modal.configurationType) {
+                set(mo, 'configurationType', modal.configurationType);
+            }
+            if (type === RepositoryType.CONFIGURATION) {
+                set(mo, 'url', binary === null || binary === void 0 ? void 0 : binary.url);
+            }
+            return id
+                ? this.inventory.update(mo)
+                : this.inventory.create(mo);
+        });
     }
     createRepositoryBinary(modal, binaryURL, type, parent) {
         const mo = this.prepareRepositoryBinaryMO(modal, binaryURL, type);
         return this.inventory.childAdditionsCreate(mo, parent);
     }
     prepareRepositoryBinaryMO(modal, binaryURL, type) {
-        const { version, patchVersion, dependency } = modal;
+        const { version, patchVersion, dependency, c8y_Global } = modal;
         const result = {
             type: REPOSITORY_BINARY_TYPES[type],
             [type]: {
                 url: binaryURL
             },
-            c8y_Global: {}
+            c8y_Global
         };
         if (dependency) {
             set(result, [type, 'version'], patchVersion);
@@ -298,13 +300,17 @@ class RepositoryService {
         }
         return result;
     }
-    linkBinary(repositoryBinary, binary) {
+    linkBinary(repositoryBinary, binary, repositoryEntry) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { id: repositoryBinaryId } = repositoryBinary;
-            if (binary) {
-                const { id: binaryId } = binary;
-                return this.inventory.childAdditionsAdd(binaryId, repositoryBinaryId);
+            if (repositoryBinary) {
+                const { id: repositoryBinaryId } = repositoryBinary;
+                if (binary) {
+                    const { id: binaryId } = binary;
+                    return this.inventory.childAdditionsAdd(binaryId, repositoryBinaryId);
+                }
             }
+            else
+                return this.inventory.childAdditionsAdd(binary, repositoryEntry);
         });
     }
     cleanUp(mosToDelete) {
@@ -1131,30 +1137,6 @@ class RepositoryService {
             return res;
         });
     }
-    createEntry(mo) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const binaryId = yield this.inventoryBinary.getIdFromUrl(mo.url);
-            const newMo = yield this.inventory.create(mo);
-            if (binaryId) {
-                yield this.inventory.childAdditionsAdd(binaryId, newMo.data);
-            }
-            return newMo;
-        });
-    }
-    updateEntry(mo, url) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const existingBinaryId = yield this.inventoryBinary.getIdFromUrl(url);
-            const newBinaryId = yield this.inventoryBinary.getIdFromUrl(mo.url);
-            if (existingBinaryId && existingBinaryId !== newBinaryId) {
-                const id = this.inventoryBinary.getIdFromUrl(url);
-                yield this.inventoryBinary.delete(id);
-            }
-            if (newBinaryId) {
-                yield this.inventory.childAdditionsAdd(newBinaryId, mo);
-            }
-            return this.inventory.update(mo);
-        });
-    }
     getBaseVersionResultListForLegacyEntry(entry) {
         return Promise.resolve({
             res: {},
@@ -1244,12 +1226,26 @@ class RepositoryService {
     softwareListToLegacy(list) {
         return (list || []).reduce((prev, curr) => (Object.assign(Object.assign({}, prev), { [curr.name]: curr.version })), {});
     }
+    getGlobalFragment(type) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield this.globalConfigService.getGlobalParam(type)) ? { c8y_Global: {} } : undefined;
+        });
+    }
+    removeOutdatedBinary(newBinaryURL, oldBinaryURL) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const existingBinaryId = yield this.inventoryBinary.getIdFromUrl(oldBinaryURL);
+            const newBinaryId = yield this.inventoryBinary.getIdFromUrl(newBinaryURL);
+            if (existingBinaryId && existingBinaryId !== newBinaryId) {
+                yield this.inventoryBinary.delete(existingBinaryId);
+            }
+        });
+    }
 }
-RepositoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: RepositoryService, deps: [{ token: i1.InventoryService }, { token: i1.InventoryBinaryService }, { token: i1.OperationService }, { token: i2.AlertService }, { token: i1.EventService }, { token: i2.OperationRealtimeService }, { token: i1.EventBinaryService }, { token: AdvancedSoftwareService }], target: i0.ɵɵFactoryTarget.Injectable });
+RepositoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: RepositoryService, deps: [{ token: i1.InventoryService }, { token: i1.InventoryBinaryService }, { token: i1.OperationService }, { token: i2.AlertService }, { token: i1.EventService }, { token: i2.OperationRealtimeService }, { token: i1.EventBinaryService }, { token: AdvancedSoftwareService }, { token: i2.GlobalConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
 RepositoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: RepositoryService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: RepositoryService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1.InventoryService }, { type: i1.InventoryBinaryService }, { type: i1.OperationService }, { type: i2.AlertService }, { type: i1.EventService }, { type: i2.OperationRealtimeService }, { type: i1.EventBinaryService }, { type: AdvancedSoftwareService }]; } });
+        }], ctorParameters: function () { return [{ type: i1.InventoryService }, { type: i1.InventoryBinaryService }, { type: i1.OperationService }, { type: i2.AlertService }, { type: i1.EventService }, { type: i2.OperationRealtimeService }, { type: i1.EventBinaryService }, { type: AdvancedSoftwareService }, { type: i2.GlobalConfigService }]; } });
 
 class FileDownloadComponent {
     constructor(repositoryService, inventoryBinaryService, alertService) {