watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 22:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed types.

Browse source
This commit is contained in:
Mike Cao 2023-11-13 21:58:23 -08:00
parent 8775d696b8
commit a78d11e352
5 changed files with 74 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/hooks/useMessages.ts
View file

@ -1,7 +1,8 @@
import { useIntl, FormattedMessage } from 'react-intl';
import { useIntl, FormattedMessage, MessageDescriptor, PrimitiveType } from 'react-intl';
import { messages, labels } from 'components/messages';
import { FormatXMLElementFn, Options } from 'intl-messageformat';
export function useMessages() {
export function useMessages(): any {
const intl = useIntl();
const getMessage = (id: string) => {
@ -10,7 +11,16 @@ export function useMessages() {
return message ? formatMessage(message) : id;
};
const formatMessage = (descriptor: any, values?: any, opts?: any) => {
const formatMessage = (
descriptor:
| MessageDescriptor
| {
id: string;
defaultMessage: string;
},
values?: Record<string, PrimitiveType | FormatXMLElementFn<string, string>>,
opts?: Options,
) => {
return descriptor ? intl.formatMessage(descriptor, values, opts) : null;
};

2
src/components/hooks/useNavigation.ts
View file

@ -17,7 +17,7 @@ export function useNavigation() {
return obj;
}, [params]);
function makeUrl(params, reset) {
function makeUrl(params: any, reset?: boolean) {
return reset ? pathname : buildUrl(pathname, { ...query, ...params });
}