summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/ng2/components
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-ui/src/app/ng2/components')
-rw-r--r--catalog-ui/src/app/ng2/components/modals/onboarding-modal/import-vsp.service.ts5
-rw-r--r--catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.ts11
2 files changed, 11 insertions, 5 deletions
diff --git a/catalog-ui/src/app/ng2/components/modals/onboarding-modal/import-vsp.service.ts b/catalog-ui/src/app/ng2/components/modals/onboarding-modal/import-vsp.service.ts
index 8e7364660f..ad80bcda49 100644
--- a/catalog-ui/src/app/ng2/components/modals/onboarding-modal/import-vsp.service.ts
+++ b/catalog-ui/src/app/ng2/components/modals/onboarding-modal/import-vsp.service.ts
@@ -1,8 +1,7 @@
import { Injectable, Inject } from "@angular/core";
-import { OnboardingModalComponent } from "./onboarding-modal.component";
+import {ImportVSPdata, OnboardingModalComponent} from "./onboarding-modal.component";
import { SdcUiServices, SdcUiCommon } from "onap-ui-angular";
import { Observable, Subject } from "rxjs";
-import { CHANGE_COMPONENT_CSAR_VERSION_FLAG } from "../../../../utils/constants";
import { CacheService } from "../../../services/cache.service";
@@ -25,7 +24,7 @@ export class ImportVSPService {
} as SdcUiCommon.IModalConfig;
const onboardingModalInstance = this.modalService.openCustomModal(onboardingModalConfig, OnboardingModalComponent, {currentCsarUUID: csarUUID, currentCsarVersion: csarVersion});
onboardingModalInstance.innerModalContent.instance.closeModalEvent.subscribe(
- (result: any) => {
+ (result: ImportVSPdata) => {
subject.next(result);
onboardingModalInstance.closeModal();
}, (err) =>{}
diff --git a/catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.ts b/catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.ts
index 10d7f67860..1e07c8b2ef 100644
--- a/catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.ts
+++ b/catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.ts
@@ -18,6 +18,12 @@ export interface ImportVSPdata {
componentCsar: Resource;
previousComponent?: Resource;
type: string;
+ actionType: ImportVSPActionType;
+}
+
+export enum ImportVSPActionType {
+ IMPORT_VSP,
+ UPDATE_VSP
}
// tslint:disable-next-line:interface-name
@@ -118,13 +124,14 @@ export class OnboardingModalComponent implements OnInit {
}
importOrUpdateCsar = (): void => {
- const selectedComponentConverted = this.onBoardingService.convertMetaDataToComponent(this.selectedComponent);
+ const selectedComponentConverted: Resource = this.onBoardingService.convertMetaDataToComponent(this.selectedComponent);
const componentFromServerConverted = this.componentFromServer ?
this.onBoardingService.convertMetaDataToComponent(this.componentFromServer) : undefined;
const importVSPdata: ImportVSPdata = {
componentCsar: selectedComponentConverted,
previousComponent: componentFromServerConverted,
- type: ComponentType.RESOURCE.toLowerCase()
+ type: ComponentType.RESOURCE.toLowerCase(),
+ actionType: this.isCsarComponentExists ? ImportVSPActionType.UPDATE_VSP : ImportVSPActionType.IMPORT_VSP
};
this.closeModalEvent.emit(importVSPdata);
}