Merge "improve selecting filenames of tempalte and mapping"

diff --combined cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.ts
index 80e5f7c,93cd5ec..561642e
--- 1/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.ts
--- 2/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-listing/templ-mapp-listing.component.ts
@@@ -1,13 -1,12 +1,12 @@@
- import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
- import { PackageCreationStore } from '../../package-creation.store';
- import { Mapping, Template } from '../../mapping-models/CBAPacakge.model';
- import { TemplateInfo, TemplateStore } from '../../template.store';
- import { TemplateAndMapping } from '../TemplateAndMapping';
- import { ActivatedRoute } from '@angular/router';
- import { SharedService } from '../shared-service';
- import { TourService } from 'ngx-tour-md-menu';
- import { TemplateType } from '../utils/TemplateType';
- import { of } from 'rxjs';
+ import {Component, EventEmitter, OnDestroy, OnInit, Output} from '@angular/core';
+ import {PackageCreationStore} from '../../package-creation.store';
+ import {Mapping, Template} from '../../mapping-models/CBAPacakge.model';
+ import {TemplateInfo, TemplateStore} from '../../template.store';
+ import {TemplateAndMapping} from '../TemplateAndMapping';
+ import {ActivatedRoute} from '@angular/router';
+ import {SharedService} from '../shared-service';
+ import {TourService} from 'ngx-tour-md-menu';
+ import {TemplateType} from '../utils/TemplateType';
  
  
  @Component({
@@@ -32,17 -31,15 +31,17 @@@ export class TemplMappListingComponent 
          private route: ActivatedRoute,
          private sharedService: SharedService,
          private tourService: TourService,
- 
      ) {
      }
+ 
      ngOnDestroy(): void {
          // this.templateStore.unsubscribe();
          // this.packageCreationStore.unsubscribe();
      }
  
      ngOnInit() {
 +        this.templateAndMappingMap = new Map<string, TemplateAndMapping>();
 +        this.edit = false;
          if (this.route.snapshot.paramMap.has('id')) {
              this.isCreate = false;
              this.sharedService.isEdit().subscribe(res => {
@@@ -81,7 -78,9 +80,9 @@@
      }
  
      private setIsMappingOrTemplate(key: string, templateAndMapping: TemplateAndMapping, isFromTemplate: boolean) {
-         const nameOfFile = key.split('/')[1].split('.')[0].split('-')[0];
+         const nameOfFile = isFromTemplate ?
+             key.split('/')[1].split('.')[0].split('-template')[0]
+             : key.split('/')[1].split('.')[0].split('-mapping')[0];
          // const fullName = nameOfFile + ',' + key.split('.');
          if (this.templateAndMappingMap.has(nameOfFile)) {
              const templateAndMappingExisted = this.templateAndMappingMap.get(nameOfFile);
@@@ -114,10 -113,12 +115,12 @@@
              this.tourService.goto('tm-templateName');
          }
      }
+ 
      openCreationView() {
          this.showCreationView.emit('tell parent to open create views');
          console.log('disable edit mode');
      }
+ 
      openListView() {
          console.log('open list view');
          this.showListView.emit('show full view');
@@@ -154,9 -155,7 +157,9 @@@
              }
              this.templateStore.changeTemplateInfo(templateInfo);
              this.openCreationView();
 -            this.sharedService.enableEdit();
 +            if (templateInfo.fileName && templateInfo.fileName.length > 0) {
 +                this.sharedService.enableEdit();
 +            }
          });
      }
  
@@@ -167,6 -166,7 +170,7 @@@
      getValue(file: string) {
          return this.templateAndMappingMap.get(file);
      }
+ 
      initDelete(file) {
          console.log(file);
          const templateKey = 'Templates/' + file + '-template';
@@@ -180,6 -180,7 +184,7 @@@
          }
  
      }
+ 
      condifrmDelete() {
          const file = this.fileToDelete.split('/')[1].split('-')[0];
          const ext = this.fileToDelete.split('/')[1].split('.')[1];