imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move integrations switch (#12733)

Browse source 
* Move integrations switch

This is the last thing to move out of 'general' now.

* unused import

* Move tests out to the SetIntegrationManager component

* Only a decade out

* Move playwright test to the new tab

* Update snapshot

* Update other snapshot
This commit is contained in:
David Baker 2024-07-10 20:10:19 +01:00 • committed by GitHub
parent 19f9f98564
commit 44b98896a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 243 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/settings/SetIntegrationManager.tsx
View file

@ -25,6 +25,7 @@ import { SettingLevel } from "../../../settings/SettingLevel";
import ToggleSwitch from "../elements/ToggleSwitch";
import Heading from "../typography/Heading";
import { SettingsSubsectionText } from "./shared/SettingsSubsection";
import { UIFeature } from "../../../settings/UIFeature";
interface IProps {}
@ -71,6 +72,8 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
bodyText = _t("integration_manager|use_im");
}
if (!SettingsStore.getValue(UIFeature.Widgets)) return null;
return (
<label
className="mx_SetIntegrationManager"
@ -79,8 +82,8 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
>
<div className="mx_SettingsFlag">
<div className="mx_SetIntegrationManager_heading_manager">
<Heading size="2">{_t("integration_manager|manage_title")}</Heading>
<Heading size="3">{managerName}</Heading>
<Heading size="3">{_t("integration_manager|manage_title")}</Heading>
<Heading size="4">{managerName}</Heading>
</div>
<ToggleSwitch
id="toggle_integration"

8
src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
View file

@ -29,7 +29,6 @@ import Modal from "../../../../../Modal";
import { UIFeature } from "../../../../../settings/UIFeature";
import ErrorDialog, { extractErrorMessageFromError } from "../../../dialogs/ErrorDialog";
import ChangePassword from "../../ChangePassword";
import SetIntegrationManager from "../../SetIntegrationManager";
import SettingsTab from "../SettingsTab";
import { SettingsSection } from "../../shared/SettingsSection";
import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection";
@ -194,12 +193,6 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
);
}
private renderIntegrationManagerSection(): ReactNode {
if (!SettingsStore.getValue(UIFeature.Widgets)) return null;
return <SetIntegrationManager />;
}
public render(): React.ReactNode {
let accountManagementSection: JSX.Element | undefined;
const isAccountManagedExternally = !!this.state.externalAccountManagementUrl;
@ -218,7 +211,6 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
<UserPersonalInfoSettings canMake3pidChanges={this.state.canMake3pidChanges} />
{this.renderAccountSection()}
</SettingsSection>
{this.renderIntegrationManagerSection()}
{accountManagementSection}
</SettingsTab>
);

2
src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
View file

@ -44,6 +44,7 @@ import { SettingsSection } from "../../shared/SettingsSection";
import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection";
import { useOwnDevices } from "../../devices/useOwnDevices";
import DiscoverySettings from "../../discovery/DiscoverySettings";
import SetIntegrationManager from "../../SetIntegrationManager";
interface IIgnoredUserProps {
userId: string;
@ -376,6 +377,7 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
return (
<SettingsTab>
{warning}
<SetIntegrationManager />
<SettingsSection heading={_t("settings|security|encryption_section")}>
{secureBackup}
{eventIndex}