Page fixing update

wasp-lang · Jun 29, 2023 · c209077 · c209077
1 parent 88a8f6a
commit c209077
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/wasp-ai/src/client/pages/MainPage.jsx b/wasp-ai/src/client/pages/MainPage.jsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, useMemo } from "react";
 import startGeneratingNewApp from "@wasp/actions/startGeneratingNewApp";
 import { StatusPill } from "../components/StatusPill";
 import { useHistory } from "react-router-dom";
@@ -55,9 +55,11 @@ const MainPage = () => {
     },
   ];
   // Pick random 3 ideas
-  const ideasToDisplay = poolOfExampleIdeas
-    .sort(() => Math.random() - Math.random())
-    .slice(0, 3);
+  const ideasToDisplay = useMemo(
+    () =>
+      poolOfExampleIdeas.sort(() => Math.random() - Math.random()).slice(0, 3),
+    []
+  );
 
   function useIdea(idea) {
     setAppName(idea.name);

diff --git a/waspc/src/Wasp/AI/GenerateNewProject.hs b/waspc/src/Wasp/AI/GenerateNewProject.hs
@@ -76,7 +76,7 @@ generateNewProject newProjectDetails waspProjectSkeletonFiles = do
 
   writeToLog "Fixing any mistakes in pages..."
   forM_ (getPageComponentPath <$> pages) $ \pageFp -> do
-    fixPageComponent newProjectDetails waspFilePath pageFp actions queries
+    fixPageComponent newProjectDetails waspFilePath pageFp
     writeToLog $ T.pack $ "Fixed '" <> pageFp <> "' page."
   writeToLog "Pages fixed."
 

diff --git a/waspc/src/Wasp/AI/GenerateNewProject/PageComponentFile.hs b/waspc/src/Wasp/AI/GenerateNewProject/PageComponentFile.hs
@@ -19,12 +19,11 @@ import Wasp.AI.GenerateNewProject.Common
   )
 import Wasp.AI.GenerateNewProject.Common.Prompts (appDescriptionBlock)
 import qualified Wasp.AI.GenerateNewProject.Common.Prompts as Prompts
-import Wasp.AI.GenerateNewProject.Operation (Operation)
-import Wasp.AI.GenerateNewProject.Page (operationInfo, pageDocPrompt)
+import Wasp.AI.GenerateNewProject.Page (pageDocPrompt)
 import Wasp.AI.OpenAI.ChatGPT (ChatMessage (..), ChatRole (..))
 
-fixPageComponent :: NewProjectDetails -> FilePath -> FilePath -> [Operation] -> [Operation] -> CodeAgent ()
-fixPageComponent newProjectDetails waspFilePath pageComponentPath actions queries = do
+fixPageComponent :: NewProjectDetails -> FilePath -> FilePath -> CodeAgent ()
+fixPageComponent newProjectDetails waspFilePath pageComponentPath = do
   currentWaspFileContent <- fromMaybe (error "couldn't find wasp file") <$> getFile waspFilePath
   currentPageComponentContent <- fromMaybe (error "couldn't find page file to fix") <$> getFile pageComponentPath
   fixedPageComponent <-
@@ -35,9 +34,6 @@ fixPageComponent newProjectDetails waspFilePath pageComponentPath actions querie
       ]
   writeToFile pageComponentPath (const $ pageComponentImpl fixedPageComponent)
   where
-    actionsInfo = T.intercalate "\n" $ (" - " <>) . operationInfo <$> actions
-    queriesInfo = T.intercalate "\n" $ (" - " <>) . operationInfo <$> queries
-
     fixPageComponentPrompt currentWaspFileContent currentPageContent =
       [trimming|
           ${basicWaspLangInfoPrompt}
@@ -48,11 +44,6 @@ fixPageComponent newProjectDetails waspFilePath pageComponentPath actions querie
 
           We are together building a new Wasp app (description at the end of prompt).
 
-          Here is a wasp file that we generated together so far:
-          ```wasp
-          ${currentWaspFileContent}
-          ```
-
           Here is a React component (${pageComponentPathText}) containing some frontend code
           that we generated together earlier:
           ```js
@@ -61,24 +52,30 @@ fixPageComponent newProjectDetails waspFilePath pageComponentPath actions querie
 
           ===============
 
-          The NodeJS file with operations likely has some mistakes: let's fix it!
+          The React component probably has some mistakes: let's fix it!
 
           Some common mistakes to look for:
-            - Make sure to use only queries and actions that are defined in the Wasp file (listed below)
-            - You should import queries from "@wasp/queries/{queryName}" like import getTask from '@wasp/queries/getTasks';
-            - You should import actions from "@wasp/actions/{actionName}" like import createTask from '@wasp/actions/createTask';
+            - Make sure to use only queries and actions that are defined in the Wasp file (listed below)!
+            - You should import queries from "@wasp/queries/{queryName}" like 
+              ```
+              import getTask from '@wasp/queries/getTasks';
+              ```
+            - You should import actions from "@wasp/actions/{actionName}" like
+              ```
+              import createTask from '@wasp/actions/createTask';
+              ```
+            - Don't use `useAction` or `useMutation`! Use actions directly.
             - Use Tailwind CSS to style the page if you didn't.
             - Use <Link /> component from "react-router-dom" to link to other pages where needed.
             - "TODO" comments or "..." that should be replaced with actual implementation.
               Fix these by replacing them with actual implementation.
             - Duplicate imports. If there are any, make sure to remove them.
             - There might be some invalid JS or JSX syntax -> fix it if there is any.
 
-          Actions:
-          ${actionsInfo}
-
-          Queries:
-          ${queriesInfo}
+          Here is the Wasp file to help you:
+          ```wasp
+          ${currentWaspFileContent}
+          ```
 
           With this in mind, generate a new, fixed React component (${pageComponentPathText}).
           Do actual fixes, don't leave comments with "TODO"!