From 4ea0c4b514eed8d65849647955bfffa97559194a Mon Sep 17 00:00:00 2001 From: Anjali walsatwar Date: Fri, 17 Aug 2018 11:03:43 +0530 Subject: Add sorting capability to property assignment Change-Id: I74cbebac6cfe76f4334fcb46813c98686de55822 Issue-ID: SDC-1516 Signed-off-by: Anjali walsatwar --- .../logic/inputs-table/inputs-table.component.ts | 49 ++++++++++++++++++---- 1 file changed, 41 insertions(+), 8 deletions(-) (limited to 'catalog-ui/src/app/ng2/components/logic/inputs-table/inputs-table.component.ts') diff --git a/catalog-ui/src/app/ng2/components/logic/inputs-table/inputs-table.component.ts b/catalog-ui/src/app/ng2/components/logic/inputs-table/inputs-table.component.ts index 0c7fc2a24c..d95198f162 100644 --- a/catalog-ui/src/app/ng2/components/logic/inputs-table/inputs-table.component.ts +++ b/catalog-ui/src/app/ng2/components/logic/inputs-table/inputs-table.component.ts @@ -3,6 +3,7 @@ * SDC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 Huawei Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +22,9 @@ /** * Created by rc2122 on 5/4/2017. */ -import {Component, Input, Output, EventEmitter} from "@angular/core"; -import {InputFEModel} from "app/models"; -import {ModalService} from "../../../services/modal.service"; +import { Component, Input, Output, EventEmitter } from "@angular/core"; +import { InputFEModel } from "app/models"; +import { ModalService } from "../../../services/modal.service"; import { InstanceFeDetails } from "app/models/instance-fe-details"; @Component({ @@ -35,16 +36,48 @@ export class InputsTableComponent { @Input() inputs: Array; @Input() instanceNamesMap: Map; - @Input() readonly:boolean; - @Input() isLoading:boolean; + @Input() readonly: boolean; + @Input() isLoading: boolean; @Output() inputChanged: EventEmitter = new EventEmitter(); @Output() deleteInput: EventEmitter = new EventEmitter(); - selectedInputToDelete:InputFEModel; + sortBy: String; + reverse: boolean; + selectedInputToDelete: InputFEModel; - constructor(private modalService: ModalService){ + sort = (sortBy) => { + this.reverse = (this.sortBy === sortBy) ? !this.reverse : true; + let reverse = this.reverse ? 1 : -1; + this.sortBy = sortBy; + let instanceNameMapTemp = this.instanceNamesMap; + let itemIdx1Val = ""; + let itemIdx2Val = ""; + this.inputs.sort(function (itemIdx1, itemIdx2) { + if (sortBy == 'instanceUniqueId') { + itemIdx1Val = (itemIdx1[sortBy] && instanceNameMapTemp[itemIdx1[sortBy]] !== undefined) ? instanceNameMapTemp[itemIdx1[sortBy]].name : ""; + itemIdx2Val = (itemIdx2[sortBy] && instanceNameMapTemp[itemIdx2[sortBy]] !== undefined) ? instanceNameMapTemp[itemIdx2[sortBy]].name : ""; + } + else { + itemIdx1Val = itemIdx1[sortBy]; + itemIdx2Val = itemIdx2[sortBy]; + } + if (itemIdx1Val < itemIdx2Val) { + return -1 * reverse; + } + else if (itemIdx1Val > itemIdx2Val) { + return 1 * reverse; + } + else { + return 0; + } + }); + }; + + + constructor(private modalService: ModalService) { } + onInputChanged = (input, event) => { input.updateDefaultValueObj(event.value, event.isValid); this.inputChanged.emit(input); @@ -55,7 +88,7 @@ export class InputsTableComponent { this.modalService.closeCurrentModal(); }; - openDeleteModal = (input:InputFEModel) => { + openDeleteModal = (input: InputFEModel) => { this.selectedInputToDelete = input; this.modalService.createActionModal("Delete Input", "Are you sure you want to delete this input?", "Delete", this.onDeleteInput, "Close").instance.open(); } -- cgit 1.2.3-korg