From 75861bda61836a31e07bd3b25f3e73b7f2be58eb Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Fri, 25 Aug 2023 13:01:48 -0700
Subject: [PATCH 1/3] Fix insight.

---
 src/pages/api/reports/insights.ts | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pages/api/reports/insights.ts b/src/pages/api/reports/insights.ts
index d10eba3f..4d17c922 100644
--- a/src/pages/api/reports/insights.ts
+++ b/src/pages/api/reports/insights.ts
@@ -38,18 +38,14 @@ const schema = {
       )
       .min(1)
       .required(),
-    filters: yup
-      .array()
-      .of(
-        yup.object().shape({
-          name: yup.string().required(),
-          type: yup.string().required(),
-          filter: yup.string().required(),
-          value: yup.string().required(),
-        }),
-      )
-      .min(1)
-      .required(),
+    filters: yup.array().of(
+      yup.object().shape({
+        name: yup.string().required(),
+        type: yup.string().required(),
+        filter: yup.string().required(),
+        value: yup.string().required(),
+      }),
+    ),
     groups: yup.array().of(
       yup.object().shape({
         name: yup.string().required(),

From 6d0b3934ebcf313d1b8784cddfd4dfc31d994c85 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 25 Aug 2023 13:32:24 -0700
Subject: [PATCH 2/3] Fix LoadingButton isLoading property

---
 src/components/common/ConfirmDeleteForm.js                  | 2 +-
 src/components/input/RefreshButton.js                       | 2 +-
 src/components/pages/reports/ReportHeader.js                | 2 +-
 .../pages/settings/teams/TeamMemberRemoveButton.js          | 6 +++++-
 .../pages/settings/teams/TeamWebsiteRemoveButton.js         | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/common/ConfirmDeleteForm.js b/src/components/common/ConfirmDeleteForm.js
index fed618da..3d2c383d 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 81bca45f..8b40cafa 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 e81f66fe..e81d6ece 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 44fd30ab..3ec0f8b3 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 2ea773fc..c0ddf95c 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>

From 236a26136da65c4a3f199115d9fa18aeb21a520f Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Fri, 25 Aug 2023 13:38:52 -0700
Subject: [PATCH 3/3] Add teamId.

---
 src/components/pages/settings/teams/TeamMembers.js      | 1 +
 src/components/pages/settings/teams/TeamMembersTable.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/pages/settings/teams/TeamMembers.js b/src/components/pages/settings/teams/TeamMembers.js
index 1420f6de..207ad72d 100644
--- a/src/components/pages/settings/teams/TeamMembers.js
+++ b/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}
diff --git a/src/components/pages/settings/teams/TeamMembersTable.js b/src/components/pages/settings/teams/TeamMembersTable.js
index e1f29e19..4f620cf7 100644
--- a/src/components/pages/settings/teams/TeamMembersTable.js
+++ b/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}