Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dashboard] Remove modal for inter app from dashboard #198619

Merged
merged 19 commits into from
Nov 6, 2024
Merged

[Dashboard] Remove modal for inter app from dashboard #198619

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d437d39
disable modal for inter app from dashboard
rshen91 Oct 31, 2024
70c7bd4
Merge remote-tracking branch 'upstream/main' into disable-unsaved-cha…
rshen91 Nov 4, 2024
4760be3
Merge branch 'main' into disable-unsaved-changes-dashboard
rshen91 Nov 4, 2024
0ddc725
Merge remote-tracking branch 'upstream/main' into disable-unsaved-cha…
rshen91 Nov 4, 2024
d737f53
Merge remote-tracking branch 'origin/disable-unsaved-changes-dashboar…
rshen91 Nov 4, 2024
076665c
update test
rshen91 Nov 4, 2024
b9e6b82
update test
rshen91 Nov 4, 2024
da54157
Merge remote-tracking branch 'upstream/main' into disable-unsaved-cha…
rshen91 Nov 4, 2024
841b2a8
refactor
rshen91 Nov 4, 2024
cbed933
remove else if
rshen91 Nov 4, 2024
efe2233
update unit test
rshen91 Nov 4, 2024
609c9c1
another refactor
rshen91 Nov 4, 2024
4393643
remove modal click
rshen91 Nov 4, 2024
abbd263
Merge branch 'main' into disable-unsaved-changes-dashboard
rshen91 Nov 4, 2024
f3b568f
Merge branch 'main' into disable-unsaved-changes-dashboard
rshen91 Nov 5, 2024
f76a194
delete unneeded strings
rshen91 Nov 6, 2024
9e9fc3a
Merge remote-tracking branch 'origin/disable-unsaved-changes-dashboar…
rshen91 Nov 6, 2024
f79fc2c
Merge remote-tracking branch 'upstream/main' into disable-unsaved-cha…
rshen91 Nov 6, 2024
18da592
remove i18n unneeded translations
rshen91 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/core/application/core-application-browser-internal/src/application_service.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,14 @@ export class ApplicationService {

private async shouldNavigate(overlays: OverlayStart, nextAppId: string): Promise<boolean> {
const currentAppId = this.currentAppId$.value;
if (currentAppId === undefined) {
if (
currentAppId === undefined ||
(currentAppId === 'dashboards' &&
(nextAppId === 'discover' || nextAppId === 'visualize' || nextAppId === 'lens'))
) {
Copy link
Contributor

@Heenawter Heenawter Nov 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this is the best solution - having all of these hard-coded values seems... risky 🙈 Is there a reason you didn't implement this change via the app leave handler in src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx?

The attached issue was specifically meant to remove this behaviour from dashboard entirely, regardless of the destination app - so I think we should be able to keep the code changes local to the Dashboard plugin.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok - refactored in 841b2a8

return true;
}

const action = getLeaveAction(
this.appInternalStates.get(currentAppId)?.leaveHandler,
nextAppId
Expand Down
1 change: 0 additions & 1 deletion test/functional/apps/dashboard/group1/edit_visualizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ export default function ({ getService, getPageObjects }) {

await header.waitUntilLoadingHasFinished();
await appsMenu.clickLink('Visualize Library');
await common.clickConfirmOnModal();
expect(await testSubjects.exists('visualizationLandingPage')).to.be(true);
});

Expand Down