Ensure that a dismissed usage alert toast stays dismissed
This commit is contained in:
parent
0daed98627
commit
aa86c1d751
2 changed files with 22 additions and 4 deletions
|
@ -107,6 +107,7 @@ interface IState {
|
||||||
errcode: string;
|
errcode: string;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
usageLimitDismissed: boolean;
|
||||||
usageLimitEventContent?: IUsageLimit;
|
usageLimitEventContent?: IUsageLimit;
|
||||||
usageLimitEventTs?: number;
|
usageLimitEventTs?: number;
|
||||||
useCompactLayout: boolean;
|
useCompactLayout: boolean;
|
||||||
|
@ -152,6 +153,7 @@ class LoggedInView extends React.Component<IProps, IState> {
|
||||||
syncErrorData: undefined,
|
syncErrorData: undefined,
|
||||||
// use compact timeline view
|
// use compact timeline view
|
||||||
useCompactLayout: SettingsStore.getValue('useCompactLayout'),
|
useCompactLayout: SettingsStore.getValue('useCompactLayout'),
|
||||||
|
usageLimitDismissed: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
// stash the MatrixClient in case we log out before we are unmounted
|
// stash the MatrixClient in case we log out before we are unmounted
|
||||||
|
@ -303,14 +305,27 @@ class LoggedInView extends React.Component<IProps, IState> {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_onHideToast = () => {
|
||||||
|
this.setState({
|
||||||
|
usageLimitDismissed: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
_calculateServerLimitToast(syncError: IState["syncErrorData"], usageLimitEventContent?: IUsageLimit) {
|
_calculateServerLimitToast(syncError: IState["syncErrorData"], usageLimitEventContent?: IUsageLimit) {
|
||||||
const error = syncError && syncError.error && syncError.error.errcode === "M_RESOURCE_LIMIT_EXCEEDED";
|
const error = syncError && syncError.error && syncError.error.errcode === "M_RESOURCE_LIMIT_EXCEEDED";
|
||||||
if (error) {
|
if (error) {
|
||||||
usageLimitEventContent = syncError.error.data;
|
usageLimitEventContent = syncError.error.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (usageLimitEventContent) {
|
// usageLimitDismissed is true when the user has explicitly hidden the toast
|
||||||
showServerLimitToast(usageLimitEventContent.limit_type, usageLimitEventContent.admin_contact, error);
|
// and it will be reset to false if a *new* usage alert comes in.
|
||||||
|
if (usageLimitEventContent && this.state.usageLimitDismissed) {
|
||||||
|
showServerLimitToast(
|
||||||
|
usageLimitEventContent.limit_type,
|
||||||
|
this._onHideToast,
|
||||||
|
usageLimitEventContent.admin_contact,
|
||||||
|
error,
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
hideServerLimitToast();
|
hideServerLimitToast();
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ import {messageForResourceLimitError} from "../utils/ErrorUtils";
|
||||||
|
|
||||||
const TOAST_KEY = "serverlimit";
|
const TOAST_KEY = "serverlimit";
|
||||||
|
|
||||||
export const showToast = (limitType: string, adminContact?: string, syncError?: boolean) => {
|
export const showToast = (limitType: string, onHideToast: () => void, adminContact?: string, syncError?: boolean) => {
|
||||||
const errorText = messageForResourceLimitError(limitType, adminContact, {
|
const errorText = messageForResourceLimitError(limitType, adminContact, {
|
||||||
'monthly_active_user': _td("Your homeserver has exceeded its user limit."),
|
'monthly_active_user': _td("Your homeserver has exceeded its user limit."),
|
||||||
'': _td("Your homeserver has exceeded one of its resource limits."),
|
'': _td("Your homeserver has exceeded one of its resource limits."),
|
||||||
|
@ -38,7 +38,10 @@ export const showToast = (limitType: string, adminContact?: string, syncError?:
|
||||||
props: {
|
props: {
|
||||||
description: <React.Fragment>{errorText} {contactText}</React.Fragment>,
|
description: <React.Fragment>{errorText} {contactText}</React.Fragment>,
|
||||||
acceptLabel: _t("Ok"),
|
acceptLabel: _t("Ok"),
|
||||||
onAccept: hideToast,
|
onAccept: () => {
|
||||||
|
hideToast()
|
||||||
|
onHideToast()
|
||||||
|
},
|
||||||
},
|
},
|
||||||
component: GenericToast,
|
component: GenericToast,
|
||||||
priority: 70,
|
priority: 70,
|
||||||
|
|
Loading…
Reference in a new issue