Merge pull request #991 from stgraber/main

ui: don't filter out the OS changelog entry on non-IncusOS systems

Author: presztak

ui/src/components/ChangelogView.tsx

@@ -7,11 +7,14 @@ import { ApplicationVersionData } from "types/server";
 type Props = {
   changelog?: Changelog;
   installedApplications?: ApplicationVersionData[];
+  osName?: string;
 };
 
-const baseApp = "IncusOS";
-
-const ChangeLogView: FC<Props> = ({ changelog, installedApplications }) => {
+const ChangeLogView: FC<Props> = ({
+  changelog,
+  installedApplications,
+  osName,
+}) => {
   const [openKeys, setOpenKeys] = useState<Record<string, boolean>>({});
 
   const toggleKey = (key: string) => {
@@ -38,7 +41,7 @@ const ChangeLogView: FC<Props> = ({ changelog, installedApplications }) => {
   // Get names of installed applications.
   const installedAppNames = installedApplications
     ? new Set([
-        baseApp.toLowerCase(),
+        (osName || "IncusOS").toLowerCase(),
         ...installedApplications.map((x) => x.name.toLowerCase()),
       ])
     : null;

ui/src/components/ServerUpdateBtn.tsx

@@ -100,6 +100,7 @@ const ServerUpdateBtn: FC<Props> = ({ server, recommended }) => {
           <ChangelogView
             changelog={changelog ?? undefined}
             installedApplications={server.version_data.applications}
+            osName={server.version_data.os?.name}
           />
         </p>
       </ModalWindow>

ui/src/types/server.d.ts

@@ -11,7 +11,14 @@ export interface ApplicationVersionData {
   version: string;
 }
 
+export interface OSVersionData {
+  name: string;
+  version: string;
+  version_next: string;
+}
+
 export interface ServerVersionData {
+  os: OSVersionData;
   applications: ApplicationVersionData[];
   needs_reboot: boolean;
   needs_update: boolean;