fix: resolve merge conflict artifacts in dev-1.10.1

- Fix missing closing tags in AppView.tsx NetworkGraphView
- Fix incomplete catch blocks in server-stats.ts and db/index.ts
- Fix missing closing brace in en.json ports section
- Fix HostManagerApp.tsx import path
- Fix stats-widgets.ts type definition
- Fix schema.ts networkTopology table definition
- Add type annotations in user-data-import.ts
This commit is contained in:
ZacharyZcR
2026-01-13 08:15:04 +08:00
parent 8ce4c6f364
commit 3922a82dfc
9 changed files with 30 additions and 9 deletions

View File

@@ -194,7 +194,7 @@ class UserDataImport {
continue;
}
const newHostData = {
const newHostData: Record<string, unknown> = {
...host,
userId: targetUserId,
updatedAt: new Date().toISOString(),
@@ -204,14 +204,14 @@ class UserDataImport {
newHostData.createdAt = new Date().toISOString();
}
let processedHostData = newHostData;
let processedHostData: Record<string, unknown> = newHostData;
if (options.userDataKey) {
processedHostData = DataCrypto.encryptRecord(
"ssh_data",
newHostData,
targetUserId,
options.userDataKey,
);
) as Record<string, unknown>;
}
delete processedHostData.id;
@@ -275,7 +275,7 @@ class UserDataImport {
continue;
}
const newCredentialData = {
const newCredentialData: Record<string, unknown> = {
...credential,
userId: targetUserId,
updatedAt: new Date().toISOString(),
@@ -287,14 +287,14 @@ class UserDataImport {
newCredentialData.createdAt = new Date().toISOString();
}
let processedCredentialData = newCredentialData;
let processedCredentialData: Record<string, unknown> = newCredentialData;
if (options.userDataKey) {
processedCredentialData = DataCrypto.encryptRecord(
"ssh_credentials",
newCredentialData,
targetUserId,
options.userDataKey,
);
) as Record<string, unknown>;
}
delete processedCredentialData.id;