Skip to content

[pull] master from mattermost:master #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jan 23, 2026
Merged

[pull] master from mattermost:master #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions webapp/channels/src/components/admin_console/save_changes_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import React from 'react';
import {FormattedMessage, useIntl} from 'react-intl';

import type {Either} from '@mattermost/types/utilities';

import BlockableButton from 'components/admin_console/blockable_button';
import BlockableLink from 'components/admin_console/blockable_link';
import SaveButton from 'components/save_button';
Expand All @@ -17,11 +15,11 @@ type Props = {
serverError?: JSX.Element | string;
isDisabled?: boolean;
savingMessage?: string;
} & Either<{
cancelLink: string;
}, {
onCancel: () => void;
}>;
} & (
| {cancelLink: string; onCancel?: never}
| {cancelLink?: never; onCancel: () => void}
| {cancelLink?: never; onCancel?: never}
); // allow a cancelLink or an onCancel handler, or neither

const SaveChangesPanel = ({saveNeeded, onClick, saving, serverError, cancelLink, onCancel, isDisabled, savingMessage}: Props) => {
const {formatMessage} = useIntl();
Expand Down
7 changes: 1 addition & 6 deletions webapp/channels/src/components/admin_console/system_properties/system_properties.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,10 @@ export default function SystemProperties(props: Props) {
userProperties.save();
};

const handleCancel = () => {
userProperties.cancel();
};

useEffect(() => {
// block nav when changes are pending
dispatch(setNavigationBlocked(hasChanges));
}, [hasChanges]);
}, [hasChanges, dispatch]);

return (
<div
Expand Down Expand Up @@ -75,7 +71,6 @@ export default function SystemProperties(props: Props) {
saving={saving}
saveNeeded={hasChanges}
onClick={handleSave}
onCancel={handleCancel}
serverError={saveError ? (
<FormattedMessage
tagName={DangerText}
Expand Down
Loading