mirror of
https://github.com/Termix-SSH/Termix.git
synced 2026-07-16 05:13:36 +00:00
ad86c2040b
* fix select edit host but not update view (#438) * fix: Checksum issue with chocolatey * fix: Remove homebrew old stuff * Add Korean translation (#439) Co-authored-by: 송준우 <2484@coreit.co.kr> * feat: Automate flatpak * fix: Add imagemagik to electron builder to resolve build error * fix: Build error with runtime repo flag * fix: Flatpak runtime error and install freedesktop ver warning * fix: Flatpak runtime error and install freedesktop ver warning * feat: Re-add homebrew cask and move scripts to backend * fix: No sandbox flag issue * fix: Change name for electron macos cask output * fix: Sandbox error with Linux * fix: Remove comming soon for app stores in readme * Adding Comment at the end of the public_key on the host on deploy (#440) * Add termix.rb Cask file * Update Termix to version 1.9.0 with new checksum * Update README to remove 'coming soon' notes * -Add New Interface for Credential DB -Add Credential Name as a comment into the server authorized_key file --------- Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> * Sudo auto fill password (#441) * Add termix.rb Cask file * Update Termix to version 1.9.0 with new checksum * Update README to remove 'coming soon' notes * Feature Sudo password auto-fill; * Fix locale json shema; --------- Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> * Added Italian Language; (#445) * Add termix.rb Cask file * Update Termix to version 1.9.0 with new checksum * Update README to remove 'coming soon' notes * Added Italian Language; --------- Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> * Auto collapse snippet folders (#448) * Add termix.rb Cask file * Update Termix to version 1.9.0 with new checksum * Update README to remove 'coming soon' notes * feat: Add collapsable snippets (customizable in user profile) * Translations (#447) * Add termix.rb Cask file * Update Termix to version 1.9.0 with new checksum * Update README to remove 'coming soon' notes * Added Italian Language; * Fix translations; Removed duplicate keys, synchronised other languages using English as the source, translated added keys, fixed inaccurate translations. --------- Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> * Remove PTY-level keepalive (#449) * Add termix.rb Cask file * Update Termix to version 1.9.0 with new checksum * Update README to remove 'coming soon' notes * Remove PTY-level keepalive to prevent unwanted terminal output; use SSH-level keepalive instead --------- Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> * feat: Seperate server stats and tunnel management (improved both UI's) then started initial docker implementation * fix: finalize adding docker to db * feat: Add docker management support (local squash) * Fix RBAC role system bugs and improve UX (#446) * Fix RBAC role system bugs and improve UX - Fix user list dropdown selection in host sharing - Fix role sharing permissions to include role-based access - Fix translation template interpolation for success messages - Standardize system roles to admin and user only - Auto-assign user role to new registrations - Remove blocking confirmation dialogs in modal contexts - Add missing i18n keys for common actions - Fix button type to prevent unintended form submissions * Enhance RBAC system with UI improvements and security fixes - Move role assignment to Users tab with per-user role management - Protect system roles (admin/user) from editing and manual assignment - Simplify permission system: remove Use level, keep View and Manage - Hide Update button and Sharing tab for view-only/shared hosts - Prevent users from sharing hosts with themselves - Unify table and modal styling across admin panels - Auto-assign system roles on user registration - Add permission metadata to host interface * Add empty state message for role assignment - Display helpful message when no custom roles available - Clarify that system roles are auto-assigned - Add noCustomRolesToAssign translation in English and Chinese * fix: Prevent credential sharing errors for shared hosts - Skip credential resolution for shared hosts with credential authentication to prevent decryption errors (credentials are encrypted per-user) - Add warning alert in sharing tab when host uses credential authentication - Inform users that shared users cannot connect to credential-based hosts - Add translations for credential sharing warning (EN/ZH) This prevents authentication failures when sharing hosts configured with credential authentication while maintaining security by keeping credentials isolated per user. * feat: Improve rbac UI and fixes some bugs --------- Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> Co-authored-by: LukeGus <bugattiguy527@gmail.com> * SOCKS5 support (#452) * Add termix.rb Cask file * Update Termix to version 1.9.0 with new checksum * Update README to remove 'coming soon' notes * SOCKS5 support Adding single and chain socks5 proxy support * fix: cleanup files --------- Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> Co-authored-by: LukeGus <bugattiguy527@gmail.com> * Notes and Expiry fields add (#453) * Add termix.rb Cask file * Update Termix to version 1.9.0 with new checksum * Update README to remove 'coming soon' notes * Notes and Expiry add * fix: cleanup files --------- Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> Co-authored-by: LukeGus <bugattiguy527@gmail.com> * fix: ssh host types * fix: sudo incorrect styling and remove expiration date * feat: add sudo password and add diagonal bg's * fix: snippet running on enter key * fix: base64 decoding * fix: improve server stats / rbac * fix: wrap ssh host json export in hosts array * feat: auto trim host inputs, fix file manager jump hosts, dashboard prevent duplicates, file manager terminal not size updating, improve left sidebar sorting, hide/show tags, add apperance user profile tab, add new host manager tabs. * feat: improve terminal connection speed * fix: sqlite constriant errors and support non-root user (nginx perm issue) * feat: add beta syntax highlighing to terminal * feat: update imports and improve admin settings user management * chore: update translations * chore: update translations * feat: Complete light mode implementation with semantic theme system (#450) - Add comprehensive light/dark mode CSS variables with semantic naming - Implement theme-aware scrollbars using CSS variables - Add light mode backgrounds: --bg-base, --bg-elevated, --bg-surface, etc. - Add theme-aware borders: --border-base, --border-panel, --border-subtle - Add semantic text colors: --foreground-secondary, --foreground-subtle - Convert oklch colors to hex for better compatibility - Add theme awareness to CodeMirror editors - Update dark mode colors for consistency (background, sidebar, card, muted, input) - Add Tailwind color mappings for semantic classes Co-authored-by: Luke Gustafson <88517757+LukeGus@users.noreply.github.com> * fix: syntax errors * chore: updating/match themes and split admin settings * feat: add translation workflow and remove old translation.json * fix: translation workflow error * fix: translation workflow error * feat: improve translation system and update workflow * fix: wrong path for translations * fix: change translation to flat files * fix: gh rule error * chore: auto-translate to multiple languages (#458) * chore: improve organization and made a few styling changes in host manager * feat: improve terminal stability and split out the host manager * fix: add unnversiioned files * chore: migrate all to use the new theme system * fix: wrong animation line colors * fix: rbac implementation general issues (local squash) * fix: remove unneeded files * feat: add 10 new langs * chore: update gitnore * chore: auto-translate to multiple languages (#459) * fix: improve tunnel system * fix: properly split tabs, still need to fix up the host manager * chore: cleanup files (possible RC) * feat: add norwegian * chore: auto-translate to multiple languages (#461) * fix: small qol fixes and began readme update * fix: run cleanup script * feat: add docker docs button * feat: general bug fixes and readme updates * fix: translations * chore: auto-translate to multiple languages (#462) * fix: cleanup files * fix: test new translation issue and add better server-stats support * fix: fix translate error * chore: auto-translate to multiple languages (#463) * fix: fix translate mismatching text * chore: auto-translate to multiple languages (#465) * fix: fix translate mismatching text * fix: fix translate mismatching text * chore: auto-translate to multiple languages (#466) * fix: fix translate mismatching text * fix: fix translate mismatching text * fix: fix translate mismatching text * chore: auto-translate to multiple languages (#467) * fix: fix translate mismatching text * chore: auto-translate to multiple languages (#468) * feat: add to readme, a few qol changes, and improve server stats in general * chore: auto-translate to multiple languages (#469) * feat: turned disk uage into graph and fixed issue with termina console * fix: electron build error and hide icons when shared * chore: run clean * fix: general server stats issues, file manager decoding, ui qol * fix: add dashboard line breaks * fix: docker console error * fix: docker console not loading and mismatched stripped background for electron * fix: docker console not loading * chore: docker console not loading in docker * chore: translate readme to chinese * chore: match package lock to package json * chore: nginx config issue for dokcer console * chore: auto-translate to multiple languages (#470) --------- Co-authored-by: Tran Trung Kien <kientt13.7@gmail.com> Co-authored-by: junu <bigdwarf_@naver.com> Co-authored-by: 송준우 <2484@coreit.co.kr> Co-authored-by: SlimGary <trash.slim@gmail.com> Co-authored-by: Nunzio Marfè <nunzio.marfe@protonmail.com> Co-authored-by: Wesley Reid <starhound@lostsouls.org> Co-authored-by: ZacharyZcR <zacharyzcr1984@gmail.com> Co-authored-by: Denis <38875137+Medvedinca@users.noreply.github.com> Co-authored-by: Peet McKinney <68706879+PeetMcK@users.noreply.github.com>
348 lines
10 KiB
TypeScript
348 lines
10 KiB
TypeScript
import React, { useState, useEffect } from "react";
|
|
import { DiffEditor } from "@monaco-editor/react";
|
|
import { Button } from "@/components/ui/button.tsx";
|
|
import { toast } from "sonner";
|
|
import { useTranslation } from "react-i18next";
|
|
import {
|
|
Download,
|
|
RefreshCw,
|
|
Eye,
|
|
EyeOff,
|
|
ArrowLeftRight,
|
|
FileText,
|
|
} from "lucide-react";
|
|
import {
|
|
readSSHFile,
|
|
downloadSSHFile,
|
|
getSSHStatus,
|
|
connectSSH,
|
|
} from "@/ui/main-axios.ts";
|
|
import type { FileItem, SSHHost } from "@/types";
|
|
|
|
interface DiffViewerProps {
|
|
file1: FileItem;
|
|
file2: FileItem;
|
|
sshSessionId: string;
|
|
sshHost: SSHHost;
|
|
onDownload1?: () => void;
|
|
onDownload2?: () => void;
|
|
}
|
|
|
|
export function DiffViewer({
|
|
file1,
|
|
file2,
|
|
sshSessionId,
|
|
sshHost,
|
|
}: DiffViewerProps) {
|
|
const { t } = useTranslation();
|
|
const [content1, setContent1] = useState<string>("");
|
|
const [content2, setContent2] = useState<string>("");
|
|
const [isLoading, setIsLoading] = useState(false);
|
|
const [error, setError] = useState<string | null>(null);
|
|
const [diffMode, setDiffMode] = useState<"side-by-side" | "inline">(
|
|
"side-by-side",
|
|
);
|
|
const [showLineNumbers, setShowLineNumbers] = useState(true);
|
|
|
|
const ensureSSHConnection = async () => {
|
|
try {
|
|
const status = await getSSHStatus(sshSessionId);
|
|
if (!status.connected) {
|
|
await connectSSH(sshSessionId, {
|
|
hostId: sshHost.id,
|
|
ip: sshHost.ip,
|
|
port: sshHost.port,
|
|
username: sshHost.username,
|
|
password: sshHost.password,
|
|
sshKey: sshHost.key,
|
|
keyPassword: sshHost.keyPassword,
|
|
authType: sshHost.authType,
|
|
credentialId: sshHost.credentialId,
|
|
userId: sshHost.userId,
|
|
});
|
|
}
|
|
} catch {
|
|
await connectSSH(sshSessionId, {
|
|
hostId: sshHost.id,
|
|
ip: sshHost.ip,
|
|
port: sshHost.port,
|
|
username: sshHost.username,
|
|
password: sshHost.password,
|
|
sshKey: sshHost.key,
|
|
keyPassword: sshHost.keyPassword,
|
|
authType: sshHost.authType,
|
|
credentialId: sshHost.credentialId,
|
|
userId: sshHost.userId,
|
|
});
|
|
}
|
|
};
|
|
|
|
const loadFileContents = async () => {
|
|
if (file1.type !== "file" || file2.type !== "file") {
|
|
setError(t("fileManager.canOnlyCompareFiles"));
|
|
return;
|
|
}
|
|
|
|
try {
|
|
setIsLoading(true);
|
|
setError(null);
|
|
|
|
await ensureSSHConnection();
|
|
|
|
const [response1, response2] = await Promise.all([
|
|
readSSHFile(sshSessionId, file1.path),
|
|
readSSHFile(sshSessionId, file2.path),
|
|
]);
|
|
|
|
setContent1(response1.content || "");
|
|
setContent2(response2.content || "");
|
|
} catch (error: unknown) {
|
|
console.error("Failed to load files for diff:", error);
|
|
|
|
const err = error as {
|
|
message?: string;
|
|
response?: { data?: { tooLarge?: boolean; error?: string } };
|
|
};
|
|
const errorData = err?.response?.data;
|
|
if (errorData?.tooLarge) {
|
|
setError(t("fileManager.fileTooLarge", { error: errorData.error }));
|
|
} else if (
|
|
err.message?.includes("connection") ||
|
|
err.message?.includes("established")
|
|
) {
|
|
setError(
|
|
t("fileManager.sshConnectionFailed", {
|
|
name: sshHost.name,
|
|
ip: sshHost.ip,
|
|
port: sshHost.port,
|
|
}),
|
|
);
|
|
} else {
|
|
setError(
|
|
t("fileManager.loadFileFailed", {
|
|
error:
|
|
err.message || errorData?.error || t("fileManager.unknownError"),
|
|
}),
|
|
);
|
|
}
|
|
} finally {
|
|
setIsLoading(false);
|
|
}
|
|
};
|
|
|
|
const handleDownloadFile = async (file: FileItem) => {
|
|
try {
|
|
await ensureSSHConnection();
|
|
const response = await downloadSSHFile(sshSessionId, file.path);
|
|
|
|
if (response?.content) {
|
|
const byteCharacters = atob(response.content);
|
|
const byteNumbers = new Array(byteCharacters.length);
|
|
for (let i = 0; i < byteCharacters.length; i++) {
|
|
byteNumbers[i] = byteCharacters.charCodeAt(i);
|
|
}
|
|
const byteArray = new Uint8Array(byteNumbers);
|
|
const blob = new Blob([byteArray], {
|
|
type: response.mimeType || "application/octet-stream",
|
|
});
|
|
|
|
const url = URL.createObjectURL(blob);
|
|
const link = document.createElement("a");
|
|
link.href = url;
|
|
link.download = response.fileName || file.name;
|
|
document.body.appendChild(link);
|
|
link.click();
|
|
document.body.removeChild(link);
|
|
URL.revokeObjectURL(url);
|
|
|
|
toast.success(
|
|
t("fileManager.downloadFileSuccess", { name: file.name }),
|
|
);
|
|
}
|
|
} catch (error: unknown) {
|
|
console.error("Failed to download file:", error);
|
|
const err = error as { message?: string };
|
|
toast.error(
|
|
t("fileManager.downloadFileFailed") +
|
|
": " +
|
|
(err.message || t("fileManager.unknownError")),
|
|
);
|
|
}
|
|
};
|
|
|
|
const getFileLanguage = (fileName: string): string => {
|
|
const ext = fileName.split(".").pop()?.toLowerCase();
|
|
const languageMap: Record<string, string> = {
|
|
js: "javascript",
|
|
jsx: "javascript",
|
|
ts: "typescript",
|
|
tsx: "typescript",
|
|
py: "python",
|
|
java: "java",
|
|
c: "c",
|
|
cpp: "cpp",
|
|
cs: "csharp",
|
|
php: "php",
|
|
rb: "ruby",
|
|
go: "go",
|
|
rs: "rust",
|
|
html: "html",
|
|
css: "css",
|
|
scss: "scss",
|
|
less: "less",
|
|
json: "json",
|
|
xml: "xml",
|
|
yaml: "yaml",
|
|
yml: "yaml",
|
|
md: "markdown",
|
|
sql: "sql",
|
|
sh: "shell",
|
|
bash: "shell",
|
|
ps1: "powershell",
|
|
dockerfile: "dockerfile",
|
|
};
|
|
return languageMap[ext || ""] || "plaintext";
|
|
};
|
|
|
|
useEffect(() => {
|
|
loadFileContents();
|
|
}, [file1, file2, sshSessionId]);
|
|
|
|
if (isLoading) {
|
|
return (
|
|
<div className="h-full flex items-center justify-center bg-canvas">
|
|
<div className="text-center">
|
|
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-500 mx-auto mb-2"></div>
|
|
<p className="text-sm text-muted-foreground">
|
|
{t("fileManager.loadingFileComparison")}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
if (error) {
|
|
return (
|
|
<div className="h-full flex items-center justify-center bg-canvas">
|
|
<div className="text-center max-w-md">
|
|
<FileText className="w-16 h-16 mx-auto mb-4 text-red-500 opacity-50" />
|
|
<p className="text-red-500 mb-4">{error}</p>
|
|
<Button onClick={loadFileContents} variant="outline">
|
|
<RefreshCw className="w-4 h-4 mr-2" />
|
|
{t("fileManager.reload")}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<div className="h-full flex flex-col bg-canvas">
|
|
<div className="flex-shrink-0 border-b border-edge p-3">
|
|
<div className="flex items-center justify-between">
|
|
<div className="flex items-center gap-4">
|
|
<div className="text-sm">
|
|
<span className="text-muted-foreground">
|
|
{t("fileManager.compare")}:
|
|
</span>
|
|
<span className="font-medium text-green-400 mx-2">
|
|
{file1.name}
|
|
</span>
|
|
<ArrowLeftRight className="w-4 h-4 inline mx-1" />
|
|
<span className="font-medium text-blue-400">{file2.name}</span>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex items-center gap-2">
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() =>
|
|
setDiffMode(
|
|
diffMode === "side-by-side" ? "inline" : "side-by-side",
|
|
)
|
|
}
|
|
>
|
|
{diffMode === "side-by-side"
|
|
? t("fileManager.sideBySide")
|
|
: t("fileManager.inline")}
|
|
</Button>
|
|
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => setShowLineNumbers(!showLineNumbers)}
|
|
>
|
|
{showLineNumbers ? (
|
|
<Eye className="w-4 h-4" />
|
|
) : (
|
|
<EyeOff className="w-4 h-4" />
|
|
)}
|
|
</Button>
|
|
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => handleDownloadFile(file1)}
|
|
title={t("fileManager.downloadFile", { name: file1.name })}
|
|
>
|
|
<Download className="w-4 h-4 mr-1" />
|
|
{file1.name}
|
|
</Button>
|
|
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => handleDownloadFile(file2)}
|
|
title={t("fileManager.downloadFile", { name: file2.name })}
|
|
>
|
|
<Download className="w-4 h-4 mr-1" />
|
|
{file2.name}
|
|
</Button>
|
|
|
|
<Button variant="outline" size="sm" onClick={loadFileContents}>
|
|
<RefreshCw className="w-4 h-4" />
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex-1">
|
|
<DiffEditor
|
|
original={content1}
|
|
modified={content2}
|
|
language={getFileLanguage(file1.name)}
|
|
theme="vs-dark"
|
|
options={{
|
|
renderSideBySide: diffMode === "side-by-side",
|
|
lineNumbers: showLineNumbers ? "on" : "off",
|
|
minimap: { enabled: false },
|
|
scrollBeyondLastLine: false,
|
|
fontSize: 13,
|
|
wordWrap: "off",
|
|
automaticLayout: true,
|
|
readOnly: true,
|
|
originalEditable: false,
|
|
scrollbar: {
|
|
vertical: "visible",
|
|
horizontal: "visible",
|
|
},
|
|
diffWordWrap: "off",
|
|
ignoreTrimWhitespace: false,
|
|
}}
|
|
loading={
|
|
<div className="h-full flex items-center justify-center">
|
|
<div className="text-center">
|
|
<div className="animate-spin rounded-full h-6 w-6 border-b-2 border-blue-500 mx-auto mb-2"></div>
|
|
<p className="text-sm text-muted-foreground">
|
|
{t("fileManager.initializingEditor")}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
}
|
|
/>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|