@c8y/ngx-components 1017.0.92 → 1017.0.93

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

@@ -38,6 +38,8 @@ var ERROR_TYPE;
     ERROR_TYPE["INVALID_PACKAGE"] = "INVALID_PACKAGE";
     ERROR_TYPE["INVALID_APPLICATION"] = "INVALID_APPLICATION";
     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 || (ERROR_TYPE = {}));
 const PRODUCT_EXPERIENCE = {
     APPLICATIONS: {
@@ -96,7 +98,9 @@ const ERROR_MESSAGES = {
     [ERROR_TYPE.INVALID_PACKAGE]: gettext('You have not uploaded a valid package.'),
     [ERROR_TYPE.INVALID_APPLICATION]: gettext('You have not uploaded a valid application.'),
     [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.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.')
 };
 const APP_STATE = {
     SUBSCRIBED: {
@@ -160,6 +164,13 @@ const packageProperties = [
     }
 ];
 
+class EcosystemError extends Error {
+    constructor(type) {
+        super(ERROR_MESSAGES[type]);
+        this.type = type;
+    }
+}
+
 const CUMULOCITY_JSON = 'cumulocity.json';
 const MICROSERVICE_NAME_MAX_LENGTH = 23;
 class EcosystemService {
@@ -420,10 +431,10 @@ class EcosystemService {
                 return yield this.applicationService.update(app);
             }
             catch (ex) {
-                this.alertService.addServerFailure(ex);
+                this.alertError(ex);
                 if (deleteOnFailure) {
                     yield this.applicationService.delete(app.id);
-                    throw new Error('Application creation failed.');
+                    throw new EcosystemError(ERROR_TYPE.APPLICATION_CREATION_FAILED);
                 }
             }
         });
@@ -456,7 +467,7 @@ class EcosystemService {
                 this.alertService.success(gettext('Successfully subscribed to application.'));
             }
             catch (ex) {
-                this.alertService.addServerFailure(ex);
+                this.alertError(ex);
             }
         });
     }
@@ -468,7 +479,7 @@ class EcosystemService {
                 this.alertService.success(gettext('Successfully unsubscribed from application.'));
             }
             catch (ex) {
-                this.alertService.addServerFailure(ex);
+                this.alertError(ex);
             }
         });
     }
@@ -477,7 +488,7 @@ class EcosystemService {
             try {
                 const currentType = yield this.getAppType(archive);
                 if (currentType !== appType) {
-                    throw new Error(ERROR_TYPE.TYPE_VALIDATION);
+                    throw new EcosystemError(ERROR_TYPE.TYPE_VALIDATION);
                 }
                 else {
                     this.progress.next(this.progress.value + 10);
@@ -485,7 +496,7 @@ class EcosystemService {
                 }
             }
             catch (ex) {
-                throw new Error(ERROR_TYPE.TYPE_VALIDATION);
+                throw new EcosystemError(ERROR_TYPE.TYPE_VALIDATION);
             }
         });
     }
@@ -506,16 +517,32 @@ class EcosystemService {
             return (yield this.setAppActiveVersion(app, (binaryMo.binaryId || binaryMo.id))).data;
         });
     }
-    validatePackageKeyAndContextPath(archive, app) {
+    validateArchiveToAppCompatibility(archive, app) {
         return __awaiter(this, void 0, void 0, function* () {
-            const manifest = yield this.getCumulocityJson(archive).toPromise();
-            const contextPath = get(manifest, 'contextPath');
-            const appKey = get(manifest, 'key');
-            if (contextPath !== app.contextPath || appKey !== app.key) {
-                const error = {
-                    data: { message: this.translateService.instant(ERROR_MESSAGES.INVALID_PACKAGE) }
-                };
-                throw error;
+            const appType = yield this.getAppType(archive);
+            if (appType !== app.type) {
+                throw new EcosystemError(ERROR_TYPE.INVALID_APPLICATION);
+            }
+            else {
+                this.progress.next(this.progress.value + 10);
+            }
+            const manifest = yield this.getCumulocityJson(archive);
+            // A user can upload an app without a Cumulocity JSON file (e.g. a react app).
+            // This is allowed and should not trigger a validation error.
+            if (!manifest) {
+                return;
+            }
+            yield this.validatePackageKeyAndContextPath(manifest, app);
+        });
+    }
+    getCumulocityJson(archive) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const c8yManifest = yield this.getCumulocityJson$(archive).toPromise();
+                return c8yManifest;
+            }
+            catch (ex) {
+                return null;
             }
         });
     }
