Merge branch 'next/minor' of github.com:Start9Labs/start-os into next/major

web/projects/ui/src/app/routes/diagnostic/home/home.page.ts

@@ -1,3 +1,4 @@
+<<<<<<<< HEAD:web/projects/ui/src/app/routes/diagnostic/home/home.page.ts
 import { TUI_CONFIRM } from '@taiga-ui/kit'
 import { Component, Inject } from '@angular/core'
 import { WINDOW } from '@ng-web-apis/common'
@@ -5,9 +6,15 @@ import { LoadingService } from '@start9labs/shared'
 import { TuiDialogService } from '@taiga-ui/core'
 import { filter } from 'rxjs'
 import { DiagnosticService } from '../services/diagnostic.service'
+========
+import { Component } from '@angular/core'
+import { AlertController } from '@ionic/angular'
+import { LoadingService } from '@start9labs/shared'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+>>>>>>>> 94a5075b6daa1375433420abf5d121171dae72cb:web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
 
 @Component({
-  selector: 'app-home',
+  selector: 'diagnostic-home',
   templateUrl: 'home.page.html',
   styleUrls: ['home.page.scss'],
 })
@@ -22,14 +29,19 @@ export class HomePage {
 
   constructor(
     private readonly loader: LoadingService,
+<<<<<<<< HEAD:web/projects/ui/src/app/routes/diagnostic/home/home.page.ts
     private readonly api: DiagnosticService,
     private readonly dialogs: TuiDialogService,
     @Inject(WINDOW) private readonly window: Window,
+========
+    private readonly api: ApiService,
+    private readonly alertCtrl: AlertController,
+>>>>>>>> 94a5075b6daa1375433420abf5d121171dae72cb:web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
   ) {}
 
   async ngOnInit() {
     try {
-      const error = await this.api.getError()
+      const error = await this.api.diagnosticGetError()
       // incorrect drive
       if (error.code === 15) {
         this.error = {
@@ -90,10 +102,14 @@ export class HomePage {
   }
 
   async restart(): Promise<void> {
+<<<<<<<< HEAD:web/projects/ui/src/app/routes/diagnostic/home/home.page.ts
     const loader = this.loader.open('').subscribe()
+========
+    const loader = this.loader.open('Loading...').subscribe()
+>>>>>>>> 94a5075b6daa1375433420abf5d121171dae72cb:web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
 
     try {
-      await this.api.restart()
+      await this.api.diagnosticRestart()
       this.restarted = true
     } catch (e) {
       console.error(e)
@@ -103,11 +119,15 @@ export class HomePage {
   }
 
   async forgetDrive(): Promise<void> {
+<<<<<<<< HEAD:web/projects/ui/src/app/routes/diagnostic/home/home.page.ts
     const loader = this.loader.open('').subscribe()
+========
+    const loader = this.loader.open('Loading...').subscribe()
+>>>>>>>> 94a5075b6daa1375433420abf5d121171dae72cb:web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
 
     try {
-      await this.api.forgetDrive()
-      await this.api.restart()
+      await this.api.diagnosticForgetDrive()
+      await this.api.diagnosticRestart()
       this.restarted = true
     } catch (e) {
       console.error(e)
@@ -116,6 +136,7 @@ export class HomePage {
     }
   }
 
+<<<<<<<< HEAD:web/projects/ui/src/app/routes/diagnostic/home/home.page.ts
   async presentAlertSystemRebuild() {
     this.dialogs
       .open(TUI_CONFIRM, {
@@ -138,6 +159,8 @@ export class HomePage {
       })
   }
 
+========
+>>>>>>>> 94a5075b6daa1375433420abf5d121171dae72cb:web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
   async presentAlertRepairDisk() {
     this.dialogs
       .open(TUI_CONFIRM, {
@@ -164,6 +187,7 @@ export class HomePage {
     this.window.location.reload()
   }
 
+<<<<<<<< HEAD:web/projects/ui/src/app/routes/diagnostic/home/home.page.ts
   private async systemRebuild(): Promise<void> {
     const loader = this.loader.open('').subscribe()
 
@@ -180,10 +204,14 @@ export class HomePage {
 
   private async repairDisk(): Promise<void> {
     const loader = this.loader.open('').subscribe()
+========
+  private async repairDisk(): Promise<void> {
+    const loader = this.loader.open('Loading...').subscribe()
+>>>>>>>> 94a5075b6daa1375433420abf5d121171dae72cb:web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
 
     try {
-      await this.api.repairDisk()
-      await this.api.restart()
+      await this.api.diagnosticRepairDisk()
+      await this.api.diagnosticRestart()
       this.restarted = true
     } catch (e) {
       console.error(e)

web/projects/ui/src/app/routes/diagnostic/services/diagnostic.service.ts

@@ -1,16 +0,0 @@
-import { FetchLogsReq, FetchLogsRes } from '@start9labs/shared'
-
-export abstract class DiagnosticService {
-  abstract getError(): Promise<GetErrorRes>
-  abstract restart(): Promise<void>
-  abstract forgetDrive(): Promise<void>
-  abstract repairDisk(): Promise<void>
-  abstract systemRebuild(): Promise<void>
-  abstract getLogs(params: FetchLogsReq): Promise<FetchLogsRes>
-}
-
-export interface GetErrorRes {
-  code: number
-  message: string
-  data: { details: string }
-}

web/projects/ui/src/app/routes/diagnostic/services/live-diagnostic.service.ts

@@ -1,68 +0,0 @@
-import { Injectable } from '@angular/core'
-import {
-  HttpService,
-  isRpcError,
-  RpcError,
-  RPCOptions,
-} from '@start9labs/shared'
-import { FetchLogsReq, FetchLogsRes } from '@start9labs/shared'
-import { DiagnosticService, GetErrorRes } from './diagnostic.service'
-
-@Injectable()
-export class LiveDiagnosticService implements DiagnosticService {
-  constructor(private readonly http: HttpService) {}
-
-  async getError(): Promise<GetErrorRes> {
-    return this.rpcRequest<GetErrorRes>({
-      method: 'diagnostic.error',
-      params: {},
-    })
-  }
-
-  async restart(): Promise<void> {
-    return this.rpcRequest<void>({
-      method: 'diagnostic.restart',
-      params: {},
-    })
-  }
-
-  async forgetDrive(): Promise<void> {
-    return this.rpcRequest<void>({
-      method: 'diagnostic.disk.forget',
-      params: {},
-    })
-  }
-
-  async repairDisk(): Promise<void> {
-    return this.rpcRequest<void>({
-      method: 'diagnostic.disk.repair',
-      params: {},
-    })
-  }
-
-  async systemRebuild(): Promise<void> {
-    return this.rpcRequest<void>({
-      method: 'diagnostic.rebuild',
-      params: {},
-    })
-  }
-
-  async getLogs(params: FetchLogsReq): Promise<FetchLogsRes> {
-    return this.rpcRequest<FetchLogsRes>({
-      method: 'diagnostic.logs',
-      params,
-    })
-  }
-
-  private async rpcRequest<T>(opts: RPCOptions): Promise<T> {
-    const res = await this.http.rpcRequest<T>(opts)
-
-    const rpcRes = res.body
-
-    if (isRpcError(rpcRes)) {
-      throw new RpcError(rpcRes.error)
-    }
-
-    return rpcRes.result
-  }
-}

web/projects/ui/src/app/routes/diagnostic/services/mock-diagnostic.service.ts

@@ -1,67 +0,0 @@
-import { Injectable } from '@angular/core'
-import { pauseFor } from '@start9labs/shared'
-import { FetchLogsReq, FetchLogsRes, Log } from '@start9labs/shared'
-import { DiagnosticService, GetErrorRes } from './diagnostic.service'
-
-@Injectable()
-export class MockDiagnosticService implements DiagnosticService {
-  async getError(): Promise<GetErrorRes> {
-    await pauseFor(1000)
-    return {
-      code: 15,
-      message: 'Unknown server',
-      data: { details: 'Some details about the error here' },
-    }
-  }
-
-  async restart(): Promise<void> {
-    await pauseFor(1000)
-  }
-
-  async forgetDrive(): Promise<void> {
-    await pauseFor(1000)
-  }
-
-  async repairDisk(): Promise<void> {
-    await pauseFor(1000)
-  }
-
-  async systemRebuild(): Promise<void> {
-    await pauseFor(1000)
-  }
-
-  async getLogs(params: FetchLogsReq): Promise<FetchLogsRes> {
-    await pauseFor(1000)
-    let entries: Log[]
-    if (Math.random() < 0.2) {
-      entries = packageLogs
-    } else {
-      const arrLength = params.limit
-        ? Math.ceil(params.limit / packageLogs.length)
-        : 10
-      entries = new Array(arrLength)
-        .fill(packageLogs)
-        .reduce((acc, val) => acc.concat(val), [])
-    }
-    return {
-      entries,
-      startCursor: 'start-cursor',
-      endCursor: 'end-cursor',
-    }
-  }
-}
-
-const packageLogs = [
-  {
-    timestamp: '2019-12-26T14:20:30.872Z',
-    message: '****** START *****',
-  },
-  {
-    timestamp: '2019-12-26T14:21:30.872Z',
-    message: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs',
-  },
-  {
-    timestamp: '2019-12-26T14:22:30.872Z',
-    message: '****** FINISH *****',
-  },
-]

web/projects/ui/src/app/routes/login/login.page.ts

@@ -1,11 +1,10 @@
+import { Router } from '@angular/router'
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop'
 import { Component, Inject, DestroyRef, inject } from '@angular/core'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { AuthService } from 'src/app/services/auth.service'
-import { Router } from '@angular/router'
 import { ConfigService } from 'src/app/services/config.service'
 import { LoadingService } from '@start9labs/shared'
-import { takeUntil } from 'rxjs'
 import { DOCUMENT } from '@angular/common'
 
 @Component({
@@ -43,8 +42,8 @@ export class LoginPage {
       }
       await this.api.login({
         password: this.password,
-        // TODO: get platforms metadata
-        metadata: { platforms: [] },
+        metadata: { platforms: [] }, // @TODO do we really need platforms now?
+        ephemeral: window.location.host === 'localhost',
       })
 
       this.password = ''

web/projects/ui/src/app/routes/portal/routes/service/pipes/install-progress.pipe.ts

@@ -8,7 +8,8 @@ import { T } from '@start9labs/start-sdk'
 export class InstallingProgressDisplayPipe implements PipeTransform {
   transform(progress: T.Progress): string {
     if (progress === true) return 'finalizing'
-    if (progress === false || !progress.total) return 'unknown %'
+    if (progress === false || progress === null || !progress.total)
+      return 'unknown %'
     const percentage = Math.round((100 * progress.done) / progress.total)
 
     return percentage < 99 ? String(percentage) + '%' : 'finalizing'
@@ -20,9 +21,9 @@ export class InstallingProgressDisplayPipe implements PipeTransform {
   name: 'installingProgress',
 })
 export class InstallingProgressPipe implements PipeTransform {
-  transform(progress: T.Progress): number | null {
-    if (progress === true) return 1
-    if (progress === false || !progress.total) return null
-    return Number((progress.done / progress.total).toFixed(2))
+  transform(progress: T.Progress): number {
+    if (progress === true) return 100
+    if (progress === false || progress === null || !progress.total) return 0
+    return Math.floor((100 * progress.done) / progress.total)
   }
 }

web/projects/ui/src/app/routes/portal/routes/system/backups/pipes/to-options.pipe.ts

@@ -1,5 +1,5 @@
 import { inject, Pipe, PipeTransform } from '@angular/core'
-import { Emver } from '@start9labs/shared'
+import { Exver } from '@start9labs/shared'
 import { map, Observable } from 'rxjs'
 import { PackageBackupInfo } from 'src/app/services/api/api.types'
 import { ConfigService } from 'src/app/services/config.service'
@@ -12,7 +12,7 @@ import { RecoverOption } from '../types/recover-option'
 })
 export class ToOptionsPipe implements PipeTransform {
   private readonly config = inject(ConfigService)
-  private readonly emver = inject(Emver)
+  private readonly exver = inject(Exver)
 
   transform(
     packageData$: Observable<Record<string, PackageDataEntry>>,
@@ -26,7 +26,7 @@ export class ToOptionsPipe implements PipeTransform {
             id,
             installed: !!packageData[id],
             checked: false,
-            newerStartOs: this.compare(packageBackups[id].osVersion),
+            newerOS: this.compare(packageBackups[id].osVersion),
           }))
           .sort((a, b) =>
             b.title.toLowerCase() > a.title.toLowerCase() ? -1 : 1,
@@ -36,7 +36,9 @@ export class ToOptionsPipe implements PipeTransform {
   }
 
   private compare(version: string): boolean {
-    // checks to see if backup was made on a newer version of eOS
-    return this.emver.compare(version, this.config.version) === 1
+    // checks to see if backup was made on a newer version of startOS
+    return (
+      this.exver.compareOsVersion(version, this.config.version) === 'greater'
+    )
   }
 }