Merge 0cc84f0c54 into 31ea366e51

ota.go

@@ -135,9 +135,9 @@ func rpcGetLocalVersion() (*ota.LocalMetadata, error) {
 }
 
 type updateParams struct {
-	AppTargetVersion    string   `json:"appTargetVersion"`
+	AppTargetVersion    string `json:"appTargetVersion"`
-	SystemTargetVersion string   `json:"systemTargetVersion"`
+	SystemTargetVersion string `json:"systemTargetVersion"`
-	Components          []string `json:"components,omitempty"`
+	Components          string `json:"components,omitempty"` // components is a comma-separated list of components to update
 }
 
 func rpcTryUpdate() error {
@@ -154,7 +154,9 @@ func rpcCheckUpdateComponents(params updateParams, includePreRelease bool) (*ota
 		IncludePreRelease:   includePreRelease,
 		AppTargetVersion:    params.AppTargetVersion,
 		SystemTargetVersion: params.SystemTargetVersion,
-		Components:          params.Components,
+	}
+	if params.Components != "" {
+		updateParams.Components = strings.Split(params.Components, ",")
 	}
 	info, err := otaState.GetUpdateStatus(context.Background(), updateParams)
 	if err != nil {
@@ -168,7 +170,6 @@ func rpcTryUpdateComponents(params updateParams, includePreRelease bool, resetCo
 		DeviceID:          GetDeviceID(),
 		IncludePreRelease: includePreRelease,
 		ResetConfig:       resetConfig,
-		Components:        params.Components,
 	}
 
 	updateParams.AppTargetVersion = params.AppTargetVersion
@@ -181,6 +182,10 @@ func rpcTryUpdateComponents(params updateParams, includePreRelease bool, resetCo
 		return fmt.Errorf("failed to set system target version: %w", err)
 	}
 
+	if params.Components != "" {
+		updateParams.Components = strings.Split(params.Components, ",")
+	}
+
 	go func() {
 		err := otaState.TryUpdate(context.Background(), updateParams)
 		if err != nil {

ui/src/routes/devices.$id.settings.advanced.tsx

@@ -203,7 +203,7 @@ export default function SettingsAdvancedRoute() {
       // because it will be redirected to the update page later
       setVersionUpdateLoading(true);
       versionInfo = await checkUpdateComponents({
-        components,
+        components: components.join(","),
         appTargetVersion: appVersion,
         systemTargetVersion: systemVersion,
       }, devChannel);

ui/src/routes/devices.$id.settings.general.update.tsx

@@ -49,7 +49,7 @@ export default function SettingsGeneralUpdateRoute() {
 
     send("tryUpdateComponents", {
       params: {
-        components,
+        components: components.join(","),
         appTargetVersion,
         systemTargetVersion,
       },
@@ -196,12 +196,13 @@ function LoadingState({
       return await getVersionInfo();
     }
     const params : updateParams = {
-      components: [],
+      components: "",
       appTargetVersion: customAppVersion,
       systemTargetVersion: customSystemVersion,
     };
-    if (customAppVersion) params.components?.push("app");
+    if (customAppVersion) params.components += ",app";
-    if (customSystemVersion) params.components?.push("system");
+    if (customSystemVersion) params.components += ",system";
+    params.components = params.components?.replace(/^,+/, "");
 
     return await checkUpdateComponents(params, false);
   }, [customAppVersion, customSystemVersion, getVersionInfo]);

ui/src/utils/jsonrpc.ts

@@ -246,7 +246,7 @@ export async function getLocalVersion() {
 export interface updateParams {
   appTargetVersion?: string;
   systemTargetVersion?: string;
-  components?: string[];
+  components?: string;
 }
 
 export async function checkUpdateComponents(params: updateParams, includePreRelease: boolean) {