Merge pull request #1800 from iFixit/troubleshooting-use--guide-flag

iFixit · Jul 6, 2023 · 308fc4c · 308fc4c · vercel · Jul 6, 2023
2 parents 1e75003 + f744fac
commit 308fc4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/frontend/templates/troubleshooting/hooks/useTroubleshootingProps.tsx b/frontend/templates/troubleshooting/hooks/useTroubleshootingProps.tsx
@@ -25,7 +25,7 @@ export type Problem = {
 };
 
 export type ApiSolutionSection = Section & {
-   guides: number[];
+   guides: Guide[];
    products: string[];
 };
 

diff --git a/frontend/templates/troubleshooting/server.tsx b/frontend/templates/troubleshooting/server.tsx
@@ -10,7 +10,6 @@ import {
    ApiSolutionSection,
    SolutionSection,
 } from './hooks/useTroubleshootingProps';
-import { Guide } from './hooks/GuideModel';
 import Product from '@pages/api/nextjs/cache/product';
 import type { Product as ProductType } from '@models/product';
 import {
@@ -56,16 +55,6 @@ export const getServerSideProps: GetServerSideProps<TroubleshootingProps> =
       async function fetchDataForSolution(
          solution: ApiSolutionSection
       ): Promise<SolutionSection> {
-         const guides = await Promise.all(
-            solution.guides.map((guideid: number) => {
-               return (
-                  client.get(`guides/${guideid}`, 'guide') as Promise<Guide>
-               ).catch((error) => {
-                  rethrowUnless404(error);
-                  return null;
-               });
-            })
-         );
          const products: ('' | null | ProductType)[] = await Promise.all(
             solution.products.map((handle: string | null) => {
                return (
@@ -86,7 +75,6 @@ export const getServerSideProps: GetServerSideProps<TroubleshootingProps> =
          );
          return {
             ...solution,
-            guides: guides.filter((guide): guide is Guide => Boolean(guide)),
             products: products.filter((product): product is ProductType =>
                Boolean(product)
             ),
@@ -96,7 +84,7 @@ export const getServerSideProps: GetServerSideProps<TroubleshootingProps> =
       let troubleshootingData: TroubleshootingApiData;
       try {
          troubleshootingData = await client.get<TroubleshootingApiData>(
-            `Troubleshooting/${wikiname}?vulcan=1`,
+            `Troubleshooting/${wikiname}?vulcan=1&fullGuides=1`,
             'troubleshooting'
          );
       } catch (e) {