fix: import sidebar issues (#1712)

packages/old-import/src/import/collections/integration-collection.ts

@@ -7,12 +7,17 @@ import { createDbInsertCollection } from "./common";
 
 export const createIntegrationInsertCollection = (
   preparedIntegrations: PreparedIntegration[],
-  encryptionToken: string | null,
+  encryptionToken: string | null | undefined,
 ) => {
   const insertCollection = createDbInsertCollection(["integrations", "integrationSecrets"]);
+
+  if (preparedIntegrations.length === 0) {
+    return insertCollection;
+  }
+
   logger.info(`Preparing integrations for insert collection count=${preparedIntegrations.length}`);
 
-  if (encryptionToken === null) {
+  if (encryptionToken === null || encryptionToken === undefined) {
     logger.debug("Skipping integration decryption due to missing token");
     return insertCollection;
   }

packages/old-import/src/import/collections/user-collection.ts

@@ -6,12 +6,19 @@ import { mapAndDecryptUsers } from "../../mappers/map-user";
 import type { OldmarrImportUser } from "../../user-schema";
 import { createDbInsertCollection } from "./common";
 
-export const createUserInsertCollection = (importUsers: OldmarrImportUser[], encryptionToken: string | null) => {
+export const createUserInsertCollection = (
+  importUsers: OldmarrImportUser[],
+  encryptionToken: string | null | undefined,
+) => {
   const insertCollection = createDbInsertCollection(["users", "groups", "groupMembers", "groupPermissions"]);
 
+  if (importUsers.length === 0) {
+    return insertCollection;
+  }
+
   logger.info(`Preparing users for insert collection count=${importUsers.length}`);
 
-  if (encryptionToken === null) {
+  if (encryptionToken === null || encryptionToken === undefined) {
     logger.debug("Skipping user decryption due to missing token");
     return insertCollection;
   }

packages/old-import/src/import/input.ts

@@ -20,5 +20,5 @@ export const importInitialOldmarrInputSchema = zfd.formData({
     const map = boardSelectionMapSchema.parse(SuperJSON.parse(value));
     return map;
   }),
-  token: zfd.text().nullable(),
+  token: zfd.text().nullable().optional(),
 });

packages/old-import/src/import/validate-token.ts

@@ -1,6 +1,6 @@
 import { decryptSecretWithKey } from "@homarr/common/server";
 
-export const ensureValidTokenOrThrow = (checksum: string | undefined, encryptionToken: string | null) => {
+export const ensureValidTokenOrThrow = (checksum: string | undefined, encryptionToken: string | null | undefined) => {
   if (!encryptionToken || !checksum) return;
 
   const [first, second] = checksum.split("\n");