IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Fix typescript strict null fixes now at 298 (#26125)

Browse Source 
* Chore: Fix typescript strict null errors

* Added new limit

* Fixed ts issue

* fixed tests

* trying to fix type inference

* Fixing more ts errors

* Revert tsconfig option

* Fix

* Fixed code

* More fixes

* fix tests

* Updated snapshot

* Chore: More ts strict null fixes

* More fixes in some really messed up azure config components

* More fixes, current count: 441

* 419

* More fixes

* Fixed invalid initial state in explore

* Fixing tests

* Fixed tests

* Explore fix

* More fixes

* Progress

* Sub 300

* Fixed incorrect type

* removed unused import
This commit is contained in:
Torkel Ödegaard
2020-07-08 11:05:20 +02:00
committed by GitHub
parent 89b56782c6
commit fd44c01675
103 changed files with 386 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/search/components/DashboardListPage.tsx
View File

@@ -21,6 +21,7 @@ export const DashboardListPage: FC<Props> = memo(({ navModel, uid, url }) => {
if (!uid || !url.startsWith('/dashboards')) {
return Promise.resolve({ pageNavModel: navModel });
}
return loadFolderPage(uid!, 'manage-folder-dashboards').then(({ folder, model }) => {
const path = locationUtil.stripBaseFromUrl(folder.url);
@@ -33,7 +34,7 @@ export const DashboardListPage: FC<Props> = memo(({ navModel, uid, url }) => {
}, [uid]);
return (
<Page navModel={value?.pageNavModel}>
<Page navModel={value?.pageNavModel ?? navModel}>
<Page.Contents isLoading={loading}>
<ManageDashboards folder={value?.folder} />
</Page.Contents>

6
public/app/features/search/loaders.ts
View File

@@ -41,14 +41,14 @@ export const loadFolderPage = (uid: string, activeChildId: string) => {
const folderUrl = folder.url;
navModel.main.text = folderTitle;
const dashTab = navModel.main.children.find((child: any) => child.id === 'manage-folder-dashboards');
const dashTab = navModel.main.children!.find((child: any) => child.id === 'manage-folder-dashboards');
dashTab!.url = folderUrl;
if (folder.canAdmin) {
const permTab = navModel.main.children.find((child: any) => child.id === 'manage-folder-permissions');
const permTab = navModel.main.children!.find((child: any) => child.id === 'manage-folder-permissions');
permTab!.url = folderUrl + '/permissions';
const settingsTab = navModel.main.children.find((child: any) => child.id === 'manage-folder-settings');
const settingsTab = navModel.main.children!.find((child: any) => child.id === 'manage-folder-settings');
settingsTab!.url = folderUrl + '/settings';
} else {
navModel.main.children = [dashTab!];