From 63899f94fc07e1aca3a54b0c656defa81c5d1bd3 Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Tue, 19 Dec 2023 18:38:11 -0500
Subject: [PATCH] refactor: state updateOs key to updateOsResponse

---
 .../plugins/dynamix.my.servers/include/state.php       | 10 +++++-----
 web/store/server.ts                                    |  6 +++++-
 web/types/server.ts                                    |  8 ++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
index dcc2f71c9..aec78b55d 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
@@ -47,7 +47,7 @@ class ServerState
     private $rebootDetails;
     private $caseModel = '';
     private $keyfileBase64UrlSafe = '';
-    private $updateOs;
+    private $updateOsResponse;
 
     public $myServersFlashCfg = [];
     public $myServersMemoryCfg = [];
@@ -165,9 +165,9 @@ class ServerState
         }
 
         /**
-         * updateOs response is provided by the unraidcheck script saving to /tmp/unraidcheck/response.json
+         * updateOsResponse is provided by the unraidcheck script saving to /tmp/unraidcheck/response.json
          */
-        $this->updateOs = @json_decode(@file_get_contents('/tmp/unraidcheck/response.json'), true);
+        $this->updateOsResponse = @json_decode(@file_get_contents('/tmp/unraidcheck/response.json'), true);
     }
 
     /**
@@ -249,8 +249,8 @@ class ServerState
             $serverState['combinedKnownOrigins'] = $this->combinedKnownOrigins;
         }
 
-        if ($this->updateOs) {
-            $serverState['updateOs'] = $this->updateOs;
+        if ($this->updateOsResponse) {
+            $serverState['updateOsResponse'] = $this->updateOsResponse;
         }
 
         return $serverState;
diff --git a/web/store/server.ts b/web/store/server.ts
index bc5d2842e..6277d79d5 100644
--- a/web/store/server.ts
+++ b/web/store/server.ts
@@ -37,6 +37,7 @@ import type {
   ServerDateTimeFormat,
   ServerStateDataKeyActions,
   ServerOsVersionBranch,
+  ServerUpdateOsResponse,
 } from '~/types/server';
 
 /**
@@ -114,6 +115,7 @@ export const useServerStore = defineStore('server', () => {
   watch(theme, (newVal) => {
     if (newVal) { themeStore.setTheme(newVal); }
   });
+  const updateOsResponse = ref<ServerUpdateOsResponse>();
   const uptime = ref<number>(0);
   const username = ref<string>(''); // @todo potentially move to a user store
   const wanFQDN = ref<string>('');
@@ -787,6 +789,7 @@ export const useServerStore = defineStore('server', () => {
     if (typeof data?.avatar !== 'undefined') { avatar.value = data.avatar; }
     if (typeof data?.caseModel !== 'undefined') { caseModel.value = data.caseModel; }
     if (typeof data?.cloud !== 'undefined') { cloud.value = data.cloud; }
+    if (typeof data?.combinedKnownOrigins !== 'undefined') { combinedKnownOrigins.value = data.combinedKnownOrigins; }
     if (typeof data?.config !== 'undefined') { config.value = data.config; }
     if (typeof data?.connectPluginInstalled !== 'undefined') { connectPluginInstalled.value = data.connectPluginInstalled; }
     if (typeof data?.connectPluginVersion !== 'undefined') { connectPluginVersion.value = data.connectPluginVersion; }
@@ -817,12 +820,12 @@ export const useServerStore = defineStore('server', () => {
     if (typeof data?.site !== 'undefined') { site.value = data.site; }
     if (typeof data?.state !== 'undefined') { state.value = data.state; }
     if (typeof data?.theme !== 'undefined') { theme.value = data.theme; }
+    if (typeof data?.updateOsResponse !== 'undefined') { updateOsResponse.value = data.updateOsResponse; }
     if (typeof data?.uptime !== 'undefined') { uptime.value = data.uptime; }
     if (typeof data?.username !== 'undefined') { username.value = data.username; }
     if (typeof data?.wanFQDN !== 'undefined') { wanFQDN.value = data.wanFQDN; }
     if (typeof data?.regTm !== 'undefined') { regTm.value = data.regTm; }
     if (typeof data?.regTo !== 'undefined') { regTo.value = data.regTo; }
-    if (typeof data?.combinedKnownOrigins !== 'undefined') { combinedKnownOrigins.value = data.combinedKnownOrigins; }
   };
 
   const mutateServerStateFromApi = (data: serverStateQuery): Server => {
@@ -986,6 +989,7 @@ export const useServerStore = defineStore('server', () => {
     site,
     state,
     theme,
+    updateOsResponse,
     uptime,
     username,
     refreshServerStateStatus,
diff --git a/web/types/server.ts b/web/types/server.ts
index 83ed48675..48f7d129b 100644
--- a/web/types/server.ts
+++ b/web/types/server.ts
@@ -49,6 +49,13 @@ export interface ServerDateTimeFormat {
   time: string;
 }
 
+export interface ServerUpdateOsResponse {
+  version: string; // "6.13.0-beta0.27"
+  name: string; // "Unraid 6.13.0-beta0.27"
+  date: string; // "2023-12-13"
+  isNewer: boolean; // false
+}
+
 export interface Server {
   apiKey?: string;
   apiVersion?: string;
@@ -91,6 +98,7 @@ export interface Server {
   site?: string;
   state?: ServerState;
   theme?: Theme | undefined;
+  updateOsResponse?: ServerUpdateOsResponse;
   uptime?: number;
   username?: string;
   wanFQDN?: string;