+
{{ item.name }}
} } } `, + styles: ` + :host { + display: grid; + grid-template-columns: repeat(12, 1fr); + flex-direction: column; + gap: 1rem; + margin: 1rem -1rem 0; + } + + :host-context(tui-root._mobile) { + display: flex; + } + + section { + display: flex; + flex-direction: column; + width: 100%; + padding: 1rem 1.5rem 0.5rem; + border-radius: 1rem; + background: var(--tui-clear); + box-shadow: inset 0 7rem 0 -4rem var(--tui-clear); + clip-path: polygon(0 1.5rem, 1.5rem 0, 100% 0, 100% 100%, 0 100%); + } + + h3 { + margin-bottom: 1.25rem; + } + + div { + display: flex; + flex-direction: column; + gap: inherit; + grid-column: span 4; + } + `, changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ @@ -113,7 +155,7 @@ import { MainStatus } from '../../../../../../../../../../core/startos/bindings/ ServiceHealthChecksComponent, ServiceDependenciesComponent, ServiceMenuComponent, - ServiceAdditionalComponent, + ServiceBackupsComponent, InstallingProgressPipe, ], }) @@ -134,13 +176,11 @@ export class ServiceRoute { this.depErrorService.getPkgDepErrors$(pkgId), ]), ), - map(([pkg, depErrors]) => { - return { - pkg, - dependencies: this.getDepInfo(pkg, depErrors), - status: renderPkgStatus(pkg, depErrors), - } - }), + map(([pkg, depErrors]) => ({ + pkg, + dependencies: this.getDepInfo(pkg, depErrors), + status: renderPkgStatus(pkg, depErrors), + })), ) readonly health$ = this.pkgId$.pipe( @@ -150,6 +190,16 @@ export class ServiceRoute { map(toHealthCheck), ) + isInstalling(state: string): boolean { + return ( + state === 'installing' || state === 'updating' || state === 'restoring' + ) + } + + isInstalled({ pkg, status }: any): boolean { + return pkg.stateInfo.state === 'installed' && status.primary !== 'backingUp' + } + getRendering({ primary }: PackageStatus): StatusRendering { return PrimaryRendering[primary] } @@ -160,9 +210,9 @@ export class ServiceRoute { ): DependencyInfo[] { const manifest = getManifest(pkg) - return Object.keys(pkg.currentDependencies) - .filter(id => !!manifest.dependencies[id]) - .map(id => this.getDepValues(pkg, manifest, id, depErrors)) + return Object.keys(pkg.currentDependencies).map(id => + this.getDepValues(pkg, manifest, id, depErrors), + ) } private getDepValues( @@ -203,7 +253,7 @@ export class ServiceRoute { depId: string, depErrors: PkgDependencyErrors, ) { - const depError = depErrors[pkgManifest.id] + const depError = depErrors[depId] let errorText: string | null = null let fixText: string | null = null @@ -271,10 +321,15 @@ export class ServiceRoute { version: pkg.currentDependencies[depId].versionSpec, } const navigationExtras: NavigationExtras = { + // @TODO state not being used by marketplace component. Maybe it is not important to use. state: { dependentInfo }, + queryParams: { id: depId }, } - await this.router.navigate(['marketplace', depId], navigationExtras) + await this.router.navigate( + ['portal', 'system', 'marketplace'], + navigationExtras, + ) } } diff --git a/web/projects/ui/src/app/routes/portal/routes/system/backups/modals/history.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/backups/modals/history.component.ts index 1a44c2322..a91bb1a7b 100644 --- a/web/projects/ui/src/app/routes/portal/routes/system/backups/modals/history.component.ts +++ b/web/projects/ui/src/app/routes/portal/routes/system/backups/modals/history.component.ts @@ -26,7 +26,7 @@ import { GetBackupIconPipe } from '../pipes/get-backup-icon.pipe' Past Events