Skip to content

Commit 5b46f79

Browse files
committed
[Dashboard De-Angular] Fix remaining functional test (opensearch-project#4496)
* fix dashboard state function test in group 4 Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com> * fix expanding panel Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com> --------- Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
1 parent a1d5e15 commit 5b46f79

File tree

6 files changed

+15
-2
lines changed

6 files changed

+15
-2
lines changed

src/plugins/dashboard/public/application/components/dashboard_editor.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ export const DashboardEditor = () => {
112112
isEmbeddableRendered={isEmbeddableRendered}
113113
indexPatterns={indexPatterns}
114114
dashboardContainer={dashboardContainer}
115+
dashboardIdFromUrl={dashboardIdFromUrl}
115116
/>
116117
)}
117118
</div>

src/plugins/dashboard/public/application/components/dashboard_top_nav.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ interface DashboardTopNavProps {
2323
isEmbeddableRendered: boolean;
2424
indexPatterns: IndexPattern[];
2525
dashboardContainer?: DashboardContainer;
26+
dashboardIdFromUrl?: string;
2627
}
2728

2829
export enum UrlParams {
@@ -42,6 +43,7 @@ const TopNav = ({
4243
isEmbeddableRendered,
4344
dashboardContainer,
4445
indexPatterns,
46+
dashboardIdFromUrl,
4547
}: DashboardTopNavProps) => {
4648
const [topNavMenu, setTopNavMenu] = useState<any>();
4749
const [isFullScreenMode, setIsFullScreenMode] = useState<any>();
@@ -80,6 +82,7 @@ const TopNav = ({
8082
savedDashboardInstance,
8183
services,
8284
dashboard,
85+
dashboardIdFromUrl,
8386
dashboardContainer
8487
);
8588
setTopNavMenu(
@@ -99,6 +102,7 @@ const TopNav = ({
99102
stateContainer,
100103
isEmbeddableRendered,
101104
dashboard,
105+
dashboardIdFromUrl
102106
]);
103107

104108
useEffect(() => {

src/plugins/dashboard/public/application/embeddable/grid/_dashboard_grid.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181

8282
&:hover,
8383
&:focus {
84-
background-color: $embEditingModeHoverColor;
84+
// TODO: this is a sass error, $embEditingModeHoverColor is undefined, comment it out for now
85+
//background-color: $embEditingModeHoverColor;
8586
}
8687
}
8788

src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import 'react-grid-layout/css/styles.css';
3232
import 'react-resizable/css/styles.css';
33+
import './_dashboard_grid.scss'
3334

3435
// @ts-ignore
3536
import sizeMe from 'react-sizeme';

src/plugins/dashboard/public/application/lib/save_dashboard.ts

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export function saveDashboard(
5151

5252
updateSavedDashboard(savedDashboard, appState, timeFilter, dashboard);
5353

54+
// TODO: should update Dashboard class in the if(id) block
5455
return savedDashboard.save(saveOptions).then((id: string) => {
5556
if (id) {
5657
return id;

src/plugins/dashboard/public/application/utils/get_nav_actions.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export const getNavActions = (
4848
savedDashboard: any,
4949
services: DashboardServices,
5050
dashboard: Dashboard,
51+
dashboardIdFromUrl?: string,
5152
dashboardContainer?: DashboardContainer
5253
) => {
5354
const {
@@ -390,7 +391,11 @@ export const getNavActions = (
390391
'data-test-subj': 'saveDashboardSuccess',
391392
});
392393

393-
chrome.docTitle.change(savedDashboard.lastSavedTitle);
394+
if (id !== dashboardIdFromUrl) {
395+
history.replace(createDashboardEditUrl(id));
396+
}
397+
398+
chrome.docTitle.change(savedDashboard.title);
394399
stateContainer.transitions.set('viewMode', ViewMode.VIEW);
395400
}
396401
return { id };

0 commit comments

Comments
 (0)