Upgrade to Grafana 8.0.0 (#67)

* Upgrade to Grafana 8.0.0

* Fix tests

Author: mikhail-vl

CHANGELOG.md

@@ -1,11 +1,12 @@
 # Change Log
 
-## 1.3.0 (IN PROGRESS)
+## 2.0.0 (IN PROGRESS)
 
 ### Bug fixes
 
 - "Available Requirements" panel should be set to $redis datasource #63
 - Cannot read property 'v1' of undefined (theme.v1) in the Grafana8 #65
+- Upgrade to Grafana 8.0.2
 
 ## 1.2.0 (2021-05-11)
 

README.md

@@ -43,7 +43,8 @@ All dashboards are available from the application's icon in the left side menu.
 
 ### Requirements
 
-Only **Grafana 7.1+** with a new Backend plug-in platform supports Redis plug-ins.
+- **Grafana 8.0** is required for Redis Application 2.X.
+- **Grafana 7.1+** is required for Redis Application 1.X.
 
 ## Getting Started
 

appveyor.yml

@@ -1,5 +1,5 @@
 import { configure } from 'enzyme';
-import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
+import Adapter from 'enzyme-adapter-react-16';
 
 /**
  * Configure for React

config/jest-setup.ts

@@ -2,16 +2,17 @@
   "author": "RedisGrafana",
   "description": "Redis Application for Grafana",
   "devDependencies": {
-    "@grafana/data": "7.5.4",
-    "@grafana/runtime": "7.5.4",
-    "@grafana/toolkit": "7.5.4",
-    "@grafana/ui": "7.5.4",
-    "@monaco-editor/react": "^4.1.1",
+    "@grafana/data": "8.0.2",
+    "@grafana/runtime": "8.0.2",
+    "@grafana/toolkit": "8.0.2",
+    "@grafana/ui": "8.0.2",
+    "@monaco-editor/react": "^4.2.0",
     "@types/enzyme": "^3.10.8",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
-    "emotion": "10.0.27",
+    "@types/enzyme-adapter-react-16": "^1.0.6",
+    "emotion": "11.0.0",
     "enzyme": "^3.11.0",
-    "tslib": "^2.2.0"
+    "enzyme-adapter-react-16": "^1.15.6",
+    "tslib": "^2.3.0"
   },
   "engines": {
     "node": ">=12"
@@ -25,13 +26,12 @@
     "sign": "grafana-toolkit plugin:sign",
     "start": "docker-compose up",
     "start:dev": "docker-compose -f docker-compose/dev.yml up",
-    "start:dev-7.2.1": "docker-compose -f docker-compose/dev-7.2.1.yml up",
     "start:master": "docker-compose -f docker-compose/master.yml pull && docker-compose -f docker-compose/master.yml up",
     "stop": "docker-compose down",
     "stop:dev": "docker-compose -f docker-compose/dev.yml down",
     "test": "grafana-toolkit plugin:test --coverage",
     "upgrade": "yarn upgrade --latest",
     "watch": "grafana-toolkit plugin:dev --watch"
   },
-  "version": "1.3.0"
+  "version": "2.0.0"
 }

docker-compose/dev-7.2.1.yml

@@ -1,6 +1,7 @@
-import React from 'react';
-import { config, setLocationSrv } from '@grafana/runtime';
 import { shallow } from 'enzyme';
+import React from 'react';
+import { setLocationSrv } from '@grafana/runtime';
+import { ApplicationRoot } from '../../constants';
 import { Config } from './config';
 
 /*
@@ -18,8 +19,6 @@ const getPlugin = (overridePlugin: any = { meta: {} }) => ({
  Config
  */
 describe('Config', () => {
-  let initialDataSources = config.datasources;
-
   beforeAll(() => {
     jest.spyOn(Config, 'getLocation').mockImplementation((): any => ({
       assign: jest.fn(),
@@ -31,67 +30,41 @@ describe('Config', () => {
    Initialization
    */
   describe('Initialization', () => {
-    it('If plugin is not enabled, state should have isEnabled = false and isConfigured = false', () => {
-      const plugin = getPlugin({ meta: { enabled: false } });
-      config.datasources = {
-        redis: {
-          type: 'redis-datasource',
-        } as any,
-      };
+    it('If plugin is not enabled and meta is not set, state should have isEnabled = false', () => {
+      const plugin = getPlugin({});
       const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
-      expect(wrapper.state().isEnabled).toBeFalsy();
-      expect(wrapper.state().isConfigured).toBeFalsy();
+      expect(wrapper.state().isEnabled).toBeTruthy();
     });
 
-    it('If plugin is enabled but config does not have needed datasources, state should have isEnabled = true and isConfigured = false', () => {
-      const plugin = getPlugin({ meta: { enabled: true } });
-      config.datasources = {};
+    it('If plugin is not enabled, state should have isEnabled = false', () => {
+      const plugin = getPlugin({ meta: { enabled: false } });
       const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
-      expect(wrapper.state().isEnabled).toBeTruthy();
-      expect(wrapper.state().isConfigured).toBeFalsy();
+      expect(wrapper.state().isEnabled).toBeFalsy();
     });
 
-    it('If plugin is enabled and config has needed datasources, state should have isEnabled = true and isConfigured = true', () => {
+    it('If plugin is enabled, state should have isEnabled = true', () => {
       const plugin = getPlugin({ meta: { enabled: true } });
-      config.datasources = {
-        redis: {
-          type: 'redis-datasource',
-        } as any,
-      };
       const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
       expect(wrapper.state().isEnabled).toBeTruthy();
-      expect(wrapper.state().isConfigured).toBeTruthy();
     });
   });
 
   /*
    Rendering
    */
   describe('rendering', () => {
-    beforeAll(() => {
-      config.datasources = {
-        redis: {
-          type: 'redis-datasource',
-        } as any,
-      };
-    });
-
-    it('If plugin is not configured, should show only enable button', () => {
+    it('If plugin is not configured, should show enable button', () => {
       const plugin = getPlugin({ meta: { enabled: false } });
       const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
       const enableButton = wrapper.findWhere((node) => node.name() === 'Button' && node.text() === 'Enable');
-      const updateButton = wrapper.findWhere((node) => node.name() === 'Button' && node.text() === 'Update');
       expect(enableButton.exists()).toBeTruthy();
-      expect(updateButton.exists()).not.toBeTruthy();
     });
 
-    it('If plugin is configured, should show update and disable buttons', () => {
+    it('If plugin is configured, should show disable buttons', () => {
       const plugin = getPlugin({ meta: { enabled: true } });
       const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
       const disableButton = wrapper.findWhere((node) => node.name() === 'Button' && node.text() === 'Disable');
-      const updateButton = wrapper.findWhere((node) => node.name() === 'Button' && node.text() === 'Update');
       expect(disableButton.exists()).toBeTruthy();
-      expect(updateButton.exists()).toBeTruthy();
     });
 
     it('Enable button should call onEnable method', () => {
@@ -113,38 +86,12 @@ describe('Config', () => {
       disableButton.simulate('click');
       expect(testedMethod).toHaveBeenCalled();
     });
-
-    it('Update button should call onUpdate method', () => {
-      const plugin = getPlugin({ meta: { enabled: true } });
-      const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
-      const testedMethod = jest.spyOn(wrapper.instance(), 'onUpdate').mockImplementation(() => null);
-      wrapper.instance().forceUpdate();
-      const updateButton = wrapper.findWhere((node) => node.name() === 'Button' && node.text() === 'Update');
-      updateButton.simulate('click');
-      expect(testedMethod).toHaveBeenCalled();
-    });
   });
 
   /*
    Methods
    */
   describe('Methods', () => {
-    it('onUpdate should call goHome method', () => {
-      const plugin = getPlugin({ meta: { enabled: true } });
-      const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
-      const testedMethod = jest.spyOn(wrapper.instance(), 'goHome').mockImplementation();
-      wrapper.instance().onUpdate();
-      expect(testedMethod).toHaveBeenCalled();
-    });
-
-    it('onUpdate should not call goHome method if enabled=false', () => {
-      const plugin = getPlugin({ meta: { enabled: false } });
-      const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
-      const testedMethod = jest.spyOn(wrapper.instance(), 'goHome').mockImplementation();
-      wrapper.instance().onUpdate();
-      expect(testedMethod).not.toHaveBeenCalled();
-    });
-
     it('onDisable should call updatePluginSettings method', () => {
       const plugin = getPlugin({ meta: { enabled: true } });
       const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
@@ -186,14 +133,13 @@ describe('Config', () => {
       const wrapper = shallow<Config>(<Config plugin={plugin} query={null as any} />);
       wrapper.instance().goHome();
       expect(updateLocationMock).toHaveBeenCalledWith({
-        path: 'a/redis-app/',
+        path: ApplicationRoot,
         partial: false,
       });
     });
   });
 
   afterAll(() => {
-    config.datasources = initialDataSources;
     jest.resetAllMocks();
   });
 });