summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/view-models/modals/onboarding-modal
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-07-29 16:13:45 +0300
committerMichael Lando <ml636r@att.com>2018-07-29 16:20:34 +0300
commit5b593496b8f1b8e8be8d7d2dbcc223332e65a49b (patch)
tree2f9dfc45191e723da69cf74be7829784e9741b94 /catalog-ui/src/app/view-models/modals/onboarding-modal
parent9200382f2ce7b4bb729aa287d0878004b2d2b4f9 (diff)
re base code
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-ui/src/app/view-models/modals/onboarding-modal')
-rw-r--r--catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts37
-rw-r--r--catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html4
2 files changed, 21 insertions, 20 deletions
diff --git a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts
index 1cc3690e9f..46b258f0bd 100644
--- a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts
+++ b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts
@@ -19,7 +19,7 @@
*/
'use strict';
-import {ComponentType, CHANGE_COMPONENT_CSAR_VERSION_FLAG, SEVERITY, FileUtils, ModalsHandler, ComponentFactory} from "app/utils";
+import {ComponentType, SEVERITY, FileUtils, ModalsHandler, ComponentFactory} from "app/utils";
import {OnboardingService, CacheService} from "app/services";
import {Component, IComponent, IUser, IAppConfigurtaion, Resource} from "app/models";
import {IServerMessageModalModel} from "../message-modal/message-server-modal/server-message-modal-view-model";
@@ -63,6 +63,7 @@ export class OnboardingModalViewModel {
'Sdc.Services.OnboardingService',
'okButtonText',
'currentCsarUUID',
+ 'currentCsarVersion',
'Sdc.Services.CacheService',
'FileUtils',
'ComponentFactory',
@@ -77,6 +78,7 @@ export class OnboardingModalViewModel {
private onBoardingService:OnboardingService,
private okButtonText:string,
private currentCsarUUID:string,
+ private currentCsarVersion:string,
private cacheService:CacheService,
private fileUtils:FileUtils,
private componentFactory:ComponentFactory,
@@ -107,28 +109,27 @@ export class OnboardingModalViewModel {
// Dismiss the modal and pass the "mini" component to workspace general page
this.$scope.doImportCsar = ():void => {
- this.$uibModalInstance.dismiss();
- this.$state.go('workspace.general', {
- type: ComponentType.RESOURCE.toLowerCase(),
- componentCsar: this.$scope.selectedComponent
+
+ this.$uibModalInstance.close({
+ componentCsar: this.$scope.selectedComponent,
+ type: ComponentType.RESOURCE.toLowerCase()
});
};
this.$scope.doUpdateCsar = ():void => {
- // In case user select on update the checkin and submit for testing buttons (in general page) should be disabled.
- // to do that we need to pass to workspace.general state parameter to know to disable the buttons.
- this.$uibModalInstance.close();
+
// Change the component version to the CSAR version we want to update.
- /*(<Resource>this.$scope.componentFromServer).csarVersion = (<Resource>this.$scope.selectedComponent).csarVersion;
- let component:Components.Component = this.componentFactory.createComponent(this.$scope.componentFromServer);
- this.$state.go('workspace.general', {vspComponent: component, disableButtons: true });*/
- this.cacheService.set(CHANGE_COMPONENT_CSAR_VERSION_FLAG, (<Resource>this.$scope.selectedComponent).csarVersion);
- this.$state.go('workspace.general', {
- id: this.$scope.componentFromServer.uniqueId,
- componentCsar: this.$scope.selectedComponent,
- type: this.$scope.componentFromServer.componentType.toLowerCase(),
- disableButtons: true
- });
+ if(!this.currentCsarVersion || this.currentCsarVersion != (<Resource>this.$scope.selectedComponent).csarVersion) {
+ this.$uibModalInstance.close({
+ componentCsar: this.$scope.selectedComponent,
+ previousComponent: this.$scope.componentFromServer,
+ type: this.$scope.componentFromServer.componentType.toLowerCase()
+
+ });
+
+ } else {
+ this.$uibModalInstance.close();
+ }
};
this.$scope.downloadCsar = (packageId:string):void => {
diff --git a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html
index b078a4b1ef..a69d0a8f3c 100644
--- a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html
+++ b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html
@@ -1,4 +1,4 @@
-<sdc-modal modal="modalOnboarding" class="w-sdc-modal-onboarding w-sdc-classic-top-line-modal" buttons="footerButtons" header="Import VF" show-close-button="true">
+<ng1-modal modal="modalOnboarding" class="w-sdc-modal-onboarding w-sdc-classic-top-line-modal" buttons="footerButtons" header="Import VF" show-close-button="true">
<info-tooltip class="general-info-button" info-message-translate="ON_BOARDING_GENERAL_INFO "></info-tooltip>
<div class="title-wrapper">
<div>
@@ -141,4 +141,4 @@
</div><!-- End table-container-flex -->
<div class="w-sdc-modal-footer classic"></div>
-</sdc-modal>
+</ng1-modal>