-
-
-
-
-
-
- Back
-
;
- canOpenInBrowser: boolean = false;
errorMessage: string;
- restart: boolean = false;
- private uploadCanceled: boolean = false;
+ fileToUpload: File;
+ uploadCanceled: boolean = false;
constructor(
private analyticsService: AnalyticsService,
private alertService: AlertService,
- private applicationService: ApplicationService,
- private wizardComponent: WizardComponent
+ private wizardComponent: WizardComponent,
+ private bsModalService: BsModalService
) {}
get progress(): BehaviorSubject {
@@ -49,6 +56,7 @@ export class ExtensionAddComponent {
}
async onFile(file: File) {
+ this.fileToUpload = file;
this.isLoading = true;
this.errorMessage = null;
this.progress.next(0);
@@ -58,9 +66,23 @@ export class ExtensionAddComponent {
pas_extension: n,
name: n
};
- await this.uploadExtensionHandler(file, this.createdApp, this.restart);
- this.alertService.success('Uploaded new extension.');
- this.isAppCreated = true;
+ const result: IResultList =
+ await this.analyticsService.getExtensionsMetadataFromInventory();
+ const { data } = result;
+ for (let i = 0; i < data.length; i++) {
+ const ext = data[i];
+ if (ext.name == n) {
+ this.createdApp = ext;
+ this.isUpdate = true;
+ break;
+ }
+ }
+ if (this.isUpdate) {
+ this.done();
+ this.confirmUpdate();
+ } else {
+ await this.uploadExtension(this.mode);
+ }
} catch (ex) {
this.analyticsService.cancelExtensionCreation(this.createdApp);
this.createdApp = null;
@@ -74,8 +96,12 @@ export class ExtensionAddComponent {
this.isLoading = false;
}
- getHref(app: IApplication): string {
- return this.applicationService.getHref(app);
+ private async uploadExtension(mode: UploadMode) {
+ await this.uploadExtensionHandler(this.fileToUpload, this.createdApp, mode);
+ this.alertService.success('Uploaded new extension.');
+ this.isAppCreated = true;
+ this.progress.next(100);
+ this.isLoading = false;
}
cancel() {
@@ -87,13 +113,39 @@ export class ExtensionAddComponent {
this.wizardComponent.close();
}
- back() {
- this.wizardComponent.reset();
- }
-
- private cancelFileUpload() {
+ cancelFileUpload() {
this.uploadCanceled = true;
this.analyticsService.cancelExtensionCreation(this.createdApp);
this.createdApp = null;
}
+ confirmUpdate() {
+ const initialState = {
+ title: 'Update extension',
+ message: `Extension with the same name ${this.createdApp.name} exists! Do you want to proceed?`,
+ labels: {
+ ok: 'Update',
+ cancel: 'Cancel'
+ }
+ };
+ const confirmDeletionModalRef: BsModalRef = this.bsModalService.show(
+ ConfirmationModalComponent,
+ { initialState }
+ );
+ confirmDeletionModalRef.content.closeSubject.subscribe(
+ async (result: boolean) => {
+ console.log('Confirmation delete result:', result);
+ if (result) {
+ try {
+ await this.uploadExtension('update');
+ this.analyticsService.initiateReload(true);
+ } catch (ex) {
+ if (ex) {
+ this.alertService.addServerFailure(ex);
+ }
+ }
+ }
+ confirmDeletionModalRef.hide();
+ }
+ );
+ }
}
diff --git a/resources/images/manage-extension-modal.png b/resources/images/manage-extension-modal.png
new file mode 100644
index 0000000..48f57ea
Binary files /dev/null and b/resources/images/manage-extension-modal.png differ
diff --git a/resources/images/manage-extension.png b/resources/images/manage-extension.png
index 94feb93..a99da8d 100644
Binary files a/resources/images/manage-extension.png and b/resources/images/manage-extension.png differ