@c8y/ngx-components 1018.0.191 → 1018.0.194

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

@@ -117,7 +117,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;
@@ -126,6 +126,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();
@@ -165,50 +166,35 @@ class RepositoryService {
         };
         return this.inventory.list(filters);
     }
-    // TODO: merge with create()
-    async save(data, type, mo = {}) {
+    async create(modal, type, mo = {}) {
         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: modal.selected?.id || mo.id,
+                        name: modal.version || modal.selected?.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 = await 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);
-    }
-    async create(modal, type) {
-        switch (type) {
-            case RepositoryType.FIRMWARE:
-            case RepositoryType.SOFTWARE:
-                return this.createFirmwareOrSoftware(modal, type);
+                const repositoryObject = this.createRepositoryObject(modal, type);
+                if (mo.url) {
+                    const newBinaryUrl = (await repositoryObject).url;
+                    this.removeOutdatedBinary(newBinaryUrl, mo.url);
+                }
+                return repositoryObject;
         }
     }
-    async createFirmwareOrSoftware(modal, type) {
+    async createRepositoryObject(modal, type) {
         let binary;
         let binaryURL;
         let repositoryEntry;
@@ -216,22 +202,28 @@ class RepositoryService {
         const mos = [];
         const { selected: { id: selectedId }, binary: { file, url } } = modal;
         try {
+            const globalParam = await this.getGlobalFragment(type);
             if (file) {
-                ({ data: binary } = await this.saveBinary(file));
+                ({ data: binary } = await this.saveBinary(file, globalParam));
                 ({ self: binaryURL } = binary);
+                if (type === RepositoryType.CONFIGURATION) {
+                    modal.binary.url = binaryURL;
+                }
                 mos.push(binary);
             }
             else {
                 binaryURL = url;
             }
-            ({ data: repositoryEntry } = await this.createOrUpdateRepositoryEntry(modal, type));
+            ({ data: repositoryEntry } = await this.createOrUpdateRepositoryEntry({ ...modal, ...globalParam }, type));
             if (isNil(selectedId)) {
                 mos.push(repositoryEntry);
             }
-            ({ data: repositoryBinary } = await this.createRepositoryBinary(modal, binaryURL, type, repositoryEntry));
-            mos.push(repositoryBinary);
+            if (type !== RepositoryType.CONFIGURATION) {
+                ({ data: repositoryBinary } = await this.createRepositoryBinary({ ...modal, ...globalParam }, binaryURL, type, repositoryEntry));
+                mos.push(repositoryBinary);
+            }
             if (file) {
-                await this.linkBinary(repositoryBinary, binary);
+                await this.linkBinary(repositoryBinary, binary, repositoryEntry);
             }
             return repositoryEntry;
         }
@@ -242,24 +234,33 @@ class RepositoryService {
             throw error;
         }
     }
-    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;
+    async createOrUpdateRepositoryEntry(modal, type) {
+        const { selected: { id, name }, description, deviceType, c8y_Global, binary } = modal;
         const mo = {
             id,
-            name: id ? undefined : name,
+            name,
             description,
-            type: id ? undefined : type,
-            c8y_Global: {}
+            type,
+            c8y_Global
         };
-        if (deviceType) {
+        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?.url);
+        }
         return id
             ? this.inventory.update(mo)
             : this.inventory.create(mo);
@@ -269,13 +270,13 @@ class RepositoryService {
         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);
@@ -290,12 +291,16 @@ class RepositoryService {
         }
         return result;
     }
-    async linkBinary(repositoryBinary, binary) {
-        const { id: repositoryBinaryId } = repositoryBinary;
-        if (binary) {
-            const { id: binaryId } = binary;
-            return this.inventory.childAdditionsAdd(binaryId, repositoryBinaryId);
+    async linkBinary(repositoryBinary, binary, repositoryEntry) {
+        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) {
         mosToDelete.forEach(mo => {
@@ -1081,26 +1086,6 @@ class RepositoryService {
         }
         return res;
     }
-    async createEntry(mo) {
-        const binaryId = await this.inventoryBinary.getIdFromUrl(mo.url);
-        const newMo = await this.inventory.create(mo);
-        if (binaryId) {
-            await this.inventory.childAdditionsAdd(binaryId, newMo.data);
-        }
-        return newMo;
-    }
-    async updateEntry(mo, url) {
-        const existingBinaryId = await this.inventoryBinary.getIdFromUrl(url);
-        const newBinaryId = await this.inventoryBinary.getIdFromUrl(mo.url);
-        if (existingBinaryId && existingBinaryId !== newBinaryId) {
-            const id = this.inventoryBinary.getIdFromUrl(url);
-            await this.inventoryBinary.delete(id);
-        }
-        if (newBinaryId) {
-            await this.inventory.childAdditionsAdd(newBinaryId, mo);
-        }
-        return this.inventory.update(mo);
-    }
     getBaseVersionResultListForLegacyEntry(entry) {
         return Promise.resolve({
             res: {},
@@ -1192,12 +1177,22 @@ class RepositoryService {
     softwareListToLegacy(list) {
         return (list || []).reduce((prev, curr) => ({ ...prev, [curr.name]: curr.version }), {});
     }
+    async getGlobalFragment(type) {
+        return (await this.globalConfigService.getGlobalParam(type)) ? { c8y_Global: {} } : undefined;
+    }
+    async removeOutdatedBinary(newBinaryURL, oldBinaryURL) {
+        const existingBinaryId = await this.inventoryBinary.getIdFromUrl(oldBinaryURL);
+        const newBinaryId = await this.inventoryBinary.getIdFromUrl(newBinaryURL);
+        if (existingBinaryId && existingBinaryId !== newBinaryId) {
+            await 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 }]; } });
 
 var LinkRenderType;
 (function (LinkRenderType) {