ui(admin): too many changes, not enough commits

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

@@ -0,0 +1,23 @@
+import http from '@/api/http';
+import { rawDataToServerAllocation } from '@/api/transformers';
+
+export interface Allocation {
+    id: number;
+    ip: string;
+    alias: string | null;
+    port: number;
+    notes: string | null;
+    isDefault: boolean;
+}
+
+export default (uuid: string): Promise<[ Allocation, string[] ]> => {
+    return new Promise((resolve, reject) => {
+        http.get(`/api/application/allocations/${uuid}`)
+            .then(({ data }) => resolve([
+                rawDataToServerAllocation(data),
+                // eslint-disable-next-line camelcase
+                data.meta?.is_allocation_owner ? [ '*' ] : (data.meta?.user_permissions || []),
+            ]))
+            .catch(reject);
+    });
+};

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

@@ -67,18 +67,61 @@ export const rawDataToNode = ({ attributes }: FractalResponseData): Node => ({
     },
 });
 
+export interface Filters {
+    uuid?: string;
+    name?: string;
+    image?: string;
+    /* eslint-disable camelcase */
+    external_id?: string;
+    /* eslint-enable camelcase */
+}
+
 interface ctx {
     page: number;
     setPage: (value: number | ((s: number) => number)) => void;
+
+    filters: Filters | null;
+    setFilters: (filters: Filters | null) => void;
+
+    sort: string | null;
+    setSort: (sort: string | null) => void;
+
+    sortDirection: boolean;
+    setSortDirection: (direction: boolean) => void;
 }
 
-export const Context = createContext<ctx>({ page: 1, setPage: () => 1 });
+export const Context = createContext<ctx>({
+    page: 1,
+    setPage: () => 1,
+
+    filters: null,
+    setFilters: () => null,
+
+    sort: null,
+    setSort: () => null,
+
+    sortDirection: false,
+    setSortDirection: () => false,
+});
 
 export default (include: string[] = []) => {
-    const { page } = useContext(Context);
+    const { page, filters, sort, sortDirection } = useContext(Context);
 
-    return useSWR<PaginatedResult<Node>>([ 'nodes', page ], async () => {
-        const { data } = await http.get('/api/application/nodes', { params: { include: include.join(','), page } });
+    const params = {};
+    if (filters !== null) {
+        Object.keys(filters).forEach(key => {
+            // @ts-ignore
+            params['filter[' + key + ']'] = filters[key];
+        });
+    }
+
+    if (sort !== null) {
+        // @ts-ignore
+        params.sort = (sortDirection ? '-' : '') + sort;
+    }
+
+    return useSWR<PaginatedResult<Node>>([ 'nodes', page, filters, sort, sortDirection ], async () => {
+        const { data } = await http.get('/api/application/nodes', { params: { include: include.join(','), page, ...params } });
 
         return ({
             items: (data.data || []).map(rawDataToNode),

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

@@ -1,3 +1,4 @@
+import { Egg, rawDataToEgg } from '@/api/admin/eggs/getEgg';
 import http, { FractalResponseData, getPaginationSet, PaginatedResult } from '@/api/http';
 import { createContext, useContext } from 'react';
 import useSWR from 'swr';
@@ -6,18 +7,46 @@ import { User, rawDataToUser } from '@/api/admin/users/getUsers';
 
 export interface Server {
     id: number;
-    externalId: string;
+    externalId: string | null
     uuid: string;
     identifier: string;
     name: string;
     description: string;
-    isSuspended: boolean;
-    isInstalling: boolean;
-    isTransferring: boolean;
+    status: string;
+
+    limits: {
+        memory: number;
+        swap: number;
+        disk: number;
+        io: number;
+        cpu: number;
+        threads: string;
+    }
+
+    featureLimits: {
+        databases: number;
+        allocations: number;
+        backups: number;
+    }
+
+    ownerId: number;
+    nodeId: number;
+    allocationId: number;
+    nestId: number;
+    eggId: number;
+
+    container: {
+        startupCommand: string;
+        defaultStartup: string;
+        image: string;
+        environment: Map<string, string>;
+    }
+
     createdAt: Date;
     updatedAt: Date;
 
     relations: {
+        egg: Egg | undefined;
         node: Node | undefined;
         user: User | undefined;
     };
@@ -30,13 +59,41 @@ export const rawDataToServer = ({ attributes }: FractalResponseData): Server =>
     identifier: attributes.identifier,
     name: attributes.name,
     description: attributes.description,
-    isSuspended: attributes.is_suspended,
-    isInstalling: attributes.is_installing,
-    isTransferring: attributes.is_transferring,
+    status: attributes.status,
+
+    limits: {
+        memory: attributes.limits.memory,
+        swap: attributes.limits.swap,
+        disk: attributes.limits.disk,
+        io: attributes.limits.io,
+        cpu: attributes.limits.cpu,
+        threads: attributes.limits.threads,
+    },
+
+    featureLimits: {
+        databases: attributes.feature_limits.databases,
+        allocations: attributes.feature_limits.allocations,
+        backups: attributes.feature_limits.backups,
+    },
+
+    ownerId: attributes.owner_id,
+    nodeId: attributes.node_id,
+    allocationId: attributes.allocation_id,
+    nestId: attributes.nest_id,
+    eggId: attributes.egg_id,
+
+    container: {
+        startupCommand: attributes.container.startup_command,
+        defaultStartup: '',
+        image: attributes.container.image,
+        environment: attributes.container.environment,
+    },
+
     createdAt: new Date(attributes.created_at),
     updatedAt: new Date(attributes.updated_at),
 
     relations: {
+        egg: attributes.relationships?.egg !== undefined ? rawDataToEgg(attributes.relationships.egg as FractalResponseData) : undefined,
         node: attributes.relationships?.node !== undefined ? rawDataToNode(attributes.relationships.node as FractalResponseData) : undefined,
         user: attributes.relationships?.user !== undefined ? rawDataToUser(attributes.relationships.user as FractalResponseData) : undefined,
     },

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

@@ -0,0 +1,12 @@
+import http from '@/api/http';
+import { Server, rawDataToServer } from '@/api/admin/servers/getServers';
+
+export default (id: number, server: Partial<Server>, include: string[] = []): Promise<Server> => {
+    return new Promise((resolve, reject) => {
+        http.patch(`/api/application/servers/${id}`, {
+            ...server,
+        }, { params: { include: include.join(',') } })
+            .then(({ data }) => resolve(rawDataToServer(data)))
+            .catch(reject);
+    });
+};

resources/scripts/api/admin/users/searchUsers.ts

@@ -0,0 +1,25 @@
+import http from '@/api/http';
+import { User, rawDataToUser } from '@/api/admin/users/getUsers';
+
+interface Filters {
+    username?: string;
+    email?: string;
+}
+
+export default (filters?: Filters): Promise<User[]> => {
+    const params = {};
+    if (filters !== undefined) {
+        Object.keys(filters).forEach(key => {
+            // @ts-ignore
+            params['filter[' + key + ']'] = filters[key];
+        });
+    }
+
+    return new Promise((resolve, reject) => {
+        http.get('/api/application/users', { params: { ...params } })
+            .then(response => resolve(
+                (response.data.data || []).map(rawDataToUser)
+            ))
+            .catch(reject);
+    });
+};