@c8y/ngx-components 1018.0.147 → 1018.0.152

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

@@ -6,7 +6,7 @@ import { gettext, PackageType, Status, DropAreaComponent, C8yStepper, CoreModule
 import * as i3 from '@c8y/client';
 import { ApplicationAvailability, ApplicationType } from '@c8y/client';
 import { saveAs } from 'file-saver';
-import { groupBy, uniqBy, get, pick, kebabCase, cloneDeep } from 'lodash-es';
+import { groupBy, uniqBy, get, pick, omit, isUndefined, kebabCase, cloneDeep } from 'lodash-es';
 import { BehaviorSubject, defer, merge, combineLatest } from 'rxjs';
 import { map, shareReplay, debounceTime, take, distinctUntilKeyChanged, tap, filter, switchMap } from 'rxjs/operators';
 import { gt, coerce } from 'semver';
@@ -37,6 +37,7 @@ var ERROR_TYPE;
 (function (ERROR_TYPE) {
     ERROR_TYPE["TYPE_VALIDATION"] = "TYPE_VALIDATION";
     ERROR_TYPE["ALREADY_SUBSCRIBED"] = "ALREADY_SUBSCRIBED";
+    ERROR_TYPE["ALREADY_EXIST"] = "ALREADY_EXIST";
     ERROR_TYPE["INTERNAL_ERROR"] = "INTERNAL_ERROR";
     ERROR_TYPE["NO_MANIFEST_FILE"] = "NO_MANIFEST_FILE";
     ERROR_TYPE["INVALID_PACKAGE"] = "INVALID_PACKAGE";
@@ -44,6 +45,7 @@ var ERROR_TYPE;
     ERROR_TYPE["MICROSERVICE_NAME_TOO_LONG"] = "MICROSERVICE_NAME_TOO_LONG";
     ERROR_TYPE["APPLICATION_CREATION_FAILED"] = "APPLICATION_CREATION_FAILED";
     ERROR_TYPE["KEY_OR_CONTEXT_PATH_MISMATCH"] = "KEY_OR_CONTEXT_PATH_MISMATCH";
+    ERROR_TYPE["VERSION_NOT_FOUND"] = "VERSION_NOT_FOUND";
 })(ERROR_TYPE || (ERROR_TYPE = {}));
 const PRODUCT_EXPERIENCE = {
     APPLICATIONS: {
@@ -96,6 +98,7 @@ const PRODUCT_EXPERIENCE = {
 };
 
 const ERROR_MESSAGES = {
+    [ERROR_TYPE.ALREADY_EXIST]: gettext('Could not deploy the application, as the application with the same name, context-path or key exist already.'),
     [ERROR_TYPE.TYPE_VALIDATION]: gettext('Wrong file format. Expected a *.zip file with a valid manifest.'),
     [ERROR_TYPE.ALREADY_SUBSCRIBED]: gettext('Could not subscribe to the microservice because another application with the same context path is already subscribed.'),
     [ERROR_TYPE.NO_MANIFEST_FILE]: gettext('Could not find a manifest.'),
@@ -104,7 +107,8 @@ const ERROR_MESSAGES = {
     [ERROR_TYPE.INTERNAL_ERROR]: gettext('An internal error occurred, try to upload again.'),
     [ERROR_TYPE.MICROSERVICE_NAME_TOO_LONG]: gettext('Microservice name "{{ name }}" must not be longer than {{ maxChars }} characters.'),
     [ERROR_TYPE.APPLICATION_CREATION_FAILED]: gettext('Application creation failed.'),
-    [ERROR_TYPE.KEY_OR_CONTEXT_PATH_MISMATCH]: gettext('The contextPath or key of the uploaded archive do not match with the existing app.')
+    [ERROR_TYPE.KEY_OR_CONTEXT_PATH_MISMATCH]: gettext('The "contextPath`KEEP_ORIGINAL`" or "key`KEEP_ORIGINAL`" of the uploaded archive do not match with the existing application.'),
+    [ERROR_TYPE.VERSION_NOT_FOUND]: gettext('The selected version was not found on the server.')
 };
 const APP_STATE = {
     SUBSCRIBED: {
@@ -159,7 +163,7 @@ const PACKAGE_TYPE_LABELS = {
 };
 const packageProperties = [
     {
-        label: gettext('Version'),
+        label: gettext('Latest version'),
         key: 'version'
     },
     {
@@ -334,6 +338,18 @@ class EcosystemService {
         });
     }
     getPackageApplications(customFilter = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filterCallback = app => this.isPackage(app);
+            return this.getApplicationsFiltered(customFilter, filterCallback);
+        });
+    }
+    getHostedAndPackageApplications(customFilter = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filterCallback = app => this.isPackage(app) || this.isApplication(app);
+            return this.getApplicationsFiltered(customFilter, filterCallback);
+        });
+    }
+    getApplicationsFiltered(customFilter = {}, filterCallback = (app) => !!app) {
         return __awaiter(this, void 0, void 0, function* () {
             const filter = Object.assign({}, customFilter);
             const sharedFilter = Object.assign({
@@ -345,7 +361,7 @@ class EcosystemService {
                 this.getApplications(filter),
                 this.applicationService.list(sharedFilter)
             ]);
-            const webApps = [...apps, ...shared].filter(app => this.isPackage(app));
+            const webApps = [...apps, ...shared].filter(filterCallback);
             // an app could be subscribed to a tenant, but also have it's availability set to SHARED, in that case it would occur twice.
             const uniqWebApps = uniqBy(webApps, (app) => app.id);
             return uniqWebApps.sort((a, b) => a.name.localeCompare(b.name));
@@ -431,20 +447,6 @@ class EcosystemService {
             availability });
         return config;
     }
-    updateAppManifest(application, sourcePackage) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { id } = application;
-            const cleanedApp = this.removeAppProperties(application);
-            if (!cleanedApp.manifest) {
-                cleanedApp.manifest = {};
-            }
-            cleanedApp.manifest.isPackage = false;
-            cleanedApp.manifest.source = sourcePackage.id;
-            return yield this.applicationService
-                .binary(id)
-                .updateFiles([{ path: CUMULOCITY_JSON, contents: JSON.stringify(cleanedApp) }]);
-        });
-    }
     listArchives(appId) {
         return __awaiter(this, void 0, void 0, function* () {
             const filter = {
@@ -678,6 +680,85 @@ class EcosystemService {
             }
         });
     }
+    deployApp(selectedPackage, formGroupValue, model) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            // Create new app config
+            const config = this.createConfig(selectedPackage, formGroupValue);
+            const requestedVersion = model.selected.version;
+            let cleanManifest;
+            try {
+                const manifest = yield this.applicationService.getAppManifest(selectedPackage, requestedVersion);
+                cleanManifest = omit(manifest, ['name', 'contextPath', 'key']);
+            }
+            catch (ex) {
+                throw new EcosystemError(ERROR_TYPE.VERSION_NOT_FOUND);
+            }
+            config.isSetup = true;
+            config.manifest = cleanManifest;
+            config.availability = ApplicationAvailability.PRIVATE;
+            config.manifest.isPackage = false;
+            config.manifest.source = selectedPackage.id;
+            config.manifest.package = 'blueprint';
+            // because of a issue with SHARED availability we always should check again
+            // if the app not exist already
+            const allExistingApps = yield this.getHostedAndPackageApplications();
+            const doesAppKeyOrContextPathExist = this.checkIfAppNameKeyPathExists(allExistingApps, config);
+            if (doesAppKeyOrContextPathExist) {
+                throw new EcosystemError(ERROR_TYPE.ALREADY_EXIST);
+            }
+            // Create new app
+            const newApp = (yield this.applicationService.create(config)).data;
+            try {
+                // Binary upload can fail if SHARED package
+                // in this case, catch error and fall back to
+                // clone API.
+                yield this.uploadBinaryFromOtherPackage(selectedPackage, newApp, model.selected.binaryId, requestedVersion);
+            }
+            catch (error) {
+                if (((_a = error === null || error === void 0 ? void 0 : error.res) === null || _a === void 0 ? void 0 : _a.status) === 404) {
+                    yield this.fallbackToClone(newApp, selectedPackage, requestedVersion);
+                }
+            }
+            return newApp;
+        });
+    }
+    fallbackToClone(application, selectedPackage, requestedVersion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let wasSuccess = true;
+            let clonedPkg;
+            try {
+                clonedPkg = (yield this.applicationService.clone(selectedPackage, requestedVersion)).data;
+                yield this.uploadBinaryFromOtherPackage(selectedPackage, application, clonedPkg.activeVersionId, requestedVersion, clonedPkg);
+            }
+            catch (error) {
+                this.alertError(error);
+                wasSuccess = false;
+            }
+            finally {
+                yield this.deleteApp(clonedPkg, true);
+            }
+            return wasSuccess;
+        });
+    }
+    uploadBinaryFromOtherPackage(selectedPackage, applicationToUploadBinaryTo, binaryId, requestedVersion, useBinariesFrom) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { data: binaryDetails } = yield this.inventoryService.detail(binaryId);
+            // Get binary from specific package version
+            const binary = yield this.getBinary(useBinariesFrom || selectedPackage, {
+                id: binaryId
+            });
+            // Create zip
+            const fileBinary = new Blob([binary], { type: binaryDetails.contentType });
+            const file = new File([fileBinary], binaryDetails.name, {
+                type: binaryDetails.contentType
+            });
+            // Upload binary to new app
+            yield this.uploadArchiveToApp(file, applicationToUploadBinaryTo);
+            // update the app manifest
+            yield this.updateAppManifest(applicationToUploadBinaryTo, selectedPackage, requestedVersion);
+        });
+    }
     getAppState(app) {
         if (!this.isOwner(app)) {
             return APP_STATE.SUBSCRIBED;
@@ -776,6 +857,45 @@ class EcosystemService {
             }
         });
     }
