From 0a907ab983596975d1d03507adf2b23a1ec26975 Mon Sep 17 00:00:00 2001
From: ahmedeldeeb50 <ahmed.eldeeb.ext@orange.com>
Date: Thu, 13 Feb 2020 12:09:13 +0200
Subject: updating source-editor changes

Issue-ID: CCSDK-2070

Signed-off-by: ahmedeldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: I203f89eb81ea9685ca69226b108c121a8be5f193
---
 .../imports-tab/imports-tab.component.html                |  9 ++++++---
 .../package-creation/imports-tab/imports-tab.component.ts | 15 +++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab')

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html
index c40703daf..344e7f599 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.html
@@ -47,7 +47,10 @@
                 <div [id]="'id-'+mapIndex" class="collapse" [attr.aria-labelledby]="'head-'+mapIndex"
                     data-parent="#accordion">
                     <div class="card-body">
-                        {{file.value}}
+                        <ace-editor [(text)]="file.value" [mode]="'json'" [autoUpdateContent]="true"
+                            [durationBeforeCallback]="1000" [theme]="'tomorrow_night_bright'" #editor
+                            style="height:300px;">
+                        </ace-editor>
                     </div>
                 </div>
             </div>
@@ -90,7 +93,7 @@
                 </button>
             </div>
             <div class="modal-body">
-                <ngx-file-drop dropZoneLabel="Drop files here" (onFileDrop)="dropped($event)"
+                <ngx-file-drop accept=".json" dropZoneLabel="Drop files here" (onFileDrop)="dropped($event)"
                     (onFileOver)="fileOver($event)" (onFileLeave)="fileLeave($event)">
                     <ng-template ngx-file-drop-content-tmp let-openFileSelector="openFileSelector">
                         <div class="folder-upload">
@@ -127,4 +130,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.ts
index 39f3fbf60..535f783ad 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/imports-tab/imports-tab.component.ts
@@ -1,7 +1,7 @@
-import {Component, OnInit} from '@angular/core';
-import {FileSystemFileEntry, NgxFileDropEntry} from 'ngx-file-drop';
-import {PackageCreationStore} from '../package-creation.store';
-import {PackageCreationUtils} from '../package-creation.utils';
+import { Component, OnInit } from '@angular/core';
+import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop';
+import { PackageCreationStore } from '../package-creation.store';
+import { PackageCreationUtils } from '../package-creation.utils';
 
 
 @Component({
@@ -63,9 +63,8 @@ export class ImportsTabComponent implements OnInit {
     }
 
     removeFile(fileIndex: number) {
-        console.log(this.uploadedFiles[fileIndex]);
-        console.log(this.uploadedFiles);
-        this.packageCreationStore.removeFileFromDefinition(this.uploadedFiles[fileIndex].name);
+        const filename = 'Definitions/' + this.uploadedFiles[fileIndex].name;
+        this.packageCreationStore.removeFileFromDefinition(filename);
         this.uploadedFiles.splice(fileIndex, 1);
     }
 
@@ -93,7 +92,7 @@ export class ImportsTabComponent implements OnInit {
                 const fileReader = new FileReader();
                 fileReader.onload = (e) => {
                     this.packageCreationStore.addDefinition('Definitions/' + droppedFile.name,
-                            fileReader.result.toString());
+                        fileReader.result.toString());
                 };
                 fileReader.readAsText(file);
             });
-- 
cgit 1.2.3-korg