phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-50485] Implement ServerManager, introduce id concept for identifying servers/views (#2654)

Browse Source 
* Implement ServerManager, introduce id concept for identifying servers/views

* REVERT ME (eventually): Move back to old logging

* PR feedback

* PR feedback

* Revert "REVERT ME (eventually): Move back to old logging"

This reverts commit 46954a5bbed4dd29e89ca9d5217bb75af2837bb3.

* Merge'd

* Use the correct method for Logger in ServerManager
This commit is contained in:
Devin Binnie
2023-04-05 16:30:50 -04:00
committed by GitHub
parent 862287edff
commit 53fb8c8fd3
19 changed files with 818 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/renderer/components/TabBar.tsx
View File

@@ -8,7 +8,7 @@ import {DragDropContext, Draggable, DraggingStyle, Droppable, DropResult, NotDra
import {FormattedMessage, injectIntl, IntlShape} from 'react-intl';
import classNames from 'classnames';
import {Tab} from 'types/config';
import {ConfigTab} from 'types/config';
import {getTabViewName, TabType, canCloseTab, getTabDisplayName} from 'common/tabs/TabView';
@@ -19,7 +19,7 @@ type Props = {
isDarkMode: boolean;
onSelect: (name: string, index: number) => void;
onCloseTab: (name: string) => void;
tabs: Tab[];
tabs: ConfigTab[];
sessionsExpired: Record<string, boolean>;
unreadCounts: Record<string, boolean>;
mentionCounts: Record<string, number>;

8
src/renderer/dropdown.tsx
View File

@@ -7,7 +7,7 @@ import {FormattedMessage} from 'react-intl';
import classNames from 'classnames';
import {DragDropContext, Draggable, DraggingStyle, Droppable, DropResult, NotDraggingStyle} from 'react-beautiful-dnd';
import {Team, TeamWithTabs, TeamWithTabsAndGpo} from 'types/config';
import {FullTeam, TeamWithTabs, TeamWithTabsAndGpo} from 'types/config';
import {getTabViewName} from 'common/tabs/TabView';
import {TAB_BAR_HEIGHT, THREE_DOT_MENU_WIDTH_MAC} from 'common/utils/constants';
@@ -83,7 +83,7 @@ class TeamDropdown extends React.PureComponent<Record<string, never>, State> {
});
}
selectServer = (team: Team) => {
selectServer = (team: FullTeam) => {
return () => {
window.desktop.serverDropdown.switchServer(team.name);
this.closeMenu();
@@ -106,7 +106,7 @@ class TeamDropdown extends React.PureComponent<Record<string, never>, State> {
this.closeMenu();
}
isActiveTeam = (team: Team) => {
isActiveTeam = (team: FullTeam) => {
return team.name === this.state.activeTeam;
}
@@ -139,7 +139,7 @@ class TeamDropdown extends React.PureComponent<Record<string, never>, State> {
tabOrder.forEach((t, order) => {
teams[t.index].order = order;
});
this.setState({teams, orderedTeams: teams.concat().sort((a: Team, b: Team) => a.order - b.order), isAnyDragging: false});
this.setState({teams, orderedTeams: teams.concat().sort((a: FullTeam, b: FullTeam) => a.order - b.order), isAnyDragging: false});
window.desktop.updateTeams(teams);
}