ui(admin): server edit cleanup, fix startup form

resources/scripts/api/admin/servers/getServers.ts

@@ -71,8 +71,7 @@ export interface Server {
     eggId: number;
 
     container: {
-        startupCommand: string;
-        defaultStartup: string;
+        startup: string;
         image: string;
         environment: Map<string, string>;
     }
@@ -121,8 +120,7 @@ export const rawDataToServer = ({ attributes }: FractalResponseData): Server =>
     eggId: attributes.egg_id,
 
     container: {
-        startupCommand: attributes.container.startup_command,
-        defaultStartup: '',
+        startup: attributes.container.startup,
         image: attributes.container.image,
         environment: attributes.container.environment,
     },

resources/scripts/api/admin/servers/updateServer.ts

@@ -6,17 +6,21 @@ export interface Values {
     name: string;
     ownerId: number;
 
-    memory: number;
-    swap: number;
-    disk: number;
-    io: number;
-    cpu: number;
-    threads: string;
-    oomDisabled: boolean;
+    limits: {
+        memory: number;
+        swap: number;
+        disk: number;
+        io: number;
+        cpu: number;
+        threads: string;
+        oomDisabled: boolean;
+    }
 
-    databases: number;
-    allocations: number;
-    backups: number;
+    featureLimits: {
+        allocations: number;
+        backups: number;
+        databases: number;
+    }
 
     allocationId: number;
     addAllocations: number[];
@@ -24,16 +28,36 @@ export interface Values {
 }
 
 export default (id: number, server: Partial<Values>, include: string[] = []): Promise<Server> => {
-    const data = {};
-
-    Object.keys(server).forEach((key) => {
-        const key2 = key.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
-        // @ts-ignore
-        data[key2] = server[key];
-    });
-
     return new Promise((resolve, reject) => {
-        http.patch(`/api/application/servers/${id}`, data, { params: { include: include.join(',') } })
+        http.patch(
+            `/api/application/servers/${id}`,
+            {
+                external_id: server.externalId,
+                name: server.name,
+                owner_id: server.ownerId,
+
+                limits: {
+                    memory: server.limits?.memory,
+                    swap: server.limits?.swap,
+                    disk: server.limits?.disk,
+                    io: server.limits?.io,
+                    cpu: server.limits?.cpu,
+                    threads: server.limits?.threads,
+                    oom_disabled: server.limits?.oomDisabled,
+                },
+
+                feature_limits: {
+                    allocations: server.featureLimits?.allocations,
+                    backups: server.featureLimits?.backups,
+                    databases: server.featureLimits?.databases,
+                },
+
+                allocation_id: server.allocationId,
+                add_allocations: server.addAllocations,
+                remove_allocations: server.removeAllocations,
+            },
+            { params: { include: include.join(',') } }
+        )
             .then(({ data }) => resolve(rawDataToServer(data)))
             .catch(reject);
     });

resources/scripts/api/admin/servers/updateServerStartup.ts

@@ -0,0 +1,28 @@
+import http from '@/api/http';
+import { Server, rawDataToServer } from '@/api/admin/servers/getServers';
+
+export interface Values {
+    startup: string;
+    environment: Record<string, any>;
+    eggId: number;
+    image: string;
+    skipScripts: boolean;
+}
+
+export default (id: number, values: Partial<Values>, include: string[] = []): Promise<Server> => {
+    return new Promise((resolve, reject) => {
+        http.patch(
+            `/api/application/servers/${id}/startup`,
+            {
+                startup: values.startup,
+                environment: values.environment,
+                egg_id: values.eggId,
+                image: values.image,
+                skip_scripts: values.skipScripts,
+            },
+            { params: { include: include.join(',') } }
+        )
+            .then(({ data }) => resolve(rawDataToServer(data)))
+            .catch(reject);
+    });
+};