Merge pull request #15371 from grafana/react-panels-request-id-fix

Fixed issue with gauge requests being cancelled

public/app/features/dashboard/dashgrid/DataPanel.tsx

@@ -28,7 +28,7 @@ interface RenderProps {
 export interface Props {
 export interface Props {
   datasource: string | null;
   datasource: string | null;
   queries: any[];
   queries: any[];
-  panelId?: number;
+  panelId: number;
   dashboardId?: number;
   dashboardId?: number;
   isVisible?: boolean;
   isVisible?: boolean;
   timeRange?: TimeRange;
   timeRange?: TimeRange;
@@ -50,7 +50,6 @@ export interface State {
 export class DataPanel extends Component<Props, State> {
 export class DataPanel extends Component<Props, State> {
   static defaultProps = {
   static defaultProps = {
     isVisible: true,
     isVisible: true,
-    panelId: 1,
     dashboardId: 1,
     dashboardId: 1,
   };
   };
 
 

public/app/features/dashboard/dashgrid/PanelChrome.tsx

@@ -149,6 +149,7 @@ export class PanelChrome extends PureComponent<Props, State> {
                 this.renderPanel(false, panel.snapshotData, width, height)
                 this.renderPanel(false, panel.snapshotData, width, height)
               ) : (
               ) : (
                 <DataPanel
                 <DataPanel
+                  panelId={panel.id}
                   datasource={datasource}
                   datasource={datasource}
                   queries={targets}
                   queries={targets}
                   timeRange={timeRange}
                   timeRange={timeRange}