Merge branch 'dev' of https://github.com/umami-software/umami into dev

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>

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>

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}
         >

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>

src/components/pages/settings/teams/TeamMembers.js

@@ -33,6 +33,7 @@ export function TeamMembers({ teamId, readOnly }) {
     <>
       <TeamMembersTable
         onSave={handleSave}
+        teamId={teamId}
         data={data}
         readOnly={readOnly}
         onFilterChange={handleFilterChange}

src/components/pages/settings/teams/TeamMembersTable.js

@@ -6,6 +6,7 @@ import SettingsTable from 'components/common/SettingsTable';
 
 export function TeamMembersTable({
   data = [],
+  teamId,
   onSave,
   readOnly,
   filterValue,
@@ -50,7 +51,7 @@ export function TeamMembersTable({
         return (
           !readOnly && (
             <TeamMemberRemoveButton
-              teamId={row.teamId}
+              teamId={teamId}
               userId={row.id}
               disabled={user.id === row?.user?.id || row.role === ROLES.teamOwner}
               onSave={onSave}

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>