Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 04:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'integration/new-container-runtime' of github.com:Start9Labs/start-os into rebase/feat/domains

Browse Source
This commit is contained in:
Matt Hill
2024-03-27 10:35:42 -06:00
parent 8cfd994170 22d8d08355
commit 70d4a0c022
77 changed files with 297 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
web/package-lock.json generated
View File

@@ -8,17 +8,17 @@
"name": "startos-ui",
"version": "0.3.5.1",
"dependencies": {
"@angular/animations": "^17.0.6",
"@angular/cdk": "^17.0.3",
"@angular/common": "^17.0.6",
"@angular/compiler": "^17.0.6",
"@angular/core": "^17.0.6",
"@angular/forms": "^17.0.6",
"@angular/platform-browser": "^17.0.6",
"@angular/platform-browser-dynamic": "^17.0.6",
"@angular/pwa": "^17.0.6",
"@angular/router": "^17.0.6",
"@angular/service-worker": "^17.0.6",
"@angular/animations": "^17.3.1",
"@angular/cdk": "^17.3.1",
"@angular/common": "^17.3.1",
"@angular/compiler": "^17.3.1",
"@angular/core": "^17.3.1",
"@angular/forms": "^17.3.1",
"@angular/platform-browser": "^17.3.1",
"@angular/platform-browser-dynamic": "^17.3.1",
"@angular/pwa": "^17.3.1",
"@angular/router": "^17.3.1",
"@angular/service-worker": "^17.3.1",
"@ionic/angular": "^6.1.15",
"@materia-ui/ngx-monaco-editor": "^6.0.0",
"@start9labs/argon2": "^0.1.0",
@@ -62,10 +62,10 @@
"zone.js": "^0.14.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.0.6",
"@angular/cli": "^17.0.6",
"@angular/compiler-cli": "^17.0.6",
"@angular/language-service": "^17.0.6",
"@angular-devkit/build-angular": "^17.3.1",
"@angular/cli": "^17.3.1",
"@angular/compiler-cli": "^17.3.1",
"@angular/language-service": "^17.3.1",
"@ionic/cli": "^6.19.0",
"@types/dompurify": "^2.3.3",
"@types/estree": "^0.0.51",

12
web/projects/ui/src/app/apps/portal/routes/service/routes/service.component.ts
View File

@@ -179,13 +179,13 @@ export class ServiceRoute {
depErrors,
)
const depInfo = pkg.dependencyInfo[depId]
const { title, icon, versionSpec } = pkg.currentDependencies[depId]
return {
id: depId,
version: pkg.currentDependencies[depId].versionRange,
title: depInfo?.title || depId,
icon: depInfo?.icon || '',
version: versionSpec,
title,
icon,
errorText: errorText
? `${errorText}. ${pkgManifest.title} will not work as expected.`
: '',
@@ -252,7 +252,7 @@ export class ServiceRoute {
return this.installDep(pkg, pkgManifest, depId)
case 'configure':
return this.formDialog.open<PackageConfigData>(ServiceConfigModal, {
label: `${pkg.dependencyInfo[depId].title} config`,
label: `${pkg.currentDependencies[depId].title} config`,
data: {
pkgId: depId,
dependentInfo: pkgManifest,
@@ -269,7 +269,7 @@ export class ServiceRoute {
const dependentInfo: DependentInfo = {
id: manifest.id,
title: manifest.title,
version: pkg.currentDependencies[depId].versionRange,
version: pkg.currentDependencies[depId].versionSpec,
}
const navigationExtras: NavigationExtras = {
state: { dependentInfo },

29
web/projects/ui/src/app/services/api/api.fixures.ts
View File

@@ -1493,7 +1493,6 @@ export module Mock {
},
},
currentDependencies: {},
dependencyInfo: {},
marketplaceUrl: 'https://registry.start9.com/',
developerKey: 'developer-key',
outboundProxy: null,
@@ -1624,15 +1623,13 @@ export module Mock {
},
},
currentDependencies: {
bitcoind: {
versionRange: '>=26.0.0',
healthChecks: [],
},
},
dependencyInfo: {
bitcoind: {
title: Mock.MockManifestBitcoind.title,
icon: 'assets/img/service-icons/bitcoind.svg',
kind: 'running',
registryUrl: '',
versionSpec: '>=26.0.0',
healthChecks: [],
},
},
marketplaceUrl: 'https://registry.start9.com/',
@@ -1871,23 +1868,21 @@ export module Mock {
},
},
currentDependencies: {
bitcoind: {
versionRange: '>=26.0.0',
healthChecks: [],
},
'btc-rpc-proxy': {
versionRange: '>2.0.0', // @TODO
healthChecks: [],
},
},
dependencyInfo: {
bitcoind: {
title: Mock.MockManifestBitcoind.title,
icon: 'assets/img/service-icons/bitcoind.svg',
kind: 'running',
registryUrl: 'https://registry.start9.com',
versionSpec: '>=26.0.0',
healthChecks: [],
},
'btc-rpc-proxy': {
title: Mock.MockManifestBitcoinProxy.title,
icon: 'assets/img/service-icons/btc-rpc-proxy.png',
kind: 'exists',
registryUrl: 'https://community-registry.start9.com',
versionSpec: '>2.0.0', // @TODO
healthChecks: [],
},
},
marketplaceUrl: 'https://registry.start9.com/',

19
web/projects/ui/src/app/services/api/mock-patch.ts
View File

@@ -402,7 +402,6 @@ export const mockPatchData: DataModel = {
},
},
currentDependencies: {},
dependencyInfo: {},
marketplaceUrl: 'https://registry.start9.com/',
developerKey: 'developer-key',
outboundProxy: null,
@@ -639,23 +638,21 @@ export const mockPatchData: DataModel = {
},
},
currentDependencies: {
bitcoind: {
versionRange: '>=26.0.0',
healthChecks: [],
},
'btc-rpc-proxy': {
versionRange: '>2.0.0',
healthChecks: [],
},
},
dependencyInfo: {
bitcoind: {
title: 'Bitcoin Core',
icon: 'assets/img/service-icons/bitcoind.svg',
kind: 'running',
registryUrl: 'https://registry.start9.com',
versionSpec: '>=26.0.0',
healthChecks: [],
},
'btc-rpc-proxy': {
title: 'Bitcoin Proxy',
icon: 'assets/img/service-icons/btc-rpc-proxy.png',
kind: 'running',
registryUrl: 'https://community-registry.start9.com',
versionSpec: '>2.0.0',
healthChecks: [],
},
},
marketplaceUrl: 'https://registry.start9.com/',

6
web/projects/ui/src/app/services/dep-error.service.ts
View File

@@ -88,14 +88,14 @@ export class DepErrorService {
}
}
const versionRange = pkg.currentDependencies[depId].versionRange
const versionSpec = pkg.currentDependencies[depId].versionSpec
const depManifest = dep.stateInfo.manifest
// incorrect version
if (!this.emver.satisfies(depManifest.version, versionRange)) {
if (!this.emver.satisfies(depManifest.version, versionSpec)) {
return {
type: DependencyErrorType.IncorrectVersion,
expected: versionRange,
expected: versionSpec,
received: depManifest.version,
}
}

14
web/projects/ui/src/app/services/patch-db/data-model.ts
View File

@@ -154,13 +154,7 @@ export type PackageDataEntry<T extends StateInfo = StateInfo> = {
status: Status
actions: Record<string, T.ActionMetadata>
lastBackup: string | null
currentDependencies: { [id: string]: CurrentDependencyInfo }
dependencyInfo: {
[id: string]: {
title: string
icon: Url
}
}
currentDependencies: Record<string, CurrentDependencyInfo>
serviceInterfaces: Record<string, T.ServiceInterfaceWithHostInfo>
marketplaceUrl: string | null
developerKey: string
@@ -197,7 +191,11 @@ export enum PackageState {
}
export interface CurrentDependencyInfo {
versionRange: string
title: string
icon: string
kind: 'exists' | 'running'
registryUrl: string
versionSpec: string
healthChecks: string[] // array of health check IDs
}

3
web/projects/ui/src/app/util/dry-update.ts
View File

@@ -12,8 +12,7 @@ export function dryUpdate(
pkg =>
Object.keys(pkg.currentDependencies || {}).some(
pkgId => pkgId === id,
) &&
!emver.satisfies(version, pkg.currentDependencies[id].versionRange),
) && !emver.satisfies(version, pkg.currentDependencies[id].versionSpec),
)
.map(pkg => getManifest(pkg).title)
}