ui(admin): get server startup ui working

resources/scripts/api/admin/nests/searchEggs.ts

@@ -5,7 +5,7 @@ interface Filters {
     name?: string;
 }
 
-export default (nestId: number, filters?: Filters): Promise<Egg[]> => {
+export default (nestId: number, filters?: Filters, include: string[] = []): Promise<Egg[]> => {
     const params = {};
     if (filters !== undefined) {
         Object.keys(filters).forEach(key => {
@@ -15,7 +15,7 @@ export default (nestId: number, filters?: Filters): Promise<Egg[]> => {
     }
 
     return new Promise((resolve, reject) => {
-        http.get(`/api/application/nests/${nestId}/eggs`, { params: { ...params } })
+        http.get(`/api/application/nests/${nestId}/eggs`, { params: { include: include.join(','), ...params } })
             .then(response => resolve(
                 (response.data.data || []).map(rawDataToEgg)
             ))

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

@@ -7,6 +7,38 @@ import { Egg, rawDataToEgg } from '@/api/admin/eggs/getEgg';
 import { Node, rawDataToNode } from '@/api/admin/nodes/getNodes';
 import { User, rawDataToUser } from '@/api/admin/users/getUsers';
 
+export interface ServerVariable {
+    id: number;
+    eggId: number;
+    name: string;
+    description: string;
+    envVariable: string;
+    defaultValue: string;
+    userViewable: boolean;
+    userEditable: boolean;
+    rules: string;
+    required: boolean;
+    serverValue: string;
+    createdAt: Date;
+    updatedAt: Date;
+}
+
+const rawDataToServerVariable = ({ attributes }: FractalResponseData): ServerVariable => ({
+    id: attributes.id,
+    eggId: attributes.egg_id,
+    name: attributes.name,
+    description: attributes.description,
+    envVariable: attributes.env_variable,
+    defaultValue: attributes.default_value,
+    userViewable: attributes.user_viewable,
+    userEditable: attributes.user_editable,
+    rules: attributes.rules,
+    required: attributes.required,
+    serverValue: attributes.server_value,
+    createdAt: new Date(attributes.created_at),
+    updatedAt: new Date(attributes.updated_at),
+});
+
 export interface Server {
     id: number;
     externalId: string | null
@@ -53,6 +85,7 @@ export interface Server {
         egg?: Egg;
         node?: Node;
         user?: User;
+        variables: ServerVariable[];
     }
 }
 
@@ -102,6 +135,7 @@ export const rawDataToServer = ({ attributes }: FractalResponseData): Server =>
         egg: attributes.relationships?.egg?.object === 'egg' ? rawDataToEgg(attributes.relationships.egg as FractalResponseData) : undefined,
         node: attributes.relationships?.node?.object === 'node' ? rawDataToNode(attributes.relationships.node as FractalResponseData) : undefined,
         user: attributes.relationships?.user?.object === 'user' ? rawDataToUser(attributes.relationships.user as FractalResponseData) : undefined,
+        variables: ((attributes.relationships?.variables as FractalResponseList | undefined)?.data || []).map(rawDataToServerVariable),
     },
 }) as Server;
 

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

@@ -31,7 +31,6 @@ export default (id: number, server: Partial<Values>, include: string[] = []): Pr
         // @ts-ignore
         data[key2] = server[key];
     });
-    console.log(data);
 
     return new Promise((resolve, reject) => {
         http.patch(`/api/application/servers/${id}`, data, { params: { include: include.join(',') } })