From e87182264a56eb7f29731a8c96ec655a02a32ee2 Mon Sep 17 00:00:00 2001 From: J H <2364004+Blu-J@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:14:12 -0600 Subject: [PATCH] chore: Fix the build for the start9labs/sdk was a new directory structure --- .../app-interfaces/app-interfaces.page.ts | 2 +- web/projects/ui/src/app/services/api/api.fixures.ts | 3 +++ web/projects/ui/src/app/services/api/mock-patch.ts | 1 + web/projects/ui/src/app/services/config.service.ts | 12 ++++++------ .../ui/src/app/services/patch-db/data-model.ts | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts index 84645fb9d..7e4302a3f 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts @@ -117,7 +117,7 @@ function getAddresses( : [] return hostnames - .map(h => { + .map((h: any) => { const addresses: MappedAddress[] = [] let name = '' diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts index ea83a4f0a..7cf449664 100644 --- a/web/projects/ui/src/app/services/api/api.fixures.ts +++ b/web/projects/ui/src/app/services/api/api.fixures.ts @@ -1785,6 +1785,7 @@ export module Mock { scheme: 'http', preferredExternalPort: 80, addSsl: { + addXForwardedHeaders: null, preferredExternalPort: 443, scheme: 'https', }, @@ -1857,6 +1858,7 @@ export module Mock { scheme: 'http', preferredExternalPort: 80, addSsl: { + addXForwardedHeaders: null, preferredExternalPort: 443, scheme: 'https', }, @@ -2032,6 +2034,7 @@ export module Mock { scheme: 'http', preferredExternalPort: 80, addSsl: { + addXForwardedHeaders: null, preferredExternalPort: 443, scheme: 'https', }, diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts index 35942e92f..a34a91652 100644 --- a/web/projects/ui/src/app/services/api/mock-patch.ts +++ b/web/projects/ui/src/app/services/api/mock-patch.ts @@ -410,6 +410,7 @@ export const mockPatchData: DataModel = { scheme: 'http', preferredExternalPort: 80, addSsl: { + addXForwardedHeaders: null, preferredExternalPort: 443, scheme: 'https', }, diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts index 50f228e95..d6ad17019 100644 --- a/web/projects/ui/src/app/services/config.service.ts +++ b/web/projects/ui/src/app/services/config.service.ts @@ -1,16 +1,16 @@ import { DOCUMENT } from '@angular/common' import { Inject, Injectable } from '@angular/core' import { WorkspaceConfig } from '@start9labs/shared' -import { - HostnameInfoIp, - HostnameInfoOnion, -} from '@start9labs/start-sdk/mjs/lib/types' +import { types } from '@start9labs/start-sdk' import { InstalledPackageDataEntry, PackageMainStatus, PackageState, } from 'src/app/services/patch-db/data-model' +type HostnameInfoIp = types.HostnameInfoIp +type HostnameInfoOnion = types.HostnameInfoOnion + const { gitHash, useMocks, @@ -79,14 +79,14 @@ export class ConfigService { if (host.kind === 'multi') { const onionHostname = host.hostnames.find( - h => h.kind === 'onion', + (h: any) => h.kind === 'onion', ) as HostnameInfoOnion if (this.isTor() && onionHostname) { url.hostname = onionHostname.hostname.value } else { const ipHostname = host.hostnames.find( - h => h.kind === 'ip', + (h: any) => h.kind === 'ip', ) as HostnameInfoIp if (!ipHostname) return '' diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts index e00350528..ccea8e076 100644 --- a/web/projects/ui/src/app/services/patch-db/data-model.ts +++ b/web/projects/ui/src/app/services/patch-db/data-model.ts @@ -2,7 +2,8 @@ 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 { ServiceInterfaceWithHostInfo } from '@start9labs/start-sdk/mjs/lib/types' +import { types } from '@start9labs/start-sdk' +type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo export interface DataModel { 'server-info': ServerInfo