Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Typescript refactor.

Mike Cao7c42f0da8290
diff --git a/package.json b/package.json
index feec3db80..a158696cf 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
"@prisma/client": "5.6.0",
"@prisma/extension-read-replicas": "^0.3.0",
"@react-spring/web": "^9.7.3",
- "@tanstack/react-query": "^4.33.0",
+ "@tanstack/react-query": "^5.12.2",
"@umami/prisma-client": "^0.8.0",
"@umami/redis-client": "^0.18.0",
"chalk": "^4.1.1",
@@ -94,12 +94,12 @@
"maxmind": "^4.3.6",
"moment-timezone": "^0.5.35",
"next": "13.5.6",
- "next-basics": "^0.37.0",
+ "next-basics": "^0.39.0",
"node-fetch": "^3.2.8",
"npm-run-all": "^4.1.5",
"prisma": "5.6.0",
"react": "^18.2.0",
- "react-basics": "^0.110.0",
+ "react-basics": "^0.114.0",
"react-beautiful-dnd": "^13.1.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.4",
@@ -127,8 +127,8 @@
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^8.1.0",
"@types/node": "^20.9.0",
- "@types/react": "^18.2.37",
- "@types/react-dom": "^18.2.15",
+ "@types/react": "^18.2.41",
+ "@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.7.3",
"@typescript-eslint/parser": "^6.7.3",
"cross-env": "^7.0.3",
diff --git a/src/app/(main)/NavBar.js b/src/app/(main)/NavBar.tsx
similarity index 100%
rename from src/app/(main)/NavBar.js
rename to src/app/(main)/NavBar.tsx
diff --git a/src/app/(main)/UpdateNotice.js b/src/app/(main)/UpdateNotice.tsx
similarity index 100%
rename from src/app/(main)/UpdateNotice.js
rename to src/app/(main)/UpdateNotice.tsx
diff --git a/src/app/(main)/console/TestConsole.js b/src/app/(main)/console/TestConsole.tsx
similarity index 85%
rename from src/app/(main)/console/TestConsole.js
rename to src/app/(main)/console/TestConsole.tsx
index 7aae09b2a..0bb807ff5 100644
--- a/src/app/(main)/console/TestConsole.js
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -1,18 +1,18 @@
'use client';
+import { Button } from 'react-basics';
+import Head from 'next/head';
+import Link from 'next/link';
+import Script from 'next/script';
import WebsiteSelect from 'components/input/WebsiteSelect';
import Page from 'components/layout/Page';
import PageHeader from 'components/layout/PageHeader';
import EventsChart from 'components/metrics/EventsChart';
-import WebsiteChart from '../../(main)/websites/[id]/WebsiteChart';
+import WebsiteChart from 'app/(main)/websites/[id]/WebsiteChart';
import useApi from 'components/hooks/useApi';
-import Head from 'next/head';
-import Link from 'next/link';
import useNavigation from 'components/hooks/useNavigation';
-import Script from 'next/script';
-import { Button } from 'react-basics';
import styles from './TestConsole.module.css';
-export function TestConsole({ websiteId }) {
+export function TestConsole({ websiteId }: { websiteId: string }) {
const { get, useQuery } = useApi();
const { data, isLoading, error } = useQuery({
queryKey: ['websites:me'],
@@ -20,14 +20,14 @@ export function TestConsole({ websiteId }) {
});
const { router } = useNavigation();
- function handleChange(value) {
+ function handleChange(value: string) {
router.push(`/console/${value}`);
}
function handleClick() {
- window.umami.track({ url: '/page-view', referrer: 'https://www.google.com' });
- window.umami.track('track-event-no-data');
- window.umami.track('track-event-with-data', {
+ window['umami'].track({ url: '/page-view', referrer: 'https://www.google.com' });
+ window['umami'].track('track-event-no-data');
+ window['umami'].track('track-event-with-data', {
test: 'test-data',
boolean: true,
booleanError: 'true',
@@ -47,7 +47,7 @@ export function TestConsole({ websiteId }) {
}
function handleIdentifyClick() {
- window.umami.identify({
+ window['umami'].identify({
userId: 123,
name: 'brian',
number: Math.random() * 100,
@@ -74,7 +74,7 @@ export function TestConsole({ websiteId }) {
const website = data?.data.find(({ id }) => websiteId === id);
return (
- <Page loading={isLoading} error={error}>
+ <Page isLoading={isLoading} error={error}>
<Head>
<title>{website ? `${website.name} | Umami Console` : 'Umami Console'}</title>
</Head>
@@ -116,7 +116,7 @@ export function TestConsole({ websiteId }) {
</div>
<div>
<div className={styles.header}>Click events</div>
- <Button id="send-event-button" data-umami-event="button-click" variant="action">
+ <Button id="send-event-button" data-umami-event="button-click" variant="primary">
Send event
</Button>
<p />
@@ -125,18 +125,18 @@ export function TestConsole({ websiteId }) {
data-umami-event="button-click"
data-umami-event-name="bob"
data-umami-event-id="123"
- variant="action"
+ variant="primary"
>
Send event with data
</Button>
</div>
<div>
<div className={styles.header}>Javascript events</div>
- <Button id="manual-button" variant="action" onClick={handleClick}>
+ <Button id="manual-button" variant="primary" onClick={handleClick}>
Run script
</Button>
<p />
- <Button id="manual-button" variant="action" onClick={handleIdentifyClick}>
+ <Button id="manual-button" variant="primary" onClick={handleIdentifyClick}>
Run identify
</Button>
</div>
diff --git a/src/app/(main)/dashboard/Dashboard.js b/src/app/(main)/dashboard/Dashboard.tsx
similarity index 80%
rename from src/app/(main)/dashboard/Dashboard.js
rename to src/app/(main)/dashboard/Dashboard.tsx
index 6f0659bbe..1afc0da2e 100644
--- a/src/app/(main)/dashboard/Dashboard.js
+++ b/src/app/(main)/dashboard/Dashboard.tsx
@@ -11,23 +11,31 @@ import useApi from 'components/hooks/useApi';
import useDashboard from 'store/dashboard';
import useMessages from 'components/hooks/useMessages';
import useLocale from 'components/hooks/useLocale';
-import useApiFilter from 'components/hooks/useApiFilter';
+import useFilterQuery from 'components/hooks/useFilterQuery';
export function Dashboard() {
const { formatMessage, labels, messages } = useMessages();
const { showCharts, editing } = useDashboard();
const { dir } = useLocale();
- const { get, useQuery } = useApi();
- const { page, handlePageChange } = useApiFilter();
+ const { get } = useApi();
const pageSize = 10;
- const { data: result, isLoading } = useQuery({
- queryKey: ['websites', page, pageSize],
- queryFn: () => get('/websites', { includeTeams: 1, page, pageSize }),
+
+ const { query, params, setParams, result } = useFilterQuery({
+ queryKey: ['dashboard:websites'],
+ queryFn: (params: any) => {
+ return get(`/websites`, { ...params, includeTeams: true, pageSize });
+ },
});
+
+ const handlePageChange = (page: number) => {
+ setParams({ ...params, page });
+ };
+
const { data, count } = result || {};
- const hasData = data && data?.length !== 0;
+ const hasData = !!(data as any)?.length;
+ const { page } = params;
- if (isLoading) {
+ if (query.isLoading) {
return <Loading size="lg" />;
}
diff --git a/src/app/(main)/dashboard/DashboardEdit.js b/src/app/(main)/dashboard/DashboardEdit.tsx
similarity index 95%
rename from src/app/(main)/dashboard/DashboardEdit.js
rename to src/app/(main)/dashboard/DashboardEdit.tsx
index 0a8734e8d..356380388 100644
--- a/src/app/(main)/dashboard/DashboardEdit.js
+++ b/src/app/(main)/dashboard/DashboardEdit.tsx
@@ -60,13 +60,13 @@ export function DashboardEdit() {
return (
<>
<div className={styles.buttons}>
- <Button onClick={handleSave} variant="action" size="small">
+ <Button onClick={handleSave} variant="primary" size="sm">
{formatMessage(labels.save)}
</Button>
- <Button onClick={handleCancel} size="small">
+ <Button onClick={handleCancel} size="sm">
{formatMessage(labels.cancel)}
</Button>
- <Button onClick={handleReset} size="small">
+ <Button onClick={handleReset} size="sm">
{formatMessage(labels.reset)}
</Button>
</div>
diff --git a/src/app/(main)/dashboard/DashboardSettingsButton.js b/src/app/(main)/dashboard/DashboardSettingsButton.tsx
similarity index 100%
rename from src/app/(main)/dashboard/DashboardSettingsButton.js
rename to src/app/(main)/dashboard/DashboardSettingsButton.tsx
diff --git a/src/app/(main)/reports/ReportDeleteButton.js b/src/app/(main)/reports/ReportDeleteButton.tsx
similarity index 81%
rename from src/app/(main)/reports/ReportDeleteButton.js
rename to src/app/(main)/reports/ReportDeleteButton.tsx
index 35809a985..d3f1bb4f3 100644
--- a/src/app/(main)/reports/ReportDeleteButton.js
+++ b/src/app/(main)/reports/ReportDeleteButton.tsx
@@ -3,13 +3,21 @@ import ConfirmDeleteForm from 'components/common/ConfirmDeleteForm';
import { useApi, useMessages } from 'components/hooks';
import { setValue } from 'store/cache';
-export function ReportDeleteButton({ reportId, reportName, onDelete }) {
+export function ReportDeleteButton({
+ reportId,
+ reportName,
+ onDelete,
+}: {
+ reportId: string;
+ reportName: string;
+ onDelete?: () => void;
+}) {
const { formatMessage, labels } = useMessages();
const { del, useMutation } = useApi();
const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));
- const handleConfirm = close => {
- mutate(reportId, {
+ const handleConfirm = (close: () => void) => {
+ mutate(reportId as any, {
onSuccess: () => {
setValue('reports', Date.now());
onDelete?.();
diff --git a/src/app/(main)/reports/ReportsDataTable.tsx b/src/app/(main)/reports/ReportsDataTable.tsx
index eeef203b4..3ede47839 100644
--- a/src/app/(main)/reports/ReportsDataTable.tsx
+++ b/src/app/(main)/reports/ReportsDataTable.tsx
@@ -1,18 +1,10 @@
'use client';
-import { useApi } from 'components/hooks';
+import { useReports } from 'components/hooks';
import ReportsTable from './ReportsTable';
-import useFilterQuery from 'components/hooks/useFilterQuery';
import DataTable from 'components/common/DataTable';
-import useCache from 'store/cache';
export default function ReportsDataTable({ websiteId }: { websiteId?: string }) {
- const { get } = useApi();
- const modified = useCache(state => (state as any)?.reports);
- const queryResult = useFilterQuery({
- queryKey: ['reports', { websiteId, modified }],
- queryFn: (params: any) =>
- get(websiteId ? `/websites/${websiteId}/reports` : `/reports`, params),
- });
+ const queryResult = useReports(websiteId);
return (
<DataTable queryResult={queryResult}>
diff --git a/src/app/(main)/reports/ReportsHeader.js b/src/app/(main)/reports/ReportsHeader.tsx
similarity index 100%
rename from src/app/(main)/reports/ReportsHeader.js
rename to src/app/(main)/reports/ReportsHeader.tsx
diff --git a/src/app/(main)/reports/ReportsTable.js b/src/app/(main)/reports/ReportsTable.tsx
similarity index 94%
rename from src/app/(main)/reports/ReportsTable.js
rename to src/app/(main)/reports/ReportsTable.tsx
index 6b2a79320..882110eec 100644
--- a/src/app/(main)/reports/ReportsTable.js
+++ b/src/app/(main)/reports/ReportsTable.tsx
@@ -5,7 +5,7 @@ import useUser from 'components/hooks/useUser';
import { REPORT_TYPES } from 'lib/constants';
import ReportDeleteButton from './ReportDeleteButton';
-export function ReportsTable({ data = [], showDomain }) {
+export function ReportsTable({ data = [], showDomain }: { data: any[]; showDomain?: boolean }) {
const { formatMessage, labels } = useMessages();
const { user } = useUser();
const breakpoint = useBreakpoint();
diff --git a/src/app/(main)/reports/[id]/BaseParameters.js b/src/app/(main)/reports/[id]/BaseParameters.tsx
similarity index 83%
rename from src/app/(main)/reports/[id]/BaseParameters.js
rename to src/app/(main)/reports/[id]/BaseParameters.tsx
index a54ef4f36..9b6be5d8c 100644
--- a/src/app/(main)/reports/[id]/BaseParameters.js
+++ b/src/app/(main)/reports/[id]/BaseParameters.tsx
@@ -6,12 +6,19 @@ import WebsiteSelect from 'components/input/WebsiteSelect';
import { useMessages } from 'components/hooks';
import { ReportContext } from './Report';
+export interface BaseParametersProps {
+ showWebsiteSelect?: boolean;
+ allowWebsiteSelect?: boolean;
+ showDateSelect?: boolean;
+ allowDateSelect?: boolean;
+}
+
export function BaseParameters({
showWebsiteSelect = true,
allowWebsiteSelect = true,
showDateSelect = true,
allowDateSelect = true,
-}) {
+}: BaseParametersProps) {
const { report, updateReport } = useContext(ReportContext);
const { formatMessage, labels } = useMessages();
@@ -19,11 +26,11 @@ export function BaseParameters({
const { websiteId, dateRange } = parameters || {};
const { value, startDate, endDate } = dateRange || {};
- const handleWebsiteSelect = websiteId => {
+ const handleWebsiteSelect = (websiteId: string) => {
updateReport({ websiteId, parameters: { websiteId } });
};
- const handleDateChange = value => {
+ const handleDateChange = (value: string) => {
updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } });
};
diff --git a/src/app/(main)/reports/[id]/FieldAddForm.js b/src/app/(main)/reports/[id]/FieldAddForm.tsx
similarity index 76%
rename from src/app/(main)/reports/[id]/FieldAddForm.js
rename to src/app/(main)/reports/[id]/FieldAddForm.tsx
index 6923bceb6..9db472d8d 100644
--- a/src/app/(main)/reports/[id]/FieldAddForm.js
+++ b/src/app/(main)/reports/[id]/FieldAddForm.tsx
@@ -7,10 +7,20 @@ import FieldAggregateForm from './FieldAggregateForm';
import FieldFilterForm from './FieldFilterForm';
import styles from './FieldAddForm.module.css';
-export function FieldAddForm({ fields = [], group, onAdd, onClose }) {
- const [selected, setSelected] = useState();
+export function FieldAddForm({
+ fields = [],
+ group,
+ onAdd,
+ onClose,
+}: {
+ fields?: any[];
+ group: string;
+ onAdd: (group: string, value: string) => void;
+ onClose: () => void;
+}) {
+ const [selected, setSelected] = useState<{ name: string; type: string; value: string }>();
- const handleSelect = value => {
+ const handleSelect = (value: any) => {
const { type } = value;
if (group === REPORT_PARAMETERS.groups || type === 'array' || type === 'boolean') {
@@ -22,7 +32,7 @@ export function FieldAddForm({ fields = [], group, onAdd, onClose }) {
setSelected(value);
};
- const handleSave = value => {
+ const handleSave = (value: any) => {
onAdd(group, value);
onClose();
};
diff --git a/src/app/(main)/reports/[id]/FieldAggregateForm.js b/src/app/(main)/reports/[id]/FieldAggregateForm.tsx
similarity index 86%
rename from src/app/(main)/reports/[id]/FieldAggregateForm.js
rename to src/app/(main)/reports/[id]/FieldAggregateForm.tsx
index 34b679808..6b5bf6360 100644
--- a/src/app/(main)/reports/[id]/FieldAggregateForm.js
+++ b/src/app/(main)/reports/[id]/FieldAggregateForm.tsx
@@ -1,7 +1,15 @@
import { Form, FormRow, Menu, Item } from 'react-basics';
import { useMessages } from 'components/hooks';
-export default function FieldAggregateForm({ name, type, onSelect }) {
+export default function FieldAggregateForm({
+ name,
+ type,
+ onSelect,
+}: {
+ name: string;
+ type: string;
+ onSelect: (key: any) => void;
+}) {
const { formatMessage, labels } = useMessages();
const options = {
@@ -27,7 +35,7 @@ export default function FieldAggregateForm({ name, type, onSelect }) {
const items = options[type];
- const handleSelect = value => {
+ const handleSelect = (value: any) => {
onSelect({ name, type, value });
};
diff --git a/src/app/(main)/reports/[id]/FieldFilterForm.js b/src/app/(main)/reports/[id]/FieldFilterForm.tsx
similarity index 86%
rename from src/app/(main)/reports/[id]/FieldFilterForm.js
rename to src/app/(main)/reports/[id]/FieldFilterForm.tsx
index ea80f82a1..4af7febfb 100644
--- a/src/app/(main)/reports/[id]/FieldFilterForm.js
+++ b/src/app/(main)/reports/[id]/FieldFilterForm.tsx
@@ -3,6 +3,15 @@ import { Form, FormRow, Item, Flexbox, Dropdown, Button } from 'react-basics';
import { useMessages, useFilters, useFormat, useLocale } from 'components/hooks';
import styles from './FieldFilterForm.module.css';
+export interface FieldFilterFormProps {
+ name: string;
+ label?: string;
+ type: string;
+ values?: any[];
+ onSelect?: (key: any) => void;
+ allowFilterSelect?: boolean;
+}
+
export default function FieldFilterForm({
name,
label,
@@ -10,7 +19,7 @@ export default function FieldFilterForm({
values,
onSelect,
allowFilterSelect = true,
-}) {
+}: FieldFilterFormProps) {
const { formatMessage, labels } = useMessages();
const [filter, setFilter] = useState('eq');
const [value, setValue] = useState();
@@ -21,7 +30,7 @@ export default function FieldFilterForm({
const formattedValues = useMemo(() => {
const formatted = {};
- const format = val => {
+ const format = (val: string) => {
formatted[val] = formatValue(val, name);
return formatted[val];
};
@@ -56,7 +65,7 @@ export default function FieldFilterForm({
items={filters}
value={filter}
renderValue={renderFilterValue}
- onChange={setFilter}
+ onChange={(key: any) => setFilter(key)}
>
{({ value, label }) => {
return <Item key={value}>{label}</Item>;
@@ -69,12 +78,12 @@ export default function FieldFilterForm({
items={values}
value={value}
renderValue={renderValue}
- onChange={setValue}
+ onChange={(key: any) => setValue(key)}
style={{
minWidth: '250px',
}}
>
- {value => {
+ {(value: string) => {
return <Item key={value}>{formattedValues[value]}</Item>;
}}
</Dropdown>
diff --git a/src/app/(main)/reports/[id]/FieldSelectForm.js b/src/app/(main)/reports/[id]/FieldSelectForm.tsx
similarity index 65%
rename from src/app/(main)/reports/[id]/FieldSelectForm.js
rename to src/app/(main)/reports/[id]/FieldSelectForm.tsx
index e7661511d..dfd402cf0 100644
--- a/src/app/(main)/reports/[id]/FieldSelectForm.js
+++ b/src/app/(main)/reports/[id]/FieldSelectForm.tsx
@@ -1,15 +1,26 @@
import { Menu, Item, Form, FormRow } from 'react-basics';
import { useMessages } from 'components/hooks';
import styles from './FieldSelectForm.module.css';
+import { Key } from 'react';
-export default function FieldSelectForm({ items, onSelect, showType = true }) {
+export interface FieldSelectFormProps {
+ fields?: any[];
+ onSelect?: (key: any) => void;
+ showType?: boolean;
+}
+
+export default function FieldSelectForm({
+ fields = [],
+ onSelect,
+ showType = true,
+}: FieldSelectFormProps) {
const { formatMessage, labels } = useMessages();
return (
<Form>
<FormRow label={formatMessage(labels.fields)}>
- <Menu className={styles.menu} onSelect={key => onSelect(items[key])}>
- {items.map(({ name, label, type }, index) => {
+ <Menu className={styles.menu} onSelect={key => onSelect(fields[key as any])}>
+ {fields.map(({ name, label, type }: any, index: Key) => {
return (
<Item key={index} className={styles.item}>
<div>{label || name}</div>
diff --git a/src/app/(main)/reports/[id]/FilterSelectForm.js b/src/app/(main)/reports/[id]/FilterSelectForm.tsx
similarity index 67%
rename from src/app/(main)/reports/[id]/FilterSelectForm.js
rename to src/app/(main)/reports/[id]/FilterSelectForm.tsx
index 8457b7ff6..4f9b92642 100644
--- a/src/app/(main)/reports/[id]/FilterSelectForm.js
+++ b/src/app/(main)/reports/[id]/FilterSelectForm.tsx
@@ -5,7 +5,7 @@ import FieldSelectForm from './FieldSelectForm';
import FieldFilterForm from './FieldFilterForm';
import { useApi } from 'components/hooks';
-function useValues(websiteId, type) {
+function useValues(websiteId: string, type: string) {
const now = Date.now();
const { get, useQuery } = useApi();
const { data, error, isLoading } = useQuery({
@@ -22,12 +22,24 @@ function useValues(websiteId, type) {
return { data, error, isLoading };
}
-export default function FilterSelectForm({ websiteId, items, onSelect, allowFilterSelect }) {
- const [field, setField] = useState();
+export interface FilterSelectFormProps {
+ websiteId: string;
+ items: any[];
+ onSelect?: (key: any) => void;
+ allowFilterSelect?: boolean;
+}
+
+export default function FilterSelectForm({
+ websiteId,
+ items,
+ onSelect,
+ allowFilterSelect,
+}: FilterSelectFormProps) {
+ const [field, setField] = useState<{ name: string; label: string; type: string }>();
const { data, isLoading } = useValues(websiteId, field?.name);
if (!field) {
- return <FieldSelectForm items={items} onSelect={setField} showType={false} />;
+ return <FieldSelectForm fields={items} onSelect={setField} showType={false} />;
}
if (isLoading) {
diff --git a/src/app/(main)/reports/[id]/ParameterList.js b/src/app/(main)/reports/[id]/ParameterList.tsx
similarity index 82%
rename from src/app/(main)/reports/[id]/ParameterList.js
rename to src/app/(main)/reports/[id]/ParameterList.tsx
index bf77dd9d2..eb1a646a4 100644
--- a/src/app/(main)/reports/[id]/ParameterList.js
+++ b/src/app/(main)/reports/[id]/ParameterList.tsx
@@ -1,10 +1,17 @@
+import { ReactNode } from 'react';
import { Icon, TooltipPopup } from 'react-basics';
import Icons from 'components/icons';
import Empty from 'components/common/Empty';
import { useMessages } from 'components/hooks';
import styles from './ParameterList.module.css';
-export function ParameterList({ items = [], children, onRemove }) {
+export interface ParameterListProps {
+ items: any[];
+ children?: ReactNode | ((item: any) => ReactNode);
+ onRemove: (index: number, e: any) => void;
+}
+
+export function ParameterList({ items = [], children, onRemove }: ParameterListProps) {
const { formatMessage, labels } = useMessages();
return (
diff --git a/src/app/(main)/reports/[id]/PopupForm.js b/src/app/(main)/reports/[id]/PopupForm.tsx
similarity index 59%
rename from src/app/(main)/reports/[id]/PopupForm.js
rename to src/app/(main)/reports/[id]/PopupForm.tsx
index 6b99b00a9..f26661991 100644
--- a/src/app/(main)/reports/[id]/PopupForm.js
+++ b/src/app/(main)/reports/[id]/PopupForm.tsx
@@ -1,7 +1,16 @@
+import { CSSProperties, ReactNode } from 'react';
import classNames from 'classnames';
import styles from './PopupForm.module.css';
-export function PopupForm({ className, style, children }) {
+export function PopupForm({
+ className,
+ style,
+ children,
+}: {
+ className?: string;
+ style?: CSSProperties;
+ children: ReactNode;
+}) {
return (
<div
className={classNames(styles.form, className)}
diff --git a/src/app/(main)/reports/[id]/Report.js b/src/app/(main)/reports/[id]/Report.tsx
similarity index 56%
rename from src/app/(main)/reports/[id]/Report.js
rename to src/app/(main)/reports/[id]/Report.tsx
index 4514a60ae..b100ad8e1 100644
--- a/src/app/(main)/reports/[id]/Report.js
+++ b/src/app/(main)/reports/[id]/Report.tsx
@@ -1,11 +1,19 @@
'use client';
-import { createContext } from 'react';
+import { createContext, ReactNode } from 'react';
import { useReport } from 'components/hooks';
import styles from './Report.module.css';
+import classNames from 'classnames';
export const ReportContext = createContext(null);
-export function Report({ reportId, defaultParameters, children, ...props }) {
+export interface ReportProps {
+ reportId: string;
+ defaultParameters: { [key: string]: any };
+ children: ReactNode;
+ className?: string;
+}
+
+export function Report({ reportId, defaultParameters, children, className }: ReportProps) {
const report = useReport(reportId, defaultParameters);
if (!report) {
@@ -14,9 +22,7 @@ export function Report({ reportId, defaultParameters, children, ...props }) {
return (
<ReportContext.Provider value={{ ...report }}>
- <div {...props} className={styles.container}>
- {children}
- </div>
+ <div className={classNames(styles.container, className)}>{children}</div>
</ReportContext.Provider>
);
}
diff --git a/src/app/(main)/reports/[id]/ReportBody.js b/src/app/(main)/reports/[id]/ReportBody.tsx
similarity index 100%
rename from src/app/(main)/reports/[id]/ReportBody.js
rename to src/app/(main)/reports/[id]/ReportBody.tsx
diff --git a/src/app/(main)/reports/[id]/ReportDetails.js b/src/app/(main)/reports/[id]/ReportDetails.tsx
similarity index 90%
rename from src/app/(main)/reports/[id]/ReportDetails.js
rename to src/app/(main)/reports/[id]/ReportDetails.tsx
index df91719a3..e4d4688a0 100644
--- a/src/app/(main)/reports/[id]/ReportDetails.js
+++ b/src/app/(main)/reports/[id]/ReportDetails.tsx
@@ -12,7 +12,7 @@ const reports = {
retention: RetentionReport,
};
-export default function ReportDetails({ reportId }) {
+export default function ReportDetails({ reportId }: { reportId: string }) {
const { get, useQuery } = useApi();
const { data: report } = useQuery({
queryKey: ['reports', reportId],
diff --git a/src/app/(main)/reports/[id]/ReportHeader.js b/src/app/(main)/reports/[id]/ReportHeader.tsx
similarity index 92%
rename from src/app/(main)/reports/[id]/ReportHeader.js
rename to src/app/(main)/reports/[id]/ReportHeader.tsx
index ed3b97364..6d226344f 100644
--- a/src/app/(main)/reports/[id]/ReportHeader.js
+++ b/src/app/(main)/reports/[id]/ReportHeader.tsx
@@ -12,8 +12,10 @@ export function ReportHeader({ icon }) {
const { showToast } = useToasts();
const { post, useMutation } = useApi();
const router = useRouter();
- const { mutate: create, isLoading: isCreating } = useMutation(data => post(`/reports`, data));
- const { mutate: update, isLoading: isUpdating } = useMutation(data =>
+ const { mutate: create, isLoading: isCreating } = useMutation((data: any) =>
+ post(`/reports`, data),
+ );
+ const { mutate: update, isLoading: isUpdating } = useMutation((data: any) =>
post(`/reports/${data.id}`, data),
);
@@ -26,7 +28,7 @@ export function ReportHeader({ icon }) {
create(report, {
onSuccess: async ({ id }) => {
showToast({ message: formatMessage(messages.saved), variant: 'success' });
- router.push(`/reports/${id}`, null, { shallow: true });
+ router.push(`/reports/${id}`);
},
});
} else {
@@ -38,11 +40,11 @@ export function ReportHeader({ icon }) {
}
};
- const handleNameChange = name => {
+ const handleNameChange = (name: string) => {
updateReport({ name: name || defaultName });
};
- const handleDescriptionChange = description => {
+ const handleDescriptionChange = (description: string) => {
updateReport({ description });
};
diff --git a/src/app/(main)/reports/[id]/ReportMenu.js b/src/app/(main)/reports/[id]/ReportMenu.tsx
similarity index 100%
rename from src/app/(main)/reports/[id]/ReportMenu.js
rename to src/app/(main)/reports/[id]/ReportMenu.tsx
diff --git a/src/app/(main)/reports/create/ReportTemplates.js b/src/app/(main)/reports/create/ReportTemplates.tsx
similarity index 100%
rename from src/app/(main)/reports/create/ReportTemplates.js
rename to src/app/(main)/reports/create/ReportTemplates.tsx
diff --git a/src/app/(main)/reports/event-data/EventDataParameters.js b/src/app/(main)/reports/event-data/EventDataParameters.tsx
similarity index 91%
rename from src/app/(main)/reports/event-data/EventDataParameters.js
rename to src/app/(main)/reports/event-data/EventDataParameters.tsx
index ac90fc2a8..7a39131ba 100644
--- a/src/app/(main)/reports/event-data/EventDataParameters.js
+++ b/src/app/(main)/reports/event-data/EventDataParameters.tsx
@@ -1,4 +1,4 @@
-import { useContext, useRef } from 'react';
+import { useContext } from 'react';
import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics';
import Empty from 'components/common/Empty';
import Icons from 'components/icons';
@@ -29,7 +29,6 @@ function useFields(websiteId, startDate, endDate) {
export function EventDataParameters() {
const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
const { formatMessage, labels, messages } = useMessages();
- const ref = useRef(null);
const { parameters } = report || {};
const { websiteId, dateRange, fields, filters, groups } = parameters || {};
const { startDate, endDate } = dateRange || {};
@@ -53,28 +52,28 @@ export function EventDataParameters() {
runReport(values);
};
- const handleAdd = (group, value) => {
+ const handleAdd = (group: string, value: any) => {
const data = parameterData[group];
- if (!data.find(({ name }) => name === value.name)) {
+ if (!data.find(({ name }) => name === value?.name)) {
updateReport({ parameters: { [group]: data.concat(value) } });
}
};
- const handleRemove = (group, index) => {
+ const handleRemove = (group: string, index: number) => {
const data = [...parameterData[group]];
data.splice(index, 1);
updateReport({ parameters: { [group]: data } });
};
- const AddButton = ({ group }) => {
+ const AddButton = ({ group, onAdd }) => {
return (
<PopupTrigger>
<Icon>
<Icons.Plus />
</Icon>
<Popup position="bottom" alignment="start">
- {close => {
+ {(close: () => void) => {
return (
<FieldAddForm
fields={data.map(({ eventKey, eventDataType }) => ({
@@ -82,7 +81,7 @@ export function EventDataParameters() {
type: DATA_TYPES[eventDataType],
}))}
group={group}
- onAdd={handleAdd}
+ onAdd={onAdd}
onClose={close}
/>
);
@@ -93,7 +92,7 @@ export function EventDataParameters() {
};
return (
- <Form ref={ref} values={parameters} error={error} onSubmit={handleSubmit}>
+ <Form values={parameters} error={error} onSubmit={handleSubmit}>
<BaseParameters />
{!hasData && <Empty message={formatMessage(messages.noEventData)} />}
{parametersSelected &&
diff --git a/src/app/(main)/reports/event-data/EventDataReport.js b/src/app/(main)/reports/event-data/EventDataReport.tsx
similarity index 89%
rename from src/app/(main)/reports/event-data/EventDataReport.js
rename to src/app/(main)/reports/event-data/EventDataReport.tsx
index e91cb4a2b..8b4dc99cd 100644
--- a/src/app/(main)/reports/event-data/EventDataReport.js
+++ b/src/app/(main)/reports/event-data/EventDataReport.tsx
@@ -11,7 +11,7 @@ const defaultParameters = {
parameters: { fields: [], filters: [] },
};
-export default function EventDataReport({ reportId }) {
+export default function EventDataReport({ reportId }: { reportId: string }) {
return (
<Report reportId={reportId} defaultParameters={defaultParameters}>
<ReportHeader icon={<Nodes />} />
diff --git a/src/app/(main)/reports/event-data/EventDataTable.js b/src/app/(main)/reports/event-data/EventDataTable.tsx
similarity index 100%
rename from src/app/(main)/reports/event-data/EventDataTable.js
rename to src/app/(main)/reports/event-data/EventDataTable.tsx
diff --git a/src/app/(main)/reports/funnel/FunnelChart.js b/src/app/(main)/reports/funnel/FunnelChart.tsx
similarity index 52%
rename from src/app/(main)/reports/funnel/FunnelChart.js
rename to src/app/(main)/reports/funnel/FunnelChart.tsx
index 7461afbcd..923e8d56b 100644
--- a/src/app/(main)/reports/funnel/FunnelChart.js
+++ b/src/app/(main)/reports/funnel/FunnelChart.tsx
@@ -1,13 +1,18 @@
-import { useCallback, useContext, useMemo } from 'react';
+import { JSX, useCallback, useContext, useMemo } from 'react';
import { Loading, StatusLight } from 'react-basics';
import useMessages from 'components/hooks/useMessages';
import useTheme from 'components/hooks/useTheme';
import BarChart from 'components/metrics/BarChart';
import { formatLongNumber } from 'lib/format';
-import styles from './FunnelChart.module.css';
import { ReportContext } from '../[id]/Report';
+import styles from './FunnelChart.module.css';
+
+export interface FunnelChartProps {
+ className?: string;
+ isLoading?: boolean;
+}
-export function FunnelChart({ className, loading }) {
+export function FunnelChart({ className, isLoading }: FunnelChartProps) {
const { report } = useContext(ReportContext);
const { formatMessage, labels } = useMessages();
const { colors } = useTheme();
@@ -15,33 +20,39 @@ export function FunnelChart({ className, loading }) {
const { parameters, data } = report || {};
const renderXLabel = useCallback(
- (label, index) => {
+ (label: string, index: number) => {
return parameters.urls[index];
},
[parameters],
);
- const renderTooltipPopup = useCallback((setTooltipPopup, model) => {
- const { opacity, labelColors, dataPoints } = model.tooltip;
+ const renderTooltipPopup = useCallback(
+ (
+ setTooltipPopup: (arg0: JSX.Element) => void,
+ model: { tooltip: { opacity: any; labelColors: any; dataPoints: any } },
+ ) => {
+ const { opacity, labelColors, dataPoints } = model.tooltip;
- if (!dataPoints?.length || !opacity) {
- setTooltipPopup(null);
- return;
- }
+ if (!dataPoints?.length || !opacity) {
+ setTooltipPopup(null);
+ return;
+ }
- setTooltipPopup(
- <>
- <div>
- {formatLongNumber(dataPoints[0].raw.y)} {formatMessage(labels.visitors)}
- </div>
- <div>
- <StatusLight color={labelColors?.[0]?.backgroundColor}>
- {formatLongNumber(dataPoints[0].raw.z)}% {formatMessage(labels.dropoff)}
- </StatusLight>
- </div>
- </>,
- );
- }, []);
+ setTooltipPopup(
+ <>
+ <div>
+ {formatLongNumber(dataPoints[0].raw.y)} {formatMessage(labels.visitors)}
+ </div>
+ <div>
+ <StatusLight color={labelColors?.[0]?.backgroundColor}>
+ {formatLongNumber(dataPoints[0].raw.z)}% {formatMessage(labels.dropoff)}
+ </StatusLight>
+ </div>
+ </>,
+ );
+ },
+ [],
+ );
const datasets = useMemo(() => {
return [
@@ -54,7 +65,7 @@ export function FunnelChart({ className, loading }) {
];
}, [data, colors, formatMessage, labels]);
- if (loading) {
+ if (isLoading) {
return <Loading icon="dots" className={styles.loading} />;
}
@@ -63,7 +74,7 @@ export function FunnelChart({ className, loading }) {
className={className}
datasets={datasets}
unit="day"
- loading={loading}
+ isLoading={isLoading}
renderXLabel={renderXLabel}
renderTooltipPopup={renderTooltipPopup}
XAxisType="category"
diff --git a/src/app/(main)/reports/funnel/FunnelParameters.js b/src/app/(main)/reports/funnel/FunnelParameters.tsx
similarity index 84%
rename from src/app/(main)/reports/funnel/FunnelParameters.js
rename to src/app/(main)/reports/funnel/FunnelParameters.tsx
index 135b5db84..0bb454156 100644
--- a/src/app/(main)/reports/funnel/FunnelParameters.js
+++ b/src/app/(main)/reports/funnel/FunnelParameters.tsx
@@ -1,4 +1,4 @@
-import { useContext, useRef } from 'react';
+import { useContext } from 'react';
import { useMessages } from 'components/hooks';
import {
Icon,
@@ -21,13 +21,12 @@ import PopupForm from '../[id]/PopupForm';
export function FunnelParameters() {
const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
const { formatMessage, labels } = useMessages();
- const ref = useRef(null);
const { parameters } = report || {};
const { websiteId, dateRange, urls } = parameters || {};
const queryDisabled = !websiteId || !dateRange || urls?.length < 2;
- const handleSubmit = (data, e) => {
+ const handleSubmit = (data: any, e: any) => {
e.stopPropagation();
e.preventDefault();
if (!queryDisabled) {
@@ -35,11 +34,11 @@ export function FunnelParameters() {
}
};
- const handleAddUrl = url => {
+ const handleAddUrl = (url: string) => {
updateReport({ parameters: { urls: parameters.urls.concat(url) } });
};
- const handleRemoveUrl = (index, e) => {
+ const handleRemoveUrl = (index: number, e: any) => {
e.stopPropagation();
const urls = [...parameters.urls];
urls.splice(index, 1);
@@ -62,7 +61,7 @@ export function FunnelParameters() {
};
return (
- <Form ref={ref} values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+ <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
<BaseParameters />
<FormRow label={formatMessage(labels.window)}>
<FormInput
@@ -73,7 +72,10 @@ export function FunnelParameters() {
</FormInput>
</FormRow>
<FormRow label={formatMessage(labels.urls)} action={<AddUrlButton />}>
- <ParameterList items={urls} onRemove={handleRemoveUrl} />
+ <ParameterList
+ items={urls}
+ onRemove={(index: number, e: any) => handleRemoveUrl(index, e)}
+ />
</FormRow>
<FormButtons>
<SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
diff --git a/src/app/(main)/reports/funnel/FunnelReport.js b/src/app/(main)/reports/funnel/FunnelReport.tsx
similarity index 100%
rename from src/app/(main)/reports/funnel/FunnelReport.js
rename to src/app/(main)/reports/funnel/FunnelReport.tsx
diff --git a/src/app/(main)/reports/funnel/FunnelTable.js b/src/app/(main)/reports/funnel/FunnelTable.tsx
similarity index 100%
rename from src/app/(main)/reports/funnel/FunnelTable.js
rename to src/app/(main)/reports/funnel/FunnelTable.tsx
diff --git a/src/app/(main)/reports/funnel/UrlAddForm.js b/src/app/(main)/reports/funnel/UrlAddForm.tsx
similarity index 86%
rename from src/app/(main)/reports/funnel/UrlAddForm.js
rename to src/app/(main)/reports/funnel/UrlAddForm.tsx
index 3e77ce156..88c27ae91 100644
--- a/src/app/(main)/reports/funnel/UrlAddForm.js
+++ b/src/app/(main)/reports/funnel/UrlAddForm.tsx
@@ -3,7 +3,12 @@ import { useMessages } from 'components/hooks';
import { Button, Form, FormRow, TextField, Flexbox } from 'react-basics';
import styles from './UrlAddForm.module.css';
-export function UrlAddForm({ defaultValue = '', onAdd }) {
+export interface UrlAddFormProps {
+ defaultValue?: string;
+ onAdd?: (url: string) => void;
+}
+
+export function UrlAddForm({ defaultValue = '', onAdd }: UrlAddFormProps) {
const [url, setUrl] = useState(defaultValue);
const { formatMessage, labels } = useMessages();
diff --git a/src/app/(main)/reports/insights/InsightsParameters.js b/src/app/(main)/reports/insights/InsightsParameters.tsx
similarity index 93%
rename from src/app/(main)/reports/insights/InsightsParameters.js
rename to src/app/(main)/reports/insights/InsightsParameters.tsx
index 91dd09f84..cd643eedf 100644
--- a/src/app/(main)/reports/insights/InsightsParameters.js
+++ b/src/app/(main)/reports/insights/InsightsParameters.tsx
@@ -1,4 +1,4 @@
-import { useContext, useRef } from 'react';
+import { useContext } from 'react';
import { useFormat, useMessages, useFilters } from 'components/hooks';
import {
Form,
@@ -24,7 +24,6 @@ export function InsightsParameters() {
const { formatMessage, labels } = useMessages();
const { formatValue } = useFormat();
const { filterLabels } = useFilters();
- const ref = useRef(null);
const { parameters } = report || {};
const { websiteId, dateRange, fields, filters } = parameters || {};
const { startDate, endDate } = dateRange || {};
@@ -72,7 +71,7 @@ export function InsightsParameters() {
updateReport({ parameters: { [id]: data } });
};
- const AddButton = ({ id }) => {
+ const AddButton = ({ id, onAdd }) => {
return (
<PopupTrigger>
<TooltipPopup label={formatMessage(labels.add)} position="top">
@@ -84,8 +83,8 @@ export function InsightsParameters() {
<PopupForm>
{id === 'fields' && (
<FieldSelectForm
- items={fieldOptions}
- onSelect={handleAdd.bind(null, id)}
+ fields={fieldOptions}
+ onSelect={onAdd.bind(null, id)}
showType={false}
/>
)}
@@ -93,7 +92,7 @@ export function InsightsParameters() {
<FilterSelectForm
websiteId={websiteId}
items={fieldOptions}
- onSelect={handleAdd.bind(null, id)}
+ onSelect={onAdd.bind(null, id)}
/>
)}
</PopupForm>
@@ -103,7 +102,7 @@ export function InsightsParameters() {
};
return (
- <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
+ <Form values={parameters} onSubmit={handleSubmit}>
<BaseParameters />
{parametersSelected &&
parameterGroups.map(({ id, label }) => {
diff --git a/src/app/(main)/reports/insights/InsightsReport.js b/src/app/(main)/reports/insights/InsightsReport.tsx
similarity index 90%
rename from src/app/(main)/reports/insights/InsightsReport.js
rename to src/app/(main)/reports/insights/InsightsReport.tsx
index f99e187bb..b90ff396d 100644
--- a/src/app/(main)/reports/insights/InsightsReport.js
+++ b/src/app/(main)/reports/insights/InsightsReport.tsx
@@ -13,7 +13,7 @@ const defaultParameters = {
parameters: { fields: [], filters: [] },
};
-export default function InsightsReport({ reportId }) {
+export default function InsightsReport({ reportId }: { reportId: string }) {
return (
<Report reportId={reportId} defaultParameters={defaultParameters}>
<ReportHeader icon={<Lightbulb />} />
diff --git a/src/app/(main)/reports/insights/InsightsTable.js b/src/app/(main)/reports/insights/InsightsTable.tsx
similarity index 96%
rename from src/app/(main)/reports/insights/InsightsTable.js
rename to src/app/(main)/reports/insights/InsightsTable.tsx
index 4194fee80..a45176983 100644
--- a/src/app/(main)/reports/insights/InsightsTable.js
+++ b/src/app/(main)/reports/insights/InsightsTable.tsx
@@ -5,7 +5,7 @@ import { ReportContext } from '../[id]/Report';
import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
export function InsightsTable() {
- const [fields, setFields] = useState();
+ const [fields, setFields] = useState([]);
const { report } = useContext(ReportContext);
const { formatMessage, labels } = useMessages();
const { formatValue } = useFormat();
diff --git a/src/app/(main)/reports/retention/RetentionParameters.js b/src/app/(main)/reports/retention/RetentionParameters.tsx
similarity index 87%
rename from src/app/(main)/reports/retention/RetentionParameters.js
rename to src/app/(main)/reports/retention/RetentionParameters.tsx
index 762a313df..fc168695f 100644
--- a/src/app/(main)/reports/retention/RetentionParameters.js
+++ b/src/app/(main)/reports/retention/RetentionParameters.tsx
@@ -1,4 +1,4 @@
-import { useContext, useRef } from 'react';
+import { useContext } from 'react';
import { useMessages } from 'components/hooks';
import { Form, FormButtons, FormRow, SubmitButton } from 'react-basics';
import { ReportContext } from '../[id]/Report';
@@ -9,14 +9,13 @@ import { parseDateRange } from 'lib/date';
export function RetentionParameters() {
const { report, runReport, isRunning, updateReport } = useContext(ReportContext);
const { formatMessage, labels } = useMessages();
- const ref = useRef(null);
const { parameters } = report || {};
const { websiteId, dateRange } = parameters || {};
const { startDate } = dateRange || {};
const queryDisabled = !websiteId || !dateRange;
- const handleSubmit = (data, e) => {
+ const handleSubmit = (data: any, e: any) => {
e.stopPropagation();
e.preventDefault();
@@ -30,7 +29,7 @@ export function RetentionParameters() {
};
return (
- <Form ref={ref} values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+ <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
<BaseParameters showDateSelect={false} />
<FormRow label={formatMessage(labels.date)}>
<MonthSelect date={startDate} onChange={handleDateChange} />
diff --git a/src/app/(main)/reports/retention/RetentionReport.js b/src/app/(main)/reports/retention/RetentionReport.tsx
similarity index 92%
rename from src/app/(main)/reports/retention/RetentionReport.js
rename to src/app/(main)/reports/retention/RetentionReport.tsx
index ae42e76bf..35f0fcb1e 100644
--- a/src/app/(main)/reports/retention/RetentionReport.js
+++ b/src/app/(main)/reports/retention/RetentionReport.tsx
@@ -19,7 +19,7 @@ const defaultParameters = {
},
};
-export default function RetentionReport({ reportId }) {
+export default function RetentionReport({ reportId }: { reportId: string }) {
return (
<Report reportId={reportId} defaultParameters={defaultParameters}>
<ReportHeader icon={<Magnet />} />
diff --git a/src/app/(main)/reports/retention/RetentionTable.js b/src/app/(main)/reports/retention/RetentionTable.tsx
similarity index 96%
rename from src/app/(main)/reports/retention/RetentionTable.js
rename to src/app/(main)/reports/retention/RetentionTable.tsx
index a71fae6f4..d2e7f129e 100644
--- a/src/app/(main)/reports/retention/RetentionTable.js
+++ b/src/app/(main)/reports/retention/RetentionTable.tsx
@@ -18,7 +18,7 @@ export function RetentionTable({ days = DAYS }) {
return <EmptyPlaceholder />;
}
- const rows = data.reduce((arr, row) => {
+ const rows = data.reduce((arr: any[], row: { date: any; visitors: any; day: any }) => {
const { date, visitors, day } = row;
if (day === 0) {
return arr.concat({
diff --git a/src/app/(main)/settings/profile/DateRangeSetting.js b/src/app/(main)/settings/profile/DateRangeSetting.tsx
similarity index 100%
rename from src/app/(main)/settings/profile/DateRangeSetting.js
rename to src/app/(main)/settings/profile/DateRangeSetting.tsx
diff --git a/src/app/(main)/settings/profile/LanguageSetting.js b/src/app/(main)/settings/profile/LanguageSetting.tsx
similarity index 100%
rename from src/app/(main)/settings/profile/LanguageSetting.js
rename to src/app/(main)/settings/profile/LanguageSetting.tsx
diff --git a/src/app/(main)/settings/profile/PasswordChangeButton.js b/src/app/(main)/settings/profile/PasswordChangeButton.tsx
similarity index 100%
rename from src/app/(main)/settings/profile/PasswordChangeButton.js
rename to src/app/(main)/settings/profile/PasswordChangeButton.tsx
diff --git a/src/app/(main)/settings/profile/PasswordEditForm.js b/src/app/(main)/settings/profile/PasswordEditForm.tsx
similarity index 91%
rename from src/app/(main)/settings/profile/PasswordEditForm.js
rename to src/app/(main)/settings/profile/PasswordEditForm.tsx
index 39ecfb770..7062ea597 100644
--- a/src/app/(main)/settings/profile/PasswordEditForm.js
+++ b/src/app/(main)/settings/profile/PasswordEditForm.tsx
@@ -6,10 +6,10 @@ import useMessages from 'components/hooks/useMessages';
export function PasswordEditForm({ onSave, onClose }) {
const { formatMessage, labels, messages } = useMessages();
const { post, useMutation } = useApi();
- const { mutate, error, isLoading } = useMutation(data => post('/me/password', data));
+ const { mutate, error, isLoading } = useMutation((data: any) => post('/me/password', data));
const ref = useRef(null);
- const handleSubmit = async data => {
+ const handleSubmit = async (data: any) => {
mutate(data, {
onSuccess: async () => {
onSave();
@@ -18,7 +18,7 @@ export function PasswordEditForm({ onSave, onClose }) {
});
};
- const samePassword = value => {
+ const samePassword = (value: string) => {
if (value !== ref?.current?.getValues('newPassword')) {
return formatMessage(messages.noMatchPassword);
}
diff --git a/src/app/(main)/settings/profile/ProfileHeader.js b/src/app/(main)/settings/profile/ProfileHeader.tsx
similarity index 100%
rename from src/app/(main)/settings/profile/ProfileHeader.js
rename to src/app/(main)/settings/profile/ProfileHeader.tsx
diff --git a/src/app/(main)/settings/profile/ProfileSettings.js b/src/app/(main)/settings/profile/ProfileSettings.tsx
similarity index 100%
rename from src/app/(main)/settings/profile/ProfileSettings.js
rename to src/app/(main)/settings/profile/ProfileSettings.tsx
diff --git a/src/app/(main)/settings/profile/ThemeSetting.js b/src/app/(main)/settings/profile/ThemeSetting.tsx
similarity index 100%
rename from src/app/(main)/settings/profile/ThemeSetting.js
rename to src/app/(main)/settings/profile/ThemeSetting.tsx
diff --git a/src/app/(main)/settings/profile/TimezoneSetting.js b/src/app/(main)/settings/profile/TimezoneSetting.tsx
similarity index 100%
rename from src/app/(main)/settings/profile/TimezoneSetting.js
rename to src/app/(main)/settings/profile/TimezoneSetting.tsx
diff --git a/src/app/(main)/settings/teams/TeamAddForm.js b/src/app/(main)/settings/teams/TeamAddForm.tsx
similarity index 72%
rename from src/app/(main)/settings/teams/TeamAddForm.js
rename to src/app/(main)/settings/teams/TeamAddForm.tsx
index b8bb8c3a7..5a242cb90 100644
--- a/src/app/(main)/settings/teams/TeamAddForm.js
+++ b/src/app/(main)/settings/teams/TeamAddForm.tsx
@@ -1,4 +1,3 @@
-import { useRef } from 'react';
import {
Form,
FormRow,
@@ -12,11 +11,12 @@ import { setValue } from 'store/cache';
import useApi from 'components/hooks/useApi';
import useMessages from 'components/hooks/useMessages';
-export function TeamAddForm({ onSave, onClose }) {
+export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
const { formatMessage, labels } = useMessages();
const { post, useMutation } = useApi();
- const { mutate, error, isLoading } = useMutation(data => post('/teams', data));
- const ref = useRef(null);
+ const { mutate, error, isPending } = useMutation({
+ mutationFn: (data: any) => post('/teams', data),
+ });
const handleSubmit = async data => {
mutate(data, {
@@ -29,17 +29,17 @@ export function TeamAddForm({ onSave, onClose }) {
};
return (
- <Form ref={ref} onSubmit={handleSubmit} error={error}>
+ <Form onSubmit={handleSubmit} error={error}>
<FormRow label={formatMessage(labels.name)}>
<FormInput name="name" rules={{ required: formatMessage(labels.required) }}>
<TextField autoComplete="off" />
</FormInput>
</FormRow>
<FormButtons flex>
- <SubmitButton variant="primary" disabled={isLoading}>
+ <SubmitButton variant="primary" disabled={isPending}>
{formatMessage(labels.save)}
</SubmitButton>
- <Button disabled={isLoading} onClick={onClose}>
+ <Button disabled={isPending} onClick={onClose}>
{formatMessage(labels.cancel)}
</Button>
</FormButtons>
diff --git a/src/app/(main)/settings/teams/TeamDeleteButton.js b/src/app/(main)/settings/teams/TeamDeleteButton.tsx
similarity index 79%
rename from src/app/(main)/settings/teams/TeamDeleteButton.js
rename to src/app/(main)/settings/teams/TeamDeleteButton.tsx
index 5e4a41ea0..36a1a1f83 100644
--- a/src/app/(main)/settings/teams/TeamDeleteButton.js
+++ b/src/app/(main)/settings/teams/TeamDeleteButton.tsx
@@ -2,7 +2,15 @@ import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
import useMessages from 'components/hooks/useMessages';
import TeamDeleteForm from './TeamDeleteForm';
-export function TeamDeleteButton({ teamId, teamName, onDelete }) {
+export function TeamDeleteButton({
+ teamId,
+ teamName,
+ onDelete,
+}: {
+ teamId: string;
+ teamName: string;
+ onDelete?: () => void;
+}) {
const { formatMessage, labels } = useMessages();
return (
@@ -14,7 +22,7 @@ export function TeamDeleteButton({ teamId, teamName, onDelete }) {
<Text>{formatMessage(labels.delete)}</Text>
</Button>
<Modal title={formatMessage(labels.deleteTeam)}>
- {close => (
+ {(close: any) => (
<TeamDeleteForm teamId={teamId} teamName={teamName} onSave={onDelete} onClose={close} />
)}
</Modal>
diff --git a/src/app/(main)/settings/teams/TeamDeleteForm.js b/src/app/(main)/settings/teams/TeamDeleteForm.tsx
similarity index 72%
rename from src/app/(main)/settings/teams/TeamDeleteForm.js
rename to src/app/(main)/settings/teams/TeamDeleteForm.tsx
index 9b80668a8..00eedb178 100644
--- a/src/app/(main)/settings/teams/TeamDeleteForm.js
+++ b/src/app/(main)/settings/teams/TeamDeleteForm.tsx
@@ -3,10 +3,22 @@ import useApi from 'components/hooks/useApi';
import useMessages from 'components/hooks/useMessages';
import { setValue } from 'store/cache';
-export function TeamDeleteForm({ teamId, teamName, onSave, onClose }) {
+export function TeamDeleteForm({
+ teamId,
+ teamName,
+ onSave,
+ onClose,
+}: {
+ teamId: string;
+ teamName: string;
+ onSave: () => void;
+ onClose: () => void;
+}) {
const { formatMessage, labels, messages, FormattedMessage } = useMessages();
const { del, useMutation } = useApi();
- const { mutate, error, isLoading } = useMutation(data => del(`/teams/${teamId}`, data));
+ const { mutate, error, isPending } = useMutation({
+ mutationFn: (data: any) => del(`/teams/${teamId}`, data),
+ });
const handleSubmit = async data => {
mutate(data, {
@@ -24,7 +36,7 @@ export function TeamDeleteForm({ teamId, teamName, onSave, onClose }) {
<FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
</p>
<FormButtons flex>
- <SubmitButton variant="danger" disabled={isLoading}>
+ <SubmitButton variant="danger" disabled={isPending}>
{formatMessage(labels.delete)}
</SubmitButton>
<Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
diff --git a/src/app/(main)/settings/teams/TeamJoinForm.js b/src/app/(main)/settings/teams/TeamJoinForm.tsx
similarity index 85%
rename from src/app/(main)/settings/teams/TeamJoinForm.js
rename to src/app/(main)/settings/teams/TeamJoinForm.tsx
index 528e1d75b..5cd382256 100644
--- a/src/app/(main)/settings/teams/TeamJoinForm.js
+++ b/src/app/(main)/settings/teams/TeamJoinForm.tsx
@@ -12,10 +12,10 @@ import useApi from 'components/hooks/useApi';
import useMessages from 'components/hooks/useMessages';
import { setValue } from 'store/cache';
-export function TeamJoinForm({ onSave, onClose }) {
+export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
const { formatMessage, labels, getMessage } = useMessages();
const { post, useMutation } = useApi();
- const { mutate, error } = useMutation(data => post('/teams/join', data));
+ const { mutate, error } = useMutation({ mutationFn: (data: any) => post('/teams/join', data) });
const ref = useRef(null);
const handleSubmit = async data => {
diff --git a/src/app/(main)/settings/teams/TeamLeaveButton.js b/src/app/(main)/settings/teams/TeamLeaveButton.tsx
similarity index 87%
rename from src/app/(main)/settings/teams/TeamLeaveButton.js
rename to src/app/(main)/settings/teams/TeamLeaveButton.tsx
index 7b98f082f..97676e176 100644
--- a/src/app/(main)/settings/teams/TeamLeaveButton.js
+++ b/src/app/(main)/settings/teams/TeamLeaveButton.tsx
@@ -4,7 +4,15 @@ import useLocale from 'components/hooks/useLocale';
import useUser from 'components/hooks/useUser';
import TeamDeleteForm from './TeamLeaveForm';
-export function TeamLeaveButton({ teamId, teamName, onLeave }) {
+export function TeamLeaveButton({
+ teamId,
+ teamName,
+ onLeave,
+}: {
+ teamId: string;
+ teamName: string;
+ onLeave?: () => void;
+}) {
const { formatMessage, labels } = useMessages();
const { dir } = useLocale();
const { user } = useUser();
diff --git a/src/app/(main)/settings/teams/TeamLeaveForm.js b/src/app/(main)/settings/teams/TeamLeaveForm.tsx
similarity index 60%
rename from src/app/(main)/settings/teams/TeamLeaveForm.js
rename to src/app/(main)/settings/teams/TeamLeaveForm.tsx
index a9b6922aa..3b4d4703c 100644
--- a/src/app/(main)/settings/teams/TeamLeaveForm.js
+++ b/src/app/(main)/settings/teams/TeamLeaveForm.tsx
@@ -3,22 +3,33 @@ import useApi from 'components/hooks/useApi';
import useMessages from 'components/hooks/useMessages';
import { setValue } from 'store/cache';
-export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
+export function TeamLeaveForm({
+ teamId,
+ userId,
+ teamName,
+ onSave,
+ onClose,
+}: {
+ teamId: string;
+ userId: string;
+ teamName: string;
+ onSave: () => void;
+ onClose: () => void;
+}) {
const { formatMessage, labels, messages, FormattedMessage } = useMessages();
const { del, useMutation } = useApi();
- const { mutate, error, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
+ const { mutate, error, isPending } = useMutation({
+ mutationFn: () => del(`/teams/${teamId}/users/${userId}`),
+ });
const handleSubmit = async () => {
- mutate(
- {},
- {
- onSuccess: async () => {
- setValue('team:members', Date.now());
- onSave();
- onClose();
- },
+ mutate(null, {
+ onSuccess: async () => {
+ setValue('team:members', Date.now());
+ onSave();
+ onClose();
},
- );
+ });
};
return (
@@ -27,7 +38,7 @@ export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
<FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
</p>
<FormButtons flex>
- <SubmitButton variant="danger" disabled={isLoading}>
+ <SubmitButton variant="danger" disabled={isPending}>
{formatMessage(labels.leave)}
</SubmitButton>
<Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
diff --git a/src/app/(main)/settings/teams/TeamsAddButton.js b/src/app/(main)/settings/teams/TeamsAddButton.tsx
similarity index 79%
rename from src/app/(main)/settings/teams/TeamsAddButton.js
rename to src/app/(main)/settings/teams/TeamsAddButton.tsx
index b7850812b..09f9ecbbf 100644
--- a/src/app/(main)/settings/teams/TeamsAddButton.js
+++ b/src/app/(main)/settings/teams/TeamsAddButton.tsx
@@ -3,7 +3,7 @@ import Icons from 'components/icons';
import useMessages from 'components/hooks/useMessages';
import TeamAddForm from './TeamAddForm';
-export function TeamsAddButton({ onAdd }) {
+export function TeamsAddButton({ onAdd }: { onAdd?: () => void }) {
const { formatMessage, labels } = useMessages();
return (
@@ -15,7 +15,7 @@ export function TeamsAddButton({ onAdd }) {
<Text>{formatMessage(labels.createTeam)}</Text>
</Button>
<Modal title={formatMessage(labels.createTeam)}>
- {close => <TeamAddForm onSave={onAdd} onClose={close} />}
+ {(close: () => void) => <TeamAddForm onSave={onAdd} onClose={close} />}
</Modal>
</ModalTrigger>
);
diff --git a/src/app/(main)/settings/teams/TeamsDataTable.js b/src/app/(main)/settings/teams/TeamsDataTable.tsx
similarity index 88%
rename from src/app/(main)/settings/teams/TeamsDataTable.js
rename to src/app/(main)/settings/teams/TeamsDataTable.tsx
index a8c9e21d1..2424e464e 100644
--- a/src/app/(main)/settings/teams/TeamsDataTable.js
+++ b/src/app/(main)/settings/teams/TeamsDataTable.tsx
@@ -7,10 +7,10 @@ import useCache from 'store/cache';
export function TeamsDataTable() {
const { get } = useApi();
- const modified = useCache(state => state?.teams);
+ const modified = useCache((state: any) => state?.teams);
const queryResult = useFilterQuery({
queryKey: ['teams', { modified }],
- queryFn: params => {
+ queryFn: (params: any) => {
return get(`/teams`, {
...params,
});
diff --git a/src/app/(main)/settings/teams/TeamsHeader.js b/src/app/(main)/settings/teams/TeamsHeader.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/TeamsHeader.js
rename to src/app/(main)/settings/teams/TeamsHeader.tsx
diff --git a/src/app/(main)/settings/teams/TeamsJoinButton.js b/src/app/(main)/settings/teams/TeamsJoinButton.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/TeamsJoinButton.js
rename to src/app/(main)/settings/teams/TeamsJoinButton.tsx
diff --git a/src/app/(main)/settings/teams/TeamsTable.js b/src/app/(main)/settings/teams/TeamsTable.tsx
similarity index 96%
rename from src/app/(main)/settings/teams/TeamsTable.js
rename to src/app/(main)/settings/teams/TeamsTable.tsx
index 1f7f1da4a..70a7bebbd 100644
--- a/src/app/(main)/settings/teams/TeamsTable.js
+++ b/src/app/(main)/settings/teams/TeamsTable.tsx
@@ -7,7 +7,7 @@ import { Button, GridColumn, GridTable, Icon, Icons, Text, useBreakpoint } from
import TeamDeleteButton from './TeamDeleteButton';
import TeamLeaveButton from './TeamLeaveButton';
-export function TeamsTable({ data = [] }) {
+export function TeamsTable({ data = [] }: { data: any[] }) {
const { formatMessage, labels } = useMessages();
const { user } = useUser();
const breakpoint = useBreakpoint();
diff --git a/src/app/(main)/settings/teams/WebsiteTags.js b/src/app/(main)/settings/teams/WebsiteTags.tsx
similarity index 83%
rename from src/app/(main)/settings/teams/WebsiteTags.js
rename to src/app/(main)/settings/teams/WebsiteTags.tsx
index c17d5763d..4a0f109d8 100644
--- a/src/app/(main)/settings/teams/WebsiteTags.js
+++ b/src/app/(main)/settings/teams/WebsiteTags.tsx
@@ -1,7 +1,15 @@
import { Button, Icon, Icons, Text } from 'react-basics';
import styles from './WebsiteTags.module.css';
-export function WebsiteTags({ items = [], websites = [], onClick }) {
+export function WebsiteTags({
+ items = [],
+ websites = [],
+ onClick,
+}: {
+ items: any[];
+ websites: any[];
+ onClick: (e: Event) => void;
+}) {
if (websites.length === 0) {
return null;
}
diff --git a/src/app/(main)/settings/teams/[id]/TeamEditForm.js b/src/app/(main)/settings/teams/[id]/TeamEditForm.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[id]/TeamEditForm.js
rename to src/app/(main)/settings/teams/[id]/TeamEditForm.tsx
diff --git a/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.js b/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx
similarity index 59%
rename from src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.js
rename to src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx
index 603adae3a..cef2977ef 100644
--- a/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.js
+++ b/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx
@@ -3,28 +3,37 @@ import useMessages from 'components/hooks/useMessages';
import { Icon, Icons, LoadingButton, Text } from 'react-basics';
import { setValue } from 'store/cache';
-export function TeamMemberRemoveButton({ teamId, userId, disabled, onSave }) {
+export function TeamMemberRemoveButton({
+ teamId,
+ userId,
+ disabled,
+ onSave,
+}: {
+ teamId: string;
+ userId: string;
+ disabled?: boolean;
+ onSave?: () => void;
+}) {
const { formatMessage, labels } = useMessages();
const { del, useMutation } = useApi();
- const { mutate, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
+ const { mutate, isPending } = useMutation({
+ mutationFn: () => del(`/teams/${teamId}/users/${userId}`),
+ });
const handleRemoveTeamMember = () => {
- mutate(
- {},
- {
- onSuccess: () => {
- setValue('team:members', Date.now());
- onSave?.();
- },
+ mutate(null, {
+ onSuccess: () => {
+ setValue('team:members', Date.now());
+ onSave?.();
},
- );
+ });
};
return (
<LoadingButton
onClick={() => handleRemoveTeamMember()}
disabled={disabled}
- isLoading={isLoading}
+ isLoading={isPending}
>
<Icon>
<Icons.Close />
diff --git a/src/app/(main)/settings/teams/[id]/TeamMembers.js b/src/app/(main)/settings/teams/[id]/TeamMembers.tsx
similarity index 89%
rename from src/app/(main)/settings/teams/[id]/TeamMembers.js
rename to src/app/(main)/settings/teams/[id]/TeamMembers.tsx
index 1b0c0d180..588a5a52b 100644
--- a/src/app/(main)/settings/teams/[id]/TeamMembers.js
+++ b/src/app/(main)/settings/teams/[id]/TeamMembers.tsx
@@ -4,7 +4,7 @@ import useFilterQuery from 'components/hooks/useFilterQuery';
import DataTable from 'components/common/DataTable';
import useCache from 'store/cache';
-export function TeamMembers({ teamId, readOnly }) {
+export function TeamMembers({ teamId, readOnly }: { teamId: string; readOnly: boolean }) {
const { get } = useApi();
const modified = useCache(state => state?.['team:members']);
const queryResult = useFilterQuery({
diff --git a/src/app/(main)/settings/teams/[id]/TeamMembersTable.js b/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx
similarity index 90%
rename from src/app/(main)/settings/teams/[id]/TeamMembersTable.js
rename to src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx
index 9a402d444..a08c746bb 100644
--- a/src/app/(main)/settings/teams/[id]/TeamMembersTable.js
+++ b/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx
@@ -4,7 +4,15 @@ import useUser from 'components/hooks/useUser';
import { ROLES } from 'lib/constants';
import TeamMemberRemoveButton from './TeamMemberRemoveButton';
-export function TeamMembersTable({ data = [], teamId, readOnly }) {
+export function TeamMembersTable({
+ data = [],
+ teamId,
+ readOnly,
+}: {
+ data: any[];
+ teamId: string;
+ readOnly: boolean;
+}) {
const { formatMessage, labels } = useMessages();
const { user } = useUser();
const breakpoint = useBreakpoint();
diff --git a/src/app/(main)/settings/teams/[id]/TeamSettings.js b/src/app/(main)/settings/teams/[id]/TeamSettings.tsx
similarity index 91%
rename from src/app/(main)/settings/teams/[id]/TeamSettings.js
rename to src/app/(main)/settings/teams/[id]/TeamSettings.tsx
index d7065f97f..cf5ae35cb 100644
--- a/src/app/(main)/settings/teams/[id]/TeamSettings.js
+++ b/src/app/(main)/settings/teams/[id]/TeamSettings.tsx
@@ -10,7 +10,7 @@ import TeamEditForm from './TeamEditForm';
import TeamMembers from './TeamMembers';
import TeamWebsites from './TeamWebsites';
-export function TeamSettings({ teamId }) {
+export function TeamSettings({ teamId }: { teamId: string }) {
const { formatMessage, labels, messages } = useMessages();
const { user } = useUser();
const [values, setValues] = useState(null);
@@ -24,7 +24,7 @@ export function TeamSettings({ teamId }) {
return get(`/teams/${teamId}`);
}
},
- cacheTime: 0,
+ gcTime: 0,
});
const canEdit = data?.teamUser?.find(
({ userId, role }) => role === ROLES.teamOwner && userId === user.id,
@@ -48,7 +48,7 @@ export function TeamSettings({ teamId }) {
return (
<Flexbox direction="column">
<PageHeader title={values?.name} />
- <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}>
+ <Tabs selectedKey={tab} onSelect={(value: any) => setTab(value)} style={{ marginBottom: 30 }}>
<Item key="details">{formatMessage(labels.details)}</Item>
<Item key="members">{formatMessage(labels.members)}</Item>
<Item key="websites">{formatMessage(labels.websites)}</Item>
diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.js b/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
similarity index 86%
rename from src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.js
rename to src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
index 004ae54f1..64a0c58e4 100644
--- a/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.js
+++ b/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
@@ -7,11 +7,21 @@ import Empty from 'components/common/Empty';
import { setValue } from 'store/cache';
import { useUser } from 'components/hooks';
-export function TeamWebsiteAddForm({ teamId, onSave, onClose }) {
+export function TeamWebsiteAddForm({
+ teamId,
+ onSave,
+ onClose,
+}: {
+ teamId: string;
+ onSave: () => void;
+ onClose: () => void;
+}) {
const { user } = useUser();
const { formatMessage, labels } = useMessages();
const { get, post, useQuery, useMutation } = useApi();
- const { mutate, error } = useMutation(data => post(`/teams/${teamId}/websites`, data));
+ const { mutate, error } = useMutation({
+ mutationFn: (data: any) => post(`/teams/${teamId}/websites`, data),
+ });
const { data: websites, isLoading } = useQuery({
queryKey: ['websites'],
queryFn: () => get('/websites'),
@@ -42,7 +52,7 @@ export function TeamWebsiteAddForm({ teamId, onSave, onClose }) {
{!isLoading && !hasData && <Empty />}
{hasData && (
<Form onSubmit={handleSubmit} error={error}>
- <WebsitesDataTable userId={user.id} showHeader={false} showActions={false}>
+ <WebsitesDataTable userId={user.id} showActions={false}>
<GridColumn name="select" label={formatMessage(labels.selectWebsite)} alignment="end">
{row => (
<Toggle
diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.js b/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.js
rename to src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx
diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsites.js b/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx
similarity index 86%
rename from src/app/(main)/settings/teams/[id]/TeamWebsites.js
rename to src/app/(main)/settings/teams/[id]/TeamWebsites.tsx
index af167b890..93bb3a106 100644
--- a/src/app/(main)/settings/teams/[id]/TeamWebsites.js
+++ b/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx
@@ -8,7 +8,7 @@ import useFilterQuery from 'components/hooks/useFilterQuery';
import DataTable from 'components/common/DataTable';
import useCache from 'store/cache';
-export function TeamWebsites({ teamId }) {
+export function TeamWebsites({ teamId, readOnly }: { teamId: string; readOnly: boolean }) {
const { formatMessage, labels, messages } = useMessages();
const { user } = useUser();
const { get } = useApi();
@@ -24,7 +24,7 @@ export function TeamWebsites({ teamId }) {
});
const handleChange = () => {
- queryResult.refetch();
+ queryResult.query.refetch();
};
return (
@@ -43,7 +43,9 @@ export function TeamWebsites({ teamId }) {
</ModalTrigger>
</ActionForm>
<DataTable queryResult={queryResult}>
- {({ data }) => <TeamWebsitesTable data={data} onRemove={handleChange} />}
+ {({ data }) => (
+ <TeamWebsitesTable data={data} onRemove={handleChange} readOnly={readOnly} />
+ )}
</DataTable>
</>
);
diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.js b/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx
similarity index 85%
rename from src/app/(main)/settings/teams/[id]/TeamWebsitesTable.js
rename to src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx
index 0f8022121..29b958160 100644
--- a/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.js
+++ b/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx
@@ -4,7 +4,15 @@ import useMessages from 'components/hooks/useMessages';
import useUser from 'components/hooks/useUser';
import TeamWebsiteRemoveButton from './TeamWebsiteRemoveButton';
-export function TeamWebsitesTable({ data = [], onRemove }) {
+export function TeamWebsitesTable({
+ data = [],
+ readOnly,
+ onRemove,
+}: {
+ data: any[];
+ readOnly: boolean;
+ onRemove: () => void;
+}) {
const { formatMessage, labels } = useMessages();
const { user } = useUser();
@@ -17,7 +25,7 @@ export function TeamWebsitesTable({ data = [], onRemove }) {
const { id: teamId, teamUser } = row.teamWebsite[0].team;
const { id: websiteId, userId } = row;
const owner = teamUser[0];
- const canRemove = user.id === userId || user.id === owner.userId;
+ const canRemove = !readOnly && (user.id === userId || user.id === owner.userId);
return (
<>
{canRemove && (
diff --git a/src/app/(main)/settings/teams/[id]/page.js b/src/app/(main)/settings/teams/[id]/page.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[id]/page.js
rename to src/app/(main)/settings/teams/[id]/page.tsx
diff --git a/src/app/(main)/settings/users/UserAddButton.js b/src/app/(main)/settings/users/UserAddButton.tsx
similarity index 92%
rename from src/app/(main)/settings/users/UserAddButton.js
rename to src/app/(main)/settings/users/UserAddButton.tsx
index 0f4bf7349..7f08107cb 100644
--- a/src/app/(main)/settings/users/UserAddButton.js
+++ b/src/app/(main)/settings/users/UserAddButton.tsx
@@ -3,7 +3,7 @@ import UserAddForm from './UserAddForm';
import useMessages from 'components/hooks/useMessages';
import { setValue } from 'store/cache';
-export function UserAddButton({ onSave }) {
+export function UserAddButton({ onSave }: { onSave?: () => void }) {
const { formatMessage, labels, messages } = useMessages();
const { showToast } = useToasts();
diff --git a/src/app/(main)/settings/users/UserAddForm.js b/src/app/(main)/settings/users/UserAddForm.tsx
similarity index 92%
rename from src/app/(main)/settings/users/UserAddForm.js
rename to src/app/(main)/settings/users/UserAddForm.tsx
index 38c1bedd7..11066a24e 100644
--- a/src/app/(main)/settings/users/UserAddForm.js
+++ b/src/app/(main)/settings/users/UserAddForm.tsx
@@ -16,7 +16,9 @@ import useMessages from 'components/hooks/useMessages';
export function UserAddForm({ onSave, onClose }) {
const { post, useMutation } = useApi();
- const { mutate, error, isLoading } = useMutation(data => post(`/users`, data));
+ const { mutate, error, isPending } = useMutation({
+ mutationFn: (data: any) => post(`/users`, data),
+ });
const { formatMessage, labels } = useMessages();
const handleSubmit = async data => {
@@ -65,7 +67,7 @@ export function UserAddForm({ onSave, onClose }) {
<SubmitButton variant="primary" disabled={false}>
{formatMessage(labels.save)}
</SubmitButton>
- <Button disabled={isLoading} onClick={onClose}>
+ <Button disabled={isPending} onClick={onClose}>
{formatMessage(labels.cancel)}
</Button>
</FormButtons>
diff --git a/src/app/(main)/settings/users/UserDeleteButton.js b/src/app/(main)/settings/users/UserDeleteButton.tsx
similarity index 85%
rename from src/app/(main)/settings/users/UserDeleteButton.js
rename to src/app/(main)/settings/users/UserDeleteButton.tsx
index 22d931713..2b93c138e 100644
--- a/src/app/(main)/settings/users/UserDeleteButton.js
+++ b/src/app/(main)/settings/users/UserDeleteButton.tsx
@@ -3,7 +3,15 @@ import useMessages from 'components/hooks/useMessages';
import useUser from 'components/hooks/useUser';
import UserDeleteForm from './UserDeleteForm';
-export function UserDeleteButton({ userId, username, onDelete }) {
+export function UserDeleteButton({
+ userId,
+ username,
+ onDelete,
+}: {
+ userId: string;
+ username: string;
+ onDelete?: () => void;
+}) {
const { formatMessage, labels } = useMessages();
const { user } = useUser();
diff --git a/src/app/(main)/settings/users/UserDeleteForm.js b/src/app/(main)/settings/users/UserDeleteForm.tsx
similarity index 72%
rename from src/app/(main)/settings/users/UserDeleteForm.js
rename to src/app/(main)/settings/users/UserDeleteForm.tsx
index 5a47fdc12..eaa8e4818 100644
--- a/src/app/(main)/settings/users/UserDeleteForm.js
+++ b/src/app/(main)/settings/users/UserDeleteForm.tsx
@@ -1,14 +1,13 @@
-import { useMutation } from '@tanstack/react-query';
import { Button, Form, FormButtons, SubmitButton } from 'react-basics';
import useApi from 'components/hooks/useApi';
import useMessages from 'components/hooks/useMessages';
export function UserDeleteForm({ userId, username, onSave, onClose }) {
const { formatMessage, FormattedMessage, labels, messages } = useMessages();
- const { del } = useApi();
- const { mutate, error, isLoading } = useMutation(() => del(`/users/${userId}`));
+ const { del, useMutation } = useApi();
+ const { mutate, error, isPending } = useMutation({ mutationFn: () => del(`/users/${userId}`) });
- const handleSubmit = async data => {
+ const handleSubmit = async (data: any) => {
mutate(data, {
onSuccess: async () => {
onSave();
@@ -23,10 +22,10 @@ export function UserDeleteForm({ userId, username, onSave, onClose }) {
<FormattedMessage {...messages.confirmDelete} values={{ target: <b>{username}</b> }} />
</p>
<FormButtons flex>
- <SubmitButton variant="danger" disabled={isLoading}>
+ <SubmitButton variant="danger" disabled={isPending}>
{formatMessage(labels.delete)}
</SubmitButton>
- <Button disabled={isLoading} onClick={onClose}>
+ <Button disabled={isPending} onClick={onClose}>
{formatMessage(labels.cancel)}
</Button>
</FormButtons>
diff --git a/src/app/(main)/settings/users/UserEditForm.js b/src/app/(main)/settings/users/UserEditForm.tsx
similarity index 82%
rename from src/app/(main)/settings/users/UserEditForm.js
rename to src/app/(main)/settings/users/UserEditForm.tsx
index 157c9ad69..0b823a94e 100644
--- a/src/app/(main)/settings/users/UserEditForm.js
+++ b/src/app/(main)/settings/users/UserEditForm.tsx
@@ -13,14 +13,30 @@ import useApi from 'components/hooks/useApi';
import { ROLES } from 'lib/constants';
import useMessages from 'components/hooks/useMessages';
-export function UserEditForm({ userId, data, onSave }) {
+export function UserEditForm({
+ userId,
+ data,
+ onSave,
+}: {
+ userId: string;
+ data: any[];
+ onSave: (data: any) => void;
+}) {
const { formatMessage, labels, messages } = useMessages();
const { post, useMutation } = useApi();
- const { mutate, error } = useMutation(({ username, password, role }) =>
- post(`/users/${userId}`, { username, password, role }),
- );
+ const { mutate, error } = useMutation({
+ mutationFn: ({
+ username,
+ password,
+ role,
+ }: {
+ username: string;
+ password: string;
+ role: string;
+ }) => post(`/users/${userId}`, { username, password, role }),
+ });
- const handleSubmit = async data => {
+ const handleSubmit = async (data: any) => {
mutate(data, {
onSuccess: async () => {
onSave(data);
diff --git a/src/app/(main)/settings/users/UserWebsites.js b/src/app/(main)/settings/users/UserWebsites.js
deleted file mode 100644
index cd53c512e..000000000
--- a/src/app/(main)/settings/users/UserWebsites.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import Page from 'components/layout/Page';
-import useApi from 'components/hooks/useApi';
-import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';
-import useApiFilter from 'components/hooks/useApiFilter';
-
-export function UserWebsites({ userId }) {
- const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
- useApiFilter();
- const { get, useQuery } = useApi();
- const { data, isLoading, error } = useQuery({
- queryKey: ['user:websites', userId, filter, page, pageSize],
- queryFn: () =>
- get(`/users/${userId}/websites`, {
- filter,
- page,
- pageSize,
- }),
- });
- const hasData = data && data.length !== 0;
-
- return (
- <Page loading={isLoading} error={error}>
- {hasData && (
- <WebsitesTable
- data={data.data}
- onFilterChange={handleFilterChange}
- onPageChange={handlePageChange}
- onPageSizeChange={handlePageSizeChange}
- filterValue={filter}
- />
- )}
- </Page>
- );
-}
-
-export default UserWebsites;
diff --git a/src/app/(main)/settings/users/UserWebsites.tsx b/src/app/(main)/settings/users/UserWebsites.tsx
new file mode 100644
index 000000000..2d06e82a9
--- /dev/null
+++ b/src/app/(main)/settings/users/UserWebsites.tsx
@@ -0,0 +1,26 @@
+import Page from 'components/layout/Page';
+import useApi from 'components/hooks/useApi';
+import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+import DataTable from 'components/common/DataTable';
+
+export function UserWebsites({ userId }) {
+ const { get } = useApi();
+ const queryResult = useFilterQuery({
+ queryKey: ['user:websites', userId],
+ queryFn: (params: any) => get(`/users/${userId}/websites`, params),
+ });
+ const hasData = queryResult.result && queryResult.result.data.length !== 0;
+
+ return (
+ <Page isLoading={queryResult.query.isLoading} error={queryResult.query.error}>
+ {hasData && (
+ <DataTable queryResult={queryResult}>
+ {({ data }) => <WebsitesTable data={data} />}
+ </DataTable>
+ )}
+ </Page>
+ );
+}
+
+export default UserWebsites;
diff --git a/src/app/(main)/settings/users/UsersDataTable.js b/src/app/(main)/settings/users/UsersDataTable.tsx
similarity index 82%
rename from src/app/(main)/settings/users/UsersDataTable.js
rename to src/app/(main)/settings/users/UsersDataTable.tsx
index 91125309b..b77164515 100644
--- a/src/app/(main)/settings/users/UsersDataTable.js
+++ b/src/app/(main)/settings/users/UsersDataTable.tsx
@@ -8,10 +8,10 @@ import useCache from 'store/cache';
export function UsersDataTable() {
const { get } = useApi();
- const modified = useCache(state => state?.users);
+ const modified = useCache((state: any) => state?.users);
const queryResult = useFilterQuery({
queryKey: ['users', { modified }],
- queryFn: params => get(`/users`, params),
+ queryFn: (params: { [key: string]: any }) => get(`/users`, params),
});
return (
diff --git a/src/app/(main)/settings/users/UsersHeader.js b/src/app/(main)/settings/users/UsersHeader.tsx
similarity index 85%
rename from src/app/(main)/settings/users/UsersHeader.js
rename to src/app/(main)/settings/users/UsersHeader.tsx
index caf1f913f..0901a6fb2 100644
--- a/src/app/(main)/settings/users/UsersHeader.js
+++ b/src/app/(main)/settings/users/UsersHeader.tsx
@@ -3,7 +3,7 @@ import PageHeader from 'components/layout/PageHeader';
import useMessages from 'components/hooks/useMessages';
import UserAddButton from './UserAddButton';
-export function UsersHeader({ onAdd }) {
+export function UsersHeader({ onAdd }: { onAdd?: () => void }) {
const { formatMessage, labels } = useMessages();
return (
diff --git a/src/app/(main)/settings/users/UsersTable.js b/src/app/(main)/settings/users/UsersTable.tsx
similarity index 96%
rename from src/app/(main)/settings/users/UsersTable.js
rename to src/app/(main)/settings/users/UsersTable.tsx
index a0b5aba1b..2b840b64c 100644
--- a/src/app/(main)/settings/users/UsersTable.js
+++ b/src/app/(main)/settings/users/UsersTable.tsx
@@ -6,7 +6,7 @@ import useMessages from 'components/hooks/useMessages';
import useLocale from 'components/hooks/useLocale';
import UserDeleteButton from './UserDeleteButton';
-export function UsersTable({ data = [] }) {
+export function UsersTable({ data = [] }: { data: any[] }) {
const { formatMessage, labels } = useMessages();
const { dateLocale } = useLocale();
const breakpoint = useBreakpoint();
diff --git a/src/app/(main)/settings/users/[id]/UserSettings.js b/src/app/(main)/settings/users/[id]/UserSettings.js
index f635bb054..3d8a92eae 100644
--- a/src/app/(main)/settings/users/[id]/UserSettings.js
+++ b/src/app/(main)/settings/users/[id]/UserSettings.js
@@ -21,7 +21,7 @@ export function UserSettings({ userId }) {
return get(`/users/${userId}`);
}
},
- cacheTime: 0,
+ gcTime: 0,
});
const handleSave = data => {
diff --git a/src/app/(main)/settings/users/[id]/page.js b/src/app/(main)/settings/users/[id]/page.tsx
similarity index 100%
rename from src/app/(main)/settings/users/[id]/page.js
rename to src/app/(main)/settings/users/[id]/page.tsx
diff --git a/src/app/(main)/settings/websites/WebsiteAddButton.js b/src/app/(main)/settings/websites/WebsiteAddButton.tsx
similarity index 92%
rename from src/app/(main)/settings/websites/WebsiteAddButton.js
rename to src/app/(main)/settings/websites/WebsiteAddButton.tsx
index b1a694296..16681b0ed 100644
--- a/src/app/(main)/settings/websites/WebsiteAddButton.js
+++ b/src/app/(main)/settings/websites/WebsiteAddButton.tsx
@@ -3,7 +3,7 @@ import WebsiteAddForm from './WebsiteAddForm';
import useMessages from 'components/hooks/useMessages';
import { setValue } from 'store/cache';
-export function WebsiteAddButton({ onSave }) {
+export function WebsiteAddButton({ onSave }: { onSave?: () => void }) {
const { formatMessage, labels, messages } = useMessages();
const { showToast } = useToasts();
diff --git a/src/app/(main)/settings/websites/WebsiteAddForm.tsx b/src/app/(main)/settings/websites/WebsiteAddForm.tsx
index 996241037..9f3ba1783 100644
--- a/src/app/(main)/settings/websites/WebsiteAddForm.tsx
+++ b/src/app/(main)/settings/websites/WebsiteAddForm.tsx
@@ -14,7 +14,9 @@ import useMessages from 'components/hooks/useMessages';
export function WebsiteAddForm({ onSave, onClose }: { onSave?: () => void; onClose?: () => void }) {
const { formatMessage, labels, messages } = useMessages();
const { post, useMutation } = useApi();
- const { mutate, error, isLoading } = useMutation(data => post('/websites', data));
+ const { mutate, error, isPending } = useMutation({
+ mutationFn: (data: any) => post('/websites', data),
+ });
const handleSubmit = async (data: any) => {
mutate(data, {
@@ -26,7 +28,7 @@ export function WebsiteAddForm({ onSave, onClose }: { onSave?: () => void; onClo
};
return (
- <Form onSubmit={handleSubmit} error={error as string}>
+ <Form onSubmit={handleSubmit} error={error}>
<FormRow label={formatMessage(labels.name)}>
<FormInput name="name" rules={{ required: formatMessage(labels.required) }}>
<TextField autoComplete="off" />
@@ -48,7 +50,7 @@ export function WebsiteAddForm({ onSave, onClose }: { onSave?: () => void; onClo
{formatMessage(labels.save)}
</SubmitButton>
{onClose && (
- <Button disabled={isLoading} onClick={onClose}>
+ <Button disabled={isPending} onClick={onClose}>
{formatMessage(labels.cancel)}
</Button>
)}
diff --git a/src/app/(main)/settings/websites/WebsiteSettings.js b/src/app/(main)/settings/websites/WebsiteSettings.js
index 79ba08fc0..ffda838cb 100644
--- a/src/app/(main)/settings/websites/WebsiteSettings.js
+++ b/src/app/(main)/settings/websites/WebsiteSettings.js
@@ -20,7 +20,7 @@ export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrl
queryKey: ['website', websiteId],
queryFn: () => get(`/websites/${websiteId}`),
enabled: !!websiteId,
- cacheTime: 0,
+ gcTime: 0,
});
const [values, setValues] = useState(null);
const [tab, setTab] = useState('details');
diff --git a/src/app/(main)/settings/websites/WebsitesHeader.js b/src/app/(main)/settings/websites/WebsitesHeader.tsx
similarity index 100%
rename from src/app/(main)/settings/websites/WebsitesHeader.js
rename to src/app/(main)/settings/websites/WebsitesHeader.tsx
diff --git a/src/app/(main)/settings/websites/WebsitesTable.js b/src/app/(main)/settings/websites/WebsitesTable.tsx
similarity index 90%
rename from src/app/(main)/settings/websites/WebsitesTable.js
rename to src/app/(main)/settings/websites/WebsitesTable.tsx
index eef3f7d40..024344481 100644
--- a/src/app/(main)/settings/websites/WebsitesTable.js
+++ b/src/app/(main)/settings/websites/WebsitesTable.tsx
@@ -1,8 +1,18 @@
+import { ReactNode } from 'react';
import Link from 'next/link';
import { Button, Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } from 'react-basics';
import useMessages from 'components/hooks/useMessages';
import useUser from 'components/hooks/useUser';
+export interface WebsitesTableProps {
+ data: any[];
+ showTeam?: boolean;
+ showActions?: boolean;
+ allowEdit?: boolean;
+ allowView?: boolean;
+ children?: ReactNode;
+}
+
export function WebsitesTable({
data = [],
showTeam,
@@ -10,7 +20,7 @@ export function WebsitesTable({
allowEdit,
allowView,
children,
-}) {
+}: WebsitesTableProps) {
const { formatMessage, labels } = useMessages();
const { user } = useUser();
const breakpoint = useBreakpoint();
diff --git a/src/app/(main)/settings/websites/[id]/ShareUrl.js b/src/app/(main)/settings/websites/[id]/ShareUrl.tsx
similarity index 91%
rename from src/app/(main)/settings/websites/[id]/ShareUrl.js
rename to src/app/(main)/settings/websites/[id]/ShareUrl.tsx
index 72ba217cc..191490357 100644
--- a/src/app/(main)/settings/websites/[id]/ShareUrl.js
+++ b/src/app/(main)/settings/websites/[id]/ShareUrl.tsx
@@ -20,9 +20,9 @@ export function ShareUrl({ websiteId, data, analyticsUrl, onSave }) {
const { name, shareId } = data;
const [id, setId] = useState(shareId);
const { post, useMutation } = useApi();
- const { mutate, error } = useMutation(({ shareId }) =>
- post(`/websites/${websiteId}`, { shareId }),
- );
+ const { mutate, error } = useMutation({
+ mutationFn: (data: any) => post(`/websites/${websiteId}`, data),
+ });
const ref = useRef(null);
const url = useMemo(
() =>
@@ -32,7 +32,7 @@ export function ShareUrl({ websiteId, data, analyticsUrl, onSave }) {
[id, name],
);
- const handleSubmit = async data => {
+ const handleSubmit = async (data: any) => {
mutate(data, {
onSuccess: async () => {
onSave(data);
@@ -50,7 +50,7 @@ export function ShareUrl({ websiteId, data, analyticsUrl, onSave }) {
setId(id);
};
- const handleCheck = checked => {
+ const handleCheck = (checked: boolean) => {
const data = { shareId: checked ? generateId() : null };
mutate(data, {
onSuccess: async () => {
diff --git a/src/app/(main)/settings/websites/[id]/TrackingCode.js b/src/app/(main)/settings/websites/[id]/TrackingCode.tsx
similarity index 87%
rename from src/app/(main)/settings/websites/[id]/TrackingCode.js
rename to src/app/(main)/settings/websites/[id]/TrackingCode.tsx
index 368368d76..b6bbdf89c 100644
--- a/src/app/(main)/settings/websites/[id]/TrackingCode.js
+++ b/src/app/(main)/settings/websites/[id]/TrackingCode.tsx
@@ -2,7 +2,13 @@ import { TextArea } from 'react-basics';
import useMessages from 'components/hooks/useMessages';
import useConfig from 'components/hooks/useConfig';
-export function TrackingCode({ websiteId, analyticsUrl }) {
+export function TrackingCode({
+ websiteId,
+ analyticsUrl,
+}: {
+ websiteId: string;
+ analyticsUrl: string;
+}) {
const { formatMessage, messages } = useMessages();
const config = useConfig();
diff --git a/src/app/(main)/settings/websites/[id]/WebsiteData.js b/src/app/(main)/settings/websites/[id]/WebsiteData.tsx
similarity index 92%
rename from src/app/(main)/settings/websites/[id]/WebsiteData.js
rename to src/app/(main)/settings/websites/[id]/WebsiteData.tsx
index 07dc92575..b4bfe6093 100644
--- a/src/app/(main)/settings/websites/[id]/WebsiteData.js
+++ b/src/app/(main)/settings/websites/[id]/WebsiteData.tsx
@@ -3,7 +3,13 @@ import WebsiteDeleteForm from './WebsiteDeleteForm';
import WebsiteResetForm from './WebsiteResetForm';
import useMessages from 'components/hooks/useMessages';
-export function WebsiteData({ websiteId, onSave }) {
+export function WebsiteData({
+ websiteId,
+ onSave,
+}: {
+ websiteId: string;
+ onSave?: (value: string) => void;
+}) {
const { formatMessage, labels, messages } = useMessages();
const handleReset = async () => {
diff --git a/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.js b/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx
similarity index 82%
rename from src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx
index 1548bddbd..c3b5d74ad 100644
--- a/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.js
+++ b/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx
@@ -12,10 +12,20 @@ import useMessages from 'components/hooks/useMessages';
const CONFIRM_VALUE = 'DELETE';
-export function WebsiteDeleteForm({ websiteId, onSave, onClose }) {
+export function WebsiteDeleteForm({
+ websiteId,
+ onSave,
+ onClose,
+}: {
+ websiteId: string;
+ onSave?: () => void;
+ onClose?: () => void;
+}) {
const { formatMessage, labels, messages, FormattedMessage } = useMessages();
const { del, useMutation } = useApi();
- const { mutate, error } = useMutation(data => del(`/websites/${websiteId}`, data));
+ const { mutate, error } = useMutation({
+ mutationFn: (data: any) => del(`/websites/${websiteId}`, data),
+ });
const handleSubmit = async data => {
mutate(data, {
diff --git a/src/app/(main)/settings/websites/[id]/WebsiteEditForm.js b/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx
similarity index 85%
rename from src/app/(main)/settings/websites/[id]/WebsiteEditForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx
index 18ad0ac98..9c05905cb 100644
--- a/src/app/(main)/settings/websites/[id]/WebsiteEditForm.js
+++ b/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx
@@ -4,10 +4,20 @@ import useApi from 'components/hooks/useApi';
import { DOMAIN_REGEX } from 'lib/constants';
import useMessages from 'components/hooks/useMessages';
-export function WebsiteEditForm({ websiteId, data, onSave }) {
+export function WebsiteEditForm({
+ websiteId,
+ data,
+ onSave,
+}: {
+ websiteId: string;
+ data: any[];
+ onSave?: (data: any) => void;
+}) {
const { formatMessage, labels, messages } = useMessages();
const { post, useMutation } = useApi();
- const { mutate, error } = useMutation(data => post(`/websites/${websiteId}`, data));
+ const { mutate, error } = useMutation({
+ mutationFn: (data: any) => post(`/websites/${websiteId}`, data),
+ });
const ref = useRef(null);
const handleSubmit = async data => {
diff --git a/src/app/(main)/settings/websites/[id]/WebsiteResetForm.js b/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx
similarity index 78%
rename from src/app/(main)/settings/websites/[id]/WebsiteResetForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx
index 9886429ba..76c2bc472 100644
--- a/src/app/(main)/settings/websites/[id]/WebsiteResetForm.js
+++ b/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx
@@ -12,12 +12,22 @@ import useMessages from 'components/hooks/useMessages';
const CONFIRM_VALUE = 'RESET';
-export function WebsiteResetForm({ websiteId, onSave, onClose }) {
+export function WebsiteResetForm({
+ websiteId,
+ onSave,
+ onClose,
+}: {
+ websiteId: string;
+ onSave?: () => void;
+ onClose?: () => void;
+}) {
const { formatMessage, labels, messages, FormattedMessage } = useMessages();
const { post, useMutation } = useApi();
- const { mutate, error } = useMutation(data => post(`/websites/${websiteId}/reset`, data));
+ const { mutate, error } = useMutation({
+ mutationFn: (data: any) => post(`/websites/${websiteId}/reset`, data),
+ });
- const handleSubmit = async data => {
+ const handleSubmit = async (data: any) => {
mutate(data, {
onSuccess: async () => {
onSave();
diff --git a/src/app/(main)/settings/websites/[id]/page.js b/src/app/(main)/settings/websites/[id]/page.tsx
similarity index 100%
rename from src/app/(main)/settings/websites/[id]/page.js
rename to src/app/(main)/settings/websites/[id]/page.tsx
diff --git a/src/app/(main)/websites/WebsitesBrowse.js b/src/app/(main)/websites/WebsitesBrowse.tsx
similarity index 91%
rename from src/app/(main)/websites/WebsitesBrowse.js
rename to src/app/(main)/websites/WebsitesBrowse.tsx
index 3e8df2b26..c426cc069 100644
--- a/src/app/(main)/websites/WebsitesBrowse.js
+++ b/src/app/(main)/websites/WebsitesBrowse.tsx
@@ -17,7 +17,7 @@ export function WebsitesBrowse() {
return (
<>
- <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}>
+ <Tabs selectedKey={tab} onSelect={(tab: any) => setTab(tab)} style={{ marginBottom: 30 }}>
<Item key={TABS.myWebsites}>{formatMessage(labels.myWebsites)}</Item>
<Item key={TABS.teamWebsites}>{formatMessage(labels.teamWebsites)}</Item>
</Tabs>
diff --git a/src/app/(main)/websites/[id]/WebsiteChart.js b/src/app/(main)/websites/[id]/WebsiteChart.tsx
similarity index 90%
rename from src/app/(main)/websites/[id]/WebsiteChart.js
rename to src/app/(main)/websites/[id]/WebsiteChart.tsx
index 15a7525f1..eba155c11 100644
--- a/src/app/(main)/websites/[id]/WebsiteChart.js
+++ b/src/app/(main)/websites/[id]/WebsiteChart.tsx
@@ -3,7 +3,7 @@ import PageviewsChart from 'components/metrics/PageviewsChart';
import { useApi, useDateRange, useTimezone, useNavigation } from 'components/hooks';
import { getDateArray } from 'lib/date';
-export function WebsiteChart({ websiteId }) {
+export function WebsiteChart({ websiteId }: { websiteId: string }) {
const [dateRange] = useDateRange(websiteId);
const { startDate, endDate, unit, modified } = dateRange;
const [timezone] = useTimezone();
@@ -45,7 +45,7 @@ export function WebsiteChart({ websiteId }) {
return { pageviews: [], sessions: [] };
}, [data, startDate, endDate, unit]);
- return <PageviewsChart websiteId={websiteId} data={chartData} unit={unit} loading={isLoading} />;
+ return <PageviewsChart data={chartData} unit={unit} isLoading={isLoading} />;
}
export default WebsiteChart;
diff --git a/src/app/(main)/websites/[id]/WebsiteChartList.js b/src/app/(main)/websites/[id]/WebsiteChartList.tsx
similarity index 91%
rename from src/app/(main)/websites/[id]/WebsiteChartList.js
rename to src/app/(main)/websites/[id]/WebsiteChartList.tsx
index bc2439ded..b35b6f1f0 100644
--- a/src/app/(main)/websites/[id]/WebsiteChartList.js
+++ b/src/app/(main)/websites/[id]/WebsiteChartList.tsx
@@ -8,7 +8,15 @@ import WebsiteHeader from './WebsiteHeader';
import { WebsiteMetricsBar } from './WebsiteMetricsBar';
import { useMessages, useLocale } from 'components/hooks';
-export default function WebsiteChartList({ websites, showCharts, limit }) {
+export default function WebsiteChartList({
+ websites,
+ showCharts,
+ limit,
+}: {
+ websites: any[];
+ showCharts?: boolean;
+ limit?: number;
+}) {
const { formatMessage, labels } = useMessages();
const { websiteOrder } = useDashboard();
const { dir } = useLocale();
diff --git a/src/app/(main)/websites/[id]/WebsiteDetails.js b/src/app/(main)/websites/[id]/WebsiteDetails.tsx
similarity index 87%
rename from src/app/(main)/websites/[id]/WebsiteDetails.js
rename to src/app/(main)/websites/[id]/WebsiteDetails.tsx
index c6ad1acc9..4d3a18e79 100644
--- a/src/app/(main)/websites/[id]/WebsiteDetails.js
+++ b/src/app/(main)/websites/[id]/WebsiteDetails.tsx
@@ -11,7 +11,7 @@ import WebsiteHeader from './WebsiteHeader';
import WebsiteMetricsBar from './WebsiteMetricsBar';
import WebsiteTableView from './WebsiteTableView';
-export default function WebsiteDetails({ websiteId }) {
+export default function WebsiteDetails({ websiteId }: { websiteId: string }) {
const { data: website, isLoading, error } = useWebsite(websiteId);
const pathname = usePathname();
const showLinks = !pathname.includes('/share/');
@@ -27,10 +27,7 @@ export default function WebsiteDetails({ websiteId }) {
return (
<>
<WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
- <FilterTags
- websiteId={websiteId}
- params={{ url, referrer, os, browser, device, country, region, city, title }}
- />
+ <FilterTags params={{ url, referrer, os, browser, device, country, region, city, title }} />
<WebsiteMetricsBar websiteId={websiteId} sticky={true} />
<WebsiteChart websiteId={websiteId} />
{!website && <Loading icon="dots" style={{ minHeight: 300 }} />}
diff --git a/src/app/(main)/websites/[id]/WebsiteFilterButton.js b/src/app/(main)/websites/[id]/WebsiteFilterButton.tsx
similarity index 91%
rename from src/app/(main)/websites/[id]/WebsiteFilterButton.js
rename to src/app/(main)/websites/[id]/WebsiteFilterButton.tsx
index e96856f62..6a02cd474 100644
--- a/src/app/(main)/websites/[id]/WebsiteFilterButton.js
+++ b/src/app/(main)/websites/[id]/WebsiteFilterButton.tsx
@@ -3,7 +3,13 @@ import PopupForm from 'app/(main)/reports/[id]/PopupForm';
import FilterSelectForm from 'app/(main)/reports/[id]/FilterSelectForm';
import { useMessages, useNavigation } from 'components/hooks';
-export function WebsiteFilterButton({ websiteId, className }) {
+export function WebsiteFilterButton({
+ websiteId,
+ className,
+}: {
+ websiteId: string;
+ className?: string;
+}) {
const { formatMessage, labels } = useMessages();
const { makeUrl, router } = useNavigation();
@@ -31,9 +37,9 @@ export function WebsiteFilterButton({ websiteId, className }) {
<Text>{formatMessage(labels.filter)}</Text>
</Button>
<Popup position="bottom" alignment="start">
- {close => {
+ {(close: () => void) => {
return (
- <PopupForm onClose={close}>
+ <PopupForm>
<FilterSelectForm
websiteId={websiteId}
items={fieldOptions}
diff --git a/src/app/(main)/websites/[id]/WebsiteHeader.js b/src/app/(main)/websites/[id]/WebsiteHeader.tsx
similarity index 92%
rename from src/app/(main)/websites/[id]/WebsiteHeader.js
rename to src/app/(main)/websites/[id]/WebsiteHeader.tsx
index bf34a2530..0af9e596f 100644
--- a/src/app/(main)/websites/[id]/WebsiteHeader.js
+++ b/src/app/(main)/websites/[id]/WebsiteHeader.tsx
@@ -1,4 +1,5 @@
'use client';
+import { ReactNode } from 'react';
import classNames from 'classnames';
import { Text, Button, Icon } from 'react-basics';
import Link from 'next/link';
@@ -9,7 +10,15 @@ import Icons from 'components/icons';
import { useMessages, useWebsite } from 'components/hooks';
import styles from './WebsiteHeader.module.css';
-export function WebsiteHeader({ websiteId, showLinks = true, children }) {
+export function WebsiteHeader({
+ websiteId,
+ showLinks = true,
+ children,
+}: {
+ websiteId: string;
+ showLinks?: boolean;
+ children?: ReactNode;
+}) {
const { formatMessage, labels } = useMessages();
const pathname = usePathname();
const { data: website } = useWebsite(websiteId);
diff --git a/src/app/(main)/websites/[id]/WebsiteMenuView.js b/src/app/(main)/websites/[id]/WebsiteMenuView.tsx
similarity index 97%
rename from src/app/(main)/websites/[id]/WebsiteMenuView.js
rename to src/app/(main)/websites/[id]/WebsiteMenuView.tsx
index c501645a4..670ea469d 100644
--- a/src/app/(main)/websites/[id]/WebsiteMenuView.js
+++ b/src/app/(main)/websites/[id]/WebsiteMenuView.tsx
@@ -33,7 +33,13 @@ const views = {
query: QueryParametersTable,
};
-export default function WebsiteMenuView({ websiteId, websiteDomain }) {
+export default function WebsiteMenuView({
+ websiteId,
+ websiteDomain,
+}: {
+ websiteId: string;
+ websiteDomain?: string;
+}) {
const { formatMessage, labels } = useMessages();
const {
router,
diff --git a/src/app/(main)/websites/[id]/WebsiteMetricsBar.js b/src/app/(main)/websites/[id]/WebsiteMetricsBar.tsx
similarity index 93%
rename from src/app/(main)/websites/[id]/WebsiteMetricsBar.js
rename to src/app/(main)/websites/[id]/WebsiteMetricsBar.tsx
index d840c7b68..e40dd11b8 100644
--- a/src/app/(main)/websites/[id]/WebsiteMetricsBar.js
+++ b/src/app/(main)/websites/[id]/WebsiteMetricsBar.tsx
@@ -7,7 +7,15 @@ import { formatShortTime } from 'lib/format';
import WebsiteFilterButton from './WebsiteFilterButton';
import styles from './WebsiteMetricsBar.module.css';
-export function WebsiteMetricsBar({ websiteId, showFilter = true, sticky }) {
+export function WebsiteMetricsBar({
+ websiteId,
+ showFilter = true,
+ sticky,
+}: {
+ websiteId: string;
+ showFilter?: boolean;
+ sticky?: boolean;
+}) {
const { formatMessage, labels } = useMessages();
const { get, useQuery } = useApi();
const [dateRange] = useDateRange(websiteId);
@@ -96,7 +104,7 @@ export function WebsiteMetricsBar({ websiteId, showFilter = true, sticky }) {
-1 || 0
: 0
}
- format={n => `${n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`}
+ format={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`}
/>
</>
)}
diff --git a/src/app/(main)/websites/[id]/WebsiteTableView.js b/src/app/(main)/websites/[id]/WebsiteTableView.tsx
similarity index 94%
rename from src/app/(main)/websites/[id]/WebsiteTableView.js
rename to src/app/(main)/websites/[id]/WebsiteTableView.tsx
index 28a8fad60..e530f2bae 100644
--- a/src/app/(main)/websites/[id]/WebsiteTableView.js
+++ b/src/app/(main)/websites/[id]/WebsiteTableView.tsx
@@ -10,7 +10,7 @@ import CountriesTable from 'components/metrics/CountriesTable';
import EventsTable from 'components/metrics/EventsTable';
import EventsChart from 'components/metrics/EventsChart';
-export default function WebsiteTableView({ websiteId }) {
+export default function WebsiteTableView({ websiteId }: { websiteId: string }) {
const [countryData, setCountryData] = useState();
const tableProps = {
websiteId,
diff --git a/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.js b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx
similarity index 94%
rename from src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.js
rename to src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx
index b02e166c1..419472d59 100644
--- a/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.js
+++ b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx
@@ -5,7 +5,7 @@ import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
import MetricsBar from 'components/metrics/MetricsBar';
import styles from './EventDataMetricsBar.module.css';
-export function EventDataMetricsBar({ websiteId }) {
+export function EventDataMetricsBar({ websiteId }: { websiteId: string }) {
const { formatMessage, labels } = useMessages();
const { get, useQuery } = useApi();
const [dateRange] = useDateRange(websiteId);
diff --git a/src/app/(main)/websites/[id]/event-data/EventDataTable.js b/src/app/(main)/websites/[id]/event-data/EventDataTable.tsx
similarity index 100%
rename from src/app/(main)/websites/[id]/event-data/EventDataTable.js
rename to src/app/(main)/websites/[id]/event-data/EventDataTable.tsx
diff --git a/src/app/(main)/websites/[id]/event-data/EventDataValueTable.js b/src/app/(main)/websites/[id]/event-data/EventDataValueTable.tsx
similarity index 94%
rename from src/app/(main)/websites/[id]/event-data/EventDataValueTable.js
rename to src/app/(main)/websites/[id]/event-data/EventDataValueTable.tsx
index 4e50f5b9b..7976ce36f 100644
--- a/src/app/(main)/websites/[id]/event-data/EventDataValueTable.js
+++ b/src/app/(main)/websites/[id]/event-data/EventDataValueTable.tsx
@@ -6,7 +6,7 @@ import PageHeader from 'components/layout/PageHeader';
import Empty from 'components/common/Empty';
import { DATA_TYPES } from 'lib/constants';
-export function EventDataValueTable({ data = [], event }) {
+export function EventDataValueTable({ data = [], event }: { data: any[]; event: string }) {
const { formatMessage, labels } = useMessages();
const { makeUrl } = useNavigation();
diff --git a/src/app/(main)/websites/[id]/event-data/page.js b/src/app/(main)/websites/[id]/event-data/page.tsx
similarity index 100%
rename from src/app/(main)/websites/[id]/event-data/page.js
rename to src/app/(main)/websites/[id]/event-data/page.tsx
diff --git a/src/app/login/LoginForm.js b/src/app/login/LoginForm.tsx
similarity index 90%
rename from src/app/login/LoginForm.js
rename to src/app/login/LoginForm.tsx
index 59d145bf3..78cf3dd37 100644
--- a/src/app/login/LoginForm.js
+++ b/src/app/login/LoginForm.tsx
@@ -1,5 +1,4 @@
'use client';
-import { useMutation } from '@tanstack/react-query';
import {
Form,
FormRow,
@@ -21,8 +20,10 @@ import styles from './LoginForm.module.css';
export function LoginForm() {
const { formatMessage, labels, getMessage } = useMessages();
const router = useRouter();
- const { post } = useApi();
- const { mutate, error, isLoading } = useMutation(data => post('/auth/login', data));
+ const { post, useMutation } = useApi();
+ const { mutate, error, isPending } = useMutation({
+ mutationFn: (data: any) => post('/auth/login', data),
+ });
const handleSubmit = async data => {
mutate(data, {
@@ -53,7 +54,7 @@ export function LoginForm() {
</FormInput>
</FormRow>
<FormButtons>
- <SubmitButton className={styles.button} variant="primary" disabled={isLoading}>
+ <SubmitButton className={styles.button} variant="primary" disabled={isPending}>
{formatMessage(labels.login)}
</SubmitButton>
</FormButtons>
diff --git a/src/app/logout/Logout.js b/src/app/logout/Logout.tsx
similarity index 100%
rename from src/app/logout/Logout.js
rename to src/app/logout/Logout.tsx
diff --git a/src/app/share/[...id]/Footer.js b/src/app/share/[...id]/Footer.tsx
similarity index 100%
rename from src/app/share/[...id]/Footer.js
rename to src/app/share/[...id]/Footer.tsx
diff --git a/src/app/share/[...id]/Header.js b/src/app/share/[...id]/Header.tsx
similarity index 100%
rename from src/app/share/[...id]/Header.js
rename to src/app/share/[...id]/Header.tsx
diff --git a/src/app/share/[...id]/Share.js b/src/app/share/[...id]/Share.tsx
similarity index 100%
rename from src/app/share/[...id]/Share.js
rename to src/app/share/[...id]/Share.tsx
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index 621a44fe4..00aba09c8 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -36,11 +36,11 @@ export function DataTable({
const hasData = Boolean(!isLoading && data?.length);
const noResults = Boolean(!isLoading && query && !hasData);
- const handleSearch = query => {
+ const handleSearch = (query: string) => {
setParams({ ...params, query, page: params.page ? page : 1 });
};
- const handlePageChange = page => {
+ const handlePageChange = (page: number) => {
setParams({ ...params, query, page });
};
@@ -54,7 +54,7 @@ export function DataTable({
<SearchField
className={styles.search}
value={query}
- onChange={handleSearch}
+ onSearch={handleSearch}
delay={searchDelay || DEFAULT_SEARCH_DELAY}
autoFocus={true}
placeholder={formatMessage(labels.search)}
diff --git a/src/components/common/EmptyPlaceholder.tsx b/src/components/common/EmptyPlaceholder.tsx
index 27282edcb..640e45d50 100644
--- a/src/components/common/EmptyPlaceholder.tsx
+++ b/src/components/common/EmptyPlaceholder.tsx
@@ -3,11 +3,11 @@ import { Icon, Text, Flexbox } from 'react-basics';
import Logo from 'assets/logo.svg';
export interface EmptyPlaceholderProps {
- message: string;
+ message?: string;
children?: ReactNode;
}
-export function EmptyPlaceholder({ message, children }) {
+export function EmptyPlaceholder({ message, children }: EmptyPlaceholderProps) {
return (
<Flexbox direction="column" alignItems="center" justifyContent="center" gap={60} height={600}>
<Icon size="xl">
diff --git a/src/components/common/FilterButtons.tsx b/src/components/common/FilterButtons.tsx
index e1860c783..a64a6482a 100644
--- a/src/components/common/FilterButtons.tsx
+++ b/src/components/common/FilterButtons.tsx
@@ -4,7 +4,7 @@ import { ButtonGroup, Button, Flexbox } from 'react-basics';
export interface FilterButtonsProps {
items: any[];
selectedKey?: Key;
- onSelect: () => void;
+ onSelect: (key: any) => void;
}
export function FilterButtons({ items, selectedKey, onSelect }: FilterButtonsProps) {
diff --git a/src/components/declarations.d.ts b/src/components/declarations.d.ts
index 81533301a..ca55157ba 100644
--- a/src/components/declarations.d.ts
+++ b/src/components/declarations.d.ts
@@ -1,3 +1,4 @@
declare module '*.css';
declare module '*.svg';
declare module '*.json';
+declare module 'uuid';
diff --git a/src/components/hooks/useApiFilter.ts b/src/components/hooks/useApiFilter.ts
deleted file mode 100644
index d411fd434..000000000
--- a/src/components/hooks/useApiFilter.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useState } from 'react';
-
-export function useApiFilter() {
- const [filter, setFilter] = useState();
- const [filterType, setFilterType] = useState('All');
- const [page, setPage] = useState(1);
- const [pageSize, setPageSize] = useState(10);
-
- const handleFilterChange = value => setFilter(value);
- const handlePageChange = value => setPage(value);
- const handlePageSizeChange = value => setPageSize(value);
-
- return {
- filter,
- setFilter,
- filterType,
- setFilterType,
- page,
- setPage,
- pageSize,
- setPageSize,
- handleFilterChange,
- handlePageChange,
- handlePageSizeChange,
- };
-}
-
-export default useApiFilter;
diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.ts
index 6e70a3689..71361b69c 100644
--- a/src/components/hooks/useDateRange.ts
+++ b/src/components/hooks/useDateRange.ts
@@ -6,7 +6,7 @@ import websiteStore, { setWebsiteDateRange } from 'store/websites';
import appStore, { setDateRange } from 'store/app';
import useApi from './useApi';
-export function useDateRange(websiteId: string) {
+export function useDateRange(websiteId?: string) {
const { get } = useApi();
const { locale } = useLocale();
const websiteConfig = websiteStore(state => state[websiteId]?.dateRange);
diff --git a/src/components/hooks/useFilterQuery.ts b/src/components/hooks/useFilterQuery.ts
index 2c5207416..6dc3abe70 100644
--- a/src/components/hooks/useFilterQuery.ts
+++ b/src/components/hooks/useFilterQuery.ts
@@ -1,24 +1,33 @@
+import { UseQueryOptions } from '@tanstack/react-query';
import { useState, Dispatch, SetStateAction } from 'react';
import { useApi } from 'components/hooks/useApi';
-import { SearchFilter, FilterResult } from 'lib/types';
+import { FilterResult, SearchFilter } from 'lib/types';
export interface FilterQueryResult<T> {
- result: FilterResult<any[]>;
+ result: FilterResult<T>;
query: any;
params: SearchFilter;
setParams: Dispatch<SetStateAction<T | SearchFilter>>;
}
-export function useFilterQuery<T>(props = {}): FilterQueryResult<T> {
+export function useFilterQuery<T>({
+ queryKey,
+ queryFn,
+ ...options
+}: UseQueryOptions): FilterQueryResult<T> {
const [params, setParams] = useState<T | SearchFilter>({
query: '',
page: 1,
});
const { useQuery } = useApi();
- const { data, ...query } = useQuery<FilterResult<any[]>>({ ...props });
+ const { data, ...query } = useQuery({
+ queryKey: [...queryKey, params],
+ queryFn: (data: any) => queryFn({ ...data, ...params }),
+ ...options,
+ });
return {
- result: data,
+ result: data as FilterResult<any>,
query,
params,
setParams,
diff --git a/src/components/hooks/useNavigation.ts b/src/components/hooks/useNavigation.ts
index 9f01cd802..fb9bffc58 100644
--- a/src/components/hooks/useNavigation.ts
+++ b/src/components/hooks/useNavigation.ts
@@ -2,7 +2,12 @@ import { useMemo } from 'react';
import { usePathname, useRouter, useSearchParams } from 'next/navigation';
import { buildUrl } from 'next-basics';
-export function useNavigation() {
+export function useNavigation(): {
+ pathname: string;
+ query: { [key: string]: string };
+ router: any;
+ makeUrl: (params: any, reset?: boolean) => string;
+} {
const router = useRouter();
const pathname = usePathname();
const params = useSearchParams();
diff --git a/src/components/hooks/useReports.ts b/src/components/hooks/useReports.ts
index 0fad2db15..d2473002d 100644
--- a/src/components/hooks/useReports.ts
+++ b/src/components/hooks/useReports.ts
@@ -1,19 +1,19 @@
import { useState } from 'react';
import useApi from './useApi';
-import useApiFilter from 'components/hooks/useApiFilter';
+import useFilterQuery from 'components/hooks/useFilterQuery';
-export function useReports() {
+export function useReports(websiteId?: string) {
const [modified, setModified] = useState(Date.now());
- const { get, useQuery, del, useMutation } = useApi();
- const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));
- const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
- useApiFilter();
- const { data, error, isLoading } = useQuery({
- queryKey: ['reports', { modified, filter, page, pageSize }],
- queryFn: () => get(`/reports`, { filter, page, pageSize }),
+ const { get, del, useMutation } = useApi();
+ const { mutate } = useMutation({ mutationFn: (reportId: string) => del(`/reports/${reportId}`) });
+ const queryResult = useFilterQuery({
+ queryKey: ['reports', { websiteId, modified }],
+ queryFn: (params: any) => {
+ return get(websiteId ? `/websites/${websiteId}/reports` : `/reports`, params);
+ },
});
- const deleteReport = id => {
+ const deleteReport = (id: any) => {
mutate(id, {
onSuccess: () => {
setModified(Date.now());
@@ -22,16 +22,8 @@ export function useReports() {
};
return {
- reports: data,
- error,
- isLoading,
+ ...queryResult,
deleteReport,
- filter,
- page,
- pageSize,
- handleFilterChange,
- handlePageChange,
- handlePageSizeChange,
};
}
diff --git a/src/components/hooks/useShareToken.ts b/src/components/hooks/useShareToken.ts
index 41ae7faf5..189657be4 100644
--- a/src/components/hooks/useShareToken.ts
+++ b/src/components/hooks/useShareToken.ts
@@ -3,7 +3,11 @@ import useApi from './useApi';
const selector = (state: { shareToken: string }) => state.shareToken;
-export function useShareToken(shareId: string) {
+export function useShareToken(shareId: string): {
+ shareToken: any;
+ isLoading?: boolean;
+ error?: Error;
+} {
const shareToken = useStore(selector);
const { get, useQuery } = useApi();
const { isLoading, error } = useQuery({
diff --git a/src/components/input/DateFilter.js b/src/components/input/DateFilter.tsx
similarity index 89%
rename from src/components/input/DateFilter.js
rename to src/components/input/DateFilter.tsx
index 9fde27ca1..f7739f170 100644
--- a/src/components/input/DateFilter.js
+++ b/src/components/input/DateFilter.tsx
@@ -3,9 +3,20 @@ import { Icon, Modal, Dropdown, Item, Text, Flexbox } from 'react-basics';
import { endOfYear, isSameDay } from 'date-fns';
import DatePickerForm from 'components/metrics/DatePickerForm';
import useLocale from 'components/hooks/useLocale';
-import { formatDate } from 'lib/date';
-import Icons from 'components/icons';
import useMessages from 'components/hooks/useMessages';
+import Icons from 'components/icons';
+import { formatDate } from 'lib/date';
+
+export interface DateFilterProps {
+ value: string;
+ startDate: Date;
+ endDate: Date;
+ className?: string;
+ onChange?: (value: string) => void;
+ selectedUnit?: string;
+ showAllTime?: boolean;
+ alignment?: 'start' | 'center' | 'end';
+}
export function DateFilter({
value,
@@ -16,7 +27,7 @@ export function DateFilter({
selectedUnit,
showAllTime = false,
alignment = 'end',
-}) {
+}: DateFilterProps) {
const { formatMessage, labels } = useMessages();
const [showPicker, setShowPicker] = useState(false);
@@ -65,7 +76,7 @@ export function DateFilter({
},
].filter(n => n);
- const renderValue = value => {
+ const renderValue = (value: string) => {
return value.startsWith('range') ? (
<CustomRange
startDate={startDate}
@@ -78,7 +89,7 @@ export function DateFilter({
);
};
- const handleChange = value => {
+ const handleChange = (value: string) => {
if (value === 'custom') {
setShowPicker(true);
return;
@@ -86,7 +97,7 @@ export function DateFilter({
onChange(value);
};
- const handlePickerChange = value => {
+ const handlePickerChange = (value: string) => {
setShowPicker(false);
onChange(value);
};
@@ -102,7 +113,7 @@ export function DateFilter({
value={value}
alignment={alignment}
placeholder={formatMessage(labels.selectDate)}
- onChange={handleChange}
+ onChange={key => handleChange(key as any)}
>
{({ label, value, divider }) => (
<Item key={value} divider={divider}>
diff --git a/src/components/input/LanguageButton.js b/src/components/input/LanguageButton.tsx
similarity index 88%
rename from src/components/input/LanguageButton.js
rename to src/components/input/LanguageButton.tsx
index 3c0d0cd6f..1151da0be 100644
--- a/src/components/input/LanguageButton.js
+++ b/src/components/input/LanguageButton.tsx
@@ -9,7 +9,7 @@ export function LanguageButton() {
const { locale, saveLocale, dir } = useLocale();
const items = Object.keys(languages).map(key => ({ ...languages[key], value: key }));
- function handleSelect(value, close, e) {
+ function handleSelect(value: string, close: () => void, e: MouseEvent) {
e.stopPropagation();
saveLocale(value);
close();
@@ -23,7 +23,7 @@ export function LanguageButton() {
</Icon>
</Button>
<Popup position="bottom" alignment={dir === 'rtl' ? 'start' : 'end'}>
- {close => {
+ {(close: () => void) => {
return (
<div className={styles.menu}>
{items.map(({ value, label }) => {
@@ -31,7 +31,7 @@ export function LanguageButton() {
<div
key={value}
className={classNames(styles.item, { [styles.selected]: value === locale })}
- onClick={handleSelect.bind(null, value, close)}
+ onClick={(e: any) => handleSelect(value, close, e)}
>
<Text>{label}</Text>
{value === locale && (
diff --git a/src/components/input/LogoutButton.js b/src/components/input/LogoutButton.tsx
similarity index 80%
rename from src/components/input/LogoutButton.js
rename to src/components/input/LogoutButton.tsx
index 6ca358a12..c787f2296 100644
--- a/src/components/input/LogoutButton.js
+++ b/src/components/input/LogoutButton.tsx
@@ -2,7 +2,11 @@ import { Button, Icon, Icons, TooltipPopup } from 'react-basics';
import Link from 'next/link';
import useMessages from 'components/hooks/useMessages';
-export function LogoutButton({ tooltipPosition = 'top' }) {
+export function LogoutButton({
+ tooltipPosition = 'top',
+}: {
+ tooltipPosition?: 'top' | 'bottom' | 'left' | 'right';
+}) {
const { formatMessage, labels } = useMessages();
return (
<Link href="/src/app/logout/logout">
diff --git a/src/components/input/MonthSelect.js b/src/components/input/MonthSelect.tsx
similarity index 87%
rename from src/components/input/MonthSelect.js
rename to src/components/input/MonthSelect.tsx
index 312c6854a..acb17dfe6 100644
--- a/src/components/input/MonthSelect.js
+++ b/src/components/input/MonthSelect.tsx
@@ -20,7 +20,7 @@ export function MonthSelect({ date = new Date(), onChange }) {
const year = date.getFullYear();
const ref = useRef();
- const handleChange = (close, date) => {
+ const handleChange = (close: () => void, date: Date) => {
onChange(`range:${startOfMonth(date).getTime()}:${endOfMonth(date).getTime()}`);
close();
};
@@ -53,12 +53,8 @@ export function MonthSelect({ date = new Date(), onChange }) {
</Icon>
</Button>
<Popup className={styles.popup} alignment="start">
- {close => (
- <CalendarYearSelect
- date={date}
- locale={dateLocale}
- onSelect={handleChange.bind(null, close)}
- />
+ {(close: any) => (
+ <CalendarYearSelect date={date} onSelect={handleChange.bind(null, close)} />
)}
</Popup>
</PopupTrigger>
diff --git a/src/components/input/ProfileButton.js b/src/components/input/ProfileButton.tsx
similarity index 100%
rename from src/components/input/ProfileButton.js
rename to src/components/input/ProfileButton.tsx
diff --git a/src/components/input/RefreshButton.js b/src/components/input/RefreshButton.tsx
similarity index 87%
rename from src/components/input/RefreshButton.js
rename to src/components/input/RefreshButton.tsx
index 8b40cafa1..01e80378d 100644
--- a/src/components/input/RefreshButton.js
+++ b/src/components/input/RefreshButton.tsx
@@ -4,7 +4,13 @@ import useDateRange from 'components/hooks/useDateRange';
import Icons from 'components/icons';
import useMessages from 'components/hooks/useMessages';
-export function RefreshButton({ websiteId, isLoading }) {
+export function RefreshButton({
+ websiteId,
+ isLoading,
+}: {
+ websiteId: string;
+ isLoading?: boolean;
+}) {
const { formatMessage, labels } = useMessages();
const [dateRange] = useDateRange(websiteId);
diff --git a/src/components/input/SettingsButton.js b/src/components/input/SettingsButton.tsx
similarity index 100%
rename from src/components/input/SettingsButton.js
rename to src/components/input/SettingsButton.tsx
diff --git a/src/components/input/ThemeButton.js b/src/components/input/ThemeButton.tsx
similarity index 100%
rename from src/components/input/ThemeButton.js
rename to src/components/input/ThemeButton.tsx
diff --git a/src/components/input/WebsiteDateFilter.js b/src/components/input/WebsiteDateFilter.tsx
similarity index 95%
rename from src/components/input/WebsiteDateFilter.js
rename to src/components/input/WebsiteDateFilter.tsx
index 1725ca3be..cf1beaa1d 100644
--- a/src/components/input/WebsiteDateFilter.js
+++ b/src/components/input/WebsiteDateFilter.tsx
@@ -5,7 +5,7 @@ import { Button, Icon, Icons } from 'react-basics';
import DateFilter from './DateFilter';
import styles from './WebsiteDateFilter.module.css';
-export function WebsiteDateFilter({ websiteId }) {
+export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
const [dateRange, setDateRange] = useDateRange(websiteId);
const { value, startDate, endDate, selectedUnit } = dateRange;
const isFutureDate =
diff --git a/src/components/input/WebsiteSelect.js b/src/components/input/WebsiteSelect.tsx
similarity index 88%
rename from src/components/input/WebsiteSelect.js
rename to src/components/input/WebsiteSelect.tsx
index 233342159..e125e2589 100644
--- a/src/components/input/WebsiteSelect.js
+++ b/src/components/input/WebsiteSelect.tsx
@@ -3,7 +3,13 @@ import useApi from 'components/hooks/useApi';
import useMessages from 'components/hooks/useMessages';
import styles from './WebsiteSelect.module.css';
-export function WebsiteSelect({ websiteId, onSelect }) {
+export function WebsiteSelect({
+ websiteId,
+ onSelect,
+}: {
+ websiteId: string;
+ onSelect?: (key: any) => void;
+}) {
const { formatMessage, labels } = useMessages();
const { get, useQuery } = useApi();
const { data } = useQuery({
diff --git a/src/components/layout/Grid.js b/src/components/layout/Grid.js
deleted file mode 100644
index 86b08887b..000000000
--- a/src/components/layout/Grid.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import classNames from 'classnames';
-import { mapChildren } from 'react-basics';
-import styles from './Grid.module.css';
-
-export function Grid({ className, ...otherProps }) {
- return <div {...otherProps} className={classNames(styles.grid, className)} />;
-}
-
-export function GridRow(props) {
- const { columns = 'two', className, children, ...otherProps } = props;
- return (
- <div {...otherProps} className={classNames(styles.row, className)}>
- {mapChildren(children, child => {
- return <div className={classNames(styles.col, { [styles[columns]]: true })}>{child}</div>;
- })}
- </div>
- );
-}
diff --git a/src/components/layout/Grid.tsx b/src/components/layout/Grid.tsx
new file mode 100644
index 000000000..2a34fdc4f
--- /dev/null
+++ b/src/components/layout/Grid.tsx
@@ -0,0 +1,34 @@
+import { CSSProperties } from 'react';
+import classNames from 'classnames';
+import { mapChildren } from 'react-basics';
+import styles from './Grid.module.css';
+
+export interface GridProps {
+ className?: string;
+ style?: CSSProperties;
+ children?: any;
+}
+
+export function Grid({ className, style, children }: GridProps) {
+ return (
+ <div className={classNames(styles.grid, className)} style={style}>
+ {children}
+ </div>
+ );
+}
+
+export function GridRow(props: {
+ [x: string]: any;
+ columns?: 'one' | 'two' | 'three' | 'one-two' | 'two-one';
+ className?: string;
+ children?: any;
+}) {
+ const { columns = 'two', className, children, ...otherProps } = props;
+ return (
+ <div {...otherProps} className={classNames(styles.row, className)}>
+ {mapChildren(children, child => {
+ return <div className={classNames(styles.col, { [styles[columns]]: true })}>{child}</div>;
+ })}
+ </div>
+ );
+}
diff --git a/src/components/layout/NavGroup.js b/src/components/layout/NavGroup.tsx
similarity index 90%
rename from src/components/layout/NavGroup.js
rename to src/components/layout/NavGroup.tsx
index 361dffb5a..e95b61faf 100644
--- a/src/components/layout/NavGroup.js
+++ b/src/components/layout/NavGroup.tsx
@@ -6,13 +6,21 @@ import Link from 'next/link';
import Icons from 'components/icons';
import styles from './NavGroup.module.css';
+export interface NavGroupProps {
+ title: string;
+ items: any[];
+ defaultExpanded?: boolean;
+ allowExpand?: boolean;
+ minimized?: boolean;
+}
+
export function NavGroup({
title,
items,
defaultExpanded = true,
allowExpand = true,
minimized = false,
-}) {
+}: NavGroupProps) {
const pathname = usePathname();
const [expanded, setExpanded] = useState(defaultExpanded);
diff --git a/src/components/layout/SideNav.js b/src/components/layout/SideNav.tsx
similarity index 82%
rename from src/components/layout/SideNav.js
rename to src/components/layout/SideNav.tsx
index c93881e47..f38bdba07 100644
--- a/src/components/layout/SideNav.js
+++ b/src/components/layout/SideNav.tsx
@@ -4,6 +4,15 @@ import { usePathname } from 'next/navigation';
import Link from 'next/link';
import styles from './SideNav.module.css';
+export interface SideNavProps {
+ selectedKey: string;
+ items: any[];
+ shallow?: boolean;
+ scroll?: boolean;
+ className?: boolean;
+ onSelect?: () => void;
+}
+
export function SideNav({
selectedKey,
items,
@@ -11,7 +20,7 @@ export function SideNav({
scroll = false,
className,
onSelect = () => {},
-}) {
+}: SideNavProps) {
const pathname = usePathname();
return (
<Menu
diff --git a/src/components/messages.js b/src/components/messages.ts
similarity index 100%
rename from src/components/messages.js
rename to src/components/messages.ts
diff --git a/src/components/metrics/ActiveUsers.js b/src/components/metrics/ActiveUsers.tsx
similarity index 85%
rename from src/components/metrics/ActiveUsers.js
rename to src/components/metrics/ActiveUsers.tsx
index cd3bfb994..605d9270e 100644
--- a/src/components/metrics/ActiveUsers.js
+++ b/src/components/metrics/ActiveUsers.tsx
@@ -4,14 +4,22 @@ import useApi from 'components/hooks/useApi';
import useMessages from 'components/hooks/useMessages';
import styles from './ActiveUsers.module.css';
-export function ActiveUsers({ websiteId, value, refetchInterval = 60000 }) {
+export function ActiveUsers({
+ websiteId,
+ value,
+ refetchInterval = 60000,
+}: {
+ websiteId: string;
+ value?: number;
+ refetchInterval?: number;
+}) {
const { formatMessage, messages } = useMessages();
const { get, useQuery } = useApi();
const { data } = useQuery({
queryKey: ['websites:active', websiteId],
queryFn: () => get(`/websites/${websiteId}/active`),
- refetchInterval,
enabled: !!websiteId,
+ refetchInterval,
});
const count = useMemo(() => {
diff --git a/src/components/metrics/BarChart.js b/src/components/metrics/BarChart.tsx
similarity index 83%
rename from src/components/metrics/BarChart.js
rename to src/components/metrics/BarChart.tsx
index 8341fbc74..8bb3a7a7f 100644
--- a/src/components/metrics/BarChart.js
+++ b/src/components/metrics/BarChart.tsx
@@ -10,12 +10,28 @@ import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
import { renderNumberLabels } from 'lib/charts';
import styles from './BarChart.module.css';
+export interface BarChartProps {
+ datasets?: any[];
+ unit?: string;
+ animationDuration?: number;
+ stacked?: boolean;
+ isLoading?: boolean;
+ renderXLabel?: (label: string, index: number, values: any[]) => string;
+ renderYLabel?: (label: string, index: number, values: any[]) => string;
+ XAxisType?: string;
+ YAxisType?: string;
+ renderTooltipPopup?: (setTooltipPopup: (data: any) => void, model: any) => void;
+ onCreate?: (chart: any) => void;
+ onUpdate?: (chart: any) => void;
+ className?: string;
+}
+
export function BarChart({
- datasets,
+ datasets = [],
unit,
animationDuration = DEFAULT_ANIMATION_DURATION,
stacked = false,
- loading = false,
+ isLoading = false,
renderXLabel,
renderYLabel,
XAxisType = 'time',
@@ -24,7 +40,7 @@ export function BarChart({
onCreate,
onUpdate,
className,
-}) {
+}: BarChartProps) {
const canvas = useRef();
const chart = useRef(null);
const [tooltip, setTooltipPopup] = useState(null);
@@ -85,7 +101,7 @@ export function BarChart({
color: colors.chart.line,
},
ticks: {
- color: colors.text,
+ color: colors.chart.text,
callback: renderYLabel || renderNumberLabels,
},
},
@@ -106,16 +122,15 @@ export function BarChart({
const createChart = () => {
Chart.defaults.font.family = 'Inter';
- const options = getOptions();
-
chart.current = new Chart(canvas.current, {
type: 'bar',
data: {
datasets,
},
- options,
});
+ chart.current.options = getOptions();
+
onCreate?.(chart.current);
};
@@ -147,7 +162,7 @@ export function BarChart({
return (
<div className={styles.container}>
<div className={classNames(styles.chart, className)}>
- {loading && <Loading position="page" icon="dots" />}
+ {isLoading && <Loading position="page" icon="dots" />}
<canvas ref={canvas} />
</div>
<Legend chart={chart.current} />
diff --git a/src/components/metrics/BrowsersTable.js b/src/components/metrics/BrowsersTable.tsx
similarity index 85%
rename from src/components/metrics/BrowsersTable.js
rename to src/components/metrics/BrowsersTable.tsx
index afc536637..e1c054358 100644
--- a/src/components/metrics/BrowsersTable.js
+++ b/src/components/metrics/BrowsersTable.tsx
@@ -1,9 +1,9 @@
import FilterLink from 'components/common/FilterLink';
-import MetricsTable from 'components/metrics/MetricsTable';
+import MetricsTable, { MetricsTableProps } from 'components/metrics/MetricsTable';
import useMessages from 'components/hooks/useMessages';
import useFormat from 'components/hooks/useFormat';
-export function BrowsersTable({ websiteId, ...props }) {
+export function BrowsersTable(props: MetricsTableProps) {
const { formatMessage, labels } = useMessages();
const { formatBrowser } = useFormat();
@@ -26,7 +26,6 @@ export function BrowsersTable({ websiteId, ...props }) {
title={formatMessage(labels.browsers)}
type="browser"
metric={formatMessage(labels.visitors)}
- websiteId={websiteId}
renderLabel={renderLink}
/>
);
diff --git a/src/components/metrics/CitiesTable.js b/src/components/metrics/CitiesTable.tsx
similarity index 85%
rename from src/components/metrics/CitiesTable.js
rename to src/components/metrics/CitiesTable.tsx
index c5f1b1d73..69b899628 100644
--- a/src/components/metrics/CitiesTable.js
+++ b/src/components/metrics/CitiesTable.tsx
@@ -1,16 +1,16 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import { emptyFilter } from 'lib/filters';
import FilterLink from 'components/common/FilterLink';
import useLocale from 'components/hooks/useLocale';
import useMessages from 'components/hooks/useMessages';
import useCountryNames from 'components/hooks/useCountryNames';
-export function CitiesTable({ websiteId, ...props }) {
+export function CitiesTable(props: MetricsTableProps) {
const { locale } = useLocale();
const { formatMessage, labels } = useMessages();
const countryNames = useCountryNames(locale);
- const renderLabel = (city, country) => {
+ const renderLabel = (city: string, country: string) => {
const name = countryNames[country];
return name ? `${city}, ${name}` : city;
};
@@ -34,7 +34,6 @@ export function CitiesTable({ websiteId, ...props }) {
title={formatMessage(labels.cities)}
type="city"
metric={formatMessage(labels.visitors)}
- websiteId={websiteId}
dataFilter={emptyFilter}
renderLabel={renderLink}
/>
diff --git a/src/components/metrics/CountriesTable.js b/src/components/metrics/CountriesTable.tsx
similarity index 73%
rename from src/components/metrics/CountriesTable.js
rename to src/components/metrics/CountriesTable.tsx
index 6f3b75b04..99f9ca2fd 100644
--- a/src/components/metrics/CountriesTable.js
+++ b/src/components/metrics/CountriesTable.tsx
@@ -1,15 +1,24 @@
import FilterLink from 'components/common/FilterLink';
import useCountryNames from 'components/hooks/useCountryNames';
import { useLocale, useMessages, useFormat } from 'components/hooks';
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
-export function CountriesTable({ websiteId, ...props }) {
+export function CountriesTable({
+ onDataLoad,
+ ...props
+}: {
+ onDataLoad: (data: any) => void;
+} & MetricsTableProps) {
const { locale } = useLocale();
const countryNames = useCountryNames(locale);
const { formatMessage, labels } = useMessages();
const { formatCountry } = useFormat();
- function renderLink({ x: code }) {
+ const handleDataLoad = (data: any) => {
+ onDataLoad?.(data);
+ };
+
+ const renderLink = ({ x: code }) => {
return (
<FilterLink
id="country"
@@ -23,7 +32,7 @@ export function CountriesTable({ websiteId, ...props }) {
/>
</FilterLink>
);
- }
+ };
return (
<MetricsTable
@@ -31,8 +40,8 @@ export function CountriesTable({ websiteId, ...props }) {
title={formatMessage(labels.countries)}
type="country"
metric={formatMessage(labels.visitors)}
- websiteId={websiteId}
renderLabel={renderLink}
+ onDataLoad={handleDataLoad}
/>
);
}
diff --git a/src/components/metrics/DatePickerForm.js b/src/components/metrics/DatePickerForm.tsx
similarity index 96%
rename from src/components/metrics/DatePickerForm.js
rename to src/components/metrics/DatePickerForm.tsx
index 5e1906c3c..b4f0781e4 100644
--- a/src/components/metrics/DatePickerForm.js
+++ b/src/components/metrics/DatePickerForm.tsx
@@ -39,7 +39,7 @@ export function DatePickerForm({
return (
<div className={styles.container}>
<div className={styles.filter}>
- <ButtonGroup selectedKey={selected} onSelect={setSelected}>
+ <ButtonGroup selectedKey={selected} onSelect={key => setSelected(key as any)}>
<Button key={FILTER_DAY}>{formatMessage(labels.singleDay)}</Button>
<Button key={FILTER_RANGE}>{formatMessage(labels.dateRange)}</Button>
</ButtonGroup>
diff --git a/src/components/metrics/DevicesTable.js b/src/components/metrics/DevicesTable.tsx
similarity index 86%
rename from src/components/metrics/DevicesTable.js
rename to src/components/metrics/DevicesTable.tsx
index 606b020ab..4ebdac1b5 100644
--- a/src/components/metrics/DevicesTable.js
+++ b/src/components/metrics/DevicesTable.tsx
@@ -1,9 +1,9 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import FilterLink from 'components/common/FilterLink';
import useMessages from 'components/hooks/useMessages';
import { useFormat } from 'components/hooks';
-export function DevicesTable({ websiteId, ...props }) {
+export function DevicesTable(props: MetricsTableProps) {
const { formatMessage, labels } = useMessages();
const { formatDevice } = useFormat();
@@ -26,7 +26,6 @@ export function DevicesTable({ websiteId, ...props }) {
title={formatMessage(labels.devices)}
type="device"
metric={formatMessage(labels.visitors)}
- websiteId={websiteId}
renderLabel={renderLink}
/>
);
diff --git a/src/components/metrics/EventsChart.js b/src/components/metrics/EventsChart.tsx
similarity index 92%
rename from src/components/metrics/EventsChart.js
rename to src/components/metrics/EventsChart.tsx
index 610a3616e..be6d4a0c3 100644
--- a/src/components/metrics/EventsChart.js
+++ b/src/components/metrics/EventsChart.tsx
@@ -7,7 +7,13 @@ import { useApi, useLocale, useDateRange, useTimezone, useNavigation } from 'com
import { EVENT_COLORS } from 'lib/constants';
import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';
-export function EventsChart({ websiteId, className, token }) {
+export interface EventsChartProps {
+ websiteId: string;
+ className?: string;
+ token?: string;
+}
+
+export function EventsChart({ websiteId, className, token }: EventsChartProps) {
const { get, useQuery } = useApi();
const [{ startDate, endDate, unit, modified }] = useDateRange(websiteId);
const { locale } = useLocale();
@@ -71,7 +77,6 @@ export function EventsChart({ websiteId, className, token }) {
className={className}
datasets={datasets}
unit={unit}
- height={300}
loading={isLoading}
stacked
renderXLabel={renderDateLabels(unit, locale)}
diff --git a/src/components/metrics/EventsTable.js b/src/components/metrics/EventsTable.tsx
similarity index 69%
rename from src/components/metrics/EventsTable.js
rename to src/components/metrics/EventsTable.tsx
index a8ae82aa2..26d9529b4 100644
--- a/src/components/metrics/EventsTable.js
+++ b/src/components/metrics/EventsTable.tsx
@@ -1,10 +1,10 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import useMessages from 'components/hooks/useMessages';
-export function EventsTable({ websiteId, ...props }) {
+export function EventsTable(props: MetricsTableProps) {
const { formatMessage, labels } = useMessages();
- function handleDataLoad(data) {
+ function handleDataLoad(data: any) {
props.onDataLoad?.(data);
}
@@ -14,7 +14,6 @@ export function EventsTable({ websiteId, ...props }) {
title={formatMessage(labels.events)}
type="event"
metric={formatMessage(labels.actions)}
- websiteId={websiteId}
onDataLoad={handleDataLoad}
/>
);
diff --git a/src/components/metrics/FilterTags.js b/src/components/metrics/FilterTags.tsx
similarity index 92%
rename from src/components/metrics/FilterTags.js
rename to src/components/metrics/FilterTags.tsx
index db8fdcbdd..140385f5c 100644
--- a/src/components/metrics/FilterTags.js
+++ b/src/components/metrics/FilterTags.tsx
@@ -18,7 +18,7 @@ export function FilterTags({ params }) {
return null;
}
- function handleCloseFilter(param) {
+ function handleCloseFilter(param?: string) {
if (!param) {
router.push(makeUrl({ view }, true));
} else {
@@ -44,7 +44,7 @@ export function FilterTags({ params }) {
</div>
);
})}
- <Button size="sm" variant="quiet" onClick={() => handleCloseFilter()}>
+ <Button size="sm" variant="quiet" onClick={handleCloseFilter}>
<Icon>
<Icons.Close />
</Icon>
diff --git a/src/components/metrics/LanguagesTable.js b/src/components/metrics/LanguagesTable.tsx
similarity index 80%
rename from src/components/metrics/LanguagesTable.js
rename to src/components/metrics/LanguagesTable.tsx
index 7d2208293..c0d2052bb 100644
--- a/src/components/metrics/LanguagesTable.js
+++ b/src/components/metrics/LanguagesTable.tsx
@@ -1,10 +1,13 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import { percentFilter } from 'lib/filters';
import useLanguageNames from 'components/hooks/useLanguageNames';
import useLocale from 'components/hooks/useLocale';
import useMessages from 'components/hooks/useMessages';
-export function LanguagesTable({ websiteId, onDataLoad, ...props }) {
+export function LanguagesTable({
+ onDataLoad,
+ ...props
+}: { onDataLoad: (data: any) => void } & MetricsTableProps) {
const { formatMessage, labels } = useMessages();
const { locale } = useLocale();
const languageNames = useLanguageNames(locale);
@@ -19,7 +22,6 @@ export function LanguagesTable({ websiteId, onDataLoad, ...props }) {
title={formatMessage(labels.languages)}
type="language"
metric={formatMessage(labels.visitors)}
- websiteId={websiteId}
onDataLoad={data => onDataLoad?.(percentFilter(data))}
renderLabel={renderLabel}
/>
diff --git a/src/components/metrics/Legend.js b/src/components/metrics/Legend.tsx
similarity index 100%
rename from src/components/metrics/Legend.js
rename to src/components/metrics/Legend.tsx
diff --git a/src/components/metrics/ListTable.js b/src/components/metrics/ListTable.tsx
similarity index 87%
rename from src/components/metrics/ListTable.js
rename to src/components/metrics/ListTable.tsx
index 356c4bc4c..7c66ff3c0 100644
--- a/src/components/metrics/ListTable.js
+++ b/src/components/metrics/ListTable.tsx
@@ -5,9 +5,22 @@ import Empty from 'components/common/Empty';
import { formatLongNumber } from 'lib/format';
import useMessages from 'components/hooks/useMessages';
import styles from './ListTable.module.css';
+import { ReactNode } from 'react';
const ITEM_SIZE = 30;
+export interface ListTableProps {
+ data?: any[];
+ title?: string;
+ metric?: string;
+ className?: string;
+ renderLabel?: (row: any) => ReactNode;
+ animate?: boolean;
+ virtualize?: boolean;
+ showPercentage?: boolean;
+ itemCount?: number;
+}
+
export function ListTable({
data = [],
title,
@@ -18,7 +31,7 @@ export function ListTable({
virtualize = false,
showPercentage = true,
itemCount = 10,
-}) {
+}: ListTableProps) {
const { formatMessage, labels } = useMessages();
const getRow = row => {
@@ -76,7 +89,7 @@ const AnimatedRow = ({ label, value = 0, percent, animate, showPercentage = true
<div className={styles.row}>
<div className={styles.label}>{label}</div>
<div className={styles.value}>
- <animated.div className={styles.value} title={props?.y}>
+ <animated.div className={styles.value} title={props?.y as any}>
{props.y?.to(formatLongNumber)}
</animated.div>
</div>
diff --git a/src/components/metrics/MetricCard.js b/src/components/metrics/MetricCard.tsx
similarity index 77%
rename from src/components/metrics/MetricCard.js
rename to src/components/metrics/MetricCard.tsx
index 5fff3960e..2359b0e20 100644
--- a/src/components/metrics/MetricCard.js
+++ b/src/components/metrics/MetricCard.tsx
@@ -3,6 +3,16 @@ import { useSpring, animated } from '@react-spring/web';
import { formatNumber } from 'lib/format';
import styles from './MetricCard.module.css';
+export interface MetricCardProps {
+ value: number;
+ change?: number;
+ label: string;
+ reverseColors?: boolean;
+ format?: typeof formatNumber;
+ hideComparison?: boolean;
+ className?: string;
+}
+
export const MetricCard = ({
value = 0,
change = 0,
@@ -11,13 +21,13 @@ export const MetricCard = ({
format = formatNumber,
hideComparison = false,
className,
-}) => {
+}: MetricCardProps) => {
const props = useSpring({ x: Number(value) || 0, from: { x: 0 } });
const changeProps = useSpring({ x: Number(change) || 0, from: { x: 0 } });
return (
<div className={classNames(styles.card, className)}>
- <animated.div className={styles.value} title={props?.x}>
+ <animated.div className={styles.value} title={props?.x as any}>
{props?.x?.to(x => format(x))}
</animated.div>
<div className={styles.label}>
@@ -29,7 +39,7 @@ export const MetricCard = ({
[styles.negative]: change * (reverseColors ? -1 : 1) < 0,
[styles.plusSign]: change > 0,
})}
- title={changeProps?.x}
+ title={changeProps?.x as any}
>
{changeProps?.x?.to(x => format(x))}
</animated.span>
diff --git a/src/components/metrics/MetricsBar.js b/src/components/metrics/MetricsBar.tsx
similarity index 79%
rename from src/components/metrics/MetricsBar.js
rename to src/components/metrics/MetricsBar.tsx
index 1160c8be0..60a217067 100644
--- a/src/components/metrics/MetricsBar.js
+++ b/src/components/metrics/MetricsBar.tsx
@@ -1,9 +1,17 @@
+import { ReactNode } from 'react';
import { Loading, cloneChildren } from 'react-basics';
import ErrorMessage from 'components/common/ErrorMessage';
import { formatLongNumber } from 'lib/format';
import styles from './MetricsBar.module.css';
-export function MetricsBar({ children, isLoading, isFetched, error }) {
+export interface MetricsBarProps {
+ isLoading?: boolean;
+ isFetched?: boolean;
+ error?: unknown;
+ children?: ReactNode;
+}
+
+export function MetricsBar({ children, isLoading, isFetched, error }: MetricsBarProps) {
const formatFunc = n => (n >= 0 ? formatLongNumber(n) : `-${formatLongNumber(Math.abs(n))}`);
return (
diff --git a/src/components/metrics/MetricsTable.js b/src/components/metrics/MetricsTable.tsx
similarity index 80%
rename from src/components/metrics/MetricsTable.js
rename to src/components/metrics/MetricsTable.tsx
index a251756f7..d4ad793d6 100644
--- a/src/components/metrics/MetricsTable.js
+++ b/src/components/metrics/MetricsTable.tsx
@@ -1,6 +1,5 @@
import { useMemo } from 'react';
import { Loading, Icon, Text } from 'react-basics';
-import firstBy from 'thenby';
import classNames from 'classnames';
import useApi from 'components/hooks/useApi';
import { percentFilter } from 'lib/filters';
@@ -8,24 +7,33 @@ import useDateRange from 'components/hooks/useDateRange';
import useNavigation from 'components/hooks/useNavigation';
import ErrorMessage from 'components/common/ErrorMessage';
import LinkButton from 'components/common/LinkButton';
-import ListTable from './ListTable';
+import ListTable, { ListTableProps } from './ListTable';
import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
import Icons from 'components/icons';
import useMessages from 'components/hooks/useMessages';
import useLocale from 'components/hooks/useLocale';
import styles from './MetricsTable.module.css';
+export interface MetricsTableProps extends ListTableProps {
+ websiteId: string;
+ type?: string;
+ className?: string;
+ dataFilter?: (data: any) => any;
+ limit?: number;
+ delay?: number;
+ onDataLoad?: (data: any) => void;
+}
+
export function MetricsTable({
websiteId,
type,
className,
dataFilter,
- filterOptions,
limit,
onDataLoad,
delay = null,
...props
-}) {
+}: MetricsTableProps) {
const [{ startDate, endDate, modified }] = useDateRange(websiteId);
const {
makeUrl,
@@ -53,26 +61,28 @@ export function MetricsTable({
city,
},
],
- queryFn: () => {
+ queryFn: async () => {
const filters = { url, title, referrer, os, browser, device, country, region, city };
filters[type] = undefined;
- onDataLoad?.();
-
- return get(`/websites/${websiteId}/metrics`, {
+ const data = await get(`/websites/${websiteId}/metrics`, {
type,
startAt: +startDate,
endAt: +endDate,
...filters,
});
+
+ onDataLoad?.(data);
+
+ return data;
},
retryDelay: delay || DEFAULT_ANIMATION_DURATION,
});
const filteredData = useMemo(() => {
if (data) {
- let items = data;
+ let items: any[] = data;
if (dataFilter) {
if (Array.isArray(dataFilter)) {
@@ -89,20 +99,19 @@ export function MetricsTable({
if (limit) {
items = items.filter((e, i) => i < limit);
}
- if (filterOptions?.sort === false) {
- return items;
- }
- return items.sort(firstBy('y', -1).thenBy('x'));
+ return items;
}
return [];
- }, [data, error, dataFilter, filterOptions, limit]);
+ }, [data, error, dataFilter, limit]);
return (
<div className={classNames(styles.container, className)}>
{!data && isLoading && !isFetched && <Loading icon="dots" />}
{error && <ErrorMessage />}
- {data && !error && <ListTable {...props} data={filteredData} className={className} />}
+ {data && !error && (
+ <ListTable {...(props as ListTableProps)} data={filteredData} className={className} />
+ )}
<div className={styles.footer}>
{data && !error && limit && (
<LinkButton href={makeUrl({ view: type })} variant="quiet">
diff --git a/src/components/metrics/OSTable.js b/src/components/metrics/OSTable.tsx
similarity index 80%
rename from src/components/metrics/OSTable.js
rename to src/components/metrics/OSTable.tsx
index 15570d858..e8b8e81f7 100644
--- a/src/components/metrics/OSTable.js
+++ b/src/components/metrics/OSTable.tsx
@@ -2,7 +2,7 @@ import MetricsTable from './MetricsTable';
import FilterLink from 'components/common/FilterLink';
import useMessages from 'components/hooks/useMessages';
-export function OSTable({ websiteId, ...props }) {
+export function OSTable({ websiteId, limit }: { websiteId: string; limit?: number }) {
const { formatMessage, labels } = useMessages();
function renderLink({ x: os }) {
@@ -10,7 +10,7 @@ export function OSTable({ websiteId, ...props }) {
<FilterLink id="os" value={os}>
<img
src={`${process.env.basePath}/images/os/${
- os?.toLowerCase().replaceAll(/[^\w]+/g, '-') || 'unknown'
+ os?.toLowerCase().replaceAll(/\W/g, '-') || 'unknown'
}.png`}
alt={os}
width={16}
@@ -22,8 +22,8 @@ export function OSTable({ websiteId, ...props }) {
return (
<MetricsTable
- {...props}
websiteId={websiteId}
+ limit={limit}
title={formatMessage(labels.os)}
metric={formatMessage(labels.visitors)}
renderLabel={renderLink}
diff --git a/src/components/metrics/PagesTable.js b/src/components/metrics/PagesTable.tsx
similarity index 83%
rename from src/components/metrics/PagesTable.js
rename to src/components/metrics/PagesTable.tsx
index 7395ef866..236764676 100644
--- a/src/components/metrics/PagesTable.js
+++ b/src/components/metrics/PagesTable.tsx
@@ -1,11 +1,15 @@
import FilterLink from 'components/common/FilterLink';
import FilterButtons from 'components/common/FilterButtons';
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import useMessages from 'components/hooks/useMessages';
import useNavigation from 'components/hooks/useNavigation';
import { emptyFilter } from 'lib/filters';
-export function PagesTable({ websiteId, showFilters, ...props }) {
+export interface PagesTableProps extends MetricsTableProps {
+ showFilters?: boolean;
+}
+
+export function PagesTable({ showFilters, ...props }: PagesTableProps) {
const {
router,
makeUrl,
@@ -40,7 +44,6 @@ export function PagesTable({ websiteId, showFilters, ...props }) {
title={formatMessage(labels.pages)}
type={view}
metric={formatMessage(labels.views)}
- websiteId={websiteId}
dataFilter={emptyFilter}
renderLabel={renderLink}
/>
diff --git a/src/components/metrics/PageviewsChart.js b/src/components/metrics/PageviewsChart.tsx
similarity index 74%
rename from src/components/metrics/PageviewsChart.js
rename to src/components/metrics/PageviewsChart.tsx
index 1ea4b044b..48e2b4f1d 100644
--- a/src/components/metrics/PageviewsChart.js
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -1,9 +1,18 @@
import { useMemo } from 'react';
-import BarChart from './BarChart';
+import BarChart, { BarChartProps } from './BarChart';
import { useLocale, useTheme, useMessages } from 'components/hooks';
import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';
-export function PageviewsChart({ websiteId, data, unit, loading, ...props }) {
+export interface PageviewsChartProps extends BarChartProps {
+ data: {
+ sessions: any[];
+ pageviews: any[];
+ };
+ unit: string;
+ isLoading?: boolean;
+}
+
+export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsChartProps) {
const { formatMessage, labels } = useMessages();
const { colors } = useTheme();
const { locale } = useLocale();
@@ -30,10 +39,9 @@ export function PageviewsChart({ websiteId, data, unit, loading, ...props }) {
return (
<BarChart
{...props}
- key={websiteId}
datasets={datasets}
unit={unit}
- loading={loading}
+ isLoading={isLoading}
renderXLabel={renderDateLabels(unit, locale)}
renderTooltipPopup={renderStatusTooltipPopup(unit, locale)}
/>
diff --git a/src/components/metrics/QueryParametersTable.js b/src/components/metrics/QueryParametersTable.tsx
similarity index 88%
rename from src/components/metrics/QueryParametersTable.js
rename to src/components/metrics/QueryParametersTable.tsx
index 47266eb24..65cac6640 100644
--- a/src/components/metrics/QueryParametersTable.js
+++ b/src/components/metrics/QueryParametersTable.tsx
@@ -3,7 +3,7 @@ import { safeDecodeURI } from 'next-basics';
import FilterButtons from 'components/common/FilterButtons';
import { emptyFilter, paramFilter } from 'lib/filters';
import { FILTER_RAW, FILTER_COMBINED } from 'lib/constants';
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import useMessages from 'components/hooks/useMessages';
import styles from './QueryParametersTable.module.css';
@@ -12,7 +12,10 @@ const filters = {
[FILTER_COMBINED]: [emptyFilter, paramFilter],
};
-export function QueryParametersTable({ websiteId, showFilters, ...props }) {
+export function QueryParametersTable({
+ showFilters,
+ ...props
+}: { showFilters: boolean } & MetricsTableProps) {
const [filter, setFilter] = useState(FILTER_COMBINED);
const { formatMessage, labels } = useMessages();
@@ -32,7 +35,6 @@ export function QueryParametersTable({ websiteId, showFilters, ...props }) {
title={formatMessage(labels.query)}
type="query"
metric={formatMessage(labels.views)}
- websiteId={websiteId}
dataFilter={filters[filter]}
renderLabel={({ x, p, v }) =>
filter === FILTER_RAW ? (
diff --git a/src/components/metrics/RealtimeChart.js b/src/components/metrics/RealtimeChart.tsx
similarity index 81%
rename from src/components/metrics/RealtimeChart.js
rename to src/components/metrics/RealtimeChart.tsx
index 43b175a31..f1a781bdc 100644
--- a/src/components/metrics/RealtimeChart.js
+++ b/src/components/metrics/RealtimeChart.tsx
@@ -4,7 +4,7 @@ import PageviewsChart from './PageviewsChart';
import { getDateArray } from 'lib/date';
import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from 'lib/constants';
-function mapData(data) {
+function mapData(data: any[]) {
let last = 0;
const arr = [];
@@ -23,7 +23,15 @@ function mapData(data) {
return arr;
}
-export function RealtimeChart({ data, unit, ...props }) {
+export interface RealtimeChartProps {
+ data: {
+ pageviews: any[];
+ visitors: any[];
+ };
+ unit: string;
+}
+
+export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
const endDate = startOfMinute(new Date());
const startDate = subMinutes(endDate, REALTIME_RANGE);
const prevEndDate = useRef(endDate);
@@ -49,13 +57,7 @@ export function RealtimeChart({ data, unit, ...props }) {
}, [endDate]);
return (
- <PageviewsChart
- {...props}
- height={200}
- unit={unit}
- data={chartData}
- animationDuration={animationDuration}
- />
+ <PageviewsChart {...props} unit={unit} data={chartData} animationDuration={animationDuration} />
);
}
diff --git a/src/components/metrics/ReferrersTable.js b/src/components/metrics/ReferrersTable.tsx
similarity index 83%
rename from src/components/metrics/ReferrersTable.js
rename to src/components/metrics/ReferrersTable.tsx
index b925b24ae..079e6e722 100644
--- a/src/components/metrics/ReferrersTable.js
+++ b/src/components/metrics/ReferrersTable.tsx
@@ -1,8 +1,8 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import FilterLink from 'components/common/FilterLink';
import useMessages from 'components/hooks/useMessages';
-export function ReferrersTable({ websiteId, ...props }) {
+export function ReferrersTable(props: MetricsTableProps) {
const { formatMessage, labels } = useMessages();
const renderLink = ({ x: referrer }) => {
@@ -23,7 +23,6 @@ export function ReferrersTable({ websiteId, ...props }) {
title={formatMessage(labels.referrers)}
type="referrer"
metric={formatMessage(labels.views)}
- websiteId={websiteId}
renderLabel={renderLink}
/>
</>
diff --git a/src/components/metrics/RegionsTable.js b/src/components/metrics/RegionsTable.tsx
similarity index 86%
rename from src/components/metrics/RegionsTable.js
rename to src/components/metrics/RegionsTable.tsx
index 50b1c3d40..187e3768d 100644
--- a/src/components/metrics/RegionsTable.js
+++ b/src/components/metrics/RegionsTable.tsx
@@ -3,15 +3,15 @@ import { emptyFilter } from 'lib/filters';
import useLocale from 'components/hooks/useLocale';
import useMessages from 'components/hooks/useMessages';
import useCountryNames from 'components/hooks/useCountryNames';
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import regions from 'public/iso-3166-2.json';
-export function RegionsTable({ websiteId, ...props }) {
+export function RegionsTable(props: MetricsTableProps) {
const { locale } = useLocale();
const { formatMessage, labels } = useMessages();
const countryNames = useCountryNames(locale);
- const renderLabel = (code, country) => {
+ const renderLabel = (code: string, country: string) => {
const region = code.includes('-') ? code : `${country}-${code}`;
return regions[region] ? `${regions[region]}, ${countryNames[country]}` : region;
};
@@ -33,7 +33,6 @@ export function RegionsTable({ websiteId, ...props }) {
title={formatMessage(labels.regions)}
type="region"
metric={formatMessage(labels.visitors)}
- websiteId={websiteId}
dataFilter={emptyFilter}
renderLabel={renderLink}
/>
diff --git a/src/components/metrics/ScreenTable.js b/src/components/metrics/ScreenTable.tsx
similarity index 70%
rename from src/components/metrics/ScreenTable.js
rename to src/components/metrics/ScreenTable.tsx
index 8ed5c05a0..5b856cbab 100644
--- a/src/components/metrics/ScreenTable.js
+++ b/src/components/metrics/ScreenTable.tsx
@@ -1,7 +1,7 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
import useMessages from 'components/hooks/useMessages';
-export function ScreenTable({ websiteId, ...props }) {
+export function ScreenTable(props: MetricsTableProps) {
const { formatMessage, labels } = useMessages();
return (
@@ -10,7 +10,6 @@ export function ScreenTable({ websiteId, ...props }) {
title={formatMessage(labels.screens)}
type="screen"
metric={formatMessage(labels.visitors)}
- websiteId={websiteId}
/>
);
}
diff --git a/src/components/metrics/WorldMap.js b/src/components/metrics/WorldMap.tsx
similarity index 91%
rename from src/components/metrics/WorldMap.js
rename to src/components/metrics/WorldMap.tsx
index ff34d5f2b..ed3b3ac99 100644
--- a/src/components/metrics/WorldMap.js
+++ b/src/components/metrics/WorldMap.tsx
@@ -12,7 +12,7 @@ import { formatLongNumber } from 'lib/format';
import { percentFilter } from 'lib/filters';
import styles from './WorldMap.module.css';
-export function WorldMap({ data, className }) {
+export function WorldMap({ data = [], className }: { data?: any[]; className?: string }) {
const [tooltip, setTooltipPopup] = useState();
const { theme, colors } = useTheme();
const { locale } = useLocale();
@@ -21,7 +21,7 @@ export function WorldMap({ data, className }) {
const visitorsLabel = formatMessage(labels.visitors).toLocaleLowerCase(locale);
const metrics = useMemo(() => (data ? percentFilter(data) : []), [data]);
- function getFillColor(code) {
+ function getFillColor(code: string) {
if (code === 'AQ') return;
const country = metrics?.find(({ x }) => x === code);
@@ -41,7 +41,9 @@ export function WorldMap({ data, className }) {
function handleHover(code) {
if (code === 'AQ') return;
const country = metrics?.find(({ x }) => x === code);
- setTooltipPopup(`${countryNames[code]}: ${formatLongNumber(country?.y || 0)} ${visitorsLabel}`);
+ setTooltipPopup(
+ `${countryNames[code]}: ${formatLongNumber(country?.y || 0)} ${visitorsLabel}` as any,
+ );
}
return (
diff --git a/src/lib/charts.js b/src/lib/charts.tsx
similarity index 77%
rename from src/lib/charts.js
rename to src/lib/charts.tsx
index ff746cb50..c80bfe3f9 100644
--- a/src/lib/charts.js
+++ b/src/lib/charts.tsx
@@ -2,12 +2,12 @@ import { StatusLight } from 'react-basics';
import { formatDate } from 'lib/date';
import { formatLongNumber } from 'lib/format';
-export function renderNumberLabels(label) {
- return +label > 1000 ? formatLongNumber(label) : label;
+export function renderNumberLabels(label: string) {
+ return +label > 1000 ? formatLongNumber(+label) : label;
}
-export function renderDateLabels(unit, locale) {
- return (label, index, values) => {
+export function renderDateLabels(unit: string, locale: string) {
+ return (label: string, index: number, values: any[]) => {
const d = new Date(values[index].value);
switch (unit) {
@@ -27,8 +27,8 @@ export function renderDateLabels(unit, locale) {
};
}
-export function renderStatusTooltipPopup(unit, locale) {
- return (setTooltipPopup, model) => {
+export function renderStatusTooltipPopup(unit: string, locale: string) {
+ return (setTooltipPopup: (data: any) => void, model: any) => {
const { opacity, labelColors, dataPoints } = model.tooltip;
if (!dataPoints?.length || !opacity) {
diff --git a/src/lib/crypto.js b/src/lib/crypto.ts
similarity index 85%
rename from src/lib/crypto.js
rename to src/lib/crypto.ts
index b2cfc653b..b0ce20dee 100644
--- a/src/lib/crypto.js
+++ b/src/lib/crypto.ts
@@ -12,12 +12,12 @@ export function salt() {
return hash(secret(), ROTATING_SALT);
}
-export function uuid(...args) {
+export function uuid(...args: [any]) {
if (!args.length) return v4();
return v5(hash(...args, salt()), v5.DNS);
}
-export function isUuid(value) {
+export function isUuid(value: string) {
return validate(value);
}
diff --git a/src/lib/db.js b/src/lib/db.ts
similarity index 91%
rename from src/lib/db.js
rename to src/lib/db.ts
index 6657ad979..46f73aa2f 100644
--- a/src/lib/db.js
+++ b/src/lib/db.ts
@@ -6,7 +6,7 @@ export const KAFKA = 'kafka';
export const KAFKA_PRODUCER = 'kafka-producer';
// Fixes issue with converting bigint values
-BigInt.prototype.toJSON = function () {
+BigInt.prototype['toJSON'] = function () {
return Number(this);
};
@@ -24,7 +24,7 @@ export function getDatabaseType(url = process.env.DATABASE_URL) {
return type;
}
-export async function runQuery(queries) {
+export async function runQuery(queries: any) {
const db = getDatabaseType(process.env.CLICKHOUSE_URL || process.env.DATABASE_URL);
if (db === POSTGRESQL || db === MYSQL) {
diff --git a/src/lib/filters.js b/src/lib/filters.ts
similarity index 86%
rename from src/lib/filters.js
rename to src/lib/filters.ts
index 2b8fbcf16..1b4a5a1e2 100644
--- a/src/lib/filters.js
+++ b/src/lib/filters.ts
@@ -1,4 +1,4 @@
-export const urlFilter = data => {
+export const urlFilter = (data: any[]) => {
const map = data.reduce((obj, { x, y }) => {
if (x) {
if (!obj[x]) {
@@ -14,7 +14,7 @@ export const urlFilter = data => {
return Object.keys(map).map(key => ({ x: key, y: map[key] }));
};
-export const refFilter = data => {
+export const refFilter = (data: any[]) => {
const links = {};
const map = data.reduce((obj, { x, y }) => {
@@ -42,16 +42,16 @@ export const refFilter = data => {
return Object.keys(map).map(key => ({ x: key, y: map[key], w: links[key] }));
};
-export const emptyFilter = data => {
+export const emptyFilter = (data: any[]) => {
return data.map(item => (item.x ? item : null)).filter(n => n);
};
-export const percentFilter = data => {
+export const percentFilter = (data: any[]) => {
const total = data.reduce((n, { y }) => n + y, 0);
return data.map(({ x, y, ...props }) => ({ x, y, z: total ? (y / total) * 100 : 0, ...props }));
};
-export const paramFilter = data => {
+export const paramFilter = (data: any[]) => {
const map = data.reduce((obj, { x, y }) => {
try {
const searchParams = new URLSearchParams(x);
diff --git a/src/lib/format.js b/src/lib/format.ts
similarity index 74%
rename from src/lib/format.js
rename to src/lib/format.ts
index e138831dc..a662a9eb4 100644
--- a/src/lib/format.js
+++ b/src/lib/format.ts
@@ -1,4 +1,4 @@
-export function parseTime(val) {
+export function parseTime(val: number) {
const days = ~~(val / 86400);
const hours = ~~(val / 3600) - days * 24;
const minutes = ~~(val / 60) - days * 1440 - hours * 60;
@@ -14,16 +14,16 @@ export function parseTime(val) {
};
}
-export function formatTime(val) {
- const { hour, minutes, seconds } = parseTime(val);
- const h = hour > 0 ? `${hour}:` : '';
- const m = hour > 0 ? minutes.toString().padStart(2, '0') : minutes;
+export function formatTime(val: number) {
+ const { hours, minutes, seconds } = parseTime(val);
+ const h = hours > 0 ? `${hours}:` : '';
+ const m = hours > 0 ? minutes.toString().padStart(2, '0') : minutes;
const s = seconds.toString().padStart(2, '0');
return `${h}${m}:${s}`;
}
-export function formatShortTime(val, formats = ['m', 's'], space = '') {
+export function formatShortTime(val: number, formats = ['m', 's'], space = '') {
const { days, hours, minutes, seconds, ms } = parseTime(val);
let t = '';
@@ -40,11 +40,11 @@ export function formatShortTime(val, formats = ['m', 's'], space = '') {
return t;
}
-export function formatNumber(n) {
+export function formatNumber(n: string | number) {
return Number(n).toFixed(0);
}
-export function formatLongNumber(value) {
+export function formatLongNumber(value: number) {
const n = Number(value);
if (n >= 1000000) {
@@ -63,7 +63,7 @@ export function formatLongNumber(value) {
return formatNumber(n);
}
-export function stringToColor(str) {
+export function stringToColor(str: string) {
if (!str) {
return '#ffffff';
}
@@ -73,7 +73,7 @@ export function stringToColor(str) {
}
let color = '#';
for (let i = 0; i < 3; i++) {
- let value = (hash >> (i * 8)) & 0xff;
+ const value = (hash >> (i * 8)) & 0xff;
color += ('00' + value.toString(16)).slice(-2);
}
return color;
diff --git a/src/lib/lang.js b/src/lib/lang.ts
similarity index 96%
rename from src/lib/lang.js
rename to src/lib/lang.ts
index caf182644..2a448f63f 100644
--- a/src/lib/lang.js
+++ b/src/lib/lang.ts
@@ -96,10 +96,10 @@ export const languages = {
'zh-TW': { label: '中文(繁體)', dateLocale: zhTW },
};
-export function getDateLocale(locale) {
+export function getDateLocale(locale: string) {
return languages[locale]?.dateLocale || enUS;
}
-export function getTextDirection(locale) {
+export function getTextDirection(locale: string) {
return languages[locale]?.dir || 'ltr';
}
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 98fbc29ba..a7fab1e7d 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -53,7 +53,7 @@ export interface SearchFilter {
}
export interface FilterResult<T> {
- data: T;
+ data: T[];
count: number;
page: number;
pageSize: number;
diff --git a/src/store/app.js b/src/store/app.ts
similarity index 100%
rename from src/store/app.js
rename to src/store/app.ts
diff --git a/src/store/cache.js b/src/store/cache.ts
similarity index 100%
rename from src/store/cache.js
rename to src/store/cache.ts
diff --git a/src/store/dashboard.js b/src/store/dashboard.ts
similarity index 100%
rename from src/store/dashboard.js
rename to src/store/dashboard.ts
diff --git a/src/store/version.js b/src/store/version.ts
similarity index 100%
rename from src/store/version.js
rename to src/store/version.ts
diff --git a/yarn.lock b/yarn.lock
index 277197f53..bdb0d4843 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2233,18 +2233,17 @@
dependencies:
tslib "^2.4.0"
-"@tanstack/[email protected]":
- version "4.36.1"
- resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.36.1.tgz#79f8c1a539d47c83104210be2388813a7af2e524"
- integrity sha512-DJSilV5+ytBP1FbFcEJovv4rnnm/CokuVvrBEtW/Va9DvuJ3HksbXUJEpI0aV1KtuL4ZoO9AVE6PyNLzF7tLeA==
+"@tanstack/[email protected]":
+ version "5.12.1"
+ resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.12.1.tgz#2e04b8ab7a04b2f2cfe77c2b0c9b982477373e06"
+ integrity sha512-WbZztNmKq0t6QjdNmHzezbi/uifYo9j6e2GLJkodsYaYUlzMbAp91RDyeHkIZrm7EfO4wa6Sm5sxJZm5SPlh6w==
-"@tanstack/react-query@^4.33.0":
- version "4.36.1"
- resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-4.36.1.tgz#acb589fab4085060e2e78013164868c9c785e5d2"
- integrity sha512-y7ySVHFyyQblPl3J3eQBWpXZkliroki3ARnBKsdJchlgt7yJLRDUcf4B8soufgiYt3pEQIkBWBx1N9/ZPIeUWw==
+"@tanstack/react-query@^5.12.2":
+ version "5.12.2"
+ resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.12.2.tgz#42b39a1ccc2bdf44137921c2395902ed4239d7eb"
+ integrity sha512-BeWZu8zVFH20oRc+S/K9ADPgWjEzP/XQCGBNz5IbApUwPQAdwkQYbXODVL5AyAlWiSxhx+P2xlARPBApj2Yrog==
dependencies:
- "@tanstack/query-core" "4.36.1"
- use-sync-external-store "^1.2.0"
+ "@tanstack/query-core" "5.12.1"
"@trysound/[email protected]":
version "0.2.0"
@@ -2415,10 +2414,10 @@
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.9.tgz#b6f785caa7ea1fe4414d9df42ee0ab67f23d8a6d"
integrity sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==
-"@types/react-dom@^18.2.15":
- version "18.2.15"
- resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.15.tgz#921af67f9ee023ac37ea84b1bc0cc40b898ea522"
- integrity sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==
+"@types/react-dom@^18.2.17":
+ version "18.2.17"
+ resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.17.tgz#375c55fab4ae671bd98448dcfa153268d01d6f64"
+ integrity sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==
dependencies:
"@types/react" "*"
@@ -2441,10 +2440,10 @@
"@types/scheduler" "*"
csstype "^3.0.2"
-"@types/react@^18.2.37":
- version "18.2.37"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.37.tgz#0f03af69e463c0f19a356c2660dbca5d19c44cae"
- integrity sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==
+"@types/react@^18.2.41":
+ version "18.2.41"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.41.tgz#9eea044246bdb10510df89ef7f8422a8b6ad8fb9"
+ integrity sha512-CwOGr/PiLiNBxEBqpJ7fO3kocP/2SSuC9fpH5K7tusrg4xPSRT/193rzolYwQnTN02We/ATXKnb6GqA5w4fRxw==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
@@ -6315,10 +6314,10 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-next-basics@^0.37.0:
- version "0.37.0"
- resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.37.0.tgz#4de96040ab38bf3fdfb6fc1aa09cba7719a81d5c"
- integrity sha512-HnEFc7MFa/dXL0u4oPYqZ9myFBQTxNmCxh4P8qghZ0pKtSFd5FQ7+CqVmakVV+CfrGAORi4k2lW3EpWU8/YwgQ==
+next-basics@^0.39.0:
+ version "0.39.0"
+ resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.39.0.tgz#1ec448a1c12966a82067445bfb9319b7e883dd6a"
+ integrity sha512-5HWf3u7jgx5n4auIkArFP5+EVdyz7kSvxs86o2V4y8/t3J4scdIHgI8BBE6UhzB17WMbMgVql44IfcJH1CQc/w==
dependencies:
bcryptjs "^2.4.3"
jsonwebtoken "^9.0.0"
@@ -7476,10 +7475,10 @@ rc@^1.2.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
-react-basics@^0.110.0:
- version "0.110.0"
- resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.110.0.tgz#7b7689edcb96b973528abc91b964345edc6e000a"
- integrity sha512-3XQx5hR0zTuEAxDDHyaqS2GfXOowb0Lri8ay65kjGUd7RmvdpnIr62MsrAwo62rtTwtzRzsJXHJCR5CKQ/D3rQ==
+react-basics@^0.114.0:
+ version "0.114.0"
+ resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.114.0.tgz#b8e2d55759366a30be7a53546215c6d7e0898bca"
+ integrity sha512-zdGk0Om4yb0JZotYosbvYAFw1GwU22amFAm3iLTuZA5sL6ArH++8BDg7TFQFyaCk73jBWzYFuCiY3+xcJPxiHw==
dependencies:
"@react-spring/web" "^9.7.3"
classnames "^2.3.1"
@@ -9042,7 +9041,7 @@ use-memo-one@^1.1.1:
resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
[email protected], use-sync-external-store@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==