Better typescript typing for a better world

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / rest / rest-data-source.ts

diff --git a/client/src/app/shared/rest/rest-data-source.ts b/client/src/app/shared/rest/rest-data-source.ts
index 847dd7c560ef157b1ee8082ead36d08b3166b866..7956637e0c36d4686b6e202c95f45c64ed40795d 100644 (file)
--- a/client/src/app/shared/rest/rest-data-source.ts
+++ b/client/src/app/shared/rest/rest-data-source.ts
@@ -1,51 +1,51 @@
-import { Http, RequestOptionsArgs, URLSearchParams,  } from '@angular/http';
+import { Http, RequestOptionsArgs, URLSearchParams, Response } from '@angular/http'
 
-import { ServerDataSource } from 'ng2-smart-table';
+import { ServerDataSource } from 'ng2-smart-table'
 
 export class RestDataSource extends ServerDataSource {
- constructor(http: Http, endpoint: string) {
-   const options = {
-     endPoint: endpoint,
-     sortFieldKey: 'sort',
-     dataKey: 'data'
-   }
-
-   super(http, options);
- }
-
- protected extractTotalFromResponse(res) {
-    const rawData = res.json();
-    return rawData ? parseInt(rawData.total): 0;
+  constructor (http: Http, endpoint: string) {
+    const options = {
+      endPoint: endpoint,
+      sortFieldKey: 'sort',
+      dataKey: 'data'
+    }
+
+    super(http, options)
+  }
+
+  protected extractTotalFromResponse (res: Response) {
+    const rawData = res.json()
+    return rawData ? parseInt(rawData.total, 10) : 0
   }
 
- protected addSortRequestOptions(requestOptions: RequestOptionsArgs) {
-    let searchParams: URLSearchParams = <URLSearchParams> requestOptions.search;
+  protected addSortRequestOptions (requestOptions: RequestOptionsArgs) {
+    const searchParams = requestOptions.params as URLSearchParams
 
     if (this.sortConf) {
       this.sortConf.forEach((fieldConf) => {
-        const sortPrefix = fieldConf.direction === 'desc' ? '-' : '';
+        const sortPrefix = fieldConf.direction === 'desc' ? '-' : ''
 
-        searchParams.set(this.conf.sortFieldKey, sortPrefix + fieldConf.field);
-      });
+        searchParams.set(this.conf.sortFieldKey, sortPrefix + fieldConf.field)
+      })
     }
 
-    return requestOptions;
+    return requestOptions
   }
 
-  protected addPagerRequestOptions(requestOptions: RequestOptionsArgs) {
-    let searchParams: URLSearchParams = <URLSearchParams> requestOptions.search;
+  protected addPagerRequestOptions (requestOptions: RequestOptionsArgs) {
+    const searchParams = requestOptions.params as URLSearchParams
 
     if (this.pagingConf && this.pagingConf['page'] && this.pagingConf['perPage']) {
-      const perPage = this.pagingConf['perPage'];
-      const page = this.pagingConf['page'];
+      const perPage = this.pagingConf['perPage']
+      const page = this.pagingConf['page']
 
-      const start = (page - 1) * perPage;
-      const count = perPage;
+      const start = (page - 1) * perPage
+      const count = perPage
 
-      searchParams.set('start', start.toString());
-      searchParams.set('count', count.toString());
+      searchParams.set('start', start.toString())
+      searchParams.set('count', count.toString())
     }
 
-    return requestOptions;
+    return requestOptions
   }
 }