opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 16:43:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: avoid app importDashboards() NPE (#18128)

Browse Source 
* tables display

* add missing file

* adding toolbar option

* adding toolbar option

* add items to index

* use root import path

* merge master

* show tables info

* add importDashboards code

* remove table changes

* remove table changes

* use deprecation warning
This commit is contained in:
Ryan McKinley
2019-07-19 07:11:16 -07:00
committed by GitHub
parent 0ca1e90b2e
commit 06b43f6d4b
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/sources/plugins/developing/apps.md
View File

@ -37,15 +37,11 @@ export class ConfigCtrl {
postUpdate() { postUpdate() {
if (!this.appModel.enabled) { if (!this.appModel.enabled) {
return this.$q.resolve(); return;
} }
return this.appEditCtrl.importDashboards().then(() => {
this.enabled = true; // TODO, whatever you want
return { console.log('Post Update:', this);
url: "plugins/raintank-kubernetes-app/page/clusters",
message: "Kubernetes App enabled!"
};
});
} }
} }
ConfigCtrl.templateUrl = 'components/config/config.html'; ConfigCtrl.templateUrl = 'components/config/config.html';

7
packages/grafana-ui/src/utils/deprecationWarning.ts
View File

@ -1,4 +1,7 @@
export const deprecationWarning = (file: string, oldName: string, newName: string) => { export const deprecationWarning = (file: string, oldName: string, newName?: string) => {
const message = `[Deprecation warning] ${file}: ${oldName} is deprecated. Use ${newName} instead`; let message = `[Deprecation warning] ${file}: ${oldName} is deprecated`;
if (newName) {
message += `. Use ${newName} instead`;
}
console.warn(message); console.warn(message);
}; };

8
public/app/features/plugins/wrappers/AppConfigWrapper.tsx
View File

@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
import cloneDeep from 'lodash/cloneDeep'; import cloneDeep from 'lodash/cloneDeep';
import extend from 'lodash/extend'; import extend from 'lodash/extend';
import { PluginMeta, AppPlugin, Button } from '@grafana/ui'; import { PluginMeta, AppPlugin, Button, deprecationWarning } from '@grafana/ui';
import { AngularComponent, getAngularLoader } from '@grafana/runtime'; import { AngularComponent, getAngularLoader } from '@grafana/runtime';
import { getBackendSrv } from 'app/core/services/backend_srv'; import { getBackendSrv } from 'app/core/services/backend_srv';
@ -124,6 +124,12 @@ export class AppConfigCtrlWrapper extends PureComponent<Props, State> {
this.postUpdateHook = callback; this.postUpdateHook = callback;
}; };
// Stub to avoid unknown function in legacy code
importDashboards = (): Promise<void> => {
deprecationWarning('AppConfig', 'importDashboards()');
return Promise.resolve();
};
enable = () => { enable = () => {
this.model.enabled = true; this.model.enabled = true;
this.model.pinned = true; this.model.pinned = true;