diff options
Diffstat (limited to 'cds-ui')
6 files changed, 7 insertions, 12 deletions
diff --git a/cds-ui/client/src/app/common/shared/pipes/search.pipe.ts b/cds-ui/client/src/app/common/shared/pipes/search.pipe.ts index 08c76df5b..fd7af89ba 100644 --- a/cds-ui/client/src/app/common/shared/pipes/search.pipe.ts +++ b/cds-ui/client/src/app/common/shared/pipes/search.pipe.ts @@ -31,8 +31,8 @@ export class SearchPipe implements PipeTransform{ if(!searchText) return items; searchText = searchText.toLowerCase(); return items.filter( it => { - if(it.tags) { - return it.tags.toLowerCase().includes(searchText); + if(it.name) { + return it.name.toLowerCase().includes(searchText); } else { return items; } diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html index 9cab6c44d..5c8435160 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html @@ -39,6 +39,7 @@ limitations under the License. <mat-card-content class="card-content"> {{option.blueprintModel.artifactName}} <br>{{option.blueprintModel.updatedBy}} + <br>{{option.blueprintModel.artifactVersion}} </mat-card-content> <mat-card-actions class="flexBox"> <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,1)">Edit</button> diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.scss b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.scss index f84213f48..158a5cf54 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.scss +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.scss @@ -62,7 +62,7 @@ button.mat-menu-item { } .searchcontainer { - min-height: 300px; + // min-height: 300px; overflow-x: hidden; overflow-y: scroll; } diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts index 1341b8bd1..58ed036aa 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts @@ -93,11 +93,9 @@ export class SearchFromDatabaseComponent implements OnInit { .then(blob => { const formData = new FormData(); formData.append("file", blob); - // this.editorService.enrich("/enrich-blueprint/", formData) this.searchService.getBlueprintZip(artifactName + "/" + artifactVersion) .subscribe( (response) => { - // console.log(response); this.zipFile.files = {}; this.zipFile.loadAsync(response) .then((zip) => { @@ -105,7 +103,7 @@ export class SearchFromDatabaseComponent implements OnInit { this.buildFileViewData(zip); } }); - // this.alertService.success('Blueprint enriched successfully'); + }, (error) => { this.alertService.error('Blue print error' + error.message); @@ -116,12 +114,9 @@ export class SearchFromDatabaseComponent implements OnInit { async buildFileViewData(zip) { this.validfile = false; this.paths = []; - // console.log(zip.files); for (var file in zip.files) { console.log("name: " + zip.files[file].name); this.fileObject = { - // nameForUIDisplay: this.uploadedFileName + '/' + zip.files[file].name, - // name: zip.files[file].name, name: this.uploadedFileName + '/' + zip.files[file].name, data: '' }; diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts index ee6e9631e..ed01e63b2 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts @@ -99,7 +99,7 @@ export class SearchTemplateComponent implements OnInit { entryDefinition: this.entryDefinition } this.store.dispatch(new SetBlueprintState(blueprintState)) - // this.store.dispatch(new LoadBlueprintSuccess(data)); + } async buildFileViewData(zip) { diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts index a4e30a494..d79f9d870 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts @@ -26,7 +26,6 @@ import { SearchTemplateComponent } from './search-template.component'; import { ReactiveFormsModule } from '@angular/forms'; import { AppMaterialModule } from 'src/app/common/modules/app-material.module'; import { SharedModule} from 'src/app/common/shared/shared.module'; -// import { SelectTemplateService } from 'src/app/feature-modules/blueprint/select-template/select-template.service'; @NgModule({ declarations: [ @@ -42,6 +41,6 @@ import { SharedModule} from 'src/app/common/shared/shared.module'; SearchTemplateComponent, SearchFromDatabaseComponent ], - // providers:[ SelectTemplateService] + }) export class SearchTemplateModule { } |