From dd55c5a9f9bbb70b0b21fe58d213d49c3f8bc6d4 Mon Sep 17 00:00:00 2001
From: Rares Mardare <rares.mardare@grafana.com>
Date: Mon, 3 Oct 2022 15:14:14 +0300
Subject: [PATCH 1/2] schedules fix

---
 .../src/pages/schedules/Schedules.tsx         | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx
index 230d2c84..cb7b1655 100644
--- a/grafana-plugin/src/pages/schedules/Schedules.tsx
+++ b/grafana-plugin/src/pages/schedules/Schedules.tsx
@@ -85,7 +85,13 @@ class SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSta
       query: { id },
     } = this.props;
 
-    if (id) {
+    if (!id) return;
+
+    const isNewSchedule = id === 'new';
+    let scheduleId = undefined;
+
+    if (!isNewSchedule) {
+      // load schedule only for valid id
       const schedule = await store.scheduleStore
         .loadItem(id, true)
         .catch((error) => this.setState({ errorData: { ...getWrongTeamResponseInfo(error) } }));
@@ -94,12 +100,13 @@ class SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSta
       }
 
       const schedules = store.scheduleStore.getSearchResult();
-      const scheduleId = schedules && schedules.find((res) => res.id === id)?.id;
-      if (scheduleId || id === 'new') {
-        this.setState({ scheduleIdToEdit: id });
-      } else {
-        openErrorNotification(`Schedule with id=${id} is not found. Please select schedule from the list.`);
-      }
+      scheduleId = schedules && schedules.find((res) => res.id === id)?.id;
+    }
+
+    if (scheduleId || isNewSchedule) {
+      this.setState({ scheduleIdToEdit: id });
+    } else {
+      openErrorNotification(`Schedule with id=${id} is not found. Please select schedule from the list.`);
     }
   };
 
@@ -165,7 +172,7 @@ class SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSta
         errorData={errorData}
         objectName="schedule"
         pageName="schedules"
-        itemNotFoundMessage={`Schedule with id=${query?.id} is not found. Please select schedule from the list.`}
+        itemNotFoundMessage={`Schedule with id=${query?.id} is not found. Please select schedule from the list. [AAAA]`}
       >
         {() => (
           <>

From c7d02deaf898ed5b798f79be9ae598258ebb3e28 Mon Sep 17 00:00:00 2001
From: Rares Mardare <rares.mardare@grafana.com>
Date: Mon, 3 Oct 2022 15:19:24 +0300
Subject: [PATCH 2/2] remove unused

linter
---
 grafana-plugin/src/pages/schedules/Schedules.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx
index cb7b1655..9493d837 100644
--- a/grafana-plugin/src/pages/schedules/Schedules.tsx
+++ b/grafana-plugin/src/pages/schedules/Schedules.tsx
@@ -85,7 +85,7 @@ class SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSta
       query: { id },
     } = this.props;
 
-    if (!id) return;
+    if (!id) {return;}
 
     const isNewSchedule = id === 'new';
     let scheduleId = undefined;
@@ -172,7 +172,7 @@ class SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSta
         errorData={errorData}
         objectName="schedule"
         pageName="schedules"
-        itemNotFoundMessage={`Schedule with id=${query?.id} is not found. Please select schedule from the list. [AAAA]`}
+        itemNotFoundMessage={`Schedule with id=${query?.id} is not found. Please select schedule from the list.`}
       >
         {() => (
           <>