+    filterContainString(name, filterTerm) {
+        const term = filterTerm.toLowerCase().trim();
+        return name && name.toLowerCase().indexOf(term) > -1;
+    }
+    updateAppManifest(application, selectedPackage, requestedVersion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id } = application;
+            const cleanedApp = this.removeAppProperties(application);
+            let manifest = selectedPackage.manifest || {};
+            if (requestedVersion) {
+                try {
+                    const versionedAppManifest = yield this.applicationService.getAppManifest(selectedPackage, requestedVersion);
+                    manifest = versionedAppManifest;
+                }
+                catch (ex) {
+                    throw new EcosystemError(ERROR_TYPE.VERSION_NOT_FOUND);
+                }
+            }
+            cleanedApp.manifest = manifest;
+            cleanedApp.manifest.isPackage = false;
+            cleanedApp.manifest.source = selectedPackage.id;
+            return yield this.applicationService
+                .binary(id)
+                .updateFiles([{ path: CUMULOCITY_JSON, contents: JSON.stringify(cleanedApp) }]);
+        });
+    }
+    checkIfAppNameKeyPathExists(existingApps, app, retryNo) {
+        if (isUndefined(retryNo)) {
+            return existingApps.find(existingApp => existingApp.name === app.name ||
+                existingApp.key === app.key ||
+                existingApp.contextPath === app.contextPath);
+        }
+        return existingApps.find(existingApp => existingApp.name === app.name ||
+            existingApp.key === app.key ||
+            existingApp.contextPath === app.contextPath ||
+            existingApp.name === [app.name, retryNo].join('-') ||
+            existingApp.key === [app.key, retryNo].join('-') ||
+            existingApp.contextPath === [app.contextPath, retryNo].join('-'));
+    }
     getAppKey(appModel, name) {
         let key = appModel === null || appModel === void 0 ? void 0 : appModel.key;
         if (!key) {
@@ -812,17 +932,9 @@ class EcosystemService {
         }
         return baseName;
     }
-    checkIfAppNameKeyPathExists(existingApps, app, retryNo) {
-        return existingApps.find(existingApp => existingApp.name === app.name ||
-            existingApp.key === app.key ||
-            existingApp.contextPath === app.contextPath ||
-            existingApp.name === [app.name, retryNo].join('-') ||
-            existingApp.key === [app.key, retryNo].join('-') ||
-            existingApp.contextPath === [app.contextPath, retryNo].join('-'));
-    }
     removeAppProperties(app) {
         const tempApp = cloneDeep(app);
-        const propertiesToRemove = ['id', 'owner', 'activeVersionId', 'self'];
+        const propertiesToRemove = ['id', 'owner', 'activeVersionId', 'self', 'type'];
         propertiesToRemove.forEach(prop => delete tempApp[prop]);
         return tempApp;
     }