Skip to content

Support new notebooks URL for reporting #373

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

Merged
rupal-bq merged 1 commit into from
Apr 17, 2023
Merged

Support new notebooks URL for reporting #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions public/components/notebooks/components/helpers/__tests__/legacy_route_helpers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ describe('Test legacy route helpers', () => {
},
] as Location[];
const expected = [
'/app/observability-dashboards#/notebooks/GQ5icXwBJCegTOBKO4Um',
'/app/observability-dashboards#/notebooks/clPiPXwBEM7l9gC0xTpA?view=view_both',
`/testBasePath/app/observability-dashboards#/notebooks/GQ5icXwBJCegTOBKO4Um?_g=(time:(from:'2021-10-15T20:25:09.556Z',to:'2021-10-15T20:55:09.556Z'))&view=output_only&security_tenant=global`,
] as RedirectProps['to'][];
'/app/observability-notebooks#/GQ5icXwBJCegTOBKO4Um',
'/app/observability-notebooks#/clPiPXwBEM7l9gC0xTpA?view=view_both',
`/testBasePath/app/observability-notebooks#/GQ5icXwBJCegTOBKO4Um?_g=(time:(from:'2021-10-15T20:25:09.556Z',to:'2021-10-15T20:55:09.556Z'))&view=output_only&security_tenant=global`,
] as Array<RedirectProps['to']>;
expect(locations.map((location) => convertLegacyNotebooksUrl(location))).toEqual(expected);
});
});
8 changes: 4 additions & 4 deletions public/components/notebooks/components/helpers/legacy_route_helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { observabilityID } from "../../../../../common/constants/shared";
import { observabilityNotebookID } from '../../../../../common/constants/shared';

export const convertLegacyNotebooksUrl = (location: Location)=> {
const pathname = location.pathname.replace('notebooks-dashboards', observabilityID);
const hash = `#/notebooks${location.hash.replace(/^#/, '')}${
export const convertLegacyNotebooksUrl = (location: Location) => {
const pathname = location.pathname.replace('notebooks-dashboards', observabilityNotebookID);
const hash = `${location.hash}${
location.hash.includes('?') ? location.search.replace(/^\?/, '&') : location.search
}`;
return pathname + hash;
Expand Down
3 changes: 1 addition & 2 deletions public/components/notebooks/components/helpers/reporting_context_menu_helper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ export const generateInContextReport = async (
toggleReportingLoadingModal(true);
let baseUrl =
location.pathname +
location.hash.replace(/\?view=(view_both|input_only|output_only)/, '') +
'?view=output_only';
location.hash.replace(/view=(view_both|input_only|output_only)/, 'view=output_only');
// Add selected tenant info to url
try {
const tenant = await getTenantInfoIfExists();
Expand Down