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

DashboardSettings: Fixed modal issue (#23155)

Browse Source 
Fixes #23148
This commit is contained in:
Torkel Ödegaard 2020-03-28 07:51:15 +01:00 committed by GitHub
parent f2337c9855
commit 366aa6b5d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 96 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/dashboard/containers/DashboardPage.tsx
View File

@ -319,11 +319,7 @@ export class DashboardPage extends PureComponent<Props, State> {
<PanelEditor dashboard={dashboard} sourcePanel={editPanel} />
</Portal>
)}
{editview && (
<Portal>
<DashboardSettings dashboard={dashboard} updateLocation={updateLocation} />
</Portal>
)}
{editview && <DashboardSettings dashboard={dashboard} updateLocation={updateLocation} />}
</div>
);
}

2
public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
View File

@ -667,7 +667,6 @@ exports[`DashboardPage When dashboard has editview url state should render setti
</div>
</CustomScrollbar>
</div>
<Portal>
<DashboardSettings
dashboard={
DashboardModel {
@ -767,6 +766,5 @@ exports[`DashboardPage When dashboard has editview url state should render setti
}
updateLocation={[MockFunction]}
/>
</Portal>
</div>
`;

2
public/sass/components/_dashboard_settings.scss
View File

@ -6,7 +6,7 @@
left: 0;
right: 0;
bottom: 0;
z-index: $zindex-modal;
z-index: $zindex-sidemenu;
background: $body-bg;
display: flex;
flex-direction: column;