-
-
-
-
-
-
- View Service
-
-
-
-
+
+
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
index 8f012b3f6..1a82a2137 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
+++ b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
@@ -21,7 +21,7 @@
Installing
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
index 0db949b0d..b3d51fb07 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
+++ b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
@@ -1,6 +1,8 @@
import { Component, Input } from '@angular/core'
-import { PackageState } from 'src/app/types/package-state'
-import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import {
+ PackageDataEntry,
+ PackageState,
+} from 'src/app/services/patch-db/data-model'
@Component({
selector: 'marketplace-status',
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
index 5568b26c4..8a7151f40 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
+++ b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
@@ -3,12 +3,17 @@ import { NgModule } from '@angular/core'
import { IonicModule } from '@ionic/angular'
import { EmverPipesModule } from '@start9labs/shared'
-import { InstallProgressPipe } from './install-progress.pipe'
+import { InstallProgressPipeModule } from '../../../pipes/install-progress/install-progress.module'
import { MarketplaceStatusComponent } from './marketplace-status.component'
@NgModule({
- imports: [CommonModule, IonicModule, EmverPipesModule],
- declarations: [MarketplaceStatusComponent, InstallProgressPipe],
+ imports: [
+ CommonModule,
+ IonicModule,
+ EmverPipesModule,
+ InstallProgressPipeModule,
+ ],
+ declarations: [MarketplaceStatusComponent],
exports: [MarketplaceStatusComponent],
})
export class MarketplaceStatusModule {}
diff --git a/frontend/projects/ui/src/app/pipes/install-progress/install-progress.module.ts b/frontend/projects/ui/src/app/pipes/install-progress/install-progress.module.ts
new file mode 100644
index 000000000..caf6a76f8
--- /dev/null
+++ b/frontend/projects/ui/src/app/pipes/install-progress/install-progress.module.ts
@@ -0,0 +1,8 @@
+import { NgModule } from '@angular/core'
+import { InstallProgressPipe } from './install-progress.pipe'
+
+@NgModule({
+ declarations: [InstallProgressPipe],
+ exports: [InstallProgressPipe],
+})
+export class InstallProgressPipeModule {}
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/install-progress.pipe.ts b/frontend/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
similarity index 52%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/install-progress.pipe.ts
rename to frontend/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
index 1d731bf93..e340c527d 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/install-progress.pipe.ts
+++ b/frontend/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
@@ -1,13 +1,13 @@
import { Pipe, PipeTransform } from '@angular/core'
-import { InstallProgress } from 'src/app/types/install-progress'
+import { InstallProgress } from 'src/app/services/patch-db/data-model'
import { packageLoadingProgress } from 'src/app/util/package-loading-progress'
@Pipe({
- name: 'installProgress',
+ name: 'installProgressDisplay',
})
export class InstallProgressPipe implements PipeTransform {
- transform(loadData?: InstallProgress): string {
- const totalProgress = packageLoadingProgress(loadData)?.totalProgress || 0
+ transform(installProgress?: InstallProgress): string {
+ const totalProgress = packageLoadingProgress(installProgress)?.totalProgress || 0
return totalProgress < 99 ? totalProgress + '%' : 'finalizing'
}
diff --git a/frontend/projects/ui/src/app/pipes/launchable/launchable.pipe.ts b/frontend/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
index 100c0eed9..be1d5218d 100644
--- a/frontend/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
+++ b/frontend/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
@@ -1,8 +1,8 @@
import { Pipe, PipeTransform } from '@angular/core'
-import { PackageState } from 'src/app/types/package-state'
import {
InterfaceDef,
PackageMainStatus,
+ PackageState,
} from 'src/app/services/patch-db/data-model'
import { ConfigService } from '../../services/config.service'
diff --git a/frontend/projects/ui/src/app/services/api/api.fixures.ts b/frontend/projects/ui/src/app/services/api/api.fixures.ts
index b3e995cdc..c45e6b9fb 100644
--- a/frontend/projects/ui/src/app/services/api/api.fixures.ts
+++ b/frontend/projects/ui/src/app/services/api/api.fixures.ts
@@ -1,10 +1,10 @@
-import { PackageState } from 'src/app/types/package-state'
import {
DependencyErrorType,
DockerIoFormat,
Manifest,
PackageDataEntry,
PackageMainStatus,
+ PackageState,
} from 'src/app/services/patch-db/data-model'
import {
Log,
diff --git a/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 0f740b535..b10516660 100644
--- a/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -2,13 +2,13 @@ import { Injectable } from '@angular/core'
import { pauseFor } from '@start9labs/shared'
import { ApiService } from './embassy-api.service'
import { PatchOp, Update, Operation, RemoveOperation } from 'patch-db-client'
-import { PackageState } from 'src/app/types/package-state'
-import { InstallProgress } from 'src/app/types/install-progress'
import {
DataModel,
DependencyErrorType,
+ InstallProgress,
PackageDataEntry,
PackageMainStatus,
+ PackageState,
ServerStatus,
} from 'src/app/services/patch-db/data-model'
import { CifsBackupTarget, Log, RR, WithRevision } from './api.types'
@@ -690,7 +690,14 @@ export class MockApiService extends ApiService {
params: RR.DryUninstallPackageReq,
): Promise {
await pauseFor(2000)
- return {}
+ return {
+ lnd: {
+ dependency: 'bitcoind',
+ error: {
+ type: DependencyErrorType.NotRunning,
+ },
+ },
+ }
}
async uninstallPackageRaw(
diff --git a/frontend/projects/ui/src/app/services/api/mock-patch.ts b/frontend/projects/ui/src/app/services/api/mock-patch.ts
index f2f44dda5..03524c3e6 100644
--- a/frontend/projects/ui/src/app/services/api/mock-patch.ts
+++ b/frontend/projects/ui/src/app/services/api/mock-patch.ts
@@ -1,4 +1,3 @@
-import { PackageState } from 'src/app/types/package-state'
import {
DataModel,
DependencyErrorType,
@@ -6,6 +5,7 @@ import {
HealthResult,
Manifest,
PackageMainStatus,
+ PackageState,
} from 'src/app/services/patch-db/data-model'
export const mockPatchData: DataModel = {
@@ -445,7 +445,7 @@ export const mockPatchData: DataModel = {
'donation-url': null,
alerts: {
install: null,
- uninstall: null,
+ uninstall: undefined,
restore:
'If this is a duplicate instance of the same LND node, you may loose your funds.',
start: 'Starting LND is good for your health.',
diff --git a/frontend/projects/ui/src/app/services/config.service.ts b/frontend/projects/ui/src/app/services/config.service.ts
index c7de8d843..32bf618d1 100644
--- a/frontend/projects/ui/src/app/services/config.service.ts
+++ b/frontend/projects/ui/src/app/services/config.service.ts
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core'
import { WorkspaceConfig } from '@start9labs/shared'
-import { PackageState } from 'src/app/types/package-state'
import {
InterfaceDef,
PackageDataEntry,
PackageMainStatus,
+ PackageState,
} from 'src/app/services/patch-db/data-model'
const {
diff --git a/frontend/projects/ui/src/app/services/patch-db/data-model.ts b/frontend/projects/ui/src/app/services/patch-db/data-model.ts
index 98f06f7ca..0d5e94d40 100644
--- a/frontend/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/frontend/projects/ui/src/app/services/patch-db/data-model.ts
@@ -2,8 +2,6 @@ import { ConfigSpec } from 'src/app/pkg-config/config-types'
import { Url } from '@start9labs/shared'
import { MarketplaceManifest } from '@start9labs/marketplace'
import { BasicInfo } from 'src/app/pages/developer-routes/developer-menu/form-info'
-import { PackageState } from 'src/app/types/package-state'
-import { InstallProgress } from 'src/app/types/install-progress'
export interface DataModel {
'server-info': ServerInfo
@@ -86,6 +84,14 @@ export interface PackageDataEntry {
'install-progress'?: InstallProgress // exists when: installing, updating
}
+export enum PackageState {
+ Installing = 'installing',
+ Installed = 'installed',
+ Updating = 'updating',
+ Removing = 'removing',
+ Restoring = 'restoring',
+}
+
export interface InstalledPackageDataEntry {
status: Status
manifest: Manifest
@@ -356,3 +362,13 @@ export interface DependencyErrorHealthChecksFailed {
export interface DependencyErrorTransitive {
type: DependencyErrorType.Transitive
}
+
+export interface InstallProgress {
+ readonly size: number | null
+ readonly downloaded: number
+ readonly 'download-complete': boolean
+ readonly validated: number
+ readonly 'validation-complete': boolean
+ readonly unpacked: number
+ readonly 'unpack-complete': boolean
+}
diff --git a/frontend/projects/ui/src/app/services/pkg-status-rendering.service.ts b/frontend/projects/ui/src/app/services/pkg-status-rendering.service.ts
index adf14d229..914c54fd3 100644
--- a/frontend/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/frontend/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -1,8 +1,8 @@
import { isEmptyObject } from '@start9labs/shared'
-import { PackageState } from 'src/app/types/package-state'
import {
PackageDataEntry,
PackageMainStatus,
+ PackageState,
Status,
} from 'src/app/services/patch-db/data-model'
diff --git a/frontend/projects/ui/src/app/types/install-progress.ts b/frontend/projects/ui/src/app/types/install-progress.ts
deleted file mode 100644
index 58b1f6286..000000000
--- a/frontend/projects/ui/src/app/types/install-progress.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export interface InstallProgress {
- readonly size: number | null
- readonly downloaded: number
- readonly 'download-complete': boolean
- readonly validated: number
- readonly 'validation-complete': boolean
- readonly unpacked: number
- readonly 'unpack-complete': boolean
-}
diff --git a/frontend/projects/ui/src/app/types/package-state.ts b/frontend/projects/ui/src/app/types/package-state.ts
deleted file mode 100644
index e5bad9c2e..000000000
--- a/frontend/projects/ui/src/app/types/package-state.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export enum PackageState {
- Installing = 'installing',
- Installed = 'installed',
- Updating = 'updating',
- Removing = 'removing',
- Restoring = 'restoring',
-}
diff --git a/frontend/projects/ui/src/app/util/package-loading-progress.ts b/frontend/projects/ui/src/app/util/package-loading-progress.ts
index 4eb0353e2..3c699dfd3 100644
--- a/frontend/projects/ui/src/app/util/package-loading-progress.ts
+++ b/frontend/projects/ui/src/app/util/package-loading-progress.ts
@@ -1,6 +1,6 @@
import { isEmptyObject } from '@start9labs/shared'
-import { InstallProgress } from 'src/app/types/install-progress'
import { ProgressData } from 'src/app/types/progress-data'
+import { InstallProgress } from '../services/patch-db/data-model'
export function packageLoadingProgress(
loadData?: InstallProgress,
diff --git a/frontend/proxy.conf-sample.json b/frontend/proxy.conf-sample.json
new file mode 100644
index 000000000..7c4053c78
--- /dev/null
+++ b/frontend/proxy.conf-sample.json
@@ -0,0 +1,16 @@
+{
+ "/rpc/v1": {
+ "target": "http:///rpc/v1"
+ },
+ "/ws/*": {
+ "target": "http://",
+ "secure": false,
+ "ws": true
+ },
+ "/public/*": {
+ "target": "http:///public",
+ "pathRewrite": {
+ "^/public": ""
+ }
+ }
+}
diff --git a/frontend/proxy.conf.json.sample b/frontend/proxy.conf.json.sample
deleted file mode 100644
index e97124bd2..000000000
--- a/frontend/proxy.conf.json.sample
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "/rpc/v1": {
- "target": "http://localhost:8100/rpc/v1"
- },
- "/ws": {
- "target": "http://localhost:8100/ws"
- },
- "/public/*": {
- "target": "http://localhost:8100/public",
- "pathRewrite": {
- "^/public": ""
- }
- }
-}
\ No newline at end of file