From 221d99bfeedbd20d1ae9816d4a0b33ef79fb2c3b Mon Sep 17 00:00:00 2001
From: Drew Ansbacher <drew.ansbacher@spiredigital.com>
Date: Fri, 22 Oct 2021 16:09:31 -0600
Subject: [PATCH] eos-version-compat

---
 .../pages/marketplace-routes/marketplace.service.ts   | 11 ++++++-----
 ui/src/app/services/api/api.types.ts                  |  4 ++--
 ui/src/app/services/patch-db/data-model.ts            |  1 +
 ui/src/app/services/startup-alerts.service.ts         |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ui/src/app/pages/marketplace-routes/marketplace.service.ts b/ui/src/app/pages/marketplace-routes/marketplace.service.ts
index 0031cf29a..75883f4c9 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace.service.ts
+++ b/ui/src/app/pages/marketplace-routes/marketplace.service.ts
@@ -4,6 +4,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
 import { Emver } from 'src/app/services/emver.service'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 
 @Injectable({
   providedIn: 'root',
@@ -19,14 +20,14 @@ export class MarketplaceService {
   constructor (
     private readonly api: ApiService,
     private readonly emver: Emver,
-    private readonly config: ConfigService,
+    private readonly patch: PatchDbService,
   ) { }
 
   async load (): Promise<void> {
     const [data, eos, pkgs] = await Promise.all([
       this.api.getMarketplaceData({ }),
       this.api.getEos({
-        'eos-version': this.config.version,
+        'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
       }),
       this.getPkgs(1, 100),
     ])
@@ -39,7 +40,7 @@ export class MarketplaceService {
     const idAndCurrentVersions =  Object.keys(localPkgs).map(key => ({ id: key, version: localPkgs[key].manifest.version }))
     const latestPkgs = await this.api.getMarketplacePkgs({
       ids: idAndCurrentVersions,
-      'eos-version': this.config.version,
+      'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
     })
 
     return latestPkgs.filter(latestPkg => {
@@ -52,7 +53,7 @@ export class MarketplaceService {
   async getPkg (id: string, version?: string): Promise<MarketplacePkg> {
     const pkgs = await this.api.getMarketplacePkgs({
       ids: [{ id, version: version || '*' }],
-      'eos-version': this.config.version,
+      'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
     })
     const pkg = pkgs.find(pkg => pkg.manifest.id == id)
 
@@ -71,7 +72,7 @@ export class MarketplaceService {
     const pkgs = await this.api.getMarketplacePkgs({
       page: String(page),
       'per-page': String(perPage),
-      'eos-version': this.config.version,
+      'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
     })
 
     return pkgs
diff --git a/ui/src/app/services/api/api.types.ts b/ui/src/app/services/api/api.types.ts
index b1f53d4f8..6806b5206 100644
--- a/ui/src/app/services/api/api.types.ts
+++ b/ui/src/app/services/api/api.types.ts
@@ -194,14 +194,14 @@ export module RR {
   export type GetMarketplaceDataRes = MarketplaceData
 
   export type GetMarketplaceEOSReq = {
-    'eos-version': string
+    'eos-version-compat': string
   }
   export type GetMarketplaceEOSRes = MarketplaceEOS
 
   export type GetMarketplacePackagesReq = {
     ids?: { id: string, version: string }[]
     // iff !id
-    'eos-version': string
+    'eos-version-compat': string
     category?: string
     query?: string
     page?: string
diff --git a/ui/src/app/services/patch-db/data-model.ts b/ui/src/app/services/patch-db/data-model.ts
index ef1fde6e7..c306c9557 100644
--- a/ui/src/app/services/patch-db/data-model.ts
+++ b/ui/src/app/services/patch-db/data-model.ts
@@ -30,6 +30,7 @@ export interface ServerInfo {
     size: number
     downloaded: number
   }
+  'eos-version-compat': string
 }
 
 export enum ServerStatus {
diff --git a/ui/src/app/services/startup-alerts.service.ts b/ui/src/app/services/startup-alerts.service.ts
index 270b34974..9d36db9ad 100644
--- a/ui/src/app/services/startup-alerts.service.ts
+++ b/ui/src/app/services/startup-alerts.service.ts
@@ -116,7 +116,7 @@ export class StartupAlertsService {
 
   private async osUpdateCheck (): Promise<RR.GetMarketplaceEOSRes | undefined> {
     const res = await this.api.getEos({
-      'eos-version': this.config.version,
+      'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
     })
 
     if (this.emver.compare(this.config.version, res.version) === -1) {