fix: link-redirect-fix

components/DocsHelp.tsx

@@ -3,18 +3,26 @@
 import extractPathWithoutFragment from '~/lib/extractPathWithoutFragment';
 
 interface DocsHelpProps {
-  markdownFile?: string;
+  FileRenderType?: '_indexmd' | 'indexmd' | 'tsx' | '_md';
 }
 
-export function DocsHelp({ markdownFile }: DocsHelpProps) {
+export function DocsHelp({ FileRenderType }: DocsHelpProps) {
   const router = useRouter();
-  const path = encodeURIComponent(router.pathname);
   const [isFormOpen, setIsFormOpen] = useState(false);
   const [feedbackStatus, setFeedbackStatus] = useState('');
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [error, setError] = useState('');
   const feedbackFormRef = useRef<HTMLFormElement>(null);
-
+  let gitredirect = '';
+  if (FileRenderType === 'tsx') {
+    gitredirect = `https://github.com/json-schema-org/website/blob/main/pages${extractPathWithoutFragment(router.asPath) + '/index.page.tsx'}`;
+  } else if (FileRenderType === '_indexmd') {
+    gitredirect = `https://github.com/json-schema-org/website/blob/main/pages${extractPathWithoutFragment(router.asPath) + '/_index.md'}`;
+  } else if (FileRenderType === 'indexmd') {
+    gitredirect = `https://github.com/json-schema-org/website/blob/main/pages${extractPathWithoutFragment(router.asPath) + '/index.md'}`;
+  } else {
+    gitredirect = `https://github.com/json-schema-org/website/blob/main/pages${extractPathWithoutFragment(router.asPath) + '.md'}`;
+  }
   async function createFeedbackHandler(event: FormEvent) {
     event.preventDefault();
     const formData = new FormData(feedbackFormRef.current!);
@@ -301,7 +309,7 @@
               target='_blank'
               rel='noreferrer'
               className='px-[16px] py-[8px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md hover:bg-gray-200 dark:hover:bg-gray-600'
-              href={`https://github.com/json-schema-org/website/blob/main/pages${markdownFile ? (markdownFile === '_indexPage' ? extractPathWithoutFragment(router.asPath) + '/_index.md' : extractPathWithoutFragment(router.asPath) + '.md') : `/${path}/index.page.tsx`}`}
+              href={gitredirect}
               data-test='edit-on-github-link'
             >
               <svg

cypress/components/DocsHelp.cy.tsx

@@ -23,10 +23,10 @@ describe('DocsHelp Component', () => {
   // Note: we are not using the mockRouter in this test file, but it is required to mock the router in the component file
 
   beforeEach(() => {
-    const markdownFile = '_index';
+    const markdownFile = '_md';
     mockRouter = mockNextRouter();
     cy.viewport(1200, 800);
-    cy.mount(<DocsHelp markdownFile={markdownFile} />);
+    cy.mount(<DocsHelp FileRenderType={markdownFile} />);
   });
 
   // should render the component correctly
@@ -241,8 +241,8 @@ describe('DocsHelp Component', () => {
     /* Note: Already checking with _index markdown file in the first test case */
 
     // render with _indexPage markdown file
-    const markdownFile = '_indexPage';
-    cy.mount(<DocsHelp markdownFile={markdownFile} />);
+    const markdownFile = 'tsx';
+    cy.mount(<DocsHelp FileRenderType={markdownFile} />);
     cy.get(DOCS_HELP).should('exist');
 
     // render without any markdown file

pages/[slug].page.tsx

@@ -22,7 +22,7 @@ export default function StaticMarkdownPage({
   frontmatter: any;
   content: any;
 }) {
-  const markdownFile = '_index';
+  const markdownFile = '_md';
   const newTitle = 'JSON Schema - ' + frontmatter.title;
   return (
     <SectionContext.Provider value={frontmatter.section || null}>
@@ -31,7 +31,7 @@ export default function StaticMarkdownPage({
       </Head>
       <Headline1>{frontmatter.title}</Headline1>
       <StyledMarkdown markdown={content} />
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/docs/index.page.tsx

@@ -8,6 +8,7 @@ import { DocsHelp } from '~/components/DocsHelp';
 
 export default function Welcome() {
   const newTitle = 'Welcome';
+  const markdownFile = 'tsx';
   return (
     <SectionContext.Provider value='docs'>
       <Head>
@@ -56,7 +57,7 @@ export default function Welcome() {
           link='/specification'
         />
       </div>
-      <DocsHelp />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft-05/index.page.tsx

@@ -33,13 +33,14 @@ export default function ImplementationsPages({
   blocks: any;
   frontmatter: any;
 }) {
+  const markdownFile = 'indexmd';
   return (
     <SectionContext.Provider value={null}>
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
       <StyledMarkdown markdown={blocks.body} />
-      <DocsHelp />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft-06/[slug].page.tsx

@@ -22,7 +22,7 @@ export default function StaticMarkdownPage({
   frontmatter: any;
   content: any;
 }) {
-  const markdownFile = '_index';
+  const markdownFile = '_md';
   const newTitle = 'JSON Schema - ' + frontmatter.title;
 
   return (
@@ -32,7 +32,7 @@ export default function StaticMarkdownPage({
       </Head>
       <Headline1>{frontmatter.title}</Headline1>
       <StyledMarkdown markdown={content} />
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft-06/index.page.tsx

@@ -31,12 +31,13 @@ export default function ImplementationsPages({
   blocks: any;
   frontmatter: any;
 }) {
+  const markdownFile = 'indexmd';
   return (
     <SectionContext.Provider value={null}>
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
-      <DocsHelp />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft-07/[slug].page.tsx

@@ -22,7 +22,7 @@ export default function StaticMarkdownPage({
   frontmatter: any;
   content: any;
 }) {
-  const markdownFile = '_index';
+  const markdownFile = '_md';
   const newTitle = 'JSON Schema - ' + frontmatter.title;
 
   return (
@@ -32,7 +32,7 @@ export default function StaticMarkdownPage({
       </Head>
       <Headline1>{frontmatter.title}</Headline1>
       <StyledMarkdown markdown={content} />
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft-07/index.page.tsx

@@ -31,12 +31,13 @@ export default function ImplementationsPages({
   blocks: any;
   frontmatter: any;
 }) {
+  const markdownFile = 'indexmd';
   return (
     <SectionContext.Provider value={null}>
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
-      <DocsHelp />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft/2019-09/[slug].page.tsx

@@ -22,7 +22,7 @@ export default function StaticMarkdownPage({
   frontmatter: any;
   content: any;
 }) {
-  const markdownFile = '_index';
+  const markdownFile = '_md';
   const newTitle = 'JSON Schema - ' + frontmatter.title;
 
   return (
@@ -32,7 +32,7 @@ export default function StaticMarkdownPage({
       </Head>
       <Headline1>{frontmatter.title}</Headline1>
       <StyledMarkdown markdown={content} />
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft/2019-09/index.page.tsx

@@ -30,12 +30,13 @@ export default function ImplementationsPages({
   blocks: any;
   frontmatter: any;
 }) {
+  const markdownFile = 'indexmd';
   return (
     <SectionContext.Provider value={null}>
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
-      <DocsHelp />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft/2020-12/[slug].page.tsx

@@ -22,7 +22,7 @@ export default function StaticMarkdownPage({
   frontmatter: any;
   content: any;
 }) {
-  const markdownFile = '_index';
+  const markdownFile = '_md';
   const newTitle = 'JSON Schema - ' + frontmatter.title;
 
   return (
@@ -32,7 +32,7 @@ export default function StaticMarkdownPage({
       </Head>
       <Headline1>{frontmatter.title}</Headline1>
       <StyledMarkdown markdown={content} />
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/draft/2020-12/index.page.tsx

@@ -30,12 +30,13 @@ export default function ImplementationsPages({
   blocks: any;
   frontmatter: any;
 }) {
+  const markdownFile = 'indexmd';
   return (
     <SectionContext.Provider value={null}>
       <Headline1>{frontmatter.title}</Headline1>
       <DocTable frontmatter={frontmatter} />
       <StyledMarkdown markdown={blocks.index} />
-      <DocsHelp />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/implementers/[slug].page.tsx

@@ -22,7 +22,7 @@ export default function StaticMarkdownPage({
   frontmatter: any;
   content: any;
 }) {
-  const markdownFile = '_index';
+  const markdownFile = '_md';
   const newTitle = 'JSON Schema - ' + frontmatter.title;
   return (
     <SectionContext.Provider value={frontmatter.section || null}>
@@ -31,7 +31,7 @@ export default function StaticMarkdownPage({
       </Head>
       <Headline1>{frontmatter.title}</Headline1>
       <StyledMarkdown markdown={content} />
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/implementers/index.page.tsx

@@ -18,7 +18,7 @@ export async function getStaticProps() {
 }
 
 export default function ContentExample({ blocks }: { blocks: any[] }) {
-  const markdownFile = '_indexPage';
+  const markdownFile = '_indexmd';
 
   return (
     <SectionContext.Provider value='docs'>
@@ -45,7 +45,7 @@ export default function ContentExample({ blocks }: { blocks: any[] }) {
           />
         </div>
       </section>
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/learn/[slug].page.tsx

@@ -22,7 +22,7 @@ export default function StaticMarkdownPage({
   frontmatter: any;
   content: any;
 }) {
-  const markdownFile = '_index';
+  const markdownFile = '_md';
   const newTitle = 'JSON Schema - ' + frontmatter.title;
   return (
     <SectionContext.Provider value={frontmatter.section || null}>
@@ -31,7 +31,7 @@ export default function StaticMarkdownPage({
       </Head>
       <Headline1>{frontmatter.title}</Headline1>
       <StyledMarkdown markdown={content} />
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/learn/getting-started-step-by-step/index.page.tsx

@@ -30,7 +30,7 @@ export async function getStaticProps() {
 
 export default function StyledValidator({ blocks }: { blocks: any[] }) {
   const newTitle = 'Creating your first schema';
-
+  const markdownFile = 'tsx';
   return (
     <SectionContext.Provider value='docs'>
       <Head>
@@ -40,7 +40,7 @@ export default function StyledValidator({ blocks }: { blocks: any[] }) {
       <StyledMarkdown markdown={blocks[0]} />
       <GettingStarted />
       <StyledMarkdown markdown={blocks[1]} />
-      <DocsHelp />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/learn/index.page.tsx

@@ -7,7 +7,7 @@ import Card from '~/components/Card';
 import { DocsHelp } from '~/components/DocsHelp';
 
 export default function Welcome() {
-  const markdownFile = '_indexPage';
+  const markdownFile = 'tsx';
 
   const newTitle = 'Getting Started';
   return (
@@ -39,7 +39,7 @@ export default function Welcome() {
           link='https://tour.json-schema.org/'
         />
       </div>
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/overview/[slug].page.tsx

@@ -22,7 +22,7 @@ export default function StaticMarkdownPage({
   frontmatter: any;
   content: any;
 }) {
-  const markdownFile = '_index';
+  const markdownFile = '_md';
   const newTitle = 'JSON Schema - ' + frontmatter.title;
 
   return (
@@ -32,7 +32,7 @@ export default function StaticMarkdownPage({
       </Head>
       <Headline1>{frontmatter.title}</Headline1>
       <StyledMarkdown markdown={content} />
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/overview/case-studies/index.page.tsx

@@ -10,7 +10,7 @@ import { useTheme } from 'next-themes';
 
 export default function ContentExample() {
   const newTitle = 'Case Studies';
-  const markdownFile = '_indexPage';
+  const markdownFile = 'tsx';
   const { resolvedTheme } = useTheme();
 
   const imgUrl = (src: string): string => {
@@ -47,7 +47,7 @@ export default function ContentExample() {
           />
         ))}
       </div>
-      <DocsHelp markdownFile={markdownFile} />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }

pages/overview/code-of-conduct/index.page.tsx

@@ -22,14 +22,14 @@ export async function getStaticProps() {
 
 export default function Content({ blocks }: { blocks: any[] }) {
   const newTitle = 'Code of Conduct';
-
+  const markdownFile = '_indexmd';
   return (
     <SectionContext.Provider value='docs'>
       <Head>
         <title>{newTitle}</title>
       </Head>
       <StyledMarkdown markdown={blocks[0]} />
-      <DocsHelp />
+      <DocsHelp FileRenderType={markdownFile} />
     </SectionContext.Provider>
   );
 }