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.

Fix LoadingButton isLoading property

Francis Cao6d0b3934ebcf
diff --git a/src/components/common/ConfirmDeleteForm.js b/src/components/common/ConfirmDeleteForm.js
index fed618da9..3d2c383d9 100644
--- a/src/components/common/ConfirmDeleteForm.js
+++ b/src/components/common/ConfirmDeleteForm.js
@@ -17,7 +17,7 @@ export function ConfirmDeleteForm({ name, onConfirm, onClose }) {
<FormattedMessage {...messages.confirmDelete} values={{ target: <b>{name}</b> }} />
</p>
<FormButtons flex>
- <LoadingButton loading={loading} onClick={handleConfirm} variant="danger">
+ <LoadingButton isLoading={loading} onClick={handleConfirm} variant="danger">
{formatMessage(labels.delete)}
</LoadingButton>
<Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
diff --git a/src/components/input/RefreshButton.js b/src/components/input/RefreshButton.js
index 81bca45f7..8b40cafa1 100644
--- a/src/components/input/RefreshButton.js
+++ b/src/components/input/RefreshButton.js
@@ -16,7 +16,7 @@ export function RefreshButton({ websiteId, isLoading }) {
return (
<TooltipPopup label={formatMessage(labels.refresh)}>
- <LoadingButton loading={isLoading} onClick={handleClick}>
+ <LoadingButton isLoading={isLoading} onClick={handleClick}>
<Icon>
<Icons.Refresh />
</Icon>
diff --git a/src/components/pages/reports/ReportHeader.js b/src/components/pages/reports/ReportHeader.js
index e81f66fe8..e81d6ece6 100644
--- a/src/components/pages/reports/ReportHeader.js
+++ b/src/components/pages/reports/ReportHeader.js
@@ -66,7 +66,7 @@ export function ReportHeader({ icon }) {
<PageHeader title={<Title />}>
<LoadingButton
variant="primary"
- loading={isCreating || isUpdating}
+ isLoading={isCreating || isUpdating}
disabled={!websiteId || !dateRange?.value || !name}
onClick={handleSave}
>
diff --git a/src/components/pages/settings/teams/TeamMemberRemoveButton.js b/src/components/pages/settings/teams/TeamMemberRemoveButton.js
index 44fd30abe..3ec0f8b36 100644
--- a/src/components/pages/settings/teams/TeamMemberRemoveButton.js
+++ b/src/components/pages/settings/teams/TeamMemberRemoveButton.js
@@ -19,7 +19,11 @@ export function TeamMemberRemoveButton({ teamId, userId, disabled, onSave }) {
};
return (
- <LoadingButton onClick={() => handleRemoveTeamMember()} disabled={disabled} loading={isLoading}>
+ <LoadingButton
+ onClick={() => handleRemoveTeamMember()}
+ disabled={disabled}
+ isLoading={isLoading}
+ >
<Icon>
<Icons.Close />
</Icon>
diff --git a/src/components/pages/settings/teams/TeamWebsiteRemoveButton.js b/src/components/pages/settings/teams/TeamWebsiteRemoveButton.js
index 2ea773fcd..c0ddf95ce 100644
--- a/src/components/pages/settings/teams/TeamWebsiteRemoveButton.js
+++ b/src/components/pages/settings/teams/TeamWebsiteRemoveButton.js
@@ -19,7 +19,7 @@ export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {
};
return (
- <LoadingButton onClick={() => handleRemoveTeamMember()} loading={isLoading}>
+ <LoadingButton onClick={() => handleRemoveTeamMember()} isLoading={isLoading}>
<Icon>
<Icons.Close />
</Icon>