Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 2aec197

Browse files
committed
Remove feature_many_integration_managers
Rationale: If we want this feature, design will do it properly.
1 parent aa664b8 commit 2aec197

File tree

13 files changed

+16
-358
lines changed

13 files changed

+16
-358
lines changed

res/css/_components.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
@import "./views/dialogs/_SpacePreferencesDialog.scss";
127127
@import "./views/dialogs/_SpaceSettingsDialog.scss";
128128
@import "./views/dialogs/_SpotlightDialog.scss";
129-
@import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
130129
@import "./views/dialogs/_TermsDialog.scss";
131130
@import "./views/dialogs/_UntrustedDeviceDialog.scss";
132131
@import "./views/dialogs/_UploadConfirmDialog.scss";

res/css/views/dialogs/_TabbedIntegrationManagerDialog.scss

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx

Lines changed: 0 additions & 176 deletions
This file was deleted.

src/components/views/right_panel/RoomSummaryCard.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,8 @@ const AppsSection: React.FC<IAppsSectionProps> = ({ room }) => {
207207
if (!managers.hasManager()) {
208208
managers.openNoManagerDialog();
209209
} else {
210-
if (SettingsStore.getValue("feature_many_integration_managers")) {
211-
managers.openAll(room);
212-
} else {
213-
managers.getPrimaryManager().open(room);
214-
}
210+
// noinspection JSIgnoredPromiseFromCall
211+
managers.getPrimaryManager().open(room);
215212
}
216213
};
217214

src/components/views/rooms/Stickerpicker.tsx

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import AccessibleButton from '../elements/AccessibleButton';
2626
import WidgetUtils, { IWidgetEvent } from '../../../utils/WidgetUtils';
2727
import PersistedElement from "../elements/PersistedElement";
2828
import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
29-
import SettingsStore from "../../../settings/SettingsStore";
3029
import ContextMenu, { ChevronFace } from "../../structures/ContextMenu";
3130
import { WidgetType } from "../../../widgets/WidgetType";
3231
import { WidgetMessagingStore } from "../../../stores/widgets/WidgetMessagingStore";
@@ -339,20 +338,12 @@ export default class Stickerpicker extends React.PureComponent<IProps, IState> {
339338
* Launch the integration manager on the stickers integration page
340339
*/
341340
private launchManageIntegrations = (): void => {
342-
// TODO: Open the right integration manager for the widget
343-
if (SettingsStore.getValue("feature_many_integration_managers")) {
344-
IntegrationManagers.sharedInstance().openAll(
345-
this.props.room,
346-
`type_${WidgetType.STICKERPICKER.preferred}`,
347-
this.state.widgetId,
348-
);
349-
} else {
350-
IntegrationManagers.sharedInstance().getPrimaryManager().open(
351-
this.props.room,
352-
`type_${WidgetType.STICKERPICKER.preferred}`,
353-
this.state.widgetId,
354-
);
355-
}
341+
// noinspection JSIgnoredPromiseFromCall
342+
IntegrationManagers.sharedInstance().getPrimaryManager().open(
343+
this.props.room,
344+
`type_${WidgetType.STICKERPICKER.preferred}`,
345+
this.state.widgetId,
346+
);
356347
};
357348

358349
public render(): JSX.Element {

src/dispatcher/actions.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,6 @@ export enum Action {
278278
*/
279279
OpenReportEventDialog = "open_report_event_dialog",
280280

281-
/**
282-
* Fired when the tabbed integration manager dialog needs to be opened.
283-
* Payload: OpenTabbedIntegrationManagerDialogPayload
284-
*/
285-
OpenTabbedIntegrationManagerDialog = "open_tabbed_imanager_dialog",
286-
287281
/**
288282
* Fired when something within the application has determined that a logout,
289283
* or logout-like behaviour, needs to happen. Specifically meant to target

src/dispatcher/payloads/OpenTabbedIntegrationManagerDialogPayload.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/i18n/strings/en_EN.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,6 @@
883883
"Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Thank you for trying the beta, please go into as much detail as you can so we can improve it.",
884884
"Video rooms (under active development)": "Video rooms (under active development)",
885885
"Render simple counters in room header": "Render simple counters in room header",
886-
"Multiple integration managers (requires manual setup)": "Multiple integration managers (requires manual setup)",
887886
"Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
888887
"Support adding custom themes": "Support adding custom themes",
889888
"Show message previews for reactions in DMs": "Show message previews for reactions in DMs",

src/integrations/IntegrationManagers.ts

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,14 @@ import { logger } from "matrix-js-sdk/src/logger";
1919
import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
2020

2121
import type { MatrixEvent } from "matrix-js-sdk/src/models/event";
22-
import type { Room } from "matrix-js-sdk/src/models/room";
2322
import SdkConfig from '../SdkConfig';
2423
import Modal from '../Modal';
2524
import { IntegrationManagerInstance, Kind } from "./IntegrationManagerInstance";
2625
import IntegrationsImpossibleDialog from "../components/views/dialogs/IntegrationsImpossibleDialog";
2726
import IntegrationsDisabledDialog from "../components/views/dialogs/IntegrationsDisabledDialog";
2827
import WidgetUtils from "../utils/WidgetUtils";
2928
import { MatrixClientPeg } from "../MatrixClientPeg";
30-
import SettingsStore from "../settings/SettingsStore";
3129
import { compare } from "../utils/strings";
32-
import defaultDispatcher from "../dispatcher/dispatcher";
33-
import {
34-
OpenTabbedIntegrationManagerDialogPayload,
35-
} from "../dispatcher/payloads/OpenTabbedIntegrationManagerDialogPayload";
36-
import { Action } from "../dispatcher/actions";
3730

3831
const KIND_PREFERENCE = [
3932
// Ordered: first is most preferred, last is least preferred.
@@ -181,23 +174,6 @@ export class IntegrationManagers {
181174
Modal.createTrackedDialog('Integrations impossible', '', IntegrationsImpossibleDialog);
182175
}
183176

184-
openAll(room: Room = null, screen: string = null, integrationId: string = null): void {
185-
if (!SettingsStore.getValue("integrationProvisioning")) {
186-
return this.showDisabledDialog();
187-
}
188-
189-
if (this.managers.length === 0) {
190-
return this.openNoManagerDialog();
191-
}
192-
193-
defaultDispatcher.dispatch(<OpenTabbedIntegrationManagerDialogPayload>{
194-
action: Action.OpenTabbedIntegrationManagerDialog,
195-
room,
196-
screen,
197-
integrationId,
198-
});
199-
}
200-
201177
showDisabledDialog(): void {
202178
Modal.createTrackedDialog('Integrations disabled', '', IntegrationsDisabledDialog);
203179
}

0 commit comments

Comments
 (0)