Fix/update admin (WIP)

src/app/admin/admin-basket/data.service.ts

@@ -6,6 +6,7 @@ import { map } from 'rxjs/operators'
 // import { Apollo, gql } from 'apollo-angular'
 
 import { Project } from '../admin-data.service'
+import { AdminService, AdminBasket, BasketNameOnly } from '../../openapi'
 
 export class AdminBasketFile {
     constructor(
@@ -25,15 +26,15 @@ export class AdminBasketFile {
     ) {}
 }
 
-export class AdminBasket {
-    constructor(
-        public name: string,
-        public files?: AdminBasketFile[],
-        public columns?: string[],
-        public uploadFields?: string[],
-        public projects?: Project[],
-    ) {}
-}
+// export class AdminBasket {
+//     constructor(
+//         public name: string,
+//         public files?: AdminBasketFile[],
+//         public columns?: string[],
+//         public uploadFields?: string[],
+//         public projects?: Project[],
+//     ) {}
+// }
 
 export class BasketImportResult {
     constructor(
@@ -122,21 +123,12 @@ export class AdminBasketUploadFieldData {
 export class AdminBasketDataService {
     constructor(
         // private apollo: Apollo,
+        public adminService: AdminService,
     ) {}
 
-    getBaskets(): Observable<AdminBasket[]> {
+    getBaskets(): Observable<BasketNameOnly[]> {
         // Get the list a basket names
-        console.warn('Migrate Graphql')
-        return observableOf()
-        // return this.apollo.query({
-        //     query: getAdminBasketsQuery,
-        // }).pipe(map(
-        //     res => res['data']['admin_baskets'].map(
-        //         (data: object) => new AdminBasket(
-        //             data['name'],
-        //         )
-        //     )
-        // ))
+        return this.adminService.getBasketsApiAdminBasketGet()
     }
 
     getBasketUploadFieldData(): Observable<AdminBasketUploadFieldData> {
@@ -160,6 +152,7 @@ export class AdminBasketDataService {
 
     getBasket(name: string): Observable<AdminBasket> {
         // Get all info and content of a basket
+        return this.adminService.getBasketApiAdminBasketNameGet(name)
         console.warn('Migrate Graphql')
         return observableOf()
         // return this.apollo.query({