DEV-14382/15122 glossary issues

src/js/components/glossary/definition/GlossaryDefinition.jsx

@@ -36,24 +36,7 @@ const GlossaryDefinition = ({ glossary }) => {
     const handleShareDispatch = (url) => {
         dispatch(showModal(url));
     };
-    // preserving in case it is needed
-    // let copyConfirmation = null;
-
-    // const getCopyFn = () => {
-    //     const separator = window.location.href.includes('?') ? '&' : '?';
-    //     const slug = `${separator}glossary=${props.glossary.term.toJS().slug}`;
-    //     const value = window.location.href.includes("glossary") ? window.location.href : window.location.href + slug;
-    //     if (window.navigator && window.navigator.clipboard && window.navigator.clipboard.writeText) {
-    //         window.navigator.clipboard.writeText(value);
-    //         setShowCopiedConfirmation(true);
-    //         copyConfirmation = window.setTimeout(() => {
-    //             setShowCopiedConfirmation(false);
-    //         }, 1750);
-    //     }
-    // };
-    // useEffect(() => window.clearTimeout(copyConfirmation), []);
-
-
+
     const checkDefinitions = () => {
         let hasPlainLocal = false;
         let hasOfficialLocal = false;

src/js/components/sharedComponents/AboutTheDataLink.jsx

@@ -33,12 +33,12 @@ const AboutTheDataLink = ({ slug, children }) => {
     // there is already a search query
     if (search && !search.includes('about-the-data')) {
         // url with original search &about-the-data={term}
-        newUrl = `${pathname}${search}&about-the-data=${entry.slug}`;
+        newUrl = `${pathname}${search}`;
     }
     else {
         // url with search term as query
         newUrl = getNewUrlForGlossary(
-            pathname, `?about-the-data=${entry.slug}`, urlSearchParam
+            pathname, urlSearchParam
         );
     }
 

src/js/components/sharedComponents/GlossaryLink.jsx

@@ -34,9 +34,10 @@ const GlossaryLink = ({
     const { pathname, search } = useLocation();
     const params = new URLSearchParams(search);
     params.set('glossary', term)
-    const glossaryUrl = `${pathname}?${params.toString()}`
+    const glossaryUrl = `${pathname}`
 
     const stopBubble = (e) => {
+        e.preventDefault();
         e.stopPropagation();
         showSlideout('glossary', { url: term });
     };