Merge pull request #1636 from SciCatProject/SWAP-4278-new-sdk-frotnend-code-refactor-part-2

fix: adjust types after using the new sdk

Author: nitrosx

package-lock.json

@@ -33,6 +33,7 @@
     "@ngrx/effects": "^16",
     "@ngrx/router-store": "^16",
     "@ngrx/store": "^16",
+    "@scicatproject/scicat-sdk-ts": "^4.6.4",
     "autolinker": "^4.0.0",
     "deep-equal": "^2.0.5",
     "exceljs": "^4.3.0",

package.json

@@ -108,14 +108,16 @@ export class AppConfigService {
 
   async loadAppConfig(): Promise<void> {
     try {
-      this.appConfig = await this.http
+      const config = await this.http
         .get("/api/v3/admin/config")
         .pipe(timeout(2000))
         .toPromise();
+      this.appConfig = Object.assign({}, this.appConfig, config);
     } catch (err) {
       console.log("No config available in backend, trying with local config.");
       try {
-        this.appConfig = await this.http.get("/assets/config.json").toPromise();
+        const config = await this.http.get("/assets/config.json").toPromise();
+        this.appConfig = Object.assign({}, this.appConfig, config);
       } catch (err) {
         console.error("No config provided.");
       }

src/app/app-config.service.ts

@@ -5,7 +5,7 @@ import {
   ActivatedRouteSnapshot,
   RouterStateSnapshot,
 } from "@angular/router";
-import { UserApi } from "shared/sdk/services";
+import { UsersService } from "@scicatproject/scicat-sdk-ts";
 
 /**
  * Ensure that the current user is logged in
@@ -19,7 +19,7 @@ import { UserApi } from "shared/sdk/services";
 })
 export class AuthGuard implements CanActivate {
   constructor(
-    private us: UserApi,
+    private us: UsersService,
     private router: Router,
   ) {}
 
@@ -31,7 +31,7 @@ export class AuthGuard implements CanActivate {
     state: RouterStateSnapshot,
   ): Promise<boolean> {
     return this.us
-      .getCurrent()
+      .usersControllerGetMyUser()
       .toPromise()
       .catch(() => {
         this.router.navigate(["/login"], {

src/app/app-routing/auth.guard.ts

@@ -9,7 +9,6 @@ import {
   ChangeDetectorRef,
 } from "@angular/core";
 import { Store } from "@ngrx/store";
-import { LoopBackConfig } from "shared/sdk";
 import {
   clearMessageAction,
   fetchCurrentUserAction,
@@ -25,6 +24,7 @@ import {
 } from "state-management/selectors/user.selectors";
 import { MessageType } from "state-management/models";
 import { AppConfigService, AppConfig as Config } from "app-config.service";
+import { Configuration } from "@scicatproject/scicat-sdk-ts";
 
 @Component({
   selector: "app-root",
@@ -45,6 +45,7 @@ export class AppComponent implements OnDestroy, OnInit, AfterViewChecked {
   constructor(
     @Inject(APP_CONFIG) public appConfig: AppConfig,
     private appConfigService: AppConfigService,
+    private apiConfigService: Configuration,
     private cdRef: ChangeDetectorRef,
     private metaService: Meta,
     public snackBar: MatSnackBar,
@@ -68,8 +69,8 @@ export class AppComponent implements OnDestroy, OnInit, AfterViewChecked {
    * @memberof AppComponent
    */
   ngOnInit() {
-    LoopBackConfig.setBaseURL(this.config.lbBaseURL);
-    console.log(LoopBackConfig.getPath());
+    this.apiConfigService.basePath = this.config.lbBaseURL;
+    console.log(this.apiConfigService.basePath);
 
     this.store.dispatch(loadDefaultSettings({ config: this.config }));
 

src/app/app.component.ts

@@ -8,9 +8,8 @@ import { EffectsModule } from "@ngrx/effects";
 import { HttpClientModule, HTTP_INTERCEPTORS } from "@angular/common/http";
 import { APP_INITIALIZER, NgModule } from "@angular/core";
 import { ExtraOptions, RouterModule } from "@angular/router";
-import { SampleApi, SDKBrowserModule } from "shared/sdk/index";
 import { StoreModule } from "@ngrx/store";
-import { UserApi } from "shared/sdk/services";
+import { ApiModule, Configuration } from "@scicatproject/scicat-sdk-ts";
 import { routerReducer } from "@ngrx/router-store";
 import { extModules } from "./build-specifics";
 import { MatNativeDateModule } from "@angular/material/core";
@@ -38,6 +37,15 @@ const appThemeInitializerFn = (appTheme: AppThemeService) => {
   return () => appTheme.loadTheme();
 };
 
+const apiConfigurationFn = (
+  authService: AuthService,
+  configurationService: AppConfigService,
+) =>
+  new Configuration({
+    basePath: configurationService.getConfig().lbBaseURL,
+    accessToken: authService.getToken().id,
+  });
+
 @NgModule({
   declarations: [AppComponent],
   imports: [
@@ -52,7 +60,7 @@ const appThemeInitializerFn = (appTheme: AppThemeService) => {
     MatTabsModule,
     MatChipsModule,
     MatSnackBarModule,
-    SDKBrowserModule.forRoot(),
+    ApiModule,
     StoreModule.forRoot(
       { router: routerReducer, users: userReducer },
       {
@@ -98,12 +106,16 @@ const appThemeInitializerFn = (appTheme: AppThemeService) => {
     },
     AuthService,
     AppThemeService,
-    UserApi,
-    SampleApi,
     Title,
     MatNativeDateModule,
     { provide: InternalStorage, useClass: CookieService },
     { provide: SDKStorage, useClass: CookieService },
+    {
+      provide: Configuration,
+      useFactory: apiConfigurationFn,
+      deps: [AuthService, AppConfigService],
+      multi: false,
+    },
   ],
   bootstrap: [AppComponent],
 })

src/app/app.module.ts

@@ -1,6 +1,5 @@
-import { ComponentFixture, inject, TestBed } from "@angular/core/testing";
+import { TestBed } from "@angular/core/testing";
 import { Store, StoreModule } from "@ngrx/store";
-import { Dataset } from "shared/sdk";
 import { AdminTabComponent } from "./admin-tab.component";
 import { MatCardModule } from "@angular/material/card";
 import { of } from "rxjs";

src/app/datasets/admin-tab/admin-tab.component.spec.ts

@@ -3,7 +3,7 @@ import { Store } from "@ngrx/store";
 import { FileObject } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
 import { Subscription } from "rxjs";
 import { take } from "rxjs/operators";
-import { Dataset, Job } from "shared/sdk";
+import { DatasetClass, JobClass } from "@scicatproject/scicat-sdk-ts";
 import { submitJobAction } from "state-management/actions/jobs.actions";
 import {
   selectCurrentDatablocks,
@@ -22,7 +22,7 @@ import {
 })
 export class AdminTabComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
-  dataset: Dataset | undefined;
+  dataset: DatasetClass | undefined;
   datablocks$ = this.store.select(selectCurrentDatablocks);
   isAdmin$ = this.store.select(selectIsAdmin);
   loading$ = this.store.select(selectIsLoading);
@@ -44,11 +44,11 @@ export class AdminTabComponent implements OnInit, OnDestroy {
         .pipe(take(1))
         .subscribe((user) => {
           if (user && this.dataset) {
-            const job = new Job();
+            let job: JobClass;
             job.emailJobInitiator = user.email;
             job.jobParams = {};
             job.jobParams["username"] = user.username;
-            job.creationTime = new Date();
+            job.creationTime = new Date().toString();
             job.type = "reset";
             const fileObj: FileObject = {
               pid: "",
@@ -62,7 +62,7 @@ export class AdminTabComponent implements OnInit, OnDestroy {
               });
             }
             fileObj.files = fileList;
-            job.datasetList = [fileObj];
+            job.datasetList = [fileObj.toString()];
             console.log(job);
             this.store.dispatch(submitJobAction({ job }));
           }

src/app/datasets/admin-tab/admin-tab.component.ts

@@ -1,7 +1,7 @@
 import { TestBed, waitForAsync } from "@angular/core/testing";
 import { MockStore, provideMockStore } from "@ngrx/store/testing";
 import { RetrieveDestinations } from "app-config.service";
-import { Dataset, Job, User } from "shared/sdk";
+import { Dataset, Job, User } from "@scicatproject/scicat-sdk-ts";
 import { submitJobAction } from "state-management/actions/jobs.actions";
 import {
   selectCurrentUser,

src/app/datasets/archiving.service.spec.ts

@@ -2,14 +2,14 @@ import { Injectable } from "@angular/core";
 import { Store } from "@ngrx/store";
 import { combineLatest, Observable } from "rxjs";
 import { first, map } from "rxjs/operators";
-import { Dataset, Job, User } from "state-management/models";
 import { submitJobAction } from "state-management/actions/jobs.actions";
 import {
   selectCurrentUser,
   selectTapeCopies,
   selectProfile,
 } from "state-management/selectors/user.selectors";
 import { RetrieveDestinations } from "app-config.service";
+import { DatasetClass, ReturnedUserDto } from "@scicatproject/scicat-sdk-ts";
 
 @Injectable()
 export class ArchivingService {
@@ -19,12 +19,12 @@ export class ArchivingService {
   constructor(private store: Store) {}
 
   private createJob(
-    user: User,
-    datasets: Dataset[],
+    user: ReturnedUserDto,
+    datasets: DatasetClass[],
     archive: boolean,
     destinationPath?: Record<string, string>,
     // Do not specify tape copies here
-  ): Job {
+  ) {
     const extra = archive ? {} : destinationPath;
     const jobParams = {
       username: user.username,
@@ -46,11 +46,11 @@ export class ArchivingService {
       type: archive ? "archive" : "retrieve",
     };
 
-    return new Job(data);
+    return data;
   }
 
   private archiveOrRetrieve(
-    datasets: Dataset[],
+    datasets: DatasetClass[],
     archive: boolean,
     destPath?: Record<string, string>,
   ): Observable<void> {
@@ -71,18 +71,18 @@ export class ArchivingService {
 
           const job = this.createJob(user, datasets, archive, destPath);
 
-          this.store.dispatch(submitJobAction({ job }));
+          this.store.dispatch(submitJobAction({ job: job as any }));
         }
       }),
     );
   }
 
-  public archive(datasets: Dataset[]): Observable<void> {
+  public archive(datasets: DatasetClass[]): Observable<void> {
     return this.archiveOrRetrieve(datasets, true);
   }
 
   public retrieve(
-    datasets: Dataset[],
+    datasets: DatasetClass[],
     destinationPath: Record<string, string>,
   ): Observable<void> {
     return this.archiveOrRetrieve(datasets, false, destinationPath);