Merge "adding tour-guide to package dashboard"

[ccsdk/cds.git] / cds-ui / designer-client / src / app / modules / feature-modules / packages / packages-api.service.ts

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-api.service.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-api.service.ts
index ca4acd3..8275f8c 100644 (file)
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-api.service.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-api.service.ts
@@ -37,15 +37,17 @@ export class PackagesApiService {
     }
 
     getPagedPackages(pageNumber: number, pageSize: number, sortBy: string): Observable<BluePrintPage[]> {
+        const sortType = sortBy.includes('DATE') ? 'DESC' : 'ASC';
         return this.api.get(BlueprintURLs.getPagedBlueprints, {
             offset: pageNumber,
             limit: pageSize,
-            sort: sortBy
+            sort: sortBy,
+            sortType
         });
     }
 
-    checkBluePrintIfItExists(keyword: string) {// : Observable<any> {
-        // return this.api.get(BlueprintURLs.get + '/' + keyword);
+    async checkBluePrintIfItExists(name: string, version: string): Promise<BluePrintPage[]> {
+        return await this.api.get(BlueprintURLs.getBlueprintByName + '/' + name + '/version/' + version).toPromise();
     }
 
     getCountOfAllPackages(observable: Observable<number>) {
@@ -56,11 +58,12 @@ export class PackagesApiService {
     }
 
     getPagedPackagesByKeyWord(keyWord: string, pageNumber: number, pageSize: number, sortBy: string) {
-
+        const sortType = sortBy.includes('DATE') ? 'DESC' : 'ASC';
         return this.api.get(BlueprintURLs.getMetaDatePageable + '/' + keyWord, {
             offset: pageNumber,
             limit: pageSize,
-            sort: sortBy
+            sort: sortBy,
+            sortType
         });
     }
 }