Revert "fix double redirect bug"

This reverts commit 5d7f3702199e268d24340e954df7c41707f15eac.

Signed-off-by: Jonathan Roebuck <jroebuck@spotify.com>
This commit is contained in:
Jonathan Roebuck
2024-11-06 08:52:27 +00:00
parent 85db4aec87
commit 67b04f0e0c
2 changed files with 8 additions and 6 deletions
@@ -187,7 +187,7 @@ export const useTechDocsReaderDom = (
const postRender = useCallback(
async (transformedElement: Element) =>
transformer(transformedElement, [
handleMetaRedirects(entityRef.name),
handleMetaRedirects(navigate, entityRef.name),
scrollIntoNavigation(),
copyToClipboard(theme),
addLinkClickListener({
@@ -20,7 +20,10 @@ import React from 'react';
import { renderReactElement } from './renderReactElement';
import { TechDocsRedirectNotification } from '../components/TechDocsRedirectNotification';
export const handleMetaRedirects = (entityName: string): Transformer => {
export const handleMetaRedirects = (
navigate: (to: string) => void,
entityName: string,
): Transformer => {
const redirectAfterMs = 3000;
const determineRedirectURL = (metaUrl: string) => {
@@ -52,6 +55,7 @@ export const handleMetaRedirects = (entityName: string): Transformer => {
if (!metaContentParameters || metaContentParameters.length < 2) {
return dom;
}
const metaUrl = metaContentParameters[1];
const redirectURL = determineRedirectURL(metaUrl);
@@ -65,9 +69,7 @@ export const handleMetaRedirects = (entityName: string): Transformer => {
renderReactElement(
<TechDocsRedirectNotification
message="This TechDocs page is no longer maintained. Will automatically redirect to the designated replacement."
handleButtonClick={() => {
window.location.href = redirectURL;
}}
handleButtonClick={() => navigate(redirectURL)}
autoHideDuration={redirectAfterMs}
/>,
container,
@@ -75,7 +77,7 @@ export const handleMetaRedirects = (entityName: string): Transformer => {
document.body.appendChild(container);
setTimeout(() => {
window.location.href = redirectURL;
navigate(redirectURL);
}, redirectAfterMs);
return dom;