@@ -527,7 +554,7 @@ class EcosystemService {
             const supportedAppTypes = [ApplicationType.HOSTED, ApplicationType.MICROSERVICE];
             if (supportedAppTypes.includes(appType)) {
                 try {
-                    appModel = yield this.getCumulocityJson(archive).toPromise();
+                    appModel = yield this.getCumulocityJson$(archive).toPromise();
                     isPackage = appModel.isPackage;
                 }
                 catch (e) {
@@ -546,10 +573,10 @@ class EcosystemService {
                 contextPath
             };
             if (isPackageTypeArchive && !isPackage) {
-                throw new Error(ERROR_TYPE.INVALID_PACKAGE);
+                throw new EcosystemError(ERROR_TYPE.INVALID_PACKAGE);
             }
             else if (!isPackageTypeArchive && isPackage) {
-                throw new Error(ERROR_TYPE.INVALID_APPLICATION);
+                throw new EcosystemError(ERROR_TYPE.INVALID_APPLICATION);
             }
             else if (this.isNameLengthExceeded(name, appType)) {
                 const error = new Error();
@@ -570,7 +597,7 @@ class EcosystemService {
                 this.alertService.success(gettext('Application reactivated.'));
             }
             catch (ex) {
-                this.alertService.addServerFailure(ex);
+                this.alertError(ex);
             }
         });
     }
@@ -583,7 +610,7 @@ class EcosystemService {
                 this.alertService.success(gettext('Archive deleted.'));
             }
             catch (ex) {
-                this.alertService.addServerFailure(ex);
+                this.alertError(ex);
             }
         });
     }
@@ -660,6 +687,27 @@ class EcosystemService {
         app.availability = ApplicationAvailability.PRIVATE;
         return app;
     }
