jazzymc/homarr
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: import sidebar issues (#1712)

Browse Source
This commit is contained in:
Meier Lukas
2024-12-18 13:52:10 +01:00
committed by GitHub
parent 5fbbf037ce
commit a51999457b
6 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/old-import/src/import/collections/integration-collection.ts
View File

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

11
packages/old-import/src/import/collections/user-collection.ts
View File

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

2
packages/old-import/src/import/input.ts
View File

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

2
packages/old-import/src/import/validate-token.ts
View File

@@ -1,6 +1,6 @@
import { decryptSecretWithKey } from "@homarr/common/server"; 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; if (!encryptionToken || !checksum) return;
const [first, second] = checksum.split("\n"); const [first, second] = checksum.split("\n");

17
packages/old-import/src/move-widgets-and-apps-merge.ts
View File

@@ -81,13 +81,26 @@ export const moveWidgetsAndAppsIfMerge = (
} }
if (configuration.sidebarBehaviour === "last-section") { if (configuration.sidebarBehaviour === "last-section") {
if (old.settings.customization.layout.enabledLeftSidebar) { const areas = [...old.apps.map((app) => app.area), ...old.widgets.map((widget) => widget.area)];
if (
old.settings.customization.layout.enabledLeftSidebar ||
areas.some((area) => area.type === "sidebar" && area.properties.location === "left")
) {
offset = moveWidgetsAndAppsInLeftSidebar(old, firstId, offset, configuration.screenSize); offset = moveWidgetsAndAppsInLeftSidebar(old, firstId, offset, configuration.screenSize);
} }
if (old.settings.customization.layout.enabledRightSidebar) { if (
old.settings.customization.layout.enabledRightSidebar ||
areas.some((area) => area.type === "sidebar" && area.properties.location === "right")
) {
moveWidgetsAndAppsInRightSidebar(old, firstId, offset, configuration.screenSize); moveWidgetsAndAppsInRightSidebar(old, firstId, offset, configuration.screenSize);
} }
} else {
// Remove all widgets and apps in the sidebar
return {
apps: old.apps.filter((app) => app.area.type !== "sidebar"),
widgets: old.widgets.filter((app) => app.area.type !== "sidebar"),
};
} }
return { apps: old.apps, widgets: old.widgets }; return { apps: old.apps, widgets: old.widgets };

2
packages/old-schema/src/app.ts
View File

@@ -69,7 +69,7 @@ export const oldmarrAppSchema = z
behaviour: appBehaviourSchema, behaviour: appBehaviourSchema,
network: appNetworkSchema, network: appNetworkSchema,
appearance: appAppearanceSchema, appearance: appAppearanceSchema,
integration: appIntegrationSchema.optional(), integration: appIntegrationSchema.optional().nullable(),
}) })
.and(tileBaseSchema); .and(tileBaseSchema);