Make database rows use context better

This commit is contained in:
Dane Everitt 2020-04-10 10:56:25 -07:00
parent 0ebf842757
commit 708c15eba8
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 83 additions and 86 deletions

View file

@ -0,0 +1,31 @@
import { action, Action } from 'easy-peasy';
import { ServerDatabase } from '@/api/server/getServerDatabases';
export interface ServerDatabaseStore {
data: ServerDatabase[];
setDatabases: Action<ServerDatabaseStore, ServerDatabase[]>;
appendDatabase: Action<ServerDatabaseStore, ServerDatabase>;
removeDatabase: Action<ServerDatabaseStore, string>;
}
const databases: ServerDatabaseStore = {
data: [],
setDatabases: action((state, payload) => {
state.data = payload;
}),
appendDatabase: action((state, payload) => {
if (state.data.find(database => database.id === payload.id)) {
state.data = state.data.map(database => database.id === payload.id ? payload : database);
} else {
state.data = [ ...state.data, payload ];
}
}),
removeDatabase: action((state, payload) => {
state.data = [ ...state.data.filter(database => database.id !== payload) ];
}),
};
export default databases;

View file

@ -1,12 +1,12 @@
import getServer, { Server } from '@/api/server/getServer';
import { action, Action, createContextStore, thunk, Thunk } from 'easy-peasy';
import socket, { SocketStore } from './socket';
import { ServerDatabase } from '@/api/server/getServerDatabases';
import files, { ServerFileStore } from '@/state/server/files';
import subusers, { ServerSubuserStore } from '@/state/server/subusers';
import { composeWithDevTools } from 'redux-devtools-extension';
import backups, { ServerBackupStore } from '@/state/server/backups';
import schedules, { ServerScheduleStore } from '@/state/server/schedules';
import databases, { ServerDatabaseStore } from '@/state/server/databases';
export type ServerStatus = 'offline' | 'starting' | 'stopping' | 'running';
@ -23,7 +23,7 @@ const server: ServerDataStore = {
permissions: [],
getServer: thunk(async (actions, payload) => {
const [server, permissions] = await getServer(payload);
const [ server, permissions ] = await getServer(payload);
actions.setServer(server);
actions.setPermissions(permissions);
@ -50,26 +50,6 @@ const status: ServerStatusStore = {
}),
};
interface ServerDatabaseStore {
items: ServerDatabase[];
setDatabases: Action<ServerDatabaseStore, ServerDatabase[]>;
appendDatabase: Action<ServerDatabaseStore, ServerDatabase>;
removeDatabase: Action<ServerDatabaseStore, ServerDatabase>;
}
const databases: ServerDatabaseStore = {
items: [],
setDatabases: action((state, payload) => {
state.items = payload;
}),
appendDatabase: action((state, payload) => {
state.items = state.items.filter(item => item.id !== payload.id).concat(payload);
}),
removeDatabase: action((state, payload) => {
state.items = state.items.filter(item => item.id !== payload.id);
}),
};
export interface ServerStore {
server: ServerDataStore;
subusers: ServerSubuserStore;
@ -94,7 +74,7 @@ export const ServerContext = createContextStore<ServerStore>({
clearServerState: action(state => {
state.server.data = undefined;
state.server.permissions = [];
state.databases.items = [];
state.databases.data = [];
state.subusers.data = [];
state.files.directory = '/';
state.files.contents = [];