Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

refactor(frontend): Phase 3 §6.1 — migrate databases modals to shared Modal

Juan Denisa877e49585b7
diff --git a/frontend/src/components/databases/modals.jsx b/frontend/src/components/databases/modals.jsx
index d439cb20..e2ebcdec 100644
--- a/frontend/src/components/databases/modals.jsx
+++ b/frontend/src/components/databases/modals.jsx
@@ -1,35 +1,31 @@
import { useState } from 'react';
import api from '../../services/api';
+import Modal from '@/components/Modal';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
// Create / credentials modals for the explorer. Logic is unchanged from the
// original Databases page; the explorer wires them to its toolbar and tree.
+// Each modal component is mounted only while open, so Modal `open` is constant.
+// The submit button stays inside <form>, so actions live in the body (not the
+// Modal footer slot).
function CredentialsResult({ title, rows, onDone }) {
return (
- <div className="modal-overlay" onClick={onDone}>
- <div className="modal" onClick={(e) => e.stopPropagation()}>
- <div className="modal-header">
- <h2>{title}</h2>
- <button className="modal-close" onClick={onDone}>&times;</button>
- </div>
- <div className="modal-body">
- <div className="credentials-box">
- <p>Save these credentials — the password won&apos;t be shown again.</p>
- {rows.map(([label, value]) => (
- <div className="credential-item" key={label}>
- <label>{label}:</label>
- <code>{value}</code>
- </div>
- ))}
+ <Modal open onClose={onDone} title={title}>
+ <div className="credentials-box">
+ <p>Save these credentials — the password won&apos;t be shown again.</p>
+ {rows.map(([label, value]) => (
+ <div className="credential-item" key={label}>
+ <label>{label}:</label>
+ <code>{value}</code>
</div>
- </div>
- <div className="modal-actions">
- <Button onClick={onDone}>Done</Button>
- </div>
+ ))}
</div>
- </div>
+ <div className="modal-actions">
+ <Button onClick={onDone}>Done</Button>
+ </div>
+ </Modal>
);
}
@@ -67,49 +63,43 @@ export function CreateMySQLDatabaseModal({ onClose, onCreated }) {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={(e) => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create MySQL database</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Create MySQL database">
+ {error && <div className="error-message">{error}</div>}
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <label>Database name *</label>
+ <Input type="text" value={formData.name} onChange={(e) => setFormData({ ...formData, name: e.target.value })} placeholder="my_database" required pattern="[a-zA-Z0-9_]+" autoFocus />
</div>
- {error && <div className="error-message">{error}</div>}
- <form onSubmit={handleSubmit}>
+ <div className="form-row">
<div className="form-group">
- <label>Database name *</label>
- <Input type="text" value={formData.name} onChange={(e) => setFormData({ ...formData, name: e.target.value })} placeholder="my_database" required pattern="[a-zA-Z0-9_]+" autoFocus />
- </div>
- <div className="form-row">
- <div className="form-group">
- <label>Character set</label>
- <select value={formData.charset} onChange={(e) => setFormData({ ...formData, charset: e.target.value })}>
- <option value="utf8mb4">utf8mb4</option>
- <option value="utf8">utf8</option>
- <option value="latin1">latin1</option>
- </select>
- </div>
- <div className="form-group">
- <label>Collation</label>
- <select value={formData.collation} onChange={(e) => setFormData({ ...formData, collation: e.target.value })}>
- <option value="utf8mb4_unicode_ci">utf8mb4_unicode_ci</option>
- <option value="utf8mb4_general_ci">utf8mb4_general_ci</option>
- <option value="utf8_general_ci">utf8_general_ci</option>
- </select>
- </div>
+ <label>Character set</label>
+ <select value={formData.charset} onChange={(e) => setFormData({ ...formData, charset: e.target.value })}>
+ <option value="utf8mb4">utf8mb4</option>
+ <option value="utf8">utf8</option>
+ <option value="latin1">latin1</option>
+ </select>
</div>
<div className="form-group">
- <label className="checkbox-label">
- <input type="checkbox" checked={formData.create_user} onChange={(e) => setFormData({ ...formData, create_user: e.target.checked })} />
- Create user with same name and full privileges
- </label>
- </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
- <Button type="submit" disabled={loading}>{loading ? 'Creating…' : 'Create database'}</Button>
+ <label>Collation</label>
+ <select value={formData.collation} onChange={(e) => setFormData({ ...formData, collation: e.target.value })}>
+ <option value="utf8mb4_unicode_ci">utf8mb4_unicode_ci</option>
+ <option value="utf8mb4_general_ci">utf8mb4_general_ci</option>
+ <option value="utf8_general_ci">utf8_general_ci</option>
+ </select>
</div>
- </form>
- </div>
- </div>
+ </div>
+ <div className="form-group">
+ <label className="checkbox-label">
+ <input type="checkbox" checked={formData.create_user} onChange={(e) => setFormData({ ...formData, create_user: e.target.checked })} />
+ Create user with same name and full privileges
+ </label>
+ </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
+ <Button type="submit" disabled={loading}>{loading ? 'Creating…' : 'Create database'}</Button>
+ </div>
+ </form>
+ </Modal>
);
}
@@ -153,47 +143,41 @@ export function CreateMySQLUserModal({ databases, onClose, onCreated }) {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={(e) => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create MySQL user</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Create MySQL user">
+ {error && <div className="error-message">{error}</div>}
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <label>Username *</label>
+ <Input type="text" value={formData.username} onChange={(e) => setFormData({ ...formData, username: e.target.value })} placeholder="db_user" required autoFocus />
</div>
- {error && <div className="error-message">{error}</div>}
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <label>Username *</label>
- <Input type="text" value={formData.username} onChange={(e) => setFormData({ ...formData, username: e.target.value })} placeholder="db_user" required autoFocus />
- </div>
- <div className="form-group">
- <label>Password</label>
- <div className="input-with-button">
- <Input type="text" value={formData.password} onChange={(e) => setFormData({ ...formData, password: e.target.value })} placeholder="Leave empty to auto-generate" />
- <Button type="button" variant="outline" size="sm" onClick={generatePassword}>Generate</Button>
- </div>
- </div>
- <div className="form-group">
- <label>Host</label>
- <select value={formData.host} onChange={(e) => setFormData({ ...formData, host: e.target.value })}>
- <option value="localhost">localhost</option>
- <option value="%">% (any host)</option>
- <option value="127.0.0.1">127.0.0.1</option>
- </select>
- </div>
- <div className="form-group">
- <label>Grant privileges on database</label>
- <select value={formData.database} onChange={(e) => setFormData({ ...formData, database: e.target.value })}>
- <option value="">— None —</option>
- {databases.map((db) => <option key={db.name} value={db.name}>{db.name}</option>)}
- </select>
+ <div className="form-group">
+ <label>Password</label>
+ <div className="input-with-button">
+ <Input type="text" value={formData.password} onChange={(e) => setFormData({ ...formData, password: e.target.value })} placeholder="Leave empty to auto-generate" />
+ <Button type="button" variant="outline" size="sm" onClick={generatePassword}>Generate</Button>
</div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
- <Button type="submit" disabled={loading}>{loading ? 'Creating…' : 'Create user'}</Button>
- </div>
- </form>
- </div>
- </div>
+ </div>
+ <div className="form-group">
+ <label>Host</label>
+ <select value={formData.host} onChange={(e) => setFormData({ ...formData, host: e.target.value })}>
+ <option value="localhost">localhost</option>
+ <option value="%">% (any host)</option>
+ <option value="127.0.0.1">127.0.0.1</option>
+ </select>
+ </div>
+ <div className="form-group">
+ <label>Grant privileges on database</label>
+ <select value={formData.database} onChange={(e) => setFormData({ ...formData, database: e.target.value })}>
+ <option value="">— None —</option>
+ {databases.map((db) => <option key={db.name} value={db.name}>{db.name}</option>)}
+ </select>
+ </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
+ <Button type="submit" disabled={loading}>{loading ? 'Creating…' : 'Create user'}</Button>
+ </div>
+ </form>
+ </Modal>
);
}
@@ -231,39 +215,33 @@ export function CreatePostgreSQLDatabaseModal({ onClose, onCreated }) {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={(e) => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create PostgreSQL database</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Create PostgreSQL database">
+ {error && <div className="error-message">{error}</div>}
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <label>Database name *</label>
+ <Input type="text" value={formData.name} onChange={(e) => setFormData({ ...formData, name: e.target.value })} placeholder="my_database" required autoFocus />
</div>
- {error && <div className="error-message">{error}</div>}
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <label>Database name *</label>
- <Input type="text" value={formData.name} onChange={(e) => setFormData({ ...formData, name: e.target.value })} placeholder="my_database" required autoFocus />
- </div>
- <div className="form-group">
- <label>Encoding</label>
- <select value={formData.encoding} onChange={(e) => setFormData({ ...formData, encoding: e.target.value })}>
- <option value="UTF8">UTF8</option>
- <option value="LATIN1">LATIN1</option>
- <option value="SQL_ASCII">SQL_ASCII</option>
- </select>
- </div>
- <div className="form-group">
- <label className="checkbox-label">
- <input type="checkbox" checked={formData.create_user} onChange={(e) => setFormData({ ...formData, create_user: e.target.checked })} />
- Create user with same name and full privileges
- </label>
- </div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
- <Button type="submit" disabled={loading}>{loading ? 'Creating…' : 'Create database'}</Button>
- </div>
- </form>
- </div>
- </div>
+ <div className="form-group">
+ <label>Encoding</label>
+ <select value={formData.encoding} onChange={(e) => setFormData({ ...formData, encoding: e.target.value })}>
+ <option value="UTF8">UTF8</option>
+ <option value="LATIN1">LATIN1</option>
+ <option value="SQL_ASCII">SQL_ASCII</option>
+ </select>
+ </div>
+ <div className="form-group">
+ <label className="checkbox-label">
+ <input type="checkbox" checked={formData.create_user} onChange={(e) => setFormData({ ...formData, create_user: e.target.checked })} />
+ Create user with same name and full privileges
+ </label>
+ </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
+ <Button type="submit" disabled={loading}>{loading ? 'Creating…' : 'Create database'}</Button>
+ </div>
+ </form>
+ </Modal>
);
}
@@ -307,38 +285,32 @@ export function CreatePostgreSQLUserModal({ databases, onClose, onCreated }) {
}
return (
- <div className="modal-overlay" onClick={onClose}>
- <div className="modal" onClick={(e) => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Create PostgreSQL user</h2>
- <button className="modal-close" onClick={onClose}>&times;</button>
+ <Modal open onClose={onClose} title="Create PostgreSQL user">
+ {error && <div className="error-message">{error}</div>}
+ <form onSubmit={handleSubmit}>
+ <div className="form-group">
+ <label>Username *</label>
+ <Input type="text" value={formData.username} onChange={(e) => setFormData({ ...formData, username: e.target.value })} placeholder="db_user" required autoFocus />
</div>
- {error && <div className="error-message">{error}</div>}
- <form onSubmit={handleSubmit}>
- <div className="form-group">
- <label>Username *</label>
- <Input type="text" value={formData.username} onChange={(e) => setFormData({ ...formData, username: e.target.value })} placeholder="db_user" required autoFocus />
- </div>
- <div className="form-group">
- <label>Password</label>
- <div className="input-with-button">
- <Input type="text" value={formData.password} onChange={(e) => setFormData({ ...formData, password: e.target.value })} placeholder="Leave empty to auto-generate" />
- <Button type="button" variant="outline" size="sm" onClick={generatePassword}>Generate</Button>
- </div>
- </div>
- <div className="form-group">
- <label>Grant privileges on database</label>
- <select value={formData.database} onChange={(e) => setFormData({ ...formData, database: e.target.value })}>
- <option value="">— None —</option>
- {databases.map((db) => <option key={db.name} value={db.name}>{db.name}</option>)}
- </select>
+ <div className="form-group">
+ <label>Password</label>
+ <div className="input-with-button">
+ <Input type="text" value={formData.password} onChange={(e) => setFormData({ ...formData, password: e.target.value })} placeholder="Leave empty to auto-generate" />
+ <Button type="button" variant="outline" size="sm" onClick={generatePassword}>Generate</Button>
</div>
- <div className="modal-actions">
- <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
- <Button type="submit" disabled={loading}>{loading ? 'Creating…' : 'Create user'}</Button>
- </div>
- </form>
- </div>
- </div>
+ </div>
+ <div className="form-group">
+ <label>Grant privileges on database</label>
+ <select value={formData.database} onChange={(e) => setFormData({ ...formData, database: e.target.value })}>
+ <option value="">— None —</option>
+ {databases.map((db) => <option key={db.name} value={db.name}>{db.name}</option>)}
+ </select>
+ </div>
+ <div className="modal-actions">
+ <Button type="button" variant="outline" onClick={onClose}>Cancel</Button>
+ <Button type="submit" disabled={loading}>{loading ? 'Creating…' : 'Create user'}</Button>
+ </div>
+ </form>
+ </Modal>
);
}