Merge pull request 'API-related fixes' (#10) from api-related-fixes into master

Reviewed-on: #10

src/panels/corpglory-dataexporter-panel/components/Panel.tsx

@@ -1,6 +1,6 @@
 import { PanelOptions, ExportTask, DashboardQuery, DatasourceType, ExportStatus, PanelStatus } from '../types';
 
-import { convertTimestampToDate, getDashboardUid } from '../../../utils';
+import { convertTimestampToDate, convertTimeZoneTypeToName, getDashboardUid } from '../../../utils';
 import { CLOSE_ICON_BASE_64, DOWNLOAD_ICON_BASE_64, SELECT_ICON_BASE_64, UNSELECT_ICON_BASE_64 } from '../../../icons';
 
 import { deleteTask, getStaticFile, getTasks, queryApi } from '../../../services/api_service';
@@ -43,7 +43,7 @@ const APP_ID = 'corpglory-dataexporter-app';
 
 interface Props extends PanelProps<PanelOptions> {}
 
-export function Panel({ width, height, timeRange, eventBus }: Props) {
+export function Panel({ width, height, timeRange, eventBus, timeZone }: Props) {
   // TODO: Dashboard type
   const [dashboard, setDashboard] = useState<any | null>(null);
   const [datasources, setDatasources] = useState<DataSourceSettings[] | null>(null);
@@ -60,6 +60,8 @@ export function Panel({ width, height, timeRange, eventBus }: Props) {
 
   const [panelStatus, setPanelStatus] = useState<PanelStatus>(PanelStatus.LOADING);
 
+  const timeZoneName = convertTimeZoneTypeToName(timeZone);
+
   if (contextSrv.user.orgRole !== OrgRole.Admin) {
     // TODO: it shouldn't be overriten
     setPanelStatus(PanelStatus.PERMISSION_ERROR);
@@ -100,12 +102,11 @@ export function Panel({ width, height, timeRange, eventBus }: Props) {
       }
 
       panel.targets?.forEach((target: DataQuery) => {
-        console.log('uid', target.datasource?.uid);
         const datasource = getDatasourceByUid(target.datasource?.uid);
         if (!datasource) {
           return;
         }
-        queries.push({ ...target, selected: false, panel, datasource });
+        queries.push({ selected: false, target, panel, datasource });
       });
 
       setQueries(queries);
@@ -167,7 +168,7 @@ export function Panel({ width, height, timeRange, eventBus }: Props) {
     return datasource;
   }
 
-  async function onAddTaskClick(): Promise<void> {
+  async function onAddTaskClick(timeZoneName: string): Promise<void> {
     const selectedQueries = _.filter(queries, (query: DashboardQuery) => query.selected);
     const timerange: [number, number] = [selectedTimeRange.from.unix(), selectedTimeRange.to.unix()];
 
@@ -186,6 +187,7 @@ export function Panel({ width, height, timeRange, eventBus }: Props) {
       data: {
         task,
         url: window.location.toString(),
+        timeZoneName,
       },
     });
 
@@ -246,7 +248,7 @@ export function Panel({ width, height, timeRange, eventBus }: Props) {
         {
           name: 'RefId',
           type: FieldType.string,
-          values: _.map(queries, (query) => query.refId),
+          values: _.map(queries, (query) => query.target.refId),
         },
         {
           name: 'Datasource',
@@ -438,7 +440,7 @@ export function Panel({ width, height, timeRange, eventBus }: Props) {
                   <Button
                     variant="primary"
                     aria-label="Add task button"
-                    onClick={onAddTaskClick}
+                    onClick={() => onAddTaskClick(timeZoneName)}
                     // TODO: move to function
                     disabled={!queries?.filter((query: DashboardQuery) => query.selected)?.length}
                   >

src/panels/corpglory-dataexporter-panel/types.ts

@@ -43,8 +43,9 @@ export type ExportTask = {
   id?: string;
 };
 
-export type DashboardQuery = DataQuery & {
+export type DashboardQuery = {
   selected: boolean;
+  target: DataQuery;
   panel: PanelModel;
   datasource: DataSourceSettings;
 };

src/utils/index.ts

@@ -1,4 +1,4 @@
-import { AppEvents } from '@grafana/data';
+import { AppEvents, TimeZone } from '@grafana/data';
 // @ts-ignore
 import appEvents from 'grafana/app/core/app_events';
 
@@ -28,3 +28,14 @@ export function convertTimestampToDate(timestamp?: number): string {
     new Date(timestamp).toLocaleString('en-GB', options):
     '-';
 }
+
+export function convertTimeZoneTypeToName(timeZone: TimeZone): string {
+  switch (timeZone) {
+    case 'utc':
+      return 'Etc/UTC';
+    case 'browser':
+      return Intl.DateTimeFormat().resolvedOptions().timeZone;
+    default:
+      return timeZone;
+  }
+}