From 83221b2423060db32826065938edeebb5680b30f Mon Sep 17 00:00:00 2001 From: AhmedEldeeb50 Date: Sat, 27 Jun 2020 12:45:17 +0200 Subject: Fix template&mapping in view/create Issue-ID: CCSDK-2450 Signed-off-by: AhmedEldeeb50 Change-Id: If7f08f4638b5574bb5d79caa062cb12b4141be10 --- .../package-creation/package-creation.store.ts | 19 +++++++++++-------- .../template-mapping/template-mapping.component.ts | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.store.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.store.ts index ce5dc4884..55e715654 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.store.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.store.ts @@ -19,16 +19,16 @@ limitations under the License. ============LICENSE_END============================================ */ -import {Injectable} from '@angular/core'; +import { Injectable } from '@angular/core'; -import {Store} from '../../../../common/core/stores/Store'; +import { Store } from '../../../../common/core/stores/Store'; -import {CBAPackage, DslDefinition} from './mapping-models/CBAPacakge.model'; -import {PackageCreationService} from './package-creation.service'; -import {MetaDataTabModel} from './mapping-models/metadata/MetaDataTab.model'; -import {Observable} from 'rxjs'; -import {ResourceDictionary} from './mapping-models/ResourceDictionary.model'; -import {BluePrintDetailModel} from '../model/BluePrint.detail.model'; +import { CBAPackage, DslDefinition } from './mapping-models/CBAPacakge.model'; +import { PackageCreationService } from './package-creation.service'; +import { MetaDataTabModel } from './mapping-models/metadata/MetaDataTab.model'; +import { Observable } from 'rxjs'; +import { ResourceDictionary } from './mapping-models/ResourceDictionary.model'; +import { BluePrintDetailModel } from '../model/BluePrint.detail.model'; @Injectable({ @@ -56,6 +56,9 @@ export class PackageCreationStore extends Store { }); } + istemplateExist(): boolean { + return this.state.templates.files.size > 0 && this.state.mapping.files.size > 0; + } changeDslDefinition(dslDefinition: DslDefinition) { this.setState({ diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.ts index 470cf27a0..341d29f66 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.ts @@ -26,7 +26,9 @@ export class TemplateMappingComponent implements OnInit { this.creationView = true; this.listView = false; console.log('URL contains Id'); - this.sharedService.enableEdit(); + if (this.pakcageStore.istemplateExist()) { + this.sharedService.enableEdit(); + } } else { console.log('Create mode'); this.pakcageStore.clear(); -- cgit 1.2.3-korg