ui(admin): allow editing allocations for servers

resources/scripts/api/admin/nodes/allocations/createAllocation.ts

@@ -1,5 +1,5 @@
 import http from '@/api/http';
-import { Allocation, rawDataToAllocation } from '@/api/admin/nodes/allocations/getAllocations';
+import { Allocation, rawDataToAllocation } from '@/api/admin/nodes/getAllocations';
 
 export interface Values {
     ip: string;

resources/scripts/api/admin/nodes/allocations/getAllocations.ts

@@ -1,35 +1,9 @@
-import { Server, rawDataToServer } from '@/api/admin/servers/getServers';
-import http, { FractalResponseData, getPaginationSet, PaginatedResult } from '@/api/http';
+import { Allocation, rawDataToAllocation } from '@/api/admin/nodes/getAllocations';
+import http, { getPaginationSet, PaginatedResult } from '@/api/http';
 import { useContext } from 'react';
 import useSWR from 'swr';
 import { createContext } from '@/api/admin';
 
-export interface Allocation {
-    id: number;
-    ip: string;
-    port: number;
-    alias: string | null;
-    serverId: number | null;
-    assigned: boolean;
-
-    relations: {
-        server?: Server;
-    }
-}
-
-export const rawDataToAllocation = ({ attributes }: FractalResponseData): Allocation => ({
-    id: attributes.id,
-    ip: attributes.ip,
-    port: attributes.port,
-    alias: attributes.ip_alias || null,
-    serverId: attributes.server_id,
-    assigned: attributes.assigned,
-
-    relations: {
-        server: attributes.relationships?.server?.object === 'server' ? rawDataToServer(attributes.relationships.server as FractalResponseData) : undefined,
-    },
-});
-
 export interface Filters {
     id?: string;
     ip?: string;

resources/scripts/api/admin/nodes/getAllocations.ts

@@ -1,26 +1,50 @@
 import http, { FractalResponseData } from '@/api/http';
+import { rawDataToServer, Server } from '@/api/admin/servers/getServers';
 
 export interface Allocation {
     id: number;
     ip: string;
-    alias: string | null;
     port: number;
-    notes: string | null;
+    alias: string | null;
+    serverId: number | null;
     assigned: boolean;
+
+    relations: {
+        server?: Server;
+    }
 }
 
-export const rawDataToAllocation = (data: FractalResponseData): Allocation => ({
-    id: data.attributes.id,
-    ip: data.attributes.ip,
-    alias: data.attributes.ip_alias,
-    port: data.attributes.port,
-    notes: data.attributes.notes,
-    assigned: data.attributes.assigned,
+export const rawDataToAllocation = ({ attributes }: FractalResponseData): Allocation => ({
+    id: attributes.id,
+    ip: attributes.ip,
+    port: attributes.port,
+    alias: attributes.ip_alias || null,
+    serverId: attributes.server_id,
+    assigned: attributes.assigned,
+
+    relations: {
+        server: attributes.relationships?.server?.object === 'server' ? rawDataToServer(attributes.relationships.server as FractalResponseData) : undefined,
+    },
 });
 
-export default (id: string | number): Promise<Allocation[]> => {
+export interface Filters {
+    ip?: string
+    /* eslint-disable camelcase */
+    server_id?: string;
+    /* eslint-enable camelcase */
+}
+
+export default (id: string | number, filters: Filters = {}, include: string[] = []): Promise<Allocation[]> => {
+    const params = {};
+    if (filters !== null) {
+        Object.keys(filters).forEach(key => {
+            // @ts-ignore
+            params['filter[' + key + ']'] = filters[key];
+        });
+    }
+
     return new Promise((resolve, reject) => {
-        http.get(`/api/application/nodes/${id}/allocations`)
+        http.get(`/api/application/nodes/${id}/allocations`, { params: { include: include.join(','), ...params } })
             .then(({ data }) => resolve((data.data || []).map(rawDataToAllocation)))
             .catch(reject);
     });

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

@@ -1,7 +1,8 @@
+import { Allocation, rawDataToAllocation } from '@/api/admin/nodes/getAllocations';
 import { useContext } from 'react';
 import useSWR from 'swr';
 import { createContext } from '@/api/admin';
-import http, { FractalResponseData, getPaginationSet, PaginatedResult } from '@/api/http';
+import http, { FractalResponseData, FractalResponseList, getPaginationSet, PaginatedResult } from '@/api/http';
 import { Egg, rawDataToEgg } from '@/api/admin/eggs/getEgg';
 import { Node, rawDataToNode } from '@/api/admin/nodes/getNodes';
 import { User, rawDataToUser } from '@/api/admin/users/getUsers';
@@ -48,6 +49,7 @@ export interface Server {
     updatedAt: Date;
 
     relations: {
+        allocations?: Allocation[];
         egg?: Egg;
         node?: Node;
         user?: User;
@@ -96,6 +98,7 @@ export const rawDataToServer = ({ attributes }: FractalResponseData): Server =>
     updatedAt: new Date(attributes.updated_at),
 
     relations: {
+        allocations: ((attributes.relationships?.allocations as FractalResponseList | undefined)?.data || []).map(rawDataToAllocation),
         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,

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

@@ -17,6 +17,10 @@ export interface Values {
     databases: number;
     allocations: number;
     backups: number;
+
+    allocationId: number;
+    addAllocations: number[];
+    removeAllocations: number[];
 }
 
 export default (id: number, server: Partial<Values>, include: string[] = []): Promise<Server> => {