From 357cd072c9ad4453a5903b841dd07b8cfb820552 Mon Sep 17 00:00:00 2001
From: Yulia Shanyrova <yulia.shanyrova@grafana.com>
Date: Wed, 7 Dec 2022 11:24:23 +0100
Subject: [PATCH] Fixed error while creating schedule and fixed Schedules types
 mistakes

---
 .../NewScheduleSelector/NewScheduleSelector.tsx          | 2 +-
 .../components/SchedulesFilters_NEW/SchedulesFilters.tsx | 4 ++--
 grafana-plugin/src/models/schedule/schedule.types.ts     | 4 ++--
 grafana-plugin/src/pages/schedule/Schedule.tsx           | 9 ++++++---
 grafana-plugin/src/pages/schedules/Schedules.tsx         | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/grafana-plugin/src/components/NewScheduleSelector/NewScheduleSelector.tsx b/grafana-plugin/src/components/NewScheduleSelector/NewScheduleSelector.tsx
index b9beecb3..fdbce3d4 100644
--- a/grafana-plugin/src/components/NewScheduleSelector/NewScheduleSelector.tsx
+++ b/grafana-plugin/src/components/NewScheduleSelector/NewScheduleSelector.tsx
@@ -50,7 +50,7 @@ const NewScheduleSelector: FC<NewScheduleSelectorProps> = (props) => {
                   </VerticalGroup>
                 </HorizontalGroup>
                 <WithPermissionControl userAction={UserActions.SchedulesWrite}>
-                  <Button variant="primary" icon="plus" onClick={getCreateScheduleClickHandler(ScheduleType.API)}>
+                  <Button variant="primary" icon="plus" onClick={getCreateScheduleClickHandler(ScheduleType.Calendar)}>
                     Create
                   </Button>
                 </WithPermissionControl>
diff --git a/grafana-plugin/src/components/SchedulesFilters_NEW/SchedulesFilters.tsx b/grafana-plugin/src/components/SchedulesFilters_NEW/SchedulesFilters.tsx
index cc6ee209..2b7f6a0b 100644
--- a/grafana-plugin/src/components/SchedulesFilters_NEW/SchedulesFilters.tsx
+++ b/grafana-plugin/src/components/SchedulesFilters_NEW/SchedulesFilters.tsx
@@ -72,7 +72,7 @@ const SchedulesFilters = (props: SchedulesFiltersProps) => {
               { label: 'All', value: undefined },
               {
                 label: 'Web',
-                value: ScheduleType.API,
+                value: ScheduleType.Calendar,
               },
               {
                 label: 'ICal',
@@ -80,7 +80,7 @@ const SchedulesFilters = (props: SchedulesFiltersProps) => {
               },
               {
                 label: 'API',
-                value: ScheduleType.Calendar,
+                value: ScheduleType.API,
               },
             ]}
             value={value?.type}
diff --git a/grafana-plugin/src/models/schedule/schedule.types.ts b/grafana-plugin/src/models/schedule/schedule.types.ts
index 8b703377..c38a69eb 100644
--- a/grafana-plugin/src/models/schedule/schedule.types.ts
+++ b/grafana-plugin/src/models/schedule/schedule.types.ts
@@ -6,9 +6,9 @@ import { User } from 'models/user/user.types';
 import { UserGroup } from 'models/user_group/user_group.types';
 
 export enum ScheduleType {
-  'Calendar',
-  'Ical',
   'API',
+  'Ical',
+  'Calendar',
 }
 
 export interface RotationFormLiveParams {
diff --git a/grafana-plugin/src/pages/schedule/Schedule.tsx b/grafana-plugin/src/pages/schedule/Schedule.tsx
index b950e4c0..4039fca2 100644
--- a/grafana-plugin/src/pages/schedule/Schedule.tsx
+++ b/grafana-plugin/src/pages/schedule/Schedule.tsx
@@ -147,9 +147,12 @@ class SchedulePage extends React.Component<SchedulePageProps, SchedulePageState>
                         )}
                         <HorizontalGroup>
                           <HorizontalGroup>
-                            <Button variant="secondary" onClick={this.handleExportClick()}>
-                              Export
-                            </Button>
+                            {schedule?.type === ScheduleType.Ical && (
+                              <Button variant="secondary" onClick={this.handleExportClick()}>
+                                Export
+                              </Button>
+                            )}
+
                             {(schedule?.type === ScheduleType.Ical || schedule?.type === ScheduleType.Calendar) && (
                               <Button variant="secondary" onClick={this.handleReloadClick(scheduleId)}>
                                 Reload
diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx
index da95c17d..699108ae 100644
--- a/grafana-plugin/src/pages/schedules/Schedules.tsx
+++ b/grafana-plugin/src/pages/schedules/Schedules.tsx
@@ -209,8 +209,8 @@ class SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSta
   };
 
   handleCreateSchedule = (data: Schedule) => {
-    if (data.type === ScheduleType.API) {
-      LocationHelper.update({ page: 'schedule', id: data.id }, 'replace');
+    if (data.type === ScheduleType.Calendar) {
+      LocationHelper.update({ page: 'schedule', id: data.id }, 'partial');
     }
   };