-import {Observable, BehaviorSubject} from 'rxjs';
+import { Observable, BehaviorSubject } from 'rxjs';
import { Injectable } from '@angular/core';
export class Store<T> {
this.subject.next(nextState);
}
+ public unsubscribe() {
+ this.subject.unsubscribe();
+ }
+
}
-import {Component, OnInit} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import {PackageStore} from './package.store';
-import {BluePrintDetailModel} from '../model/BluePrint.detail.model';
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { PackageStore } from './package.store';
+import { BluePrintDetailModel } from '../model/BluePrint.detail.model';
@Component({
viewedPackage: BluePrintDetailModel = new BluePrintDetailModel();
constructor(private route: ActivatedRoute, private configurationStore: PackageStore) {
-
- const id = this.route.snapshot.paramMap.get('id');
- this.configurationStore.getPagedPackages(id);
-
-
}
-
+ // test
ngOnInit() {
- this.configurationStore.state$.subscribe(
- el => {
- if (el && el.configuration) {
- this.viewedPackage = el.configuration;
+ const id = this.route.snapshot.paramMap.get('id');
+ this.configurationStore.getPagedPackages(id).subscribe(
+ (bluePrintDetailModels) => {
+ console.log('-------------xxxxxxxxxxx----------------');
+ console.log(bluePrintDetailModels);
+ this.configurationStore.setConfiguration(bluePrintDetailModels);
+
+ console.log('----------------- id ' + id);
+ if (bluePrintDetailModels) {
this.configurationStore.downloadResource(
- this.viewedPackage.artifactName + '/' + this.viewedPackage.artifactVersion);
+ bluePrintDetailModels[0].artifactName + '/' + bluePrintDetailModels[0].artifactVersion);
}
- }
- );
+ });
}
}
============LICENSE_END============================================
*/
-import {Injectable} from '@angular/core';
-import {Store} from '../../../../common/core/stores/Store';
-import {ConfigurationDashboardService} from './configuration-dashboard.service';
-import {PackageDashboardState} from '../model/package-dashboard.state';
-import {BlueprintURLs} from '../../../../common/constants/app-constants';
+import { Injectable } from '@angular/core';
+import { Store } from '../../../../common/core/stores/Store';
+import { ConfigurationDashboardService } from './configuration-dashboard.service';
+import { PackageDashboardState } from '../model/package-dashboard.state';
+import { BlueprintURLs } from '../../../../common/constants/app-constants';
import * as JSZip from 'jszip';
@Injectable({
}
getPagedPackages(id: string) {
- this.configurationDashboardService.getBluePrintModel(id).subscribe(
- (bluePrintDetailModels) => {
- this.setState({
- ...this.state,
- configuration: bluePrintDetailModels[0]
- });
- });
+ return this.configurationDashboardService.getBluePrintModel(id);
}
public downloadResource(path: string) {
+ console.log('download resource xx');
this.configurationDashboardService.downloadResource(BlueprintURLs.download + path).subscribe(response => {
- const blob = new Blob([response], {type: 'application/octet-stream'});
+ console.log('try to download ');
+ const blob = new Blob([response], { type: 'application/octet-stream' });
this.zipFile.loadAsync(blob).then((zip) => {
Object.keys(zip.files).forEach((filename) => {
+ console.log(filename);
zip.files[filename].async('string').then((fileData) => {
if (fileData) {
- if (filename.includes('scripts/')) {
+ if (filename.includes('Scripts/')) {
this.setScripts(filename, fileData);
} else if (filename.includes('templates/')) {
this.setTemplates(filename, fileData);
});
}
+ setConfiguration(bluePrintDetailModels) {
+ this.setState({
+ ...this.state,
+ configuration: bluePrintDetailModels[0]
+ });
+ }
+
private setScripts(filename: string, fileData: any) {
this.setState({
...this.state,
- scripts: this.state.scripts.setScripts(name, fileData)
+ scripts: this.state.scripts.setScripts(filename, fileData)
});
}
*/
-import {BluePrintDetailModel} from './BluePrint.detail.model';
-import {Mapping, Scripts, Template} from '../package-creation/mapping-models/CBAPacakge.model';
+import { BluePrintDetailModel } from './BluePrint.detail.model';
+import { Mapping, Scripts, Template } from '../package-creation/mapping-models/CBAPacakge.model';
export class PackageDashboardState {
configuration: BluePrintDetailModel;
public mapping: Mapping;
public imports: Map<string, string>;
+ constructor() {
+ this.scripts = new Scripts();
+ this.templates = new Template();
+ this.mapping = new Mapping();
+ this.imports = new Map<string, string>();
+ }
+
}
metadata.template_author = 'Shaaban Ebrahim';
metadata.template_name = cbaPackage.metaData.name;
- metadata.template_tags = cbaPackage.metaData.tags;
metadata.template_version = cbaPackage.metaData.version;
metadata['author-email'] = 'shaaban.eltanany.ext@orange.com';
metadata['user-groups'] = 'test';
let fullTags = '';
let setCount = 0;
cbaPackage.metaData.templateTags.forEach(val => {
+ setCount++;
if (setCount === cbaPackage.metaData.templateTags.size) {
fullTags += val;
} else {
fullTags += val + ', ';
}
- setCount++;
});
metadata.template_tags = fullTags;
vlbDefinition.metadata = metadata;
}
getValueOfMetaData(metaDataTab: MetaDataTabModel): string {
+ let tags = '';
+ let count = 0;
+ for (const tag of metaDataTab.templateTags) {
+ count++;
+ if (count === metaDataTab.templateTags.size) {
+ tags += tag;
+ } else {
+ tags += tag + ', ';
+ }
+ }
return 'TOSCA-Meta-File-Version: 1.0.0\n' +
'CSAR-Version: 1.0\n' +
'Created-By: Shaaban Ebrahim <shaaban.eltanany.ext@orange.con>\n' +
'Template-Name:' + metaDataTab.name + '\n' +
'Template-Version:' + metaDataTab.version + '\n' +
'Template-Type: ' + metaDataTab.mode + '\n' +
- 'Template-Tags:' + metaDataTab.tags;
+ 'Template-Tags:' + tags;
}
name: string;
description: string;
version: string;
- tags: string;
mapOfCustomKey: Map<string, string> = new Map<string, string>();
entryFileName: string;
templateName: string;
-import {Component, OnInit} from '@angular/core';
-import {PackageCreationService} from '../package-creation.service';
-import {MetaDataTabModel} from '../mapping-models/metadata/MetaDataTab.model';
-import {PackageCreationStore} from '../package-creation.store';
-import {PackageStore} from '../../configuration-dashboard/package.store';
+import { Component, OnInit } from '@angular/core';
+import { PackageCreationService } from '../package-creation.service';
+import { MetaDataTabModel } from '../mapping-models/metadata/MetaDataTab.model';
+import { PackageCreationStore } from '../package-creation.store';
+import { PackageStore } from '../../configuration-dashboard/package.store';
@Component({
tags = new Set<string>();
customKeysMap = new Map();
modes: object[] = [
- {name: 'Designer Mode', style: 'mode-icon icon-designer-mode'},
- {name: 'Scripting Mode', style: 'mode-icon icon-scripting-mode'},
- {name: 'Generic Script Mode', style: 'mode-icon icon-generic-script-mode'}];
+ { name: 'Designer Mode', style: 'mode-icon icon-designer-mode' },
+ { name: 'Scripting Mode', style: 'mode-icon icon-scripting-mode' },
+ { name: 'Generic Script Mode', style: 'mode-icon icon-generic-script-mode' }];
private metaDataTab: MetaDataTabModel = new MetaDataTabModel();
private errorMessage: string;
- constructor(private packageCreationService: PackageCreationService, private packageCreationStore: PackageCreationStore,
- private packageStore: PackageStore) {
+ constructor(
+ private packageCreationService: PackageCreationService,
+ private packageCreationStore: PackageCreationStore,
+ private packageStore: PackageStore) {
}
this.packageStore.state$.subscribe(element => {
if (element && element.configuration) {
+ console.log('from element2');
+ console.log(element);
this.metaDataTab.name = element.configuration.artifactName;
this.metaDataTab.version = element.configuration.artifactVersion;
- this.metaDataTab.tags = element.configuration.tags;
this.metaDataTab.description = element.configuration.artifactDescription;
+ this.tags = new Set(element.configuration.tags.split(','));
}
});
-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';
import 'ace-builds/src-noconflict/ace';
import 'ace-builds/webpack-resolver';
+import { PackageStore } from '../../configuration-dashboard/package.store';
@Component({
selector: 'app-scripts-tab',
public files: NgxFileDropEntry[] = [];
private fileNames: Set<string> = new Set();
- constructor(private packageCreationStore: PackageCreationStore, private packageCreationUtils: PackageCreationUtils) {
+ constructor(
+ private packageCreationStore: PackageCreationStore,
+ private packageCreationUtils: PackageCreationUtils,
+ private packageStore: PackageStore
+ ) {
+
+ }
+
+
+ ngOnInit() {
this.packageCreationStore.state$.subscribe(cbaPackage => {
if (cbaPackage.scripts && cbaPackage.scripts.files && cbaPackage.scripts.files.size > 0) {
this.scriptsFiles = cbaPackage.scripts.files;
}
});
- }
-
- ngOnInit() {
+ this.packageStore.state$.subscribe(res => {
+ // this.scriptsFiles =
+ console.log('from scripts');
+ console.log(res.scripts);
+ this.scriptsFiles = res.scripts.files;
+ });
}
public dropped(files: NgxFileDropEntry[]) {
</div>
<div class="card-footer row">
<div class="col">
- <a routerLink="/packages/createPackage" role="button" aria-pressed="true" class="btn-create-package float">Create
+ <a routerLink="/packages/createPackage" role="button" aria-pressed="true"
+ class="btn-create-package float">Create
</a>
</div>
<div class="col">
<div class="card-body">
<div class="row">
<div class="col-9 pr-0">
- <h5 class="card-title" [routerLink]="['/packages/package', bluePrint.id]" (click)="testDispatch(bluePrint)">
+ <a class="card-title" [routerLink]="['/packages/package', bluePrint.id]"
+ (click)="testDispatch(bluePrint)">
<img class="icon-deployed" src="/assets/img/icon-deploy.svg">
{{bluePrint.artifactName}}
- </h5>
+ </a>
</div>
<div class="col-3">
<div class="row">
<div class="col">
<p class="mb-0">Last modified {{ bluePrint.createdDate | date:'short' }}
- </p>
- <p>By {{bluePrint.updatedBy}}</p>
+ </p>
+
<p>By {{bluePrint.updatedBy}}</p>
<ul class="package-contributers">
<li>
<button type="button" class="border-fade" data-toggle="tooltip"
- data-placement="bottom"
- title="User name">
+ data-placement="bottom" title="User name">
<img src="/assets/img/img-user1.jpeg">
</button>
</li>
<li>
<button type="button" data-toggle="tooltip" data-placement="bottom"
- title="User name">
+ title="User name">
<img src="/assets/img/img-user2.jpg">
</button>
</li>
<li>
<button type="button" data-toggle="tooltip" data-placement="bottom"
- title="User name">
+ title="User name">
<img src="/assets/img/img-user3.jpg">
</button>
</li>
</div>
</div>
-</div>
+</div>
\ No newline at end of file
Code Review / ccsdk / cds.git / commitdiff