filter packages by tag

rename filter-by-keyword to search-by-packages

Issue-ID: CCSDK-1968
Issue-ID: CCSDK-1951
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
Change-Id: I4667f2b9e98ba7e217ba7ab15e5cd8c45bee0c33

1 files changed, 5 insertions, 13 deletions

diff --git a/cds-ui/client-frankfurt/src/app/modules/feature-modules/packages/packages-list.service.ts b/cds-ui/client-frankfurt/src/app/modules/feature-modules/packages/packages-list.service.ts
index deaa4d957..e8a98099c 100644
--- a/cds-ui/client-frankfurt/src/app/modules/feature-modules/packages/packages-list.service.ts
+++ b/cds-ui/client-frankfurt/src/app/modules/feature-modules/packages/packages-list.service.ts
@@ -31,18 +31,16 @@ import {BlueprintModel, BluePrintPage} from './model/BluePrint.model';
 })
 export class PackagesListService {
     packages: BlueprintModel[] = [];
-    originalPackage: BlueprintModel[] = [];
-    private bluePrintModel: BlueprintModel;
     private numberOfPackages: number;
 
     constructor(private api: ApiService<BluePrintPage>) {
     }
 
-    getPagedPackages(pageNumber: number, pageSize: number): Observable<BluePrintPage[]> {
+    getPagedPackages(pageNumber: number, pageSize: number, sortBy: string): Observable<BluePrintPage[]> {
         return this.api.get(BlueprintURLs.getPagedBlueprints, {
             offset: pageNumber,
             limit: pageSize,
-            sort: 'DATE'
+            sort: sortBy
         });
     }
 
@@ -50,13 +48,6 @@ export class PackagesListService {
         return this.api.get(BlueprintURLs.getMetaDate + '/' + keyword);
     }
 
-
-    // getPackageNumber(): number {
-    //     this.getCountOfAllPackages(this.api.get(BlueprintURLs.countOfAllBluePrints));
-    //     return this.numberOfPackages;
-
-    // }
-
     getCountOfAllPackages(observable: Observable<number>) {
         observable.subscribe(data => {
             this.numberOfPackages = data;
@@ -64,11 +55,12 @@ export class PackagesListService {
         });
     }
 
-    getPagedPackagesByKeyWord(keyWord: string, pageNumber: number, pageSize: number) {
+    getPagedPackagesByKeyWord(keyWord: string, pageNumber: number, pageSize: number, sortBy: string) {
+
         return this.api.get(BlueprintURLs.getMetaDatePageable + '/' + keyWord, {
             offset: pageNumber,
             limit: pageSize,
-            sort: 'DATE'
+            sort: sortBy
         });
     }
 }