+    /**
+     * Shows an error dialog.
+     * @param error Either a server error or an internal [[EcosystemError]].
+     */
+    alertError(error) {
+        if (error instanceof EcosystemError) {
+            this.alertService.danger(error.message);
+        }
+        else {
+            this.alertService.addServerFailure(error);
+        }
+    }
+    validatePackageKeyAndContextPath(manifest, app) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const contextPath = get(manifest, 'contextPath');
+            const appKey = get(manifest, 'key');
+            if (contextPath !== app.contextPath || appKey !== app.key) {
+                throw new EcosystemError(ERROR_TYPE.KEY_OR_CONTEXT_PATH_MISMATCH);
+            }
+        });
+    }
     getAppKey(appModel, name) {
         let key = appModel === null || appModel === void 0 ? void 0 : appModel.key;
         if (!key) {
@@ -677,13 +725,13 @@ class EcosystemService {
         const currentApp = this.appStateService.state.app;
         return currentApp.contextPath === app.contextPath;
     }
-    getCumulocityJson(archive) {
+    getCumulocityJson$(archive) {
         return this.zipService.getJsonData(archive, {
             filename: CUMULOCITY_JSON
         });
     }
     getAppType(archive) {
-        return this.getCumulocityJson(archive)
+        return this.getCumulocityJson$(archive)
             .toPromise()
             .then(data => get(data, 'type') ||
             (get(data, 'apiVersion') ? ApplicationType.MICROSERVICE : ApplicationType.HOSTED))
@@ -713,7 +761,7 @@ class EcosystemService {
     getUploadOverrides(archive, app) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { version } = yield this.getCumulocityJson(archive).toPromise();
+            const { version } = yield this.getCumulocityJson$(archive).toPromise();
             const isInitialPackage = ((_a = app.applicationVersions) === null || _a === void 0 ? void 0 : _a.length) === 0;
             return {
                 listUrl: 'versions',
@@ -1046,7 +1094,7 @@ class UploadArchiveComponent {
     onFile(file) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.ecosystemService.isValidAppType(file, this.application.type);
+                yield this.ecosystemService.validateArchiveToAppCompatibility(file, this.application);
                 const isCustomMicroservice = this.ecosystemService.isCustomMicroservice(this.application);
                 this.archives = isCustomMicroservice
                     ? []
@@ -1059,9 +1107,6 @@ class UploadArchiveComponent {
                 if (this.archives.length === 6 && !isCustomMicroservice) {
                     yield this.ecosystemService.removeOldestArchive(this.application, this.archives);
                 }
-                if (this.uploadNewVersion) {
-                    yield this.ecosystemService.validatePackageKeyAndContextPath(file, this.application);
-                }
                 const app = yield this.ecosystemService.uploadArchiveToApp(file, this.application, this.uploadNewVersion);
                 this.applicationChange.emit(app);
                 this.uploadProgress.next(100);
@@ -1074,16 +1119,16 @@ class UploadArchiveComponent {
             }
             catch (ex) {
                 this.uploadInProgress = false;
-                this.alertService.addServerFailure(ex);
+                this.ecosystemService.alertError(ex);
             }
         });
     }
 }
 UploadArchiveComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: UploadArchiveComponent, deps: [{ token: EcosystemService }, { token: i2.AlertService }], target: i0.ɵɵFactoryTarget.Component });
-UploadArchiveComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.6", type: UploadArchiveComponent, selector: "c8y-upload-archive", inputs: { application: "application", uploadNewVersion: "uploadNewVersion", preUploadCallback: "preUploadCallback" }, outputs: { applicationChange: "applicationChange", refresh: "refresh" }, ngImport: i0, template: "<c8y-drop-area\n  (dropped)=\"onFileDroppedEvent($event)\"\n  [accept]=\"'.zip'\"\n  [files]=\"fileList\"\n  [loading]=\"uploadInProgress\"\n  [maxAllowedFiles]=\"1\"\n  [message]=\"'Upload a *.zip file' | translate\"\n  [progress]=\"uploadProgress | async\"\n  [forceHideList]=\"true\"\n  class=\"drop-area-sm\"\n>\n</c8y-drop-area>\n", dependencies: [{ kind: "component", type: i2.DropAreaComponent, selector: "c8y-drop-area", inputs: ["formControl", "title", "message", "icon", "loadingMessage", "forceHideList", "alwaysShow", "clickToOpen", "loading", "progress", "maxAllowedFiles", "files", "accept"], outputs: ["dropped"] }, { kind: "pipe", type: i2.C8yTranslatePipe, name: "translate" }, { kind: "pipe", type: i3$1.AsyncPipe, name: "async" }] });
+UploadArchiveComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.6", type: UploadArchiveComponent, selector: "c8y-upload-archive", inputs: { application: "application", uploadNewVersion: "uploadNewVersion", preUploadCallback: "preUploadCallback" }, outputs: { applicationChange: "applicationChange", refresh: "refresh" }, ngImport: i0, template: "<c8y-drop-area\n  (dropped)=\"onFileDroppedEvent($event)\"\n  [accept]=\"'.zip'\"\n  [loading]=\"uploadInProgress\"\n  [maxAllowedFiles]=\"1\"\n  [message]=\"'Upload a *.zip file' | translate\"\n  [progress]=\"uploadProgress | async\"\n  [forceHideList]=\"true\"\n  class=\"drop-area-sm\"\n>\n</c8y-drop-area>\n", dependencies: [{ kind: "component", type: i2.DropAreaComponent, selector: "c8y-drop-area", inputs: ["formControl", "title", "message", "icon", "loadingMessage", "forceHideList", "alwaysShow", "clickToOpen", "loading", "progress", "maxAllowedFiles", "files", "accept"], outputs: ["dropped"] }, { kind: "pipe", type: i2.C8yTranslatePipe, name: "translate" }, { kind: "pipe", type: i3$1.AsyncPipe, name: "async" }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: UploadArchiveComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'c8y-upload-archive', template: "<c8y-drop-area\n  (dropped)=\"onFileDroppedEvent($event)\"\n  [accept]=\"'.zip'\"\n  [files]=\"fileList\"\n  [loading]=\"uploadInProgress\"\n  [maxAllowedFiles]=\"1\"\n  [message]=\"'Upload a *.zip file' | translate\"\n  [progress]=\"uploadProgress | async\"\n  [forceHideList]=\"true\"\n  class=\"drop-area-sm\"\n>\n</c8y-drop-area>\n" }]
+            args: [{ selector: 'c8y-upload-archive', template: "<c8y-drop-area\n  (dropped)=\"onFileDroppedEvent($event)\"\n  [accept]=\"'.zip'\"\n  [loading]=\"uploadInProgress\"\n  [maxAllowedFiles]=\"1\"\n  [message]=\"'Upload a *.zip file' | translate\"\n  [progress]=\"uploadProgress | async\"\n  [forceHideList]=\"true\"\n  class=\"drop-area-sm\"\n>\n</c8y-drop-area>\n" }]
         }], ctorParameters: function () { return [{ type: EcosystemService }, { type: i2.AlertService }]; }, propDecorators: { application: [{
                 type: Input
             }], uploadNewVersion: [{