fix: adapt to pnpm monorepo after rebase onto master

Post-rebase fixups for the v1.12.7 -> v1.12.20 jump (yarn single-package
-> pnpm monorepo):

- UserSettingsDialog: TranslationKey is now a global ambient type (drop
  the import); remove imports left unused by the disabled Account/Security
  tabs; cast the module tab icon to the tightened Tab icon type.
- SdkConfig: point the default branding auth_header_logo_url at the PNG
  logo (the SVG was removed by HealthChat branding), fixing a broken
  default asset reference.
- build-healthchat.yaml: build apps/web/Dockerfile (monorepo location).
This commit is contained in:
2026-06-06 10:47:56 +02:00
parent 53ee5a7e07
commit 67663d394a
3 changed files with 5 additions and 9 deletions
+1 -1
View File
@@ -168,7 +168,7 @@ jobs:
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
context: . context: .
file: ./Dockerfile file: ./apps/web/Dockerfile
push: ${{ env.DOCKER_PUSH }} push: ${{ env.DOCKER_PUSH }}
tags: ${{ steps.metadata.outputs.tags }} tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }} labels: ${{ steps.metadata.outputs.labels }}
+1 -1
View File
@@ -19,7 +19,7 @@ export const DEFAULTS: DeepReadonly<IConfigOptions> = {
brand: "HealthChat", brand: "HealthChat",
branding: { branding: {
logo_link_url: "https://element.io", logo_link_url: "https://element.io",
auth_header_logo_url: "themes/element/img/logos/element-logo.svg", auth_header_logo_url: "themes/element/img/logos/element-logo.png",
welcome_background_url: "themes/element/img/backgrounds/lake.jpg", welcome_background_url: "themes/element/img/backgrounds/lake.jpg",
}, },
help_url: "https://element.io/help", help_url: "https://element.io/help",
@@ -10,7 +10,6 @@ Please see LICENSE files in the repository root for full details.
import { ClientEvent, type MatrixEvent } from "matrix-js-sdk/src/matrix"; import { ClientEvent, type MatrixEvent } from "matrix-js-sdk/src/matrix";
import { Toast } from "@vector-im/compound-web"; import { Toast } from "@vector-im/compound-web";
import React, { type JSX, useState } from "react"; import React, { type JSX, useState } from "react";
import UserProfileIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-profile";
import DevicesIcon from "@vector-im/compound-design-tokens/assets/web/icons/devices"; import DevicesIcon from "@vector-im/compound-design-tokens/assets/web/icons/devices";
import VisibilityOnIcon from "@vector-im/compound-design-tokens/assets/web/icons/visibility-on"; import VisibilityOnIcon from "@vector-im/compound-design-tokens/assets/web/icons/visibility-on";
import NotificationsIcon from "@vector-im/compound-design-tokens/assets/web/icons/notifications"; import NotificationsIcon from "@vector-im/compound-design-tokens/assets/web/icons/notifications";
@@ -19,16 +18,13 @@ import KeyboardIcon from "@vector-im/compound-design-tokens/assets/web/icons/key
import KeyIcon from "@vector-im/compound-design-tokens/assets/web/icons/key"; import KeyIcon from "@vector-im/compound-design-tokens/assets/web/icons/key";
import SidebarIcon from "@vector-im/compound-design-tokens/assets/web/icons/sidebar"; import SidebarIcon from "@vector-im/compound-design-tokens/assets/web/icons/sidebar";
import MicOnIcon from "@vector-im/compound-design-tokens/assets/web/icons/mic-on"; import MicOnIcon from "@vector-im/compound-design-tokens/assets/web/icons/mic-on";
import LockIcon from "@vector-im/compound-design-tokens/assets/web/icons/lock";
import BlockIcon from "@vector-im/compound-design-tokens/assets/web/icons/block"; import BlockIcon from "@vector-im/compound-design-tokens/assets/web/icons/block";
import TabbedView, { Tab, useActiveTabWithDefault } from "../../structures/TabbedView"; import TabbedView, { Tab, useActiveTabWithDefault } from "../../structures/TabbedView";
import { _t, _td, type TranslationKey } from "../../../languageHandler"; import { _t, _td } from "../../../languageHandler";
import AccountUserSettingsTab from "../settings/tabs/user/AccountUserSettingsTab";
import { useModuleSettingsTabs } from "../../../modules/ExtrasApi"; import { useModuleSettingsTabs } from "../../../modules/ExtrasApi";
import { ModuleApi } from "../../../modules/Api"; import { ModuleApi } from "../../../modules/Api";
import AppearanceUserSettingsTab from "../settings/tabs/user/AppearanceUserSettingsTab"; import AppearanceUserSettingsTab from "../settings/tabs/user/AppearanceUserSettingsTab";
import SecurityUserSettingsTab from "../settings/tabs/user/SecurityUserSettingsTab";
import NotificationUserSettingsTab from "../settings/tabs/user/NotificationUserSettingsTab"; import NotificationUserSettingsTab from "../settings/tabs/user/NotificationUserSettingsTab";
import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSettingsTab"; import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSettingsTab";
import VoiceUserSettingsTab from "../settings/tabs/user/VoiceUserSettingsTab"; import VoiceUserSettingsTab from "../settings/tabs/user/VoiceUserSettingsTab";
@@ -135,7 +131,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
new Tab( new Tab(
moduleTab.key as UserTab, moduleTab.key as UserTab,
moduleTab.label as TranslationKey, moduleTab.label as TranslationKey,
moduleTab.icon, moduleTab.icon as JSX.Element | null,
moduleTab.body(), moduleTab.body(),
), ),
); );
@@ -258,7 +254,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
); );
} }
// JP: Disable help tab for now // JP: Disable help tab for now
/* tabs.push( /* tabs.push(
new Tab( new Tab(
UserTab.Help, UserTab.Help,
_td("setting|help_about|title"), _td("setting|help_about|title"),