diff options
author | 2019-05-29 18:05:10 +0000 | |
---|---|---|
committer | 2019-05-29 18:05:10 +0000 | |
commit | b86fe0e27bc66ecae386007c1d751f82cbf920cd (patch) | |
tree | 353abe10e7bed944b904d9c6dfd26ae305a1d469 | |
parent | 7f44056b720529928c165a9fb11e5ec7a32b404f (diff) | |
parent | b0bda9b6310a84ce00a747926c78b04b66eac8ae (diff) |
Merge "CCSDK-1308- Files sorting"
4 files changed, 66 insertions, 3 deletions
diff --git a/cds-ui/client/src/app/common/shared/pipes/sort.pipe.ts b/cds-ui/client/src/app/common/shared/pipes/sort.pipe.ts new file mode 100644 index 000000000..f878a2256 --- /dev/null +++ b/cds-ui/client/src/app/common/shared/pipes/sort.pipe.ts @@ -0,0 +1,54 @@ +/* +============LICENSE_START========================================== +=================================================================== +Copyright (C) 2019 IBM Intellectual propertyNameerty. All rights reserved. +=================================================================== + +Unless otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the License); +you may not use this software except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END============================================ +*/ + +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'sort', + pure:false, +}) +export class SortPipe implements PipeTransform { + + transform(arrayData: any[], direcion: string, propertyName?: string): any { + if (!arrayData) { + return []; + } + if (!direcion || !propertyName) { + return arrayData + } + if (arrayData.length > 0) { + const _direction = direcion === 'asc' ? -1 : 1, + isArray = Array.isArray(arrayData), + arrayDataType = typeof arrayData[0], + flag = isArray && arrayDataType === 'object' ? true : isArray && arrayDataType !== 'object' ? false : true; + arrayData.sort((a, b) => { + a = flag ? a[propertyName] : a; + b = flag ? b[propertyName] : b; + if (typeof a === 'string') { + return a.toLowerCase() > b.toLowerCase() ? -1 * _direction : 1 * _direction; + } else if (typeof a === 'number') { + return a - b > 0 ? -1 * _direction : 1 * _direction; + } + }); + } + return arrayData; + } +}
\ No newline at end of file diff --git a/cds-ui/client/src/app/common/shared/shared.module.ts b/cds-ui/client/src/app/common/shared/shared.module.ts index 6ca5b13a5..b036f5967 100644 --- a/cds-ui/client/src/app/common/shared/shared.module.ts +++ b/cds-ui/client/src/app/common/shared/shared.module.ts @@ -29,20 +29,22 @@ import { RouterModule } from "@angular/router"; import { SearchPipe } from './pipes/search.pipe'; import { SearchDialog } from './components/search-dialog/search-dialog.component'; import { AppMaterialModule } from '../modules/app-material.module'; +import { SortPipe } from './pipes/sort.pipe'; @NgModule({ declarations: [ HomeComponent, CBAWizardComponent, SearchPipe, - SearchDialog - + SearchDialog, + SortPipe ], exports: [ HomeComponent, CBAWizardComponent, SearchPipe, - SearchDialog + SearchDialog, + SortPipe ], imports: [ AppMaterialModule, diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts index 09fa00315..b982fa29f 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts @@ -38,6 +38,7 @@ import { LoadBlueprintSuccess, SetBlueprintState } from '../../../../common/core import { ApiService } from 'src/app/common/core/services/api.service'; import { IMetaData } from 'src/app/common/core/store/models/metadata.model'; import { EditorService } from './editor.service'; +import { SortPipe } from '../../../../common/shared/pipes/sort.pipe'; interface Node { name: string; @@ -390,6 +391,7 @@ export class EditorComponent implements OnInit { newFileNode.data = ''; this.filesData.push(newFileNode); } + this.filesData = new SortPipe().transform(this.filesData, 'asc', 'name'); this.arrangeTreeData(this.filesData); } } @@ -431,7 +433,9 @@ export class EditorComponent implements OnInit { if (this.validfile) { this.fetchTOSACAMetadata(); + this.paths = new SortPipe().transform(this.paths, 'asc', 'name'); this.filesData = this.paths; + this.paths = new SortPipe().transform(this.paths, 'asc', 'name'); this.tree = this.arrangeTreeData(this.paths); } else { alert('Please update proper file with TOSCA metadata'); @@ -505,6 +509,7 @@ export class EditorComponent implements OnInit { i = i - 1; } } + this.filesData = new SortPipe().transform(this.filesData, 'asc', 'name'); this.arrangeTreeData(this.filesData); } 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 c232414e0..92003c919 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 @@ -29,6 +29,7 @@ import { IBlueprintState } from '../../../../common/core/store/models/blueprintS import { IAppState } from '../../../../common/core/store/state/app.state'; import { LoadBlueprintSuccess, SET_BLUEPRINT_STATE, SetBlueprintState } from '../../../../common/core/store/actions/blueprint.action'; import { json } from 'd3'; +import { SortPipe } from '../../../../common/shared/pipes/sort.pipe'; @Component({ selector: 'app-search-template', @@ -116,6 +117,7 @@ export class SearchTemplateComponent implements OnInit { if(this.validfile) { this.fetchTOSACAMetadata(); + this.paths = new SortPipe().transform(this.paths, 'asc', 'name'); this.tree = this.arrangeTreeData(this.paths); } else { alert('Please update proper file with TOSCA metadata'); |