From 6d9c1df8594265d0ae7144043448eab38a6f8322 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Wed, 25 Sep 2024 15:02:10 -0400 Subject: [PATCH 01/32] add init button --- .../editor/src/app/(editor)/git/page.tsx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index d6c0547..a8c1555 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -17,11 +17,27 @@ async function createBranch(formData: FormData) { revalidatePath("/git"); } +async function initializeContentGit() { + "use server"; + + const contentDirectory = getContentDirectory(); + if (!(await directoryIsGitRepo(contentDirectory))) { + const git = simpleGit(contentDirectory); + await git.init(); + await git.add("."); + await git.commit("Initial commit"); + } + revalidatePath("/git"); +} + async function GitPageWithoutGit() { return ( <>

- Content directory is not tracked with Git + Content directory is not tracked with Git. +
+ Initialize +

); From 2e2d7a1293e4aca6ebf820b064e0433f50fb2634 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Wed, 25 Sep 2024 15:13:35 -0400 Subject: [PATCH 02/32] tests b --- .../editor/cypress/e2e/git.cy.ts | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index fd828e9..5776766 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -1,5 +1,107 @@ describe("Git content", function () { describe("when empty", function () { + describe.only("new tests", function () { + it("should initialize a Git repository", function () { + cy.resetData(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("Content directory is not tracked with Git").should( + "exist", + ); + + cy.findByText("Initialize").click(); + cy.findByText("Content directory is not tracked with Git").should( + "not.exist", + ); + cy.findByText("Branches").should("exist"); + }); + + it("should create a new branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + cy.fillSignInForm(); + + const newBranchName = "test-branch"; + + cy.findByText("Settings").click(); + cy.findByText("Git").click(); + cy.findByLabelText("Branch Name").type(newBranchName); + cy.findByText("Create").click(); + + cy.findByText(newBranchName).should("exist"); + }); + it("should checkout a branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + cy.fillSignInForm(); + + const mainBranchName = "main"; + const newBranchName = "test-branch"; + + cy.findByText("Settings").click(); + cy.findByText("Git").click(); + cy.findByText(newBranchName).click(); + cy.findByText("Checkout").click(); + + cy.findByText(newBranchName).should("have.class", "font-bold"); + cy.findByText(mainBranchName).should("not.have.class", "font-bold"); + }); + it("should delete a branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + cy.fillSignInForm(); + + const newBranchName = "test-branch"; + + cy.findByText("Settings").click(); + cy.findByText("Git").click(); + cy.findByText(newBranchName).click(); + cy.findByText("Delete").click(); + + cy.findByText(`The branch '${newBranchName}' has been deleted.`).should( + "exist", + ); + cy.findByText(newBranchName).should("not.exist"); + }); + it("should force delete a branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + cy.fillSignInForm(); + + const newBranchName = "test-branch"; + + cy.findByText("Settings").click(); + cy.findByText("Git").click(); + cy.findByLabelText("Branch Name").type(newBranchName); + cy.findByText("Create").click(); + + cy.findByText(newBranchName).click(); + cy.findByText("Force Delete").click(); + + cy.findByText(`The branch '${newBranchName}' has been deleted.`).should( + "exist", + ); + cy.findByText(newBranchName).should("not.exist"); + }); + it("should display error messages for invalid branch names", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + cy.fillSignInForm(); + + cy.findByText("Settings").click(); + cy.findByText("Git").click(); + cy.findByText("Create").click(); + + cy.findByText("Branch Name is required").should("exist"); + }); + }); + it("should indicate when the content directory is not tracked by git", function () { cy.resetData(); cy.visit("/git"); From 928736984d3fe0927df883213d999c149d924cfe Mon Sep 17 00:00:00 2001 From: rogermparent Date: Wed, 25 Sep 2024 15:20:51 -0400 Subject: [PATCH 03/32] edit b a bit --- .../recipe-website/editor/cypress/e2e/git.cy.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index 5776766..94dd902 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -6,12 +6,12 @@ describe("Git content", function () { cy.visit("/git"); cy.fillSignInForm(); - cy.findByText("Content directory is not tracked with Git").should( + cy.findByText("Content directory is not tracked with Git.").should( "exist", ); cy.findByText("Initialize").click(); - cy.findByText("Content directory is not tracked with Git").should( + cy.findByText("Content directory is not tracked with Git.").should( "not.exist", ); cy.findByText("Branches").should("exist"); @@ -21,11 +21,11 @@ describe("Git content", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); - cy.fillSignInForm(); const newBranchName = "test-branch"; cy.findByText("Settings").click(); + cy.fillSignInForm(); cy.findByText("Git").click(); cy.findByLabelText("Branch Name").type(newBranchName); cy.findByText("Create").click(); @@ -36,12 +36,12 @@ describe("Git content", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); - cy.fillSignInForm(); const mainBranchName = "main"; const newBranchName = "test-branch"; cy.findByText("Settings").click(); + cy.fillSignInForm(); cy.findByText("Git").click(); cy.findByText(newBranchName).click(); cy.findByText("Checkout").click(); @@ -53,11 +53,11 @@ describe("Git content", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); - cy.fillSignInForm(); const newBranchName = "test-branch"; cy.findByText("Settings").click(); + cy.fillSignInForm(); cy.findByText("Git").click(); cy.findByText(newBranchName).click(); cy.findByText("Delete").click(); @@ -71,11 +71,11 @@ describe("Git content", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); - cy.fillSignInForm(); const newBranchName = "test-branch"; cy.findByText("Settings").click(); + cy.fillSignInForm(); cy.findByText("Git").click(); cy.findByLabelText("Branch Name").type(newBranchName); cy.findByText("Create").click(); @@ -92,9 +92,9 @@ describe("Git content", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); - cy.fillSignInForm(); cy.findByText("Settings").click(); + cy.fillSignInForm(); cy.findByText("Git").click(); cy.findByText("Create").click(); @@ -107,7 +107,7 @@ describe("Git content", function () { cy.visit("/git"); cy.fillSignInForm(); - cy.findByText("Content directory is not tracked with Git"); + cy.findByText("Content directory is not tracked with Git."); cy.findAllByText("Branches").should("not.exist"); }); From e828656333fe55a1289fc73ae19eafd8424fd28a Mon Sep 17 00:00:00 2001 From: rogermparent Date: Thu, 26 Sep 2024 15:19:10 -0400 Subject: [PATCH 04/32] fix new tests --- .../editor/cypress/e2e/git.cy.ts | 100 ++++++++---------- .../src/app/(editor)/git/BranchSelector.tsx | 7 +- 2 files changed, 49 insertions(+), 58 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index 94dd902..a3ec0a5 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -1,6 +1,21 @@ describe("Git content", function () { describe("when empty", function () { describe.only("new tests", function () { + it("should navigate to the Git UI from home and create a branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + + cy.findByText("Settings").click(); + cy.fillSignInForm(); + cy.findByText("Git").click(); + + cy.findByLabelText("Branch Name").type("other-branch"); + cy.findByText("Create").click(); + cy.findByText("Branches").should("exist"); + cy.findByText("other-branch").should("exist"); + }); + it("should initialize a Git repository", function () { cy.resetData(); cy.visit("/git"); @@ -17,88 +32,59 @@ describe("Git content", function () { cy.findByText("Branches").should("exist"); }); - it("should create a new branch", function () { + it("should display an error message when creating a branch with an empty name", function () { cy.resetData(); cy.initializeContentGit(); - cy.visit("/"); - - const newBranchName = "test-branch"; - - cy.findByText("Settings").click(); + cy.visit("/git"); cy.fillSignInForm(); - cy.findByText("Git").click(); - cy.findByLabelText("Branch Name").type(newBranchName); + cy.findByText("Create").click(); - cy.findByText(newBranchName).should("exist"); + // Adjust to fit your error message if needed + cy.findByText("Branch Name is required").should("exist"); }); - it("should checkout a branch", function () { + + it.only("should display an error message when using checkout with no selected branch", function () { cy.resetData(); cy.initializeContentGit(); - cy.visit("/"); + cy.visit("/git"); + cy.fillSignInForm(); - const mainBranchName = "main"; - const newBranchName = "test-branch"; + cy.findByRole("radio").should("not.be.checked"); - cy.findByText("Settings").click(); - cy.fillSignInForm(); - cy.findByText("Git").click(); - cy.findByText(newBranchName).click(); - cy.findByText("Checkout").click(); + cy.findByText("Checkout").invoke("attr", "disabled", false); + cy.findByText("Checkout").click({ force: true }); - cy.findByText(newBranchName).should("have.class", "font-bold"); - cy.findByText(mainBranchName).should("not.have.class", "font-bold"); + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); }); - it("should delete a branch", function () { + + it("should display an error message when using delete with no selected branch", function () { cy.resetData(); cy.initializeContentGit(); - cy.visit("/"); + cy.visit("/git"); + cy.fillSignInForm(); - const newBranchName = "test-branch"; + cy.findByRole("radio").should("not.be.checked"); - cy.findByText("Settings").click(); - cy.fillSignInForm(); - cy.findByText("Git").click(); - cy.findByText(newBranchName).click(); cy.findByText("Delete").click(); - cy.findByText(`The branch '${newBranchName}' has been deleted.`).should( - "exist", - ); - cy.findByText(newBranchName).should("not.exist"); + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); }); - it("should force delete a branch", function () { + + it("should display an error message when using force delete with no selected branch", function () { cy.resetData(); cy.initializeContentGit(); - cy.visit("/"); - - const newBranchName = "test-branch"; - - cy.findByText("Settings").click(); + cy.visit("/git"); cy.fillSignInForm(); - cy.findByText("Git").click(); - cy.findByLabelText("Branch Name").type(newBranchName); - cy.findByText("Create").click(); - cy.findByText(newBranchName).click(); - cy.findByText("Force Delete").click(); - - cy.findByText(`The branch '${newBranchName}' has been deleted.`).should( - "exist", - ); - cy.findByText(newBranchName).should("not.exist"); - }); - it("should display error messages for invalid branch names", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/"); + cy.findByRole("radio").should("not.be.checked"); - cy.findByText("Settings").click(); - cy.fillSignInForm(); - cy.findByText("Git").click(); - cy.findByText("Create").click(); + cy.findByText("Force Delete").click(); - cy.findByText("Branch Name is required").should("exist"); + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); }); }); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/BranchSelector.tsx b/websites/recipe-website/editor/src/app/(editor)/git/BranchSelector.tsx index a2c1416..d859537 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/BranchSelector.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/BranchSelector.tsx @@ -1,6 +1,6 @@ "use client"; -import { useActionState } from "react"; +import { useActionState, useState } from "react"; import { SubmitButton } from "component-library/components/SubmitButton"; import { branchCommandAction } from "./actions"; import clsx from "clsx"; @@ -15,6 +15,7 @@ export function BranchSelector({ branchCommandAction, null, ); + const [branchSelected, setBranchSelected] = useState(false); return (
{branchCommandState && ( @@ -35,6 +36,7 @@ export function BranchSelector({ value={name} type="radio" disabled={current} + onSelect={() => setBranchSelected(true)} />{" "} {name} @@ -48,6 +50,7 @@ export function BranchSelector({ className="border border-white rounded px-2 py-1" name="command" value="checkout" + disabled={!branchSelected} > Checkout @@ -56,6 +59,7 @@ export function BranchSelector({ className="border border-white rounded px-2 py-1" name="command" value="delete" + disabled={!branchSelected} > Delete @@ -64,6 +68,7 @@ export function BranchSelector({ className="border border-white rounded px-2 py-1 bg-orange-950" name="command" value="forceDelete" + disabled={!branchSelected} > Force Delete From c624490017855bccbf407fc2cf1ea382eab4198e Mon Sep 17 00:00:00 2001 From: rogermparent Date: Thu, 26 Sep 2024 17:09:52 -0400 Subject: [PATCH 05/32] Rename test image and suppress bugged image resize cache --- packages/next-static-image/src/resizeImage.ts | 10 +++++----- .../portfolio/editor/cypress/e2e/new-project.cy.ts | 5 ++--- .../editor/cypress/e2e/new-recipe.cy.ts | 11 +++++------ .../uploads/blackstone-nachos.html | 2 +- ...20x720.png => recipe-imported-image-566x566.png} | Bin .../editor/cypress/support/commands.ts | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) rename websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/{2021-11-28_0107-scaled-720x720.png => recipe-imported-image-566x566.png} (100%) diff --git a/packages/next-static-image/src/resizeImage.ts b/packages/next-static-image/src/resizeImage.ts index 19577fc..b8c035d 100644 --- a/packages/next-static-image/src/resizeImage.ts +++ b/packages/next-static-image/src/resizeImage.ts @@ -51,11 +51,11 @@ async function resizeImage({ export async function queuePossibleImageResize(props: ImageResizeProps) { const { resultPath } = props; // If this same transform is currently running, await it and return. - const currentlyRunningTransform = runningResizes.get(resultPath); - if (currentlyRunningTransform) { - await currentlyRunningTransform; - return; - } + // const currentlyRunningTransform = runningResizes.get(resultPath); + // if (currentlyRunningTransform) { + // await currentlyRunningTransform; + // return; + // } // Otherwise, claim our spot in cache and start the transform. const resizePromise = resizeImage(props); diff --git a/websites/portfolio/editor/cypress/e2e/new-project.cy.ts b/websites/portfolio/editor/cypress/e2e/new-project.cy.ts index 7b7be6c..cc27c6b 100644 --- a/websites/portfolio/editor/cypress/e2e/new-project.cy.ts +++ b/websites/portfolio/editor/cypress/e2e/new-project.cy.ts @@ -195,8 +195,7 @@ describe("New Project View", function () { cy.findByRole("img").should( "have.attr", "src", - new URL("/uploads/2021-11-28_0107-scaled-720x720.png", baseURL) - .href, + new URL("/uploads/recipe-imported-image-566x566.png", baseURL).href, ); }); @@ -207,7 +206,7 @@ describe("New Project View", function () { // Image should be newly created from the import's source const processedImagePath = - "/image/project/blackstone-griddle-grilled-nachos/uploads/2021-11-28_0107-scaled-720x720.png/2021-11-28_0107-scaled-720x720-w3840q75.webp"; + "/image/project/blackstone-griddle-grilled-nachos/uploads/recipe-imported-image-566x566-w3840q75.webp"; cy.findByRole("img").should("have.attr", "src", processedImagePath); diff --git a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts index 443ec71..b3e6d9e 100644 --- a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts @@ -403,7 +403,7 @@ Have no number on three }); }); - it("should be able to import a recipe with an image", function () { + it.only("should be able to import a recipe with an image", function () { const baseURL = Cypress.config().baseUrl; const testURL = "/uploads/blackstone-nachos.html"; const fullTestURL = new URL(testURL, baseURL); @@ -455,19 +455,18 @@ Have no number on three cy.findByRole("img").should( "have.attr", "src", - new URL("/uploads/2021-11-28_0107-scaled-720x720.png", baseURL) - .href, + new URL("/uploads/recipe-imported-image-566x566.png", baseURL).href, ); }); cy.findByText("Submit").click(); // Ensure we're on the view page and not the new-recipe page - cy.findByLabelText("Multiply"); + cy.findByLabelText("Multiply", { timeout: 10000 }); // Image should be newly created from the import's source const processedImagePath = - "/image/uploads/recipe/blackstone-griddle-grilled-nachos/uploads/2021-11-28_0107-scaled-720x720.png/2021-11-28_0107-scaled-720x720-w3840q75.webp"; + "/image/uploads/recipe/blackstone-griddle-grilled-nachos/uploads/recipe-imported-image-566x566.png/recipe-imported-image-566x566-w3840q75.webp"; cy.findByRole("img").should("have.attr", "src", processedImagePath); @@ -550,7 +549,7 @@ Carnitas, or Mexican pulled pork, is made by slow cooking pork until perfectly t // Image should be newly created from the import's source const processedImagePath = - "/image/uploads/recipe/pork-carnitas/uploads/pork-carnitas.webp/pork-carnitas-w3840q75.webp"; + "/image/uploads/recipe/blackstone-griddle-grilled-nachos/uploads/recipe-imported-image-566x566.png/recipe-imported-image-566x566-w3840q75.webp"; cy.findByRole("img").should("have.attr", "src", processedImagePath); diff --git a/websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/blackstone-nachos.html b/websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/blackstone-nachos.html index 1f8bfab..b0e1e51 100644 --- a/websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/blackstone-nachos.html +++ b/websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/blackstone-nachos.html @@ -268,7 +268,7 @@ "recipeYield": 10, "description": "Who doesn\u2019t love nachos? Jazz up your nacho routine with these super-tasty Blackstone Nachos Supreme. Made effortlessly on your Blackstone Griddle, there\u2019s nothing like this towering pile of crispy chips and delish toppings for your next snack attack.", "image": [ - "http:\/\/localhost:3000\/uploads\/2021-11-28_0107-scaled-720x720.png", + "http:\/\/localhost:3000\/uploads\/recipe-imported-image-566x566.png", "http:\/\/localhost:3000\/uploads\/2021-11-28_0107-scaled-720x540.png", "http:\/\/localhost:3000\/uploads\/2021-11-28_0107-scaled-540x720.png", "http:\/\/localhost:3000\/uploads\/2021-11-28_0107-scaled-720x405.png", diff --git a/websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/2021-11-28_0107-scaled-720x720.png b/websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/recipe-imported-image-566x566.png similarity index 100% rename from websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/2021-11-28_0107-scaled-720x720.png rename to websites/recipe-website/editor/cypress/fixtures/test-content/importable-uploads/uploads/recipe-imported-image-566x566.png diff --git a/websites/recipe-website/editor/cypress/support/commands.ts b/websites/recipe-website/editor/cypress/support/commands.ts index 31def61..791cf96 100644 --- a/websites/recipe-website/editor/cypress/support/commands.ts +++ b/websites/recipe-website/editor/cypress/support/commands.ts @@ -59,7 +59,7 @@ declare global { Cypress.Commands.add("resetData", (fixture) => { cy.task("resetData", fixture); - fetch("http://localhost:3000/settings/invalidate-cache"); + cy.request("http://localhost:3000/settings/invalidate-cache"); }); Cypress.Commands.add("getContentGitLog", () => { From 0e1f48cf02243945657c2ca15cb995c7e72b7214 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Thu, 26 Sep 2024 18:22:04 -0400 Subject: [PATCH 06/32] resizing b --- packages/next-static-image/src/resizeImage.ts | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/packages/next-static-image/src/resizeImage.ts b/packages/next-static-image/src/resizeImage.ts index b8c035d..4457c5d 100644 --- a/packages/next-static-image/src/resizeImage.ts +++ b/packages/next-static-image/src/resizeImage.ts @@ -39,10 +39,21 @@ async function resizeImage({ const { dir } = parse(resultPath); await ensureDir(dir); - await oraPromise( - sharp.resize({ width }).webp({ quality }).toFile(resultPath), - `Resizing ${resultFilename}`, - ); + // Get the original image metadata + const metadata = await sharp.metadata(); + const originalWidth = metadata.width; + const originalHeight = metadata.height; + + // Check if the target width is larger than the original width + if (width <= originalWidth) { + await oraPromise( + sharp.resize({ width }).webp({ quality }).toFile(resultPath), + `Resizing ${resultFilename}`, + ); + } else { + // If the target width is larger than the original width, skip resizing + await sharp.toFile(resultPath); + } // Release our spot in cache for currently running transforms. runningResizes.delete(resultPath); @@ -51,11 +62,11 @@ async function resizeImage({ export async function queuePossibleImageResize(props: ImageResizeProps) { const { resultPath } = props; // If this same transform is currently running, await it and return. - // const currentlyRunningTransform = runningResizes.get(resultPath); - // if (currentlyRunningTransform) { - // await currentlyRunningTransform; - // return; - // } + const currentlyRunningTransform = runningResizes.get(resultPath); + if (currentlyRunningTransform) { + await currentlyRunningTransform; + return; + } // Otherwise, claim our spot in cache and start the transform. const resizePromise = resizeImage(props); From 18369c6ef37c319863409555508ca590e3022cc3 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Thu, 26 Sep 2024 18:53:54 -0400 Subject: [PATCH 07/32] Ignore current transforms --- packages/next-static-image/src/resizeImage.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/next-static-image/src/resizeImage.ts b/packages/next-static-image/src/resizeImage.ts index 4457c5d..5a784b3 100644 --- a/packages/next-static-image/src/resizeImage.ts +++ b/packages/next-static-image/src/resizeImage.ts @@ -62,11 +62,11 @@ async function resizeImage({ export async function queuePossibleImageResize(props: ImageResizeProps) { const { resultPath } = props; // If this same transform is currently running, await it and return. - const currentlyRunningTransform = runningResizes.get(resultPath); - if (currentlyRunningTransform) { - await currentlyRunningTransform; - return; - } + // const currentlyRunningTransform = runningResizes.get(resultPath); + // if (currentlyRunningTransform) { + // await currentlyRunningTransform; + // return; + // } // Otherwise, claim our spot in cache and start the transform. const resizePromise = resizeImage(props); From 4350e6ea279a2ce215a4866d7fc845d66176e800 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Fri, 27 Sep 2024 06:25:02 -0400 Subject: [PATCH 08/32] edit resize test B --- .../editor/cypress/e2e/new-recipe.cy.ts | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts index b3e6d9e..d41fa3c 100644 --- a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts @@ -14,6 +14,34 @@ describe("New Recipe View", function () { cy.fillSignInForm(); }); + it("should resize the image in an imported recipe", function () { + const baseURL = Cypress.config().baseUrl; + const testURL = "/uploads/blackstone-nachos.html"; + const fullTestURL = new URL(testURL, baseURL); + cy.findByLabelText("Import from URL").type(fullTestURL.href); + cy.findByRole("button", { name: "Import" }).click(); + cy.url().should( + "equal", + new URL( + "/new-recipe?import=http%3A%2F%2Flocalhost%3A3000%2Fuploads%2Fblackstone-nachos.html", + baseURL, + ).href, + ); + + cy.findByText("Submit").click(); + + // Ensure we're on the view page and not the new-recipe page + cy.findByLabelText("Multiply", { timeout: 10000 }); + + // Check if the image is resized correctly + cy.findByRole("img").should(($img) => { + const img = $img[0] as HTMLImageElement; + // Adjust dimensions to the expected size of your image + expect(img.naturalWidth).to.eq(566); + expect(img.naturalHeight).to.eq(566); + }); + }); + it("should be able to add a new ingredient", function () { cy.findByRole("heading", { name: "New Recipe" }); @@ -403,7 +431,7 @@ Have no number on three }); }); - it.only("should be able to import a recipe with an image", function () { + it("should be able to import a recipe with an image", function () { const baseURL = Cypress.config().baseUrl; const testURL = "/uploads/blackstone-nachos.html"; const fullTestURL = new URL(testURL, baseURL); From 0761c4c268e8e49da38c229b58d5009cd195b85b Mon Sep 17 00:00:00 2001 From: rogermparent Date: Fri, 27 Sep 2024 06:35:44 -0400 Subject: [PATCH 09/32] fix tests, remove broken tests from portfolio --- packages/next-static-image/src/index.tsx | 2 +- websites/portfolio/editor/cypress.config.ts | 30 -- .../portfolio/editor/cypress/e2e/edit.cy.ts | 199 ----------- .../editor/cypress/e2e/homepage.cy.ts | 98 ------ .../portfolio/editor/cypress/e2e/menus.cy.ts | 103 ------ .../editor/cypress/e2e/new-project.cy.ts | 313 ------------------ .../portfolio/editor/cypress/e2e/pages.cy.ts | 93 ------ .../editor/cypress/e2e/project.cy.ts | 94 ------ .../portfolio/editor/cypress/e2e/search.cy.ts | 62 ---- .../editor/cypress/fixtures/example.json | 5 - .../images/project-6-test-image-alternate.png | Bin 19122 -> 0 bytes .../fixtures/images/project-6-test-image.png | Bin 11573 -> 0 bytes .../cypress/fixtures/users/admin@nextmail.com | 1 - .../editor/cypress/support/commands.ts | 82 ----- .../portfolio/editor/cypress/support/e2e.ts | 20 -- .../portfolio/editor/cypress/tsconfig.json | 8 - .../editor/cypress/e2e/git.cy.ts | 170 +++++----- .../editor/cypress/e2e/new-recipe.cy.ts | 2 +- 18 files changed, 86 insertions(+), 1196 deletions(-) delete mode 100644 websites/portfolio/editor/cypress.config.ts delete mode 100644 websites/portfolio/editor/cypress/e2e/edit.cy.ts delete mode 100644 websites/portfolio/editor/cypress/e2e/homepage.cy.ts delete mode 100644 websites/portfolio/editor/cypress/e2e/menus.cy.ts delete mode 100644 websites/portfolio/editor/cypress/e2e/new-project.cy.ts delete mode 100644 websites/portfolio/editor/cypress/e2e/pages.cy.ts delete mode 100644 websites/portfolio/editor/cypress/e2e/project.cy.ts delete mode 100644 websites/portfolio/editor/cypress/e2e/search.cy.ts delete mode 100644 websites/portfolio/editor/cypress/fixtures/example.json delete mode 100644 websites/portfolio/editor/cypress/fixtures/images/project-6-test-image-alternate.png delete mode 100644 websites/portfolio/editor/cypress/fixtures/images/project-6-test-image.png delete mode 100644 websites/portfolio/editor/cypress/fixtures/users/admin@nextmail.com delete mode 100644 websites/portfolio/editor/cypress/support/commands.ts delete mode 100644 websites/portfolio/editor/cypress/support/e2e.ts delete mode 100644 websites/portfolio/editor/cypress/tsconfig.json diff --git a/packages/next-static-image/src/index.tsx b/packages/next-static-image/src/index.tsx index d7680cc..2741a90 100644 --- a/packages/next-static-image/src/index.tsx +++ b/packages/next-static-image/src/index.tsx @@ -14,7 +14,7 @@ export interface StaticImageProps { props: ImgProps; } -export interface TransformedRecipeImageProps { +export interface TransformedStaticImageProps { slug: string; image: string; alt: string; diff --git a/websites/portfolio/editor/cypress.config.ts b/websites/portfolio/editor/cypress.config.ts deleted file mode 100644 index cc45892..0000000 --- a/websites/portfolio/editor/cypress.config.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { defineConfig } from "cypress"; -import { resolve } from "node:path"; -import { copy, remove } from "fs-extra"; - -export default defineConfig({ - e2e: { - baseUrl: "http://localhost:3000", - setupNodeEvents(on) { - on("task", { - async resetData(fixture?: string) { - await remove(resolve("test-content")); - if (fixture) { - await copy( - resolve("cypress", "fixtures", "test-content", fixture), - resolve("test-content"), - ); - } - await copy( - resolve("cypress", "fixtures", "users"), - resolve("test-content", "users"), - ); - return null; - }, - }); - }, - retries: { - runMode: 2, - }, - }, -}); diff --git a/websites/portfolio/editor/cypress/e2e/edit.cy.ts b/websites/portfolio/editor/cypress/e2e/edit.cy.ts deleted file mode 100644 index fdcd177..0000000 --- a/websites/portfolio/editor/cypress/e2e/edit.cy.ts +++ /dev/null @@ -1,199 +0,0 @@ -describe("Project Edit View", function () { - describe("with seven items", function () { - beforeEach(function () { - cy.resetData("two-pages"); - cy.visit("/project/project-6/edit"); - }); - - it("should need authorization", function () { - cy.findByText("Sign in with Credentials"); - }); - - it("should require authorization even when project doesn't exist", function () { - cy.visit({ - url: "/project/non-existent-project/edit", - }); - }); - - describe("when authenticated", function () { - beforeEach(function () { - cy.fillSignInForm(); - }); - - it("should be able to edit a project", function () { - cy.findByText("Editing Project: Project 6"); - - cy.findByText("Advanced").click(); - - const editedProjectTitle = "Edited Project"; - - cy.findAllByLabelText("Name").first().clear(); - cy.findAllByLabelText("Name").first().type(editedProjectTitle); - - const projectDate = "2023-12-08T01:16:12.622"; - cy.findByLabelText("Date (UTC)").should("have.value", projectDate); - - cy.findByText("Submit").click(); - - cy.findByText(editedProjectTitle); - - cy.visit("/"); - cy.findByText(editedProjectTitle); - cy.checkNamesInOrder([ - "Project 7", - editedProjectTitle, - "Project 5", - "Project 4", - "Project 3", - "Project 2", - ]); - - // Project date should not have changed - cy.findByText(new Date(projectDate + "Z").toLocaleString()); - }); - - it("should be able to set a project image over another image", function () { - cy.findByText("Editing Project: Project 6"); - - // Image preview should be current image - cy.findByRole("img").should( - "have.attr", - "src", - "/image/project/project-6/uploads/project-6-test-image.png/project-6-test-image-w3840q75.webp", - ); - - cy.findByLabelText("Image").selectFile({ - contents: - "cypress/fixtures/images/project-6-test-image-alternate.png", - fileName: "project-6-test-image-alternate.png", - mimeType: "image/png", - }); - - // Image preview should now be blob from pending image - cy.findByRole("img") - .should("have.attr", "src") - .should("match", /^blob:/); - - cy.findByText("Submit").click(); - - // Image on view page should be alternate - cy.findByRole("img").should( - "have.attr", - "src", - "/image/project/project-6/uploads/project-6-test-image-alternate.png/project-6-test-image-alternate-w3840q75.webp", - ); - - // Image on index should be alternate - cy.visit("/"); - cy.findByText("Project 6") - .parentsUntil("li") - .findByRole("img") - .should( - "have.attr", - "src", - "/image/project/project-6/uploads/project-6-test-image-alternate.png/project-6-test-image-alternate-w828q75.webp", - ); - }); - - it("should be able to set a project image on a project without an image", function () { - cy.visit("/project/project-5/edit"); - cy.findByText("Editing Project: Project 5"); - - // With no image, the preview and "remove image" checkbox should not be present - cy.findAllByRole("img").should("not.exist"); - cy.findAllByLabelText("Remove Image").should("not.exist"); - - cy.findByLabelText("Image").selectFile({ - contents: - "cypress/fixtures/images/project-6-test-image-alternate.png", - fileName: "project-6-test-image-alternate.png", - mimeType: "image/png", - }); - - // Image preview should now be blob from pending image - cy.findByRole("img", { timeout: 10000 }) - .should("have.attr", "src") - .should("match", /^blob:/); - - cy.findAllByLabelText("Remove Image").should("not.exist"); - - cy.findByText("Submit").click(); - - cy.findByText("Project 5"); - // Image on view page should be alternate - cy.findByRole("img").should( - "have.attr", - "src", - "/image/project/project-5/uploads/project-6-test-image-alternate.png/project-6-test-image-alternate-w3840q75.webp", - ); - - // Image on index should be alternate - cy.visit("/"); - cy.findByText("Project 5") - .parentsUntil("li") - .findByRole("img") - .should( - "have.attr", - "src", - "/image/project/project-5/uploads/project-6-test-image-alternate.png/project-6-test-image-alternate-w828q75.webp", - ); - }); - - it("should be able to remove an image", function () { - cy.findByText("Editing Project: Project 6"); - - cy.findByRole("img"); - - cy.findByLabelText("Remove Image").click(); - - cy.findByText("Submit").click(); - - cy.findByText("Edit").click(); - - // With no image, the preview and "remove image" checkbox should not be present - cy.findAllByRole("img").should("not.exist"); - cy.findAllByLabelText("Remove Image").should("not.exist"); - }); - - it("should be able to preserve an image when editing", function () { - cy.findByText("Editing Project: Project 6"); - - cy.findByRole("img"); - - const editedProjectTitle = "Edited Project"; - - cy.findAllByLabelText("Name").first().clear(); - cy.findAllByLabelText("Name").first().type(editedProjectTitle); - - cy.findByText("Submit").click(); - - cy.findByText(editedProjectTitle); - cy.findByRole("img").should( - "have.attr", - "src", - "/image/project/project-6/uploads/project-6-test-image.png/project-6-test-image-w3840q75.webp", - ); - - cy.findByText("Edit").click(); - - cy.findByText("Editing Project: Edited Project"); - - cy.findByRole("img").should( - "have.attr", - "src", - "/image/project/project-6/uploads/project-6-test-image.png/project-6-test-image-w3840q75.webp", - ); - cy.findByLabelText("Remove Image"); - }); - - it("should have status 404 when project doesn't exist", function () { - cy.request({ - url: "/project/non-existent-project/edit", - failOnStatusCode: false, - }) - .its("status") - .should("equal", 404); - }); - }); - }); -}); diff --git a/websites/portfolio/editor/cypress/e2e/homepage.cy.ts b/websites/portfolio/editor/cypress/e2e/homepage.cy.ts deleted file mode 100644 index 387f3a0..0000000 --- a/websites/portfolio/editor/cypress/e2e/homepage.cy.ts +++ /dev/null @@ -1,98 +0,0 @@ -describe("Index Page", function () { - describe("when empty", function () { - beforeEach(function () { - cy.resetData(); - cy.visit("/"); - }); - - it("should not need authorization", function () { - cy.findByText("Sign In"); - }); - - it("should inform the user if there are no projects", function () { - cy.findByText("There are no projects yet."); - }); - - it("should be able to create and delete a project", function () { - const testProject = "Test Project"; - - // We should start with no projects - cy.findByText("There are no projects yet."); - cy.findAllByText(testProject).should("not.exist"); - - cy.findByText("New Project").click(); - - cy.fillSignInForm(); - - cy.findByLabelText("Name").type(testProject); - cy.findByText("Submit").click(); - cy.findByText(testProject); - - // Check home and ensure the project is present - cy.visit("/"); - cy.findByText(testProject).click(); - - // Delete the project and ensure it's gone - cy.findByText("Delete").click(); - cy.findAllByText(testProject).should("not.exist"); - - cy.request({ - url: "/project/test-page", - failOnStatusCode: false, - }) - .its("status") - .should("equal", 404); - }); - - it("should be able to create projects and see them in chronological order", function () { - cy.findByText("Sign In").click(); - - cy.fillSignInForm(); - - const testNames = ["c", "a", "1"].map((x) => `Project ${x}`); - for (const testProject of testNames) { - cy.visit("/new-project"); - cy.findByLabelText("Name").type(testProject); - cy.findByText("Submit").click(); - cy.findByText(testProject); - } - - cy.visit("/"); - cy.checkNamesInOrder(testNames.reverse()); - }); - }); - - describe("with just enough items for the front page", function () { - beforeEach(function () { - cy.resetData("front-page-only"); - cy.visit("/"); - }); - - it("should not display a link to the index", function () { - const allNames = [3, 2, 1].map((x) => `Project ${x}`); - - // Homepage should have latest three projects - cy.checkNamesInOrder(allNames); - - cy.findAllByText("More").should("not.exist"); - }); - }); - - describe("with seven items", function () { - beforeEach(function () { - cy.resetData("two-pages"); - cy.visit("/"); - }); - - it("should display the latest six projects", function () { - const allNames = [7, 6, 5, 4, 3, 2, 1].map((x) => `Project ${x}`); - - // Homepage should have latest three projects - cy.checkNamesInOrder(allNames.slice(0, 6)); - - // First page should have all projects - cy.findByText("More").click(); - cy.checkNamesInOrder(allNames.slice(0, 7)); - }); - }); -}); diff --git a/websites/portfolio/editor/cypress/e2e/menus.cy.ts b/websites/portfolio/editor/cypress/e2e/menus.cy.ts deleted file mode 100644 index 3238502..0000000 --- a/websites/portfolio/editor/cypress/e2e/menus.cy.ts +++ /dev/null @@ -1,103 +0,0 @@ -describe("Menu Editor", function () { - describe("with a clean slate", function () { - beforeEach(function () { - cy.resetData(); - cy.visit("/menus"); - }); - - it("should need authorization", function () { - cy.findByText("Sign in with Credentials"); - }); - - it("should need authorization when directly going to edit the header", function () { - cy.visit("/menus/edit/header"); - cy.findByText("Sign in with Credentials"); - }); - - describe("when authenticated", function () { - beforeEach(function () { - cy.fillSignInForm(); - }); - - it("should be able to add to, edit, and clear the header nav", function () { - // Add nav item to header - - cy.findByText("Header").click(); - cy.findByText("Append").click(); - cy.findByLabelText("Name").type("About", { force: true }); - cy.findByLabelText("Href").type("/about", { force: true }); - cy.findByText("Submit").click(); - - // Verify new header nav - - cy.findByText("Menu Editor"); - cy.findByText("About").should("have.attr", "href", "/about"); - - // Edit header nav - - cy.findByText("Header").click(); - - cy.findByLabelText("Name").clear(); - cy.findByLabelText("Name").type("About Us", { force: true }); - cy.findByLabelText("Href").clear(); - cy.findByLabelText("Href").type("/about-us", { force: true }); - cy.findByText("Submit").click(); - - // Verify edited header nav - - cy.findByText("Menu Editor"); - cy.findByText("About Us").should("have.attr", "href", "/about-us"); - - // Clear header nav - - cy.findByText("Header").click(); - cy.findByText("Delete").click(); - - // Verify cleared header nav - - cy.findByText("Menu Editor"); - cy.findAllByText("About").should("not.exist"); - }); - - it("should be able to add to, edit, and clear the footer nav", function () { - // Add nav item to footer - - cy.findByText("Footer").click(); - cy.findByText("Append").click(); - cy.findByLabelText("Name").type("About", { force: true }); - cy.findByLabelText("Href").type("/about", { force: true }); - cy.findByText("Submit").click(); - - // Verify new footer nav - - cy.findByText("Menu Editor"); - cy.findByText("About").should("have.attr", "href", "/about"); - - // Edit footer nav - - cy.findByText("Footer").click(); - - cy.findByLabelText("Name").clear(); - cy.findByLabelText("Name").type("About Us", { force: true }); - cy.findByLabelText("Href").clear(); - cy.findByLabelText("Href").type("/about-us", { force: true }); - cy.findByText("Submit").click(); - - // Verify edited footer nav - - cy.findByText("Menu Editor"); - cy.findByText("About Us").should("have.attr", "href", "/about-us"); - - // Clear footer nav - - cy.findByText("Footer").click(); - cy.findByText("Delete").click(); - - // Verify cleared footer nav - - cy.findByText("Menu Editor"); - cy.findAllByText("About").should("not.exist"); - }); - }); - }); -}); diff --git a/websites/portfolio/editor/cypress/e2e/new-project.cy.ts b/websites/portfolio/editor/cypress/e2e/new-project.cy.ts deleted file mode 100644 index cc27c6b..0000000 --- a/websites/portfolio/editor/cypress/e2e/new-project.cy.ts +++ /dev/null @@ -1,313 +0,0 @@ -describe("New Project View", function () { - describe("with the importable uploads fixture", function () { - beforeEach(function () { - cy.resetData("importable-uploads"); - cy.visit("/new-project"); - }); - - it("should need authentication", function () { - cy.findByText("Sign in with Credentials"); - }); - - describe("when authenticated", function () { - beforeEach(function () { - cy.fillSignInForm(); - }); - - it("should be able to create a new project", function () { - cy.findByRole("heading", { name: "New Project" }); - - const newProjectTitle = "My New Project"; - - cy.findAllByLabelText("Name").first().clear(); - cy.findAllByLabelText("Name").first().type(newProjectTitle); - - cy.findByText("Submit").click(); - - cy.findByRole("heading", { name: newProjectTitle }); - - cy.visit("/"); - - cy.findByText(newProjectTitle); - - cy.checkNamesInOrder([newProjectTitle]); - }); - - it("should be able to paste ingredients", function () { - cy.findByRole("heading", { name: "New Project" }); - - const newProjectTitle = "My New Project"; - - cy.findAllByLabelText("Name").first().clear(); - cy.findAllByLabelText("Name").first().type(newProjectTitle); - - cy.findByText("Paste Ingredients").click(); - cy.findByTitle("Ingredients Paste Area").type( - ` -1 cup water ((for the dashi packet)) -1 dashi packet -2 tsp sugar -2 Tbsp mirin -2 Tbsp soy sauce -½ onion ((4 oz 113 g)) -1 green onion/scallion ((for garnish)) -3 large eggs (50 g each w/o shell) -2 tonkatsu -2 servings cooked Japanese short-grain rice ((typically 1⅔ cups (250 g) per donburi serving)) -`, - ); - - cy.findByText("Import Ingredients").click(); - - // Verify first ingredient - cy.get('[name="ingredients[0].ingredient"]').should( - "have.value", - ` cup water ((for the dashi packet))`, - ); - - // Verify vulgar fraction ingredient - cy.get('[name="ingredients[5].ingredient"]').should( - "have.value", - ` onion (( oz g))`, - ); - - cy.findByText("Submit").click(); - - cy.findByRole("heading", { name: newProjectTitle }); - - cy.findByText("1 cup water ((for the dashi packet))"); - cy.findByText("1 dashi packet"); - cy.findByText("2 tsp sugar"); - cy.findByText("2 Tbsp mirin"); - cy.findByText("2 Tbsp soy sauce"); - cy.findByText("1/2 onion ((4 oz 113 g))"); - cy.findByText("1 green onion/scallion ((for garnish))"); - cy.findByText("3 large eggs (50 g each w/o shell)"); - cy.findByText("2 tonkatsu"); - cy.findByText( - "2 servings cooked Japanese short-grain rice ((typically 4 cups (250 g) per donburi serving))", - ); - }); - - it("should be able to import a project", function () { - const baseURL = Cypress.config().baseUrl; - const testURL = "/uploads/katsudon.html"; - const fullTestURL = new URL(testURL, baseURL); - cy.findByLabelText("Import from URL").type(fullTestURL.href); - cy.findByRole("button", { name: "Import" }).click(); - cy.url().should( - "equal", - new URL( - "/new-project?import=http%3A%2F%2Flocalhost%3A3000%2Fuploads%2Fkatsudon.html", - baseURL, - ).href, - ); - - // Stay within the project form to minimize matching outside - cy.get("#project-form").within(() => { - // Verify top-level fields, i.e. name and description - cy.get('[name="name"]').should("have.value", "Katsudon"); - cy.get('[name="description"]').should( - "have.value", - "*Imported from [http://localhost:3000/uploads/katsudon.html](http://localhost:3000/uploads/katsudon.html)*\n\n---\n\nKatsudon is a Japanese pork cutlet rice bowl made with tonkatsu, eggs, and sautéed onions simmered in a sweet and savory sauce. It‘s a one-bowl wonder and true comfort food!", - ); - - // Verify first ingredient - cy.get('[name="ingredients[0].ingredient"]').should( - "have.value", - ` cup water ((for the dashi packet))`, - ); - - // Verify vulgar fraction ingredient - cy.get('[name="ingredients[5].ingredient"]').should( - "have.value", - ` onion (( oz, g))`, - ); - - // Verify first instruction, which is a simple step - cy.get('[name="instructions[0].type"]').should("have.value", "step"); - cy.get('[name="instructions[0].name"]').should("have.value", ""); - cy.get('[name="instructions[0].text"]').should( - "have.value", - "Before You Start: Gather all the ingredients. For the steamed rice, please note that 1½ cups (300 g, 2 rice cooker cups) of uncooked Japanese short-grain rice yield 4⅓ cups (660 g) of cooked rice, enough for 2 donburi servings (3⅓ cups, 500 g). See how to cook short-grain rice with a rice cooker, pot over the stove, Instant Pot, or donabe.", - ); - - // Verify second instruction, which is a group - cy.get('[name="instructions[1].type"]').should("have.value", "group"); - cy.get('[name="instructions[1].name"]').should( - "have.value", - "To Make the Dashi", - ); - cy.get('[name="instructions[1].text"]').should("not.exist"); - }); - }); - - it("should be able to import a project with an image", function () { - const baseURL = Cypress.config().baseUrl; - const testURL = "/uploads/blackstone-nachos.html"; - const fullTestURL = new URL(testURL, baseURL); - cy.findByLabelText("Import from URL").type(fullTestURL.href); - cy.findByRole("button", { name: "Import" }).click(); - cy.url().should( - "equal", - new URL( - "/new-project?import=http%3A%2F%2Flocalhost%3A3000%2Fuploads%2Fblackstone-nachos.html", - baseURL, - ).href, - ); - - // Stay within the project form to minimize matching outside - cy.get("#project-form").within(() => { - // Verify top-level fields, i.e. name and description - cy.get('[name="name"]').should( - "have.value", - "Blackstone Griddle Grilled Nachos", - ); - cy.get('[name="description"]').should( - "have.value", - "*Imported from [http://localhost:3000/uploads/blackstone-nachos.html](http://localhost:3000/uploads/blackstone-nachos.html)*\n\n---\n\nWho doesn’t love nachos? Jazz up your nacho routine with these super-tasty Blackstone Nachos Supreme. Made effortlessly on your Blackstone Griddle, there’s nothing like this towering pile of crispy chips and delish toppings for your next snack attack.", - ); - - // Verify first ingredient - cy.get('[name="ingredients[0].ingredient"]').should( - "have.value", - `Olive Oil tablespoon`, - ); - - // Verify last ingredient - cy.get('[name="ingredients[9].ingredient"]').should( - "have.value", - `Lettuce, Shredded cup`, - ); - - // Verify empty string ingredient from import was ignored - cy.get('[name="ingredients[10].ingredient"]').should("not.exist"); - - // Verify first instruction - cy.get('[name="instructions[0].type"]').should("have.value", "step"); - cy.get('[name="instructions[0].name"]').should("have.value", ""); - cy.get('[name="instructions[0].text"]').should( - "have.value", - "Preheat the Blackstone Flat Top Griddle to medium heat.", - ); - - // Image preview should be external link to image we will import - cy.findByRole("img").should( - "have.attr", - "src", - new URL("/uploads/recipe-imported-image-566x566.png", baseURL).href, - ); - }); - - cy.findByText("Submit").click(); - - // Ensure we're on the view page and not the new-project page - cy.findByLabelText("Multiply"); - - // Image should be newly created from the import's source - const processedImagePath = - "/image/project/blackstone-griddle-grilled-nachos/uploads/recipe-imported-image-566x566-w3840q75.webp"; - - cy.findByRole("img").should("have.attr", "src", processedImagePath); - - cy.request({ - url: processedImagePath, - }) - .its("status") - .should("equal", 200); - - // Ensure resulting edit page works - - cy.findByText("Edit").click(); - - cy.findByText("Editing Project: Blackstone Griddle Grilled Nachos"); - - cy.findByRole("img").should("have.attr", "src", processedImagePath); - }); - - it("should be able to import a project with a singular image", function () { - const baseURL = Cypress.config().baseUrl; - const testURL = "/uploads/pork-carnitas.html"; - const fullTestURL = new URL(testURL, baseURL); - cy.findByLabelText("Import from URL").type(fullTestURL.href); - cy.findByRole("button", { name: "Import" }).click(); - cy.url().should( - "equal", - new URL( - "/new-project?import=http%3A%2F%2Flocalhost%3A3000%2Fuploads%2Fpork-carnitas.html", - baseURL, - ).href, - ); - - // Stay within the project form to minimize matching outside - cy.get("#project-form").within(() => { - // Verify top-level fields, i.e. name and description - cy.get('[name="name"]').should("have.value", "Pork Carnitas"); - cy.get('[name="description"]').should( - "have.value", - `*Imported from [http://localhost:3000/uploads/pork-carnitas.html](http://localhost:3000/uploads/pork-carnitas.html)* - ---- - -Carnitas, or Mexican pulled pork, is made by slow cooking pork until perfectly tender and juicy, then roasting the shredded pork for deliciously crisp edges.`, - ); - - // Verify first ingredient - cy.get('[name="ingredients[0].ingredient"]').should( - "have.value", - ` cup vegetable oil`, - ); - - // Verify last ingredient - cy.get('[name="ingredients[9].ingredient"]').should( - "have.value", - ` ( ounce) cans chicken broth`, - ); - - // Verify empty string ingredient from import was ignored - cy.get('[name="ingredients[10].ingredient"]').should("not.exist"); - - // Verify first instruction - cy.get('[name="instructions[0].type"]').should("have.value", "step"); - cy.get('[name="instructions[0].name"]').should("have.value", ""); - cy.get('[name="instructions[0].text"]').should( - "have.value", - "Gather all ingredients.", - ); - - // Image preview should be external link to image we will import - cy.findByRole("img").should( - "have.attr", - "src", - new URL("/uploads/pork-carnitas.webp", baseURL).href, - ); - }); - - cy.findByText("Submit").click(); - - // Ensure we're on the view page and not the new-project page - cy.findByLabelText("Multiply"); - - // Image should be newly created from the import's source - const processedImagePath = - "/image/project/pork-carnitas/uploads/pork-carnitas.webp/pork-carnitas-w3840q75.webp"; - - cy.findByRole("img").should("have.attr", "src", processedImagePath); - - cy.request({ - url: processedImagePath, - }) - .its("status") - .should("equal", 200); - - // Ensure resulting edit page works - - cy.findByText("Edit").click(); - - cy.findByText("Editing Project: Pork Carnitas"); - - cy.findByRole("img").should("have.attr", "src", processedImagePath); - }); - }); - }); -}); diff --git a/websites/portfolio/editor/cypress/e2e/pages.cy.ts b/websites/portfolio/editor/cypress/e2e/pages.cy.ts deleted file mode 100644 index 19dffa6..0000000 --- a/websites/portfolio/editor/cypress/e2e/pages.cy.ts +++ /dev/null @@ -1,93 +0,0 @@ -describe("Page Editor", function () { - describe("with a clean slate", function () { - it("should need authorization", function () { - cy.resetData(); - cy.visit("/pages"); - cy.findByText("Sign in with Credentials"); - }); - - it("should need authorization when directly going to an edit page", function () { - cy.resetData("about-page"); - cy.visit("/pages/edit/about"); - cy.findByText("Sign in with Credentials"); - }); - - describe("when authenticated", function () { - beforeEach(function () { - cy.resetData(); - cy.visit("/pages"); - cy.fillSignInForm(); - }); - - it("should be able to add, edit, and remove a page", function () { - // Confirm initial empty state - cy.findByText("There are no pages yet."); - - cy.request({ - url: "/my-new-page", - failOnStatusCode: false, - }) - .its("status") - .should("equal", 404); - - // Add new page - cy.findByText("New Page").click(); - - cy.findByText("Back to Pages"); - - cy.findByLabelText("Name").type("My New Page"); - cy.findByLabelText("Content").type( - "## Page Subtitle\n\nThis is a new page, *formatted* in **markdown**!", - ); - - cy.findByText("Submit").click(); - - // Confirm redirected to new page with given content - - cy.findByText(/^This is a new page/); - cy.findByText("formatted"); - cy.findByText("markdown"); - - cy.request({ - url: "/my-new-page", - failOnStatusCode: false, - }) - .its("status") - .should("equal", 200); - - // Edit the page - cy.findByText("Edit").click(); - - cy.findByLabelText("Name").clear(); - cy.findByLabelText("Name").type("My New Edited Page"); - cy.findByLabelText("Content").clear(); - cy.findByLabelText("Content").type( - "## Page Subtitle\n\nThis is an edited page, *formatted* in **markdown**!\n\n- It has a list!\n\n- with two items!", - ); - - cy.findByText("Submit").click(); - - // Verify page is edited - - cy.findByText(/^This is an edited page/); - cy.findByText("formatted"); - cy.findByText("markdown"); - cy.findByText("It has a list!"); - cy.findByText("with two items!"); - - // Delete page - cy.findByText("Delete").click(); - - // Confirm page is deleted - cy.findByText("There are no pages yet."); - - cy.request({ - url: "/my-new-page", - failOnStatusCode: false, - }) - .its("status") - .should("equal", 404); - }); - }); - }); -}); diff --git a/websites/portfolio/editor/cypress/e2e/project.cy.ts b/websites/portfolio/editor/cypress/e2e/project.cy.ts deleted file mode 100644 index 402866c..0000000 --- a/websites/portfolio/editor/cypress/e2e/project.cy.ts +++ /dev/null @@ -1,94 +0,0 @@ -describe("Single Project View", function () { - describe("with seven items", function () { - beforeEach(function () { - cy.resetData("two-pages"); - cy.visit("/project/project-6"); - }); - - it("should display a project", function () { - cy.findByText("Project 6"); - }); - - it("should not need authorization", function () { - cy.findByText("Sign In"); - }); - - it("should be able to multiply ingredient amounts", function () { - cy.findByText("1 1/2 tsp salt"); - cy.findByText("Sprinkle 1/2 tsp salt in water"); - cy.findByLabelText("Multiply").type("2"); - cy.findByText("3 tsp salt"); - cy.findByText("Sprinkle 1 tsp salt in water"); - }); - - it("should be able to edit a project", function () { - cy.findByText("Edit").click(); - - cy.fillSignInForm(); - - cy.findByText("Editing Project: Project 6", { timeout: 10000 }); - - cy.findByText("Advanced").click(); - - const editedProject = "Edited Project"; - - cy.findAllByLabelText("Name").first().clear(); - cy.findAllByLabelText("Name").first().type(editedProject); - - const projectDate = "2023-12-08T01:16:12.622"; - cy.findByLabelText("Date (UTC)").should("have.value", projectDate); - - cy.findByText("Submit").click(); - - cy.findByText(editedProject); - - cy.visit("/"); - cy.findByText(editedProject); - cy.checkNamesInOrder([ - "Project 7", - editedProject, - "Project 5", - "Project 4", - "Project 3", - "Project 2", - ]); - - // Project date should not have changed - cy.findByText(new Date(projectDate + "Z").toLocaleString()); - }); - - it("should be able to delete the project", function () { - cy.findByText("Delete").click(); - - // First click of the delete button should trigger a sign-in - cy.fillSignInForm(); - - cy.findByText("Delete").click(); - - cy.findByText("Project 4"); - cy.checkNamesInOrder([ - "Project 7", - "Project 5", - "Project 4", - "Project 3", - "Project 2", - "Project 1", - ]); - cy.request({ - url: "/project/project-6", - failOnStatusCode: false, - }) - .its("status") - .should("equal", 404); - }); - }); - - it("should have status 404 when project doesn't exist", function () { - cy.request({ - url: "/project/non-existent-project", - failOnStatusCode: false, - }) - .its("status") - .should("equal", 404); - }); -}); diff --git a/websites/portfolio/editor/cypress/e2e/search.cy.ts b/websites/portfolio/editor/cypress/e2e/search.cy.ts deleted file mode 100644 index 2700d15..0000000 --- a/websites/portfolio/editor/cypress/e2e/search.cy.ts +++ /dev/null @@ -1,62 +0,0 @@ -describe("Search Page", function () { - describe("with seven items", function () { - beforeEach(function () { - cy.resetData("two-pages"); - cy.visit("/search"); - }); - - it("should not need authorization", function () { - cy.findByText("Sign In"); - }); - - it("should be able to find a single project by name", function () { - cy.findByLabelText("Query").type("Project 6"); - cy.findByRole("button", { name: "Submit" }).click(); - - cy.findByRole("listitem") - .findByRole("heading") - .should("have.text", "Project 6"); - - cy.findByLabelText("Query").clear(); - cy.findByLabelText("Query").type("6 Project"); - cy.findByRole("button", { name: "Submit" }).click(); - - cy.findByRole("listitem") - .findByRole("heading") - .should("have.text", "Project 6"); - - cy.findByLabelText("Query").clear(); - cy.findByLabelText("Query").type("project 6"); - cy.findByRole("button", { name: "Submit" }).click(); - - cy.findByRole("listitem") - .findByRole("heading") - .should("have.text", "Project 6"); - - cy.findByLabelText("Query").clear(); - cy.findByLabelText("Query").type("6"); - cy.findByRole("button", { name: "Submit" }).click(); - - cy.findByRole("listitem") - .findByRole("heading") - .should("have.text", "Project 6"); - - cy.findByLabelText("Query").clear(); - cy.findByLabelText("Query").type("5"); - cy.findByRole("button", { name: "Submit" }).click(); - - cy.findByRole("listitem") - .findByRole("heading") - .should("have.text", "Project 5"); - }); - - it("should be able to find a project by ingredient", function () { - cy.findByLabelText("Query").type("sal"); - cy.findByRole("button", { name: "Submit" }).click(); - - cy.findByRole("heading", { name: "Project 6" }); - - cy.findByText(/^1 1\/2 tsp.*t$/).findByText("sal"); - }); - }); -}); diff --git a/websites/portfolio/editor/cypress/fixtures/example.json b/websites/portfolio/editor/cypress/fixtures/example.json deleted file mode 100644 index 02e4254..0000000 --- a/websites/portfolio/editor/cypress/fixtures/example.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "Using fixtures to represent data", - "email": "hello@cypress.io", - "body": "Fixtures are a great way to mock data for responses to routes" -} diff --git a/websites/portfolio/editor/cypress/fixtures/images/project-6-test-image-alternate.png b/websites/portfolio/editor/cypress/fixtures/images/project-6-test-image-alternate.png deleted file mode 100644 index ecf7af22d6c6bbb1f3d781ac81841461bf43d64c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19122 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 diff --git a/websites/portfolio/editor/cypress/fixtures/images/project-6-test-image.png b/websites/portfolio/editor/cypress/fixtures/images/project-6-test-image.png deleted file mode 100644 index 90d8015fad0281d5ccc0ffff393fa0fee63e4c84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11573 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 E0VjR8EdT%j diff --git a/websites/portfolio/editor/cypress/fixtures/users/admin@nextmail.com b/websites/portfolio/editor/cypress/fixtures/users/admin@nextmail.com deleted file mode 100644 index be6e347..0000000 --- a/websites/portfolio/editor/cypress/fixtures/users/admin@nextmail.com +++ /dev/null @@ -1 +0,0 @@ -{"email":"admin@nextmail.com","password":"$2b$10$82q8wy6VC18Xf8RlauuFluLOxHZJrnmTCwJuBUJX.j9AuxZpTYCma"} \ No newline at end of file diff --git a/websites/portfolio/editor/cypress/support/commands.ts b/websites/portfolio/editor/cypress/support/commands.ts deleted file mode 100644 index 897ea99..0000000 --- a/websites/portfolio/editor/cypress/support/commands.ts +++ /dev/null @@ -1,82 +0,0 @@ -/// -// *********************************************** -// This example commands.ts shows you how to -// create various custom commands and overwrite -// existing commands. -// -// For more comprehensive examples of custom -// commands please read more here: -// https://on.cypress.io/custom-commands -// *********************************************** -// -// -// -- This is a parent command -- -// Cypress.Commands.add('signIn', (email, password) => { ... }) -// -// -// -- This is a child command -- -// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... }) -// -// -// -- This is a dual command -- -// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... }) -// -// -// -- This will overwrite an existing command -- -// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... }) -// -// declare global { -// namespace Cypress { -// interface Chainable { -// signIn(email: string, password: string): Chainable -// drag(subject: string, options?: Partial): Chainable -// dismiss(subject: string, options?: Partial): Chainable -// visit(originalFn: CommandOriginalFn, url: string, options: Partial): Chainable -// } -// } -// } -import "@testing-library/cypress/add-commands"; - -interface SignInOptions { - email: string; - password: string; -} - -/* eslint-disable @typescript-eslint/no-namespace */ - -declare global { - namespace Cypress { - interface Chainable { - resetData(fixture?: string): Chainable; - fillSignInForm(user?: SignInOptions): Chainable; - signIn(user?: SignInOptions): Chainable; - checkNamesInOrder(names: string[]): Chainable; - } - } -} - -Cypress.Commands.add("resetData", (fixture) => { - cy.task("resetData", fixture); - fetch("http://localhost:3000/settings/invalidate-cache"); -}); - -Cypress.Commands.add("checkNamesInOrder", (names: string[]) => { - cy.findAllByRole("listitem").should("have.length", names.length); - cy.findAllByRole("listitem").each((el, i) => - cy.wrap(el).findByText(names[i]), - ); -}); - -Cypress.Commands.add( - "fillSignInForm", - ({ email = "admin@nextmail.com", password = "password" } = {}) => { - cy.findByLabelText("Email").type(email, { force: true }); - cy.findByLabelText("Password").type(password, { force: true }); - cy.findByText("Sign in with Credentials").click(); - }, -); - -Cypress.Commands.add("signIn", (options) => { - cy.findByText("Sign In").click(); - cy.fillSignInForm(options); -}); diff --git a/websites/portfolio/editor/cypress/support/e2e.ts b/websites/portfolio/editor/cypress/support/e2e.ts deleted file mode 100644 index 6a173d6..0000000 --- a/websites/portfolio/editor/cypress/support/e2e.ts +++ /dev/null @@ -1,20 +0,0 @@ -// *********************************************************** -// This example support/e2e.ts is processed and -// loaded automatically before your test files. -// -// This is a great place to put global configuration and -// behavior that modifies Cypress. -// -// You can change the location of this file or turn off -// automatically serving support files with the -// 'supportFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/configuration -// *********************************************************** - -// Import commands.js using ES2015 syntax: -import "./commands"; - -// Alternatively you can use CommonJS syntax: -// require('./commands') diff --git a/websites/portfolio/editor/cypress/tsconfig.json b/websites/portfolio/editor/cypress/tsconfig.json deleted file mode 100644 index 74b7cb3..0000000 --- a/websites/portfolio/editor/cypress/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "compilerOptions": { - "target": "es5", - "lib": ["es5", "dom"], - "types": ["cypress", "@testing-library/cypress", "node"] - }, - "include": ["**/*.ts"] -} diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index a3ec0a5..9675050 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -1,91 +1,89 @@ describe("Git content", function () { describe("when empty", function () { - describe.only("new tests", function () { - it("should navigate to the Git UI from home and create a branch", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/"); - - cy.findByText("Settings").click(); - cy.fillSignInForm(); - cy.findByText("Git").click(); - - cy.findByLabelText("Branch Name").type("other-branch"); - cy.findByText("Create").click(); - cy.findByText("Branches").should("exist"); - cy.findByText("other-branch").should("exist"); - }); - - it("should initialize a Git repository", function () { - cy.resetData(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByText("Content directory is not tracked with Git.").should( - "exist", - ); - - cy.findByText("Initialize").click(); - cy.findByText("Content directory is not tracked with Git.").should( - "not.exist", - ); - cy.findByText("Branches").should("exist"); - }); - - it("should display an error message when creating a branch with an empty name", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByText("Create").click(); - - // Adjust to fit your error message if needed - cy.findByText("Branch Name is required").should("exist"); - }); - - it.only("should display an error message when using checkout with no selected branch", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByRole("radio").should("not.be.checked"); - - cy.findByText("Checkout").invoke("attr", "disabled", false); - cy.findByText("Checkout").click({ force: true }); - - // Adjust to fit your error message if needed - cy.findByText("Invalid branch").should("exist"); - }); - - it("should display an error message when using delete with no selected branch", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByRole("radio").should("not.be.checked"); - - cy.findByText("Delete").click(); - - // Adjust to fit your error message if needed - cy.findByText("Invalid branch").should("exist"); - }); - - it("should display an error message when using force delete with no selected branch", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByRole("radio").should("not.be.checked"); - - cy.findByText("Force Delete").click(); - - // Adjust to fit your error message if needed - cy.findByText("Invalid branch").should("exist"); - }); + it("should navigate to the Git UI from home and create a branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + + cy.findByText("Settings").click(); + cy.fillSignInForm(); + cy.findByText("Git").click(); + + cy.findByLabelText("Branch Name").type("other-branch"); + cy.findByText("Create").click(); + cy.findByText("Branches").should("exist"); + cy.findByText("other-branch").should("exist"); + }); + + it("should initialize a Git repository", function () { + cy.resetData(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("Content directory is not tracked with Git.").should( + "exist", + ); + + cy.findByText("Initialize").click(); + cy.findByText("Content directory is not tracked with Git.").should( + "not.exist", + ); + cy.findByText("Branches").should("exist"); + }); + + it("should display an error message when creating a branch with an empty name", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("Create").click(); + + // Adjust to fit your error message if needed + cy.findByText("Branch Name is required").should("exist"); + }); + + it("should display an error message when using checkout with no selected branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByRole("radio").should("not.be.checked"); + + cy.findByText("Checkout").invoke("attr", "disabled", false); + cy.findByText("Checkout").click({ force: true }); + + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); + }); + + it("should display an error message when using delete with no selected branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByRole("radio").should("not.be.checked"); + + cy.findByText("Delete").click(); + + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); + }); + + it("should display an error message when using force delete with no selected branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByRole("radio").should("not.be.checked"); + + cy.findByText("Force Delete").click(); + + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); }); it("should indicate when the content directory is not tracked by git", function () { diff --git a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts index d41fa3c..feda1c7 100644 --- a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts @@ -577,7 +577,7 @@ Carnitas, or Mexican pulled pork, is made by slow cooking pork until perfectly t // Image should be newly created from the import's source const processedImagePath = - "/image/uploads/recipe/blackstone-griddle-grilled-nachos/uploads/recipe-imported-image-566x566.png/recipe-imported-image-566x566-w3840q75.webp"; + "/image/uploads/recipe/pork-carnitas/uploads/pork-carnitas.webp/pork-carnitas-w3840q75.webp"; cy.findByRole("img").should("have.attr", "src", processedImagePath); From c43ef73f612ff0977948049ddd4e4e61d618ed43 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Fri, 27 Sep 2024 06:56:03 -0400 Subject: [PATCH 10/32] Fix build, rename image props, set stage for video test debug --- packages/next-static-image/src/resizeImage.ts | 3 +-- .../recipe-website/common/components/RecipeImage/index.tsx | 6 +++--- websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/next-static-image/src/resizeImage.ts b/packages/next-static-image/src/resizeImage.ts index 5a784b3..5c04e6c 100644 --- a/packages/next-static-image/src/resizeImage.ts +++ b/packages/next-static-image/src/resizeImage.ts @@ -42,10 +42,9 @@ async function resizeImage({ // Get the original image metadata const metadata = await sharp.metadata(); const originalWidth = metadata.width; - const originalHeight = metadata.height; // Check if the target width is larger than the original width - if (width <= originalWidth) { + if (originalWidth === undefined || width <= originalWidth) { await oraPromise( sharp.resize({ width }).webp({ quality }).toFile(resultPath), `Resizing ${resultFilename}`, diff --git a/websites/recipe-website/common/components/RecipeImage/index.tsx b/websites/recipe-website/common/components/RecipeImage/index.tsx index 2539666..c67ff0b 100644 --- a/websites/recipe-website/common/components/RecipeImage/index.tsx +++ b/websites/recipe-website/common/components/RecipeImage/index.tsx @@ -1,7 +1,7 @@ import { join } from "path"; import { getContentDirectory } from "content-engine/fs/getContentDirectory"; import { - TransformedRecipeImageProps, + TransformedStaticImageProps, getStaticImageProps, } from "next-static-image/src"; import Image from "next/image"; @@ -18,7 +18,7 @@ export async function getTransformedRecipeImageProps({ loading, sizes, className, -}: TransformedRecipeImageProps) { +}: TransformedStaticImageProps) { if (!image) return undefined; const srcPath = getRecipeUploadPath(getContentDirectory(), slug, image); try { @@ -44,7 +44,7 @@ export async function getTransformedRecipeImageProps({ } } -export async function RecipeImage(inputProps: TransformedRecipeImageProps) { +export async function RecipeImage(inputProps: TransformedStaticImageProps) { const image = await getTransformedRecipeImageProps(inputProps); if (image) { return ( diff --git a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts index feda1c7..b2d68ef 100644 --- a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts @@ -207,7 +207,7 @@ describe("New Recipe View", function () { cy.findByRole("heading", { name: newRecipeTitle }).should("not.exist"); }); - it("should be able to add a video to a new recipe", function () { + it.only("should be able to add a video to a new recipe", function () { cy.findByRole("heading", { name: "New Recipe" }); const newRecipeTitle = "My New Recipe with Video"; @@ -243,7 +243,7 @@ describe("New Recipe View", function () { // Test VideoTime component's timestamp link cy.findByText("10s").click(); - cy.get("video", { timeout: 10000 }).should(($video) => { + cy.get("video", { timeout: 5000 }).should(($video) => { expect($video[0].currentTime).to.be.closeTo(10, 1); // Adjust the time as per your test video }); }); From ca3ad33d0feafe1159fbfcbb14fd0581cc53563f Mon Sep 17 00:00:00 2001 From: rogermparent Date: Fri, 27 Sep 2024 07:19:32 -0400 Subject: [PATCH 11/32] video test b --- websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts index b2d68ef..3045772 100644 --- a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts @@ -207,7 +207,7 @@ describe("New Recipe View", function () { cy.findByRole("heading", { name: newRecipeTitle }).should("not.exist"); }); - it.only("should be able to add a video to a new recipe", function () { + it.only("should be able to add a video to a new recipe and seek to a specific time", function () { cy.findByRole("heading", { name: "New Recipe" }); const newRecipeTitle = "My New Recipe with Video"; @@ -230,7 +230,7 @@ describe("New Recipe View", function () { // Add instruction with VideoTime component cy.findByText("Paste Instructions").click(); cy.findByTitle("Instructions Paste Area").type( - `Do the first step like 10s`, + `Do the first step like 10s`, ); cy.findByText("Import Instructions").click(); From 6d555836854537b6c7421d036c1d58007a04eee1 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Fri, 27 Sep 2024 14:52:08 -0400 Subject: [PATCH 12/32] fix vid test --- websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts index 3045772..0429312 100644 --- a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts @@ -207,7 +207,7 @@ describe("New Recipe View", function () { cy.findByRole("heading", { name: newRecipeTitle }).should("not.exist"); }); - it.only("should be able to add a video to a new recipe and seek to a specific time", function () { + it.only("should be able to add a new recipe with a video", function () { cy.findByRole("heading", { name: "New Recipe" }); const newRecipeTitle = "My New Recipe with Video"; @@ -230,7 +230,7 @@ describe("New Recipe View", function () { // Add instruction with VideoTime component cy.findByText("Paste Instructions").click(); cy.findByTitle("Instructions Paste Area").type( - `Do the first step like 10s`, + `Do the first step like 10s`, ); cy.findByText("Import Instructions").click(); @@ -243,7 +243,7 @@ describe("New Recipe View", function () { // Test VideoTime component's timestamp link cy.findByText("10s").click(); - cy.get("video", { timeout: 5000 }).should(($video) => { + cy.get("video", { timeout: 8000 }).should(($video) => { expect($video[0].currentTime).to.be.closeTo(10, 1); // Adjust the time as per your test video }); }); From a1fd30e8061896e6037ab94178ecb9cde6cda76c Mon Sep 17 00:00:00 2001 From: rogermparent Date: Fri, 27 Sep 2024 16:21:57 -0400 Subject: [PATCH 13/32] refactors a --- .../editor/src/app/(editor)/git/constants.ts | 3 ++ .../editor/src/app/(editor)/git/page.tsx | 28 +++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 websites/recipe-website/editor/src/app/(editor)/git/constants.ts diff --git a/websites/recipe-website/editor/src/app/(editor)/git/constants.ts b/websites/recipe-website/editor/src/app/(editor)/git/constants.ts new file mode 100644 index 0000000..01263ca --- /dev/null +++ b/websites/recipe-website/editor/src/app/(editor)/git/constants.ts @@ -0,0 +1,3 @@ +export const BRANCH_NAME_KEY = "branchName"; +export const GIT_PATH = "/git"; +export const INITIAL_COMMIT_MESSAGE = "Initial commit"; diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index a8c1555..95d070f 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -6,28 +6,40 @@ import { TextInput } from "component-library/components/Form/inputs/Text"; import { SubmitButton } from "component-library/components/SubmitButton"; import { revalidatePath } from "next/cache"; import { BranchSelector } from "./BranchSelector"; +import { BRANCH_NAME_KEY, GIT_PATH, INITIAL_COMMIT_MESSAGE } from "./constants"; async function createBranch(formData: FormData) { "use server"; const contentDirectory = getContentDirectory(); - const branchName = formData.get("branchName") as string; + const branchName = formData.get(BRANCH_NAME_KEY) as string; if (await directoryIsGitRepo(contentDirectory)) { - await simpleGit(contentDirectory).checkout(["-b", branchName]); + try { + await simpleGit(contentDirectory).checkout(["-b", branchName]); + } catch (e) { + // Log the error and provide user feedback + console.error(e); + throw new Error("Failed to create branch."); + } } - revalidatePath("/git"); + revalidatePath(GIT_PATH); } async function initializeContentGit() { "use server"; - const contentDirectory = getContentDirectory(); if (!(await directoryIsGitRepo(contentDirectory))) { const git = simpleGit(contentDirectory); - await git.init(); - await git.add("."); - await git.commit("Initial commit"); + try { + await git.init(); + await git.add("."); + await git.commit(INITIAL_COMMIT_MESSAGE); + } catch (e) { + // Log the error and provide user feedback + console.error(e); + throw new Error("Failed to initialize Git repository."); + } } - revalidatePath("/git"); + revalidatePath(GIT_PATH); } async function GitPageWithoutGit() { From 1d13c5cc462c6e44ad104948eeb68ec29f65214b Mon Sep 17 00:00:00 2001 From: rogermparent Date: Fri, 27 Sep 2024 18:50:37 -0400 Subject: [PATCH 14/32] edit a --- websites/recipe-website/editor/cypress/e2e/git.cy.ts | 2 +- websites/recipe-website/editor/src/app/(editor)/git/page.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index 9675050..27c7778 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -95,7 +95,7 @@ describe("Git content", function () { cy.findAllByText("Branches").should("not.exist"); }); - it("should be able to work with a git-tracked content directory", function () { + it.only("should be able to work with a git-tracked content directory", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index 95d070f..de5ee5c 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -42,7 +42,7 @@ async function initializeContentGit() { revalidatePath(GIT_PATH); } -async function GitPageWithoutGit() { +function GitPageWithoutGit() { return ( <>

From 5d76684f11a5e375de60c558a1b6d2f67e416821 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Fri, 27 Sep 2024 19:08:30 -0400 Subject: [PATCH 15/32] improved git b --- .../editor/cypress/e2e/git.cy.ts | 2 +- .../src/app/(editor)/git/BranchSelector.tsx | 2 +- .../editor/src/app/(editor)/git/actions.ts | 42 ++++++++++------- .../editor/src/app/(editor)/git/page.tsx | 45 +++++++++---------- 4 files changed, 49 insertions(+), 42 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index 27c7778..9675050 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -95,7 +95,7 @@ describe("Git content", function () { cy.findAllByText("Branches").should("not.exist"); }); - it.only("should be able to work with a git-tracked content directory", function () { + it("should be able to work with a git-tracked content directory", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/BranchSelector.tsx b/websites/recipe-website/editor/src/app/(editor)/git/BranchSelector.tsx index d859537..f95aea2 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/BranchSelector.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/BranchSelector.tsx @@ -36,7 +36,7 @@ export function BranchSelector({ value={name} type="radio" disabled={current} - onSelect={() => setBranchSelected(true)} + onChange={() => setBranchSelected(true)} />{" "} {name} diff --git a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts index 3b6a51a..d98b064 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts +++ b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts @@ -11,13 +11,22 @@ const commandHandlers: Record< (args: { contentDirectory: string; branch: string }) => Promise > = { async checkout({ contentDirectory, branch }) { + if (!branch) { + throw new Error("Invalid branch"); + } await simpleGit(contentDirectory).checkout(branch); await rebuildRecipeIndex(); }, async delete({ contentDirectory, branch }) { + if (!branch) { + throw new Error("Invalid branch"); + } await simpleGit(contentDirectory).deleteLocalBranch(branch); }, async forceDelete({ contentDirectory, branch }) { + if (!branch) { + throw new Error("Invalid branch"); + } await simpleGit(contentDirectory).deleteLocalBranch(branch, true); }, }; @@ -39,23 +48,24 @@ export async function branchCommandAction( throw new Error(`Invalid branch: ${branch}`); } const contentDirectory = getContentDirectory(); - if (await directoryIsGitRepo(contentDirectory)) { - try { - await commandHandler({ contentDirectory, branch }); - } catch (e) { - if ( - e && - typeof e === "object" && - "message" in e && - typeof e.message === "string" - ) { - return e.message; - } else { - throw e; - } + if (!(await directoryIsGitRepo(contentDirectory))) { + throw new Error("Content directory is not a Git repository."); + } + try { + await commandHandler({ contentDirectory, branch }); + } catch (e) { + if ( + e && + typeof e === "object" && + "message" in e && + typeof e.message === "string" + ) { + return e.message; + } else { + throw e; } - await rebuildRecipeIndex(); - revalidatePath("/git"); } + await rebuildRecipeIndex(); + revalidatePath("/git"); return null; } diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index de5ee5c..0f74a7e 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -6,49 +6,46 @@ import { TextInput } from "component-library/components/Form/inputs/Text"; import { SubmitButton } from "component-library/components/SubmitButton"; import { revalidatePath } from "next/cache"; import { BranchSelector } from "./BranchSelector"; -import { BRANCH_NAME_KEY, GIT_PATH, INITIAL_COMMIT_MESSAGE } from "./constants"; + +const BRANCH_NAME = "branchName"; +const INITIALIZE_BUTTON_TEXT = "Initialize"; +const CREATE_BRANCH_BUTTON_TEXT = "Create"; +const BRANCH_SELECTOR_LABEL = "Branch Name"; +const INITIAL_COMMIT_MESSAGE = "Initial commit"; async function createBranch(formData: FormData) { "use server"; const contentDirectory = getContentDirectory(); - const branchName = formData.get(BRANCH_NAME_KEY) as string; + const branchName = formData.get(BRANCH_NAME) as string; + if (!branchName) { + throw new Error("Branch Name is required"); + } if (await directoryIsGitRepo(contentDirectory)) { - try { - await simpleGit(contentDirectory).checkout(["-b", branchName]); - } catch (e) { - // Log the error and provide user feedback - console.error(e); - throw new Error("Failed to create branch."); - } + await simpleGit(contentDirectory).checkout(["-b", branchName]); } - revalidatePath(GIT_PATH); + revalidatePath("/git"); } async function initializeContentGit() { "use server"; + const contentDirectory = getContentDirectory(); if (!(await directoryIsGitRepo(contentDirectory))) { const git = simpleGit(contentDirectory); - try { - await git.init(); - await git.add("."); - await git.commit(INITIAL_COMMIT_MESSAGE); - } catch (e) { - // Log the error and provide user feedback - console.error(e); - throw new Error("Failed to initialize Git repository."); - } + await git.init(); + await git.add("."); + await git.commit(INITIAL_COMMIT_MESSAGE); } - revalidatePath(GIT_PATH); + revalidatePath("/git"); } -function GitPageWithoutGit() { +async function GitPageWithoutGit() { return ( <>

Content directory is not tracked with Git. - Initialize + {INITIALIZE_BUTTON_TEXT}

@@ -70,9 +67,9 @@ async function GitPageWithGit({

New Branch

- +
- Create + {CREATE_BRANCH_BUTTON_TEXT}
From a62934689014d32ce0fb463a539a8a3bf5970460 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 07:09:33 -0400 Subject: [PATCH 16/32] improve branch form and tests --- .../editor/cypress/e2e/git.cy.ts | 9 ++++-- .../src/app/(editor)/git/CreateBranchForm.tsx | 29 +++++++++++++++++++ .../editor/src/app/(editor)/git/actions.ts | 24 ++++++++++++--- .../editor/src/app/(editor)/git/page.tsx | 25 ++-------------- 4 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 websites/recipe-website/editor/src/app/(editor)/git/CreateBranchForm.tsx diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index 9675050..c3d2abd 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -51,6 +51,7 @@ describe("Git content", function () { cy.findByRole("radio").should("not.be.checked"); + cy.findByText("Checkout").should("be.disabled"); cy.findByText("Checkout").invoke("attr", "disabled", false); cy.findByText("Checkout").click({ force: true }); @@ -66,7 +67,9 @@ describe("Git content", function () { cy.findByRole("radio").should("not.be.checked"); - cy.findByText("Delete").click(); + cy.findByText("Delete").should("be.disabled"); + cy.findByText("Delete").invoke("attr", "disabled", false); + cy.findByText("Delete").click({ force: true }); // Adjust to fit your error message if needed cy.findByText("Invalid branch").should("exist"); @@ -80,7 +83,9 @@ describe("Git content", function () { cy.findByRole("radio").should("not.be.checked"); - cy.findByText("Force Delete").click(); + cy.findByText("Force Delete").should("be.disabled"); + cy.findByText("Force Delete").invoke("attr", "disabled", false); + cy.findByText("Force Delete").click({ force: true }); // Adjust to fit your error message if needed cy.findByText("Invalid branch").should("exist"); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/CreateBranchForm.tsx b/websites/recipe-website/editor/src/app/(editor)/git/CreateBranchForm.tsx new file mode 100644 index 0000000..b0052fd --- /dev/null +++ b/websites/recipe-website/editor/src/app/(editor)/git/CreateBranchForm.tsx @@ -0,0 +1,29 @@ +"use client"; + +import { TextInput } from "component-library/components/Form/inputs/Text"; +import { useActionState } from "react"; +import { createBranch } from "./actions"; +import { SubmitButton } from "component-library/components/SubmitButton"; + +const CREATE_BRANCH_BUTTON_TEXT = "Create"; +const BRANCH_SELECTOR_LABEL = "Branch Name"; + +export function CreateBranchForm() { + const [createBranchState, createBranchWithState] = useActionState( + createBranch, + undefined, + ); + return ( +
+ +
+ {createBranchState && ( +
+ {createBranchState} +
+ )} + {CREATE_BRANCH_BUTTON_TEXT} +
+ + ); +} diff --git a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts index d98b064..1d73f27 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts +++ b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts @@ -6,6 +6,22 @@ import { getContentDirectory } from "content-engine/fs/getContentDirectory"; import { directoryIsGitRepo } from "content-engine/git/commit"; import { revalidatePath } from "next/cache"; +export async function createBranch( + _state: string | undefined, + formData: FormData, +) { + "use server"; + const contentDirectory = getContentDirectory(); + const branchName = formData.get("branchName") as string; + if (!branchName) { + return "Branch Name is required"; + } + if (await directoryIsGitRepo(contentDirectory)) { + await simpleGit(contentDirectory).checkout(["-b", branchName]); + } + revalidatePath("/git"); +} + const commandHandlers: Record< string, (args: { contentDirectory: string; branch: string }) => Promise @@ -37,19 +53,19 @@ export async function branchCommandAction( ): Promise { const command = formData.get("command"); if (typeof command !== "string") { - throw new Error("No command provided!"); + return "No command provided!"; } const commandHandler = commandHandlers[command]; if (!commandHandler) { - throw new Error(`Invalid command: ${command}`); + return `Invalid command: ${command}`; } const branch = formData.get("branch"); if (typeof branch !== "string") { - throw new Error(`Invalid branch: ${branch}`); + return `Invalid branch`; } const contentDirectory = getContentDirectory(); if (!(await directoryIsGitRepo(contentDirectory))) { - throw new Error("Content directory is not a Git repository."); + return "Content directory is not a Git repository."; } try { await commandHandler({ contentDirectory, branch }); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index 0f74a7e..9617714 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -2,30 +2,14 @@ import { auth, signIn } from "@/auth"; import simpleGit from "simple-git"; import { getContentDirectory } from "content-engine/fs/getContentDirectory"; import { directoryIsGitRepo } from "content-engine/git/commit"; -import { TextInput } from "component-library/components/Form/inputs/Text"; import { SubmitButton } from "component-library/components/SubmitButton"; import { revalidatePath } from "next/cache"; import { BranchSelector } from "./BranchSelector"; +import { CreateBranchForm } from "./CreateBranchForm"; -const BRANCH_NAME = "branchName"; const INITIALIZE_BUTTON_TEXT = "Initialize"; -const CREATE_BRANCH_BUTTON_TEXT = "Create"; -const BRANCH_SELECTOR_LABEL = "Branch Name"; const INITIAL_COMMIT_MESSAGE = "Initial commit"; -async function createBranch(formData: FormData) { - "use server"; - const contentDirectory = getContentDirectory(); - const branchName = formData.get(BRANCH_NAME) as string; - if (!branchName) { - throw new Error("Branch Name is required"); - } - if (await directoryIsGitRepo(contentDirectory)) { - await simpleGit(contentDirectory).checkout(["-b", branchName]); - } - revalidatePath("/git"); -} - async function initializeContentGit() { "use server"; @@ -66,12 +50,7 @@ async function GitPageWithGit({

New Branch

-
- -
- {CREATE_BRANCH_BUTTON_TEXT} -
- +
); From 14766ca216295f17f7f8bc27f41419af4813ca40 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 07:38:03 -0400 Subject: [PATCH 17/32] git log tests a --- .../editor/cypress/e2e/git.cy.ts | 209 +++++++----------- 1 file changed, 81 insertions(+), 128 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index c3d2abd..9bca427 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -1,6 +1,6 @@ describe("Git content", function () { describe("when empty", function () { - it("should navigate to the Git UI from home and create a branch", function () { + it("should display an empty git log", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); @@ -9,127 +9,37 @@ describe("Git content", function () { cy.fillSignInForm(); cy.findByText("Git").click(); - cy.findByLabelText("Branch Name").type("other-branch"); - cy.findByText("Create").click(); - cy.findByText("Branches").should("exist"); - cy.findByText("other-branch").should("exist"); - }); - - it("should initialize a Git repository", function () { - cy.resetData(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByText("Content directory is not tracked with Git.").should( - "exist", - ); - - cy.findByText("Initialize").click(); - cy.findByText("Content directory is not tracked with Git.").should( - "not.exist", - ); - cy.findByText("Branches").should("exist"); - }); - - it("should display an error message when creating a branch with an empty name", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByText("Create").click(); - - // Adjust to fit your error message if needed - cy.findByText("Branch Name is required").should("exist"); - }); - - it("should display an error message when using checkout with no selected branch", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByRole("radio").should("not.be.checked"); - - cy.findByText("Checkout").should("be.disabled"); - cy.findByText("Checkout").invoke("attr", "disabled", false); - cy.findByText("Checkout").click({ force: true }); - - // Adjust to fit your error message if needed - cy.findByText("Invalid branch").should("exist"); + cy.findByText("No commits yet").should("exist"); }); + }); - it("should display an error message when using delete with no selected branch", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByRole("radio").should("not.be.checked"); - - cy.findByText("Delete").should("be.disabled"); - cy.findByText("Delete").invoke("attr", "disabled", false); - cy.findByText("Delete").click({ force: true }); - - // Adjust to fit your error message if needed - cy.findByText("Invalid branch").should("exist"); - }); - - it("should display an error message when using force delete with no selected branch", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByRole("radio").should("not.be.checked"); + describe("when not empty", function () { + const firstRecipeName = "Recipe A"; + const secondRecipeName = "Recipe B"; - cy.findByText("Force Delete").should("be.disabled"); - cy.findByText("Force Delete").invoke("attr", "disabled", false); - cy.findByText("Force Delete").click({ force: true }); + const firstRecipeSlug = "recipe-a"; + const secondRecipeSlug = "recipe-b"; - // Adjust to fit your error message if needed - cy.findByText("Invalid branch").should("exist"); - }); + const editedTestName = "edited"; - it("should indicate when the content directory is not tracked by git", function () { - cy.resetData(); - cy.visit("/git"); - cy.fillSignInForm(); + const mainBranchName = "main"; + const otherBranchName = "other-branch"; - cy.findByText("Content directory is not tracked with Git."); - cy.findAllByText("Branches").should("not.exist"); - }); + function makeTestRecipe(recipeName: string) { + cy.visit("/new-recipe"); + cy.findByLabelText("Name").type(recipeName); + cy.findByText("Submit").click(); + cy.findByText(recipeName, { selector: "h1" }); + } - it("should be able to work with a git-tracked content directory", function () { + beforeEach(function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); - // Verify we're at the initial commit state - cy.getContentGitLog().should("have.ordered.members", ["Initial Commit"]); - cy.findByText("Sign In").click(); cy.fillSignInForm(); - const firstRecipeName = "Recipe A"; - const secondRecipeName = "Recipe B"; - - const firstRecipeSlug = "recipe-a"; - const secondRecipeSlug = "recipe-b"; - - const editedTestName = "edited"; - //const editedTestSlug = "edited"; - - const mainBranchName = "main"; - const otherBranchName = "other-branch"; - - function makeTestRecipe(recipeName: string) { - cy.visit("/new-recipe"); - cy.findByLabelText("Name").type(recipeName); - cy.findByText("Submit").click(); - cy.findByText(recipeName, { selector: "h1" }); - } - // Make two recipes to build some test history makeTestRecipe(firstRecipeName); makeTestRecipe(secondRecipeName); @@ -164,38 +74,81 @@ describe("Git content", function () { `Add new recipe: ${firstRecipeSlug}`, "Initial Commit", ]); - cy.visit("/"); - cy.checkNamesInOrder([editedTestName]); - - // Checkout main - cy.findByText("Settings").click(); - cy.findByText("Git").click(); - cy.findByText(mainBranchName, { selector: "label" }).click(); - cy.findByText("Checkout").click(); - cy.findByLabelText("main").should("be.disabled"); + }); - // Verify we're in the state we were in when the branch was copied - cy.visit("/"); - cy.checkNamesInOrder([secondRecipeName, firstRecipeName]); + it("should display the git log below the branches menu", function () { + cy.visit("/git"); + cy.findByText("Branches").should("exist"); + cy.findByText("Initial Commit").should("exist"); + cy.findByText(`Add new recipe: ${firstRecipeSlug}`).should("exist"); + cy.findByText(`Add new recipe: ${secondRecipeSlug}`).should("exist"); + cy.findByText(`Update recipe: ${secondRecipeSlug}`).should("exist"); + cy.findByText(`Delete recipe: ${firstRecipeSlug}`).should("exist"); + }); + it("should display the correct commit order in the git log", function () { + cy.visit("/git"); cy.getContentGitLog().should("have.ordered.members", [ + `Delete recipe: ${firstRecipeSlug}`, + `Update recipe: ${secondRecipeSlug}`, `Add new recipe: ${secondRecipeSlug}`, `Add new recipe: ${firstRecipeSlug}`, "Initial Commit", ]); + }); + it("should display commit details when clicking on a commit", function () { cy.visit("/git"); - // Test delete: try to normal delete branch which should fail because unmerged - cy.findByText("other-branch").click(); - cy.findByText("Delete").click(); + cy.findByText(`Update recipe: ${secondRecipeSlug}`).click(); + + cy.findByText("Commit Details").should("exist"); + cy.findByText(`Update recipe: ${secondRecipeSlug}`).should("exist"); + cy.findByText("Author").should("exist"); + cy.findByText("Date").should("exist"); + cy.findByText("Diff").should("exist"); + + cy.findByText("Close").click(); + cy.findByText("Commit Details").should("not.exist"); + }); + + it("should display the correct commit details", function () { + cy.visit("/git"); + cy.findByText(`Update recipe: ${secondRecipeSlug}`).click(); + + cy.findByText("Commit Details").should("exist"); + cy.findByText(`Update recipe: ${secondRecipeSlug}`).should("exist"); + cy.findByText("Author").should("exist"); + cy.findByText("Date").should("exist"); + cy.findByText("Diff").should("exist"); + + cy.findByText("- Name: Recipe B").should("exist"); + cy.findByText("+ Name: edited").should("exist"); + }); + + it("should display the correct commit details for a delete commit", function () { + cy.visit("/git"); + cy.findByText(`Delete recipe: ${firstRecipeSlug}`).click(); + + cy.findByText("Commit Details").should("exist"); + cy.findByText(`Delete recipe: ${firstRecipeSlug}`).should("exist"); + cy.findByText("Author").should("exist"); + cy.findByText("Date").should("exist"); + cy.findByText("Diff").should("exist"); - cy.findByText(/the branch 'other-branch' is not fully merged/); + cy.findByText(`- Recipe A`).should("exist"); + }); + + it("should display the correct commit details for an add commit", function () { + cy.visit("/git"); + cy.findByText(`Add new recipe: ${firstRecipeSlug}`).click(); - // Test force delete: delete should succeed and branch should be removed - cy.findByText("other-branch").click(); - cy.findByText("Force Delete").click(); + cy.findByText("Commit Details").should("exist"); + cy.findByText(`Add new recipe: ${firstRecipeSlug}`).should("exist"); + cy.findByText("Author").should("exist"); + cy.findByText("Date").should("exist"); + cy.findByText("Diff").should("exist"); - cy.findAllByText("other-branch").should("not.exist"); + cy.findByText(`+ Recipe A`).should("exist"); }); }); }); From f96232c8a8ef56dc6038db267576b8b634d988d7 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 09:25:18 -0400 Subject: [PATCH 18/32] re-add old tests --- .../editor/cypress/e2e/git.cy.ts | 211 +++++++++++++++++- 1 file changed, 199 insertions(+), 12 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index 9bca427..1cff634 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -1,5 +1,203 @@ describe("Git content", function () { describe("when empty", function () { + it("should navigate to the Git UI from home and create a branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + + cy.findByText("Settings").click(); + cy.fillSignInForm(); + cy.findByText("Git").click(); + + cy.findByLabelText("Branch Name").type("other-branch"); + cy.findByText("Create").click(); + cy.findByText("Branches").should("exist"); + cy.findByText("other-branch").should("exist"); + }); + + it("should initialize a Git repository", function () { + cy.resetData(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("Content directory is not tracked with Git.").should( + "exist", + ); + + cy.findByText("Initialize").click(); + cy.findByText("Content directory is not tracked with Git.").should( + "not.exist", + ); + cy.findByText("Branches").should("exist"); + }); + + it("should display an error message when creating a branch with an empty name", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("Create").click(); + + // Adjust to fit your error message if needed + cy.findByText("Branch Name is required").should("exist"); + }); + + it("should display an error message when using checkout with no selected branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByRole("radio").should("not.be.checked"); + + cy.findByText("Checkout").should("be.disabled"); + cy.findByText("Checkout").invoke("attr", "disabled", false); + cy.findByText("Checkout").click({ force: true }); + + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); + }); + + it("should display an error message when using delete with no selected branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByRole("radio").should("not.be.checked"); + + cy.findByText("Delete").should("be.disabled"); + cy.findByText("Delete").invoke("attr", "disabled", false); + cy.findByText("Delete").click({ force: true }); + + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); + }); + + it("should display an error message when using force delete with no selected branch", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByRole("radio").should("not.be.checked"); + + cy.findByText("Force Delete").should("be.disabled"); + cy.findByText("Force Delete").invoke("attr", "disabled", false); + cy.findByText("Force Delete").click({ force: true }); + + // Adjust to fit your error message if needed + cy.findByText("Invalid branch").should("exist"); + }); + + it("should indicate when the content directory is not tracked by git", function () { + cy.resetData(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("Content directory is not tracked with Git."); + cy.findAllByText("Branches").should("not.exist"); + }); + + it("should be able to work with a git-tracked content directory", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/"); + + // Verify we're at the initial commit state + cy.getContentGitLog().should("have.ordered.members", ["Initial Commit"]); + + cy.findByText("Sign In").click(); + cy.fillSignInForm(); + + const firstRecipeName = "Recipe A"; + const secondRecipeName = "Recipe B"; + + const firstRecipeSlug = "recipe-a"; + const secondRecipeSlug = "recipe-b"; + + const editedTestName = "edited"; + //const editedTestSlug = "edited"; + + const mainBranchName = "main"; + const otherBranchName = "other-branch"; + + function makeTestRecipe(recipeName: string) { + cy.visit("/new-recipe"); + cy.findByLabelText("Name").type(recipeName); + cy.findByText("Submit").click(); + cy.findByText(recipeName, { selector: "h1" }); + } + + // Make two recipes to build some test history + makeTestRecipe(firstRecipeName); + makeTestRecipe(secondRecipeName); + + // Copy (checkout -b) the branch to preserve current state + cy.findByText("Settings").click(); + cy.findByText("Git").click(); + cy.findByLabelText("Branch Name").type(otherBranchName); + cy.findByText("Create").click(); + cy.findByLabelText("Branch Name").should("have.value", ""); + + // Edit second recipe + cy.visit("/"); + cy.findByText(secondRecipeName).click(); + cy.findByText("Edit").click(); + cy.findAllByLabelText("Name").first().clear(); + cy.findAllByLabelText("Name").first().type(editedTestName); + cy.findByText("Submit").click(); + cy.findByText(editedTestName, { selector: "h1" }); + + // Delete first recipe + cy.visit("/"); + cy.findByText(firstRecipeName).click(); + cy.findByText("Delete").click(); + + // Verify edit and delete have happened + cy.findByText(editedTestName); + cy.getContentGitLog().should("have.ordered.members", [ + `Delete recipe: ${firstRecipeSlug}`, + `Update recipe: ${secondRecipeSlug}`, + `Add new recipe: ${secondRecipeSlug}`, + `Add new recipe: ${firstRecipeSlug}`, + "Initial Commit", + ]); + cy.visit("/"); + cy.checkNamesInOrder([editedTestName]); + + // Checkout main + cy.findByText("Settings").click(); + cy.findByText("Git").click(); + cy.findByText(mainBranchName, { selector: "label" }).click(); + cy.findByText("Checkout").click(); + cy.findByLabelText("main").should("be.disabled"); + + // Verify we're in the state we were in when the branch was copied + cy.visit("/"); + cy.checkNamesInOrder([secondRecipeName, firstRecipeName]); + + cy.getContentGitLog().should("have.ordered.members", [ + `Add new recipe: ${secondRecipeSlug}`, + `Add new recipe: ${firstRecipeSlug}`, + "Initial Commit", + ]); + + cy.visit("/git"); + // Test delete: try to normal delete branch which should fail because unmerged + cy.findByText("other-branch").click(); + cy.findByText("Delete").click(); + + cy.findByText(/the branch 'other-branch' is not fully merged/); + + // Test force delete: delete should succeed and branch should be removed + cy.findByText("other-branch").click(); + cy.findByText("Force Delete").click(); + + cy.findAllByText("other-branch").should("not.exist"); + }); + it("should display an empty git log", function () { cy.resetData(); cy.initializeContentGit(); @@ -13,7 +211,7 @@ describe("Git content", function () { }); }); - describe("when not empty", function () { + describe("with some git history", function () { const firstRecipeName = "Recipe A"; const secondRecipeName = "Recipe B"; @@ -22,7 +220,6 @@ describe("Git content", function () { const editedTestName = "edited"; - const mainBranchName = "main"; const otherBranchName = "other-branch"; function makeTestRecipe(recipeName: string) { @@ -64,16 +261,6 @@ describe("Git content", function () { cy.visit("/"); cy.findByText(firstRecipeName).click(); cy.findByText("Delete").click(); - - // Verify edit and delete have happened - cy.findByText(editedTestName); - cy.getContentGitLog().should("have.ordered.members", [ - `Delete recipe: ${firstRecipeSlug}`, - `Update recipe: ${secondRecipeSlug}`, - `Add new recipe: ${secondRecipeSlug}`, - `Add new recipe: ${firstRecipeSlug}`, - "Initial Commit", - ]); }); it("should display the git log below the branches menu", function () { From 4d86356a90fc339b5c4600865fd14ebba4676764 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 09:26:50 -0400 Subject: [PATCH 19/32] only new tests --- websites/recipe-website/editor/cypress/e2e/git.cy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index 1cff634..dfe50b5 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -198,7 +198,7 @@ describe("Git content", function () { cy.findAllByText("other-branch").should("not.exist"); }); - it("should display an empty git log", function () { + it.only("should display an empty git log", function () { cy.resetData(); cy.initializeContentGit(); cy.visit("/"); @@ -211,7 +211,7 @@ describe("Git content", function () { }); }); - describe("with some git history", function () { + describe.only("with some git history", function () { const firstRecipeName = "Recipe A"; const secondRecipeName = "Recipe B"; From b9bd363baddb31d09595ff4b87257c7fcc3c330b Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 09:41:00 -0400 Subject: [PATCH 20/32] git log UI B --- .../editor/src/app/(editor)/git/GitLog.tsx | 29 +++++++++++++++++++ .../editor/src/app/(editor)/git/page.tsx | 7 +++++ 2 files changed, 36 insertions(+) create mode 100644 websites/recipe-website/editor/src/app/(editor)/git/GitLog.tsx diff --git a/websites/recipe-website/editor/src/app/(editor)/git/GitLog.tsx b/websites/recipe-website/editor/src/app/(editor)/git/GitLog.tsx new file mode 100644 index 0000000..3b9aa03 --- /dev/null +++ b/websites/recipe-website/editor/src/app/(editor)/git/GitLog.tsx @@ -0,0 +1,29 @@ +import React from "react"; + +interface LogEntry { + hash: string; + date: string; + message: string; + author_name: string; +} + +interface GitLogProps { + log: LogEntry[]; +} + +export const GitLog: React.FC = ({ log }) => { + return ( +
    + {log.map((entry) => ( +
  • +
    + {entry.message} +
    +
    + {entry.author_name} - {entry.date} +
    +
    • + ))} +
+ ); +}; diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index 9617714..6cbde1e 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -6,6 +6,7 @@ import { SubmitButton } from "component-library/components/SubmitButton"; import { revalidatePath } from "next/cache"; import { BranchSelector } from "./BranchSelector"; import { CreateBranchForm } from "./CreateBranchForm"; +import { GitLog } from "./GitLog"; // Assuming you have a GitLog component const INITIALIZE_BUTTON_TEXT = "Initialize"; const INITIAL_COMMIT_MESSAGE = "Initial commit"; @@ -44,6 +45,8 @@ async function GitPageWithGit({ const contentGit = simpleGit(contentDirectory); const branchSummary = await contentGit.branch(); const branches = Object.values(branchSummary.branches); + const log = await contentGit.log(); + return ( <>

Branches

@@ -52,6 +55,10 @@ async function GitPageWithGit({

New Branch

+
+

Commit History

+ {/* Assuming you have a GitLog component */} +
); } From bf217e30eecdd092146ea86f3fd721e68133437b Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 12:02:37 -0400 Subject: [PATCH 21/32] Edit git log B --- .../editor/cypress/e2e/git.cy.ts | 24 ++++---- .../editor/src/app/(editor)/git/GitLog.tsx | 59 +++++++++++++++---- .../editor/src/app/(editor)/git/page.tsx | 9 ++- 3 files changed, 65 insertions(+), 27 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index dfe50b5..c8b0479 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -198,20 +198,18 @@ describe("Git content", function () { cy.findAllByText("other-branch").should("not.exist"); }); - it.only("should display an empty git log", function () { + it("should display an empty git log", function () { cy.resetData(); - cy.initializeContentGit(); - cy.visit("/"); - - cy.findByText("Settings").click(); + cy.visit("/git"); cy.fillSignInForm(); - cy.findByText("Git").click(); + + cy.findByText("Initialize").click(); cy.findByText("No commits yet").should("exist"); }); }); - describe.only("with some git history", function () { + describe("with some git history", function () { const firstRecipeName = "Recipe A"; const secondRecipeName = "Recipe B"; @@ -232,9 +230,7 @@ describe("Git content", function () { beforeEach(function () { cy.resetData(); cy.initializeContentGit(); - cy.visit("/"); - - cy.findByText("Sign In").click(); + cy.visit("/git"); cy.fillSignInForm(); // Make two recipes to build some test history @@ -308,8 +304,8 @@ describe("Git content", function () { cy.findByText("Date").should("exist"); cy.findByText("Diff").should("exist"); - cy.findByText("- Name: Recipe B").should("exist"); - cy.findByText("+ Name: edited").should("exist"); + cy.findByText(/-.*Recipe B/).should("exist"); + cy.findByText(/\+.*edited/).should("exist"); }); it("should display the correct commit details for a delete commit", function () { @@ -322,7 +318,7 @@ describe("Git content", function () { cy.findByText("Date").should("exist"); cy.findByText("Diff").should("exist"); - cy.findByText(`- Recipe A`).should("exist"); + cy.findByText(/-.*Recipe A/).should("exist"); }); it("should display the correct commit details for an add commit", function () { @@ -335,7 +331,7 @@ describe("Git content", function () { cy.findByText("Date").should("exist"); cy.findByText("Diff").should("exist"); - cy.findByText(`+ Recipe A`).should("exist"); + cy.findByText(/\+.*Recipe A/).should("exist"); }); }); }); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/GitLog.tsx b/websites/recipe-website/editor/src/app/(editor)/git/GitLog.tsx index 3b9aa03..e21a604 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/GitLog.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/GitLog.tsx @@ -1,4 +1,6 @@ -import React from "react"; +"use client"; + +import React, { useState } from "react"; interface LogEntry { hash: string; @@ -8,22 +10,55 @@ interface LogEntry { } interface GitLogProps { - log: LogEntry[]; + log: (LogEntry & { diff: string })[]; } -export const GitLog: React.FC = ({ log }) => { +const GitLogItem = ({ entry }: { entry: LogEntry & { diff: string } }) => { + const [open, setOpen] = useState(false); return ( -
    - {log.map((entry) => ( -
  • +
    +
    setOpen(!open)} className="my-1 font-lg font-bold"> + {entry.message} +
    + {open && ( +
    +
    Commit Details
    +
      +
    • + Author: {entry.author_name} +
      • +
    • + Date: {entry.date} +
      • +
    • + Diff: 
      {entry.diff}
      +
      • +
    - {entry.message} +
    -
    - {entry.author_name} - {entry.date} -
    -
    • - ))} + + )} + + ); +}; + +export const GitLog: React.FC = ({ log }) => { + return ( +
      + {log && log.length > 1 + ? log.map((entry) => ( +
    • + +
      • + )) + : "No commits yet"}
    ); }; diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index 6cbde1e..369992e 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -46,6 +46,12 @@ async function GitPageWithGit({ const branchSummary = await contentGit.branch(); const branches = Object.values(branchSummary.branches); const log = await contentGit.log(); + const entriesWithDiffs = await Promise.all( + log.all.map(async (entry) => ({ + ...entry, + diff: await contentGit.show(entry.hash), + })), + ); return ( <> @@ -57,7 +63,8 @@ async function GitPageWithGit({

    Commit History

    - {/* Assuming you have a GitLog component */} + {" "} + {/* Assuming you have a GitLog component */}
    ); From 14c28a94507321b4e46f84a674ac2f786ff48c51 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 14:23:25 -0400 Subject: [PATCH 22/32] Add git bundle fixture support --- .../recipe-website/editor/cypress.config.ts | 12 +++++ .../editor/cypress/e2e/git.cy.ts | 42 +----------------- .../editor/cypress/e2e/new-recipe.cy.ts | 2 +- .../fixtures/git-test-content/test-git.bundle | Bin 0 -> 2311 bytes .../editor/cypress/support/commands.ts | 6 +++ 5 files changed, 20 insertions(+), 42 deletions(-) create mode 100644 websites/recipe-website/editor/cypress/fixtures/git-test-content/test-git.bundle diff --git a/websites/recipe-website/editor/cypress.config.ts b/websites/recipe-website/editor/cypress.config.ts index f6cf27a..e5397ac 100644 --- a/websites/recipe-website/editor/cypress.config.ts +++ b/websites/recipe-website/editor/cypress.config.ts @@ -41,6 +41,18 @@ export default defineConfig({ return null; }, resetData, + async loadGitFixture(fixture: string) { + const outputDir = resolve("test-content"); + await remove(outputDir); + const fixtureBundlePath = resolve( + "cypress", + "fixtures", + "git-test-content", + fixture, + ); + await simpleGit().clone(fixtureBundlePath, outputDir); + return null; + }, }); }, retries: { diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index c8b0479..cf3bd0d 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -210,53 +210,13 @@ describe("Git content", function () { }); describe("with some git history", function () { - const firstRecipeName = "Recipe A"; - const secondRecipeName = "Recipe B"; - const firstRecipeSlug = "recipe-a"; const secondRecipeSlug = "recipe-b"; - const editedTestName = "edited"; - - const otherBranchName = "other-branch"; - - function makeTestRecipe(recipeName: string) { - cy.visit("/new-recipe"); - cy.findByLabelText("Name").type(recipeName); - cy.findByText("Submit").click(); - cy.findByText(recipeName, { selector: "h1" }); - } - beforeEach(function () { - cy.resetData(); - cy.initializeContentGit(); + cy.loadGitFixture("test-git.bundle"); cy.visit("/git"); cy.fillSignInForm(); - - // Make two recipes to build some test history - makeTestRecipe(firstRecipeName); - makeTestRecipe(secondRecipeName); - - // Copy (checkout -b) the branch to preserve current state - cy.findByText("Settings").click(); - cy.findByText("Git").click(); - cy.findByLabelText("Branch Name").type(otherBranchName); - cy.findByText("Create").click(); - cy.findByLabelText("Branch Name").should("have.value", ""); - - // Edit second recipe - cy.visit("/"); - cy.findByText(secondRecipeName).click(); - cy.findByText("Edit").click(); - cy.findAllByLabelText("Name").first().clear(); - cy.findAllByLabelText("Name").first().type(editedTestName); - cy.findByText("Submit").click(); - cy.findByText(editedTestName, { selector: "h1" }); - - // Delete first recipe - cy.visit("/"); - cy.findByText(firstRecipeName).click(); - cy.findByText("Delete").click(); }); it("should display the git log below the branches menu", function () { diff --git a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts index 0429312..ec4ac8c 100644 --- a/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/new-recipe.cy.ts @@ -207,7 +207,7 @@ describe("New Recipe View", function () { cy.findByRole("heading", { name: newRecipeTitle }).should("not.exist"); }); - it.only("should be able to add a new recipe with a video", function () { + it("should be able to add a new recipe with a video", function () { cy.findByRole("heading", { name: "New Recipe" }); const newRecipeTitle = "My New Recipe with Video"; diff --git a/websites/recipe-website/editor/cypress/fixtures/git-test-content/test-git.bundle b/websites/recipe-website/editor/cypress/fixtures/git-test-content/test-git.bundle new file mode 100644 index 0000000000000000000000000000000000000000..7bc9170e77750984bb43d94a0c736351d4780a39 GIT binary patch literal 2311 zcmbW1c{tnI8pnUJRU;uyEp6>v39&>X7^Swlng~rSQ$gJ#lv-NG(ptt=V~MA&TB1T- zl&Y#$b*PbcY9~JluBG9cYhT8+D1*{6s?WW5+-Ew^GyUWI_nz~<=kxiVqpT3Fr{L@N zje=)bkaqwLiZ#?V(%19$#QR`yI2z8=z<}oCrH?s}Gt$Kv8e;KyeJmb}HNq=|(0oF5 zF3`?Ucfui*qAbG;?(JhQ z#9D3{$f1q73!EXW8q$OD+;-#BWahh*!2}ksoH9K#ReG7Jl(Zorc1gC*QK>eqX$M6S zV;WV3|LsZDeJW*0Y$D#;PR5F-=A4DQVkUK!ZZxe9^_je1?K3G#OUX<9*N^c_n%)q_ z1k_#AgRJNi=>`0(?;|cqkoXW7NgZx$&Bj$ka7By#Zb&)^x-+Bg5 zooKw(Xm5ktV&g|hiMe~sh|p$Tgyp(vtD8dWPAXCTH93H52=70wtIdji(owvioz!DV z2?obX)0~k$85%c4ui<1vP>*!ZG77?Fc^t`ZU|`d=9JHHChY5B+D!sS}Do9Si9X3N8PKiUcm+XL(uKp4-$F~{I~_< z9t$bX$*fU!%I+{qV`xdD2Wns~TRFzwYEyCM(Idvog^3MGD#vanrY>%}rE4vu=*hqR zwQjWC$gbLfI-5`XcCDbKkUDZhS+$ zn2$cqdQHlg1kD~w4_R3Vr>1(TRJbbX!_&YI=C&YxM~vH`G1a(K>|n!4;mdeJ5zaI^ z_^wFJTy9dO`IiZ{T$N>T<=Q6QJtA=>*nQ|2I~=S!_jd$xt)p-}POdj5NXuu_VC+rQ zW28ZSjOx0OKktOeJ)uY@7N@I=#gKc5Ty&=`m#ssfMb_E0ai^nd@-kdU)g%JvT@9G6 zKjj?(;w{MjAwK5*nC8mKuY(t3>IyY8s-^-@c!1=cprg_$X?+v@#h%Id^LHFmv9ibc zFq$&~zg+&{cR7k*8Gxs&^J@7bnUj4wC<3Ty$JXg0k$Ss9lC8bgOrH*c#6jC=4RS%^ z>8de4U`YtJUJcnD4g>IA%WBEAN_LlXIq-9x``Q#KdPUD4S_|J?4G(; zSKL1ZCOD3&B%fR-36{~k{hyn>!x)yDzc{nbS*ZiY)x@OAKh}P_u=-xh0k#H*>&3V_ zj=kvENjSL@?E-I4dNZiXmW==aL7r$$9e*UV(z%NWlALNN1X3sZG>P0tCY;u?)9ym6 zcY<7gXrcg;7zc%QXMiLU45Y)*^o)y;g)@j#5C7NA#O+NXgXA@OS8L)3D;8ULnnkFiNw(mLd<*36UB{bZ$m7ZY!;!wf~B-t zgO(*~7DFwR3PKNO`$H5{l!m@A1&J0Dg)4WcPNjCTE_oGoD<4XctQ{6Y;%;ljsa9BE zlW7Ig_bXcgPiK(#YI5_R6Kg`&074QKyU(kT;!vx@!&s5%OUp}DY-{Mb&;q;F070N3 z1-@M-uwSfIGV6MIRwJW!v-x^b*h#SfR&&0KUshnk1C`WqZj3{`-_g9=!S=B*QNJFY ze%8u+Edc#mzUwp2h3#zeT3%*?@^=eZf9`MEVFsyGTQ2AI@Zh5t7JZ=Ed5wja0Py0^@tv=YH*0K$$QM z@mFZRv~zP)elbJnM$gP0&z%L+4W+7Gg@6P4GIO7y$>^O~K0BAU5#=tCs24Fh085b0 z{~iJWEYSmhh?DZCI6u9iU7Q@m?JvZc7;$ccFwi-1zfI;agK5?LGj>amPf>%A?vS2# zbT}!7qRRP(A>8tS@#Jy)ujQ?;;dH=aOeJ|g%~M~eSom*ZW<>Elm zh)Cl9e>$JZCLG{bK-BJ`{|n!&-(`O?#xnnr{r#3a(Zlf!iBSAn{dR3VEB+7=sD3P^ YenM6QC0->iPHBB}mH_3#2SUF44HCW=m;e9( literal 0 HcmV?d00001 diff --git a/websites/recipe-website/editor/cypress/support/commands.ts b/websites/recipe-website/editor/cypress/support/commands.ts index 791cf96..653408d 100644 --- a/websites/recipe-website/editor/cypress/support/commands.ts +++ b/websites/recipe-website/editor/cypress/support/commands.ts @@ -48,6 +48,7 @@ declare global { namespace Cypress { interface Chainable { resetData(fixture?: string): Chainable; + loadGitFixture(fixture?: string): Chainable; initializeContentGit(fixture?: string): Chainable; getContentGitLog(): Chainable; fillSignInForm(user?: SignInOptions): Chainable; @@ -62,6 +63,11 @@ Cypress.Commands.add("resetData", (fixture) => { cy.request("http://localhost:3000/settings/invalidate-cache"); }); +Cypress.Commands.add("loadGitFixture", (fixture) => { + cy.task("loadGitFixture", fixture); + cy.request("http://localhost:3000/settings/invalidate-cache"); +}); + Cypress.Commands.add("getContentGitLog", () => { return cy.task("getContentGitLog"); }); From d93719543d914250413cce0b3d32c42bcb98aad7 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 15:30:15 -0400 Subject: [PATCH 23/32] Catch errors in branch create and clean comments --- .../src/app/(editor)/git/CreateBranchForm.tsx | 10 +++++----- .../editor/src/app/(editor)/git/actions.ts | 15 ++++++++++++++- .../editor/src/app/(editor)/git/page.tsx | 5 ++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/websites/recipe-website/editor/src/app/(editor)/git/CreateBranchForm.tsx b/websites/recipe-website/editor/src/app/(editor)/git/CreateBranchForm.tsx index b0052fd..e04548f 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/CreateBranchForm.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/CreateBranchForm.tsx @@ -15,13 +15,13 @@ export function CreateBranchForm() { ); return (
    + {createBranchState && ( +
    + {createBranchState} +
    + )}
    - {createBranchState && ( -
    - {createBranchState} -
    - )} {CREATE_BRANCH_BUTTON_TEXT}
    diff --git a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts index 1d73f27..8877b87 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts +++ b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts @@ -17,7 +17,20 @@ export async function createBranch( return "Branch Name is required"; } if (await directoryIsGitRepo(contentDirectory)) { - await simpleGit(contentDirectory).checkout(["-b", branchName]); + try { + await simpleGit(contentDirectory).checkout(["-b", branchName]); + } catch (e) { + if ( + e && + typeof e === "object" && + "message" in e && + typeof e.message === "string" + ) { + return e.message; + } else { + throw e; + } + } } revalidatePath("/git"); } diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index 369992e..b81e13d 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -6,7 +6,7 @@ import { SubmitButton } from "component-library/components/SubmitButton"; import { revalidatePath } from "next/cache"; import { BranchSelector } from "./BranchSelector"; import { CreateBranchForm } from "./CreateBranchForm"; -import { GitLog } from "./GitLog"; // Assuming you have a GitLog component +import { GitLog } from "./GitLog"; const INITIALIZE_BUTTON_TEXT = "Initialize"; const INITIAL_COMMIT_MESSAGE = "Initial commit"; @@ -63,8 +63,7 @@ async function GitPageWithGit({

    Commit History

    - {" "} - {/* Assuming you have a GitLog component */} +
    ); From 84f244db9135dd6b469ea70ff061b0484262fc10 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 15:59:52 -0400 Subject: [PATCH 24/32] remote branches b --- websites/recipe-website/editor/cypress/e2e/git.cy.ts | 2 +- websites/recipe-website/editor/src/app/(editor)/git/page.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index cf3bd0d..1b5c470 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -219,7 +219,7 @@ describe("Git content", function () { cy.fillSignInForm(); }); - it("should display the git log below the branches menu", function () { + it.only("should display the git log below the branches menu", function () { cy.visit("/git"); cy.findByText("Branches").should("exist"); cy.findByText("Initial Commit").should("exist"); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index b81e13d..d428e22 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -44,7 +44,9 @@ async function GitPageWithGit({ }) { const contentGit = simpleGit(contentDirectory); const branchSummary = await contentGit.branch(); - const branches = Object.values(branchSummary.branches); + const branches = Object.values(branchSummary.branches).filter( + (branch) => !branch.name.startsWith("remotes/"), + ); const log = await contentGit.log(); const entriesWithDiffs = await Promise.all( log.all.map(async (entry) => ({ From 4ab8838d16e9a33bdf4b1c125ad549fcf1ed736c Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sat, 28 Sep 2024 17:53:25 -0400 Subject: [PATCH 25/32] branchlocal --- .../recipe-website/editor/src/app/(editor)/git/page.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index d428e22..2712051 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -43,10 +43,8 @@ async function GitPageWithGit({ contentDirectory: string; }) { const contentGit = simpleGit(contentDirectory); - const branchSummary = await contentGit.branch(); - const branches = Object.values(branchSummary.branches).filter( - (branch) => !branch.name.startsWith("remotes/"), - ); + const branchSummary = await contentGit.branchLocal(); + const branches = Object.values(branchSummary.branches); const log = await contentGit.log(); const entriesWithDiffs = await Promise.all( log.all.map(async (entry) => ({ From fb72550e8ee07969904e6d1ec7c7e6f9c13964ae Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sun, 29 Sep 2024 12:41:04 -0400 Subject: [PATCH 26/32] Create RemoteSelector frontend with stub action --- .../src/app/(editor)/git/RemoteSelector.tsx | 51 +++++++++++++++++++ .../editor/src/app/(editor)/git/actions.ts | 7 +++ .../editor/src/app/(editor)/git/page.tsx | 4 ++ 3 files changed, 62 insertions(+) create mode 100644 websites/recipe-website/editor/src/app/(editor)/git/RemoteSelector.tsx diff --git a/websites/recipe-website/editor/src/app/(editor)/git/RemoteSelector.tsx b/websites/recipe-website/editor/src/app/(editor)/git/RemoteSelector.tsx new file mode 100644 index 0000000..a1f406c --- /dev/null +++ b/websites/recipe-website/editor/src/app/(editor)/git/RemoteSelector.tsx @@ -0,0 +1,51 @@ +"use client"; + +import { useActionState } from "react"; +import { SubmitButton } from "component-library/components/SubmitButton"; +import { remoteCommandAction } from "./actions"; +import { RemoteWithoutRefs } from "simple-git"; + +export function RemoteSelector({ remotes }: { remotes: RemoteWithoutRefs[] }) { + const [remoteCommandState, remoteCommandActionWithState] = useActionState( + remoteCommandAction, + null, + ); + return ( +
    + {remoteCommandState && ( +
    + {remoteCommandState} +
    + )} +
      + {remotes.map(({ name }) => { + return ( +
    • + +
      • + ); + })} +
    +
    + + Pull + + + Push + +
    +
    + ); +} diff --git a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts index 8877b87..18b2e7d 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts +++ b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts @@ -98,3 +98,10 @@ export async function branchCommandAction( revalidatePath("/git"); return null; } + +export async function remoteCommandAction( + _previousState: string | null, + _formData: FormData, +): Promise { + return null; +} diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index 2712051..1d69011 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -7,6 +7,7 @@ import { revalidatePath } from "next/cache"; import { BranchSelector } from "./BranchSelector"; import { CreateBranchForm } from "./CreateBranchForm"; import { GitLog } from "./GitLog"; +import { RemoteSelector } from "./RemoteSelector"; const INITIALIZE_BUTTON_TEXT = "Initialize"; const INITIAL_COMMIT_MESSAGE = "Initial commit"; @@ -45,6 +46,7 @@ async function GitPageWithGit({ const contentGit = simpleGit(contentDirectory); const branchSummary = await contentGit.branchLocal(); const branches = Object.values(branchSummary.branches); + const remotes = await contentGit.getRemotes(true); const log = await contentGit.log(); const entriesWithDiffs = await Promise.all( log.all.map(async (entry) => ({ @@ -65,6 +67,8 @@ async function GitPageWithGit({

    Commit History

    +

    Remotes

    + ); } From 422110631ce611863b47bd8c1e78337f3fa925e6 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sun, 29 Sep 2024 13:15:12 -0400 Subject: [PATCH 27/32] remote tests A --- .../editor/cypress/e2e/git.cy.ts | 90 ++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index 1b5c470..e52e458 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -1,5 +1,93 @@ describe("Git content", function () { describe("when empty", function () { + describe.only("Git remote management", function () { + it("should allow creating a new remote", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("New Remote").click(); + cy.findByLabelText("Remote Name").type("origin"); + cy.findByLabelText("Remote URL").type( + "https://github.com/user/repo.git", + ); + cy.findByText("Add").click(); + + cy.findByText("origin").should("exist"); + cy.findByText("https://github.com/user/repo.git").should("exist"); + }); + + it("should display an error message when creating a remote with an empty name", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("New Remote").click(); + cy.findByLabelText("Remote URL").type( + "https://github.com/user/repo.git", + ); + cy.findByText("Add").click(); + + // Adjust to fit your error message if needed + cy.findByText("Remote Name is required").should("exist"); + }); + + it("should display an error message when creating a remote with an empty URL", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("New Remote").click(); + cy.findByLabelText("Remote Name").type("origin"); + cy.findByText("Add").click(); + + // Adjust to fit your error message if needed + cy.findByText("Remote URL is required").should("exist"); + }); + + it("should display an error message when creating a remote with an invalid URL", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("New Remote").click(); + cy.findByLabelText("Remote Name").type("origin"); + cy.findByLabelText("Remote URL").type("invalid-url"); + cy.findByText("Add").click(); + + // Adjust to fit your error message if needed + cy.findByText("Invalid URL").should("exist"); + }); + + it("should display an error message when creating a remote with a duplicate name", function () { + cy.resetData(); + cy.initializeContentGit(); + cy.visit("/git"); + cy.fillSignInForm(); + + cy.findByText("New Remote").click(); + cy.findByLabelText("Remote Name").type("origin"); + cy.findByLabelText("Remote URL").type( + "https://github.com/user/repo.git", + ); + cy.findByText("Add").click(); + + cy.findByText("New Remote").click(); + cy.findByLabelText("Remote Name").type("origin"); + cy.findByLabelText("Remote URL").type( + "https://github.com/user/repo2.git", + ); + cy.findByText("Add").click(); + + // Adjust to fit your error message if needed + cy.findByText("Remote name already exists").should("exist"); + }); + }); + it("should navigate to the Git UI from home and create a branch", function () { cy.resetData(); cy.initializeContentGit(); @@ -219,7 +307,7 @@ describe("Git content", function () { cy.fillSignInForm(); }); - it.only("should display the git log below the branches menu", function () { + it("should display the git log below the branches menu", function () { cy.visit("/git"); cy.findByText("Branches").should("exist"); cy.findByText("Initial Commit").should("exist"); From ddc2a805875c3600b7845852cf667ba1b1d49a65 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sun, 29 Sep 2024 15:10:40 -0400 Subject: [PATCH 28/32] remote code a --- .../src/app/(editor)/git/CreateRemoteForm.tsx | 31 +++++++++++++++++ .../editor/src/app/(editor)/git/actions.ts | 33 +++++++++++++++++++ .../editor/src/app/(editor)/git/page.tsx | 5 +++ 3 files changed, 69 insertions(+) create mode 100644 websites/recipe-website/editor/src/app/(editor)/git/CreateRemoteForm.tsx diff --git a/websites/recipe-website/editor/src/app/(editor)/git/CreateRemoteForm.tsx b/websites/recipe-website/editor/src/app/(editor)/git/CreateRemoteForm.tsx new file mode 100644 index 0000000..3fbfea9 --- /dev/null +++ b/websites/recipe-website/editor/src/app/(editor)/git/CreateRemoteForm.tsx @@ -0,0 +1,31 @@ +"use client"; + +import { TextInput } from "component-library/components/Form/inputs/Text"; +import { useActionState } from "react"; +import { createRemote } from "./actions"; +import { SubmitButton } from "component-library/components/SubmitButton"; + +const CREATE_REMOTE_BUTTON_TEXT = "Add"; +const REMOTE_NAME_LABEL = "Remote Name"; +const REMOTE_URL_LABEL = "Remote URL"; + +export function CreateRemoteForm() { + const [createRemoteState, createRemoteWithState] = useActionState( + createRemote, + undefined, + ); + return ( +
    + {createRemoteState && ( +
    + {createRemoteState} +
    + )} + + +
    + {CREATE_REMOTE_BUTTON_TEXT} +
    + + ); +} diff --git a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts index 18b2e7d..a050dbf 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts +++ b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts @@ -6,6 +6,39 @@ import { getContentDirectory } from "content-engine/fs/getContentDirectory"; import { directoryIsGitRepo } from "content-engine/git/commit"; import { revalidatePath } from "next/cache"; +export async function createRemote( + _state: string | undefined, + formData: FormData, +) { + "use server"; + const contentDirectory = getContentDirectory(); + const remoteName = formData.get("remoteName") as string; + const remoteUrl = formData.get("remoteUrl") as string; + if (!remoteName) { + return "Remote Name is required"; + } + if (!remoteUrl) { + return "Remote URL is required"; + } + if (await directoryIsGitRepo(contentDirectory)) { + try { + await simpleGit(contentDirectory).addRemote(remoteName, remoteUrl); + } catch (e) { + if ( + e && + typeof e === "object" && + "message" in e && + typeof e.message === "string" + ) { + return e.message; + } else { + throw e; + } + } + } + revalidatePath("/git"); +} + export async function createBranch( _state: string | undefined, formData: FormData, diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index 1d69011..11aca80 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -8,6 +8,7 @@ import { BranchSelector } from "./BranchSelector"; import { CreateBranchForm } from "./CreateBranchForm"; import { GitLog } from "./GitLog"; import { RemoteSelector } from "./RemoteSelector"; +import { CreateRemoteForm } from "./CreateRemoteForm"; const INITIALIZE_BUTTON_TEXT = "Initialize"; const INITIAL_COMMIT_MESSAGE = "Initial commit"; @@ -69,6 +70,10 @@ async function GitPageWithGit({

    Remotes

    +
    +

    New Remote

    + +
    ); } From f153fa29d65af1014d2adb979a09aec7a58c14fa Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sun, 29 Sep 2024 17:05:18 -0400 Subject: [PATCH 29/32] Edit A --- websites/recipe-website/editor/cypress/e2e/git.cy.ts | 11 ++--------- .../editor/src/app/(editor)/git/RemoteSelector.tsx | 11 +++++++---- .../editor/src/app/(editor)/git/actions.ts | 12 ++++++++++++ .../editor/src/app/(editor)/git/page.tsx | 8 +++++--- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index e52e458..ef03cba 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -30,7 +30,6 @@ describe("Git content", function () { ); cy.findByText("Add").click(); - // Adjust to fit your error message if needed cy.findByText("Remote Name is required").should("exist"); }); @@ -44,7 +43,6 @@ describe("Git content", function () { cy.findByLabelText("Remote Name").type("origin"); cy.findByText("Add").click(); - // Adjust to fit your error message if needed cy.findByText("Remote URL is required").should("exist"); }); @@ -59,7 +57,6 @@ describe("Git content", function () { cy.findByLabelText("Remote URL").type("invalid-url"); cy.findByText("Add").click(); - // Adjust to fit your error message if needed cy.findByText("Invalid URL").should("exist"); }); @@ -76,14 +73,14 @@ describe("Git content", function () { ); cy.findByText("Add").click(); - cy.findByText("New Remote").click(); + cy.findByText("origin").should("exist"); + cy.findByLabelText("Remote Name").type("origin"); cy.findByLabelText("Remote URL").type( "https://github.com/user/repo2.git", ); cy.findByText("Add").click(); - // Adjust to fit your error message if needed cy.findByText("Remote name already exists").should("exist"); }); }); @@ -127,7 +124,6 @@ describe("Git content", function () { cy.findByText("Create").click(); - // Adjust to fit your error message if needed cy.findByText("Branch Name is required").should("exist"); }); @@ -143,7 +139,6 @@ describe("Git content", function () { cy.findByText("Checkout").invoke("attr", "disabled", false); cy.findByText("Checkout").click({ force: true }); - // Adjust to fit your error message if needed cy.findByText("Invalid branch").should("exist"); }); @@ -159,7 +154,6 @@ describe("Git content", function () { cy.findByText("Delete").invoke("attr", "disabled", false); cy.findByText("Delete").click({ force: true }); - // Adjust to fit your error message if needed cy.findByText("Invalid branch").should("exist"); }); @@ -175,7 +169,6 @@ describe("Git content", function () { cy.findByText("Force Delete").invoke("attr", "disabled", false); cy.findByText("Force Delete").click({ force: true }); - // Adjust to fit your error message if needed cy.findByText("Invalid branch").should("exist"); }); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/RemoteSelector.tsx b/websites/recipe-website/editor/src/app/(editor)/git/RemoteSelector.tsx index a1f406c..1c527dc 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/RemoteSelector.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/RemoteSelector.tsx @@ -3,9 +3,9 @@ import { useActionState } from "react"; import { SubmitButton } from "component-library/components/SubmitButton"; import { remoteCommandAction } from "./actions"; -import { RemoteWithoutRefs } from "simple-git"; +import { RemoteWithRefs } from "simple-git"; -export function RemoteSelector({ remotes }: { remotes: RemoteWithoutRefs[] }) { +export function RemoteSelector({ remotes }: { remotes: RemoteWithRefs[] }) { const [remoteCommandState, remoteCommandActionWithState] = useActionState( remoteCommandAction, null, @@ -18,11 +18,14 @@ export function RemoteSelector({ remotes }: { remotes: RemoteWithoutRefs[] }) { )}
      - {remotes.map(({ name }) => { + {remotes.map(({ name, refs }) => { return (
      • ); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts index a050dbf..5905f4c 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts +++ b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts @@ -20,6 +20,11 @@ export async function createRemote( if (!remoteUrl) { return "Remote URL is required"; } + try { + new URL(remoteUrl); + } catch { + return "Invalid URL"; + } if (await directoryIsGitRepo(contentDirectory)) { try { await simpleGit(contentDirectory).addRemote(remoteName, remoteUrl); @@ -30,6 +35,13 @@ export async function createRemote( "message" in e && typeof e.message === "string" ) { + if ( + e.message === + `error: remote ${remoteName} already exists. +` + ) { + return "Remote name already exists"; + } return e.message; } else { throw e; diff --git a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx index 11aca80..7d9c407 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/page.tsx +++ b/websites/recipe-website/editor/src/app/(editor)/git/page.tsx @@ -70,10 +70,12 @@ async function GitPageWithGit({

      Remotes

      -
      -

      New Remote

      +
      + + New Remote + -
      + ); } From abd3363fe9b1ba3bbdc402b02204f7153952b9dd Mon Sep 17 00:00:00 2001 From: rogermparent Date: Sun, 29 Sep 2024 17:09:37 -0400 Subject: [PATCH 30/32] remote changes a --- .../editor/cypress/e2e/git.cy.ts | 17 +------- .../editor/src/app/(editor)/git/actions.ts | 42 ++++++++++--------- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index ef03cba..bd7e32f 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -46,20 +46,6 @@ describe("Git content", function () { cy.findByText("Remote URL is required").should("exist"); }); - it("should display an error message when creating a remote with an invalid URL", function () { - cy.resetData(); - cy.initializeContentGit(); - cy.visit("/git"); - cy.fillSignInForm(); - - cy.findByText("New Remote").click(); - cy.findByLabelText("Remote Name").type("origin"); - cy.findByLabelText("Remote URL").type("invalid-url"); - cy.findByText("Add").click(); - - cy.findByText("Invalid URL").should("exist"); - }); - it("should display an error message when creating a remote with a duplicate name", function () { cy.resetData(); cy.initializeContentGit(); @@ -75,13 +61,14 @@ describe("Git content", function () { cy.findByText("origin").should("exist"); + cy.findByText("New Remote").click(); cy.findByLabelText("Remote Name").type("origin"); cy.findByLabelText("Remote URL").type( "https://github.com/user/repo2.git", ); cy.findByText("Add").click(); - cy.findByText("Remote name already exists").should("exist"); + cy.findByText("A remote named origin already exists.").should("exist"); }); }); diff --git a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts index 5905f4c..a9c16c8 100644 --- a/websites/recipe-website/editor/src/app/(editor)/git/actions.ts +++ b/websites/recipe-website/editor/src/app/(editor)/git/actions.ts @@ -6,28 +6,37 @@ import { getContentDirectory } from "content-engine/fs/getContentDirectory"; import { directoryIsGitRepo } from "content-engine/git/commit"; import { revalidatePath } from "next/cache"; +import { z } from "zod"; + +const remoteSchema = z.object({ + remoteName: z.string().min(1, "Remote Name is required"), + remoteUrl: z.string().min(1, "Remote URL is required"), +}); + export async function createRemote( _state: string | undefined, formData: FormData, ) { "use server"; const contentDirectory = getContentDirectory(); - const remoteName = formData.get("remoteName") as string; - const remoteUrl = formData.get("remoteUrl") as string; - if (!remoteName) { - return "Remote Name is required"; - } - if (!remoteUrl) { - return "Remote URL is required"; - } - try { - new URL(remoteUrl); - } catch { - return "Invalid URL"; + const result = remoteSchema.safeParse({ + remoteName: formData.get("remoteName"), + remoteUrl: formData.get("remoteUrl"), + }); + + if (!result.success) { + return ( + result.error.flatten().fieldErrors.remoteName?.[0] ?? + result.error.flatten().fieldErrors.remoteUrl?.[0] + ); } + if (await directoryIsGitRepo(contentDirectory)) { try { - await simpleGit(contentDirectory).addRemote(remoteName, remoteUrl); + await simpleGit(contentDirectory).addRemote( + result.data.remoteName, + result.data.remoteUrl, + ); } catch (e) { if ( e && @@ -35,13 +44,6 @@ export async function createRemote( "message" in e && typeof e.message === "string" ) { - if ( - e.message === - `error: remote ${remoteName} already exists. -` - ) { - return "Remote name already exists"; - } return e.message; } else { throw e; From 8def64eeb16250294243510fd91b3fecf093edac Mon Sep 17 00:00:00 2001 From: rogermparent Date: Wed, 2 Oct 2024 13:39:52 -0400 Subject: [PATCH 31/32] Fix git remote tests --- websites/recipe-website/editor/cypress/e2e/git.cy.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index bd7e32f..b61a36a 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -61,14 +61,13 @@ describe("Git content", function () { cy.findByText("origin").should("exist"); - cy.findByText("New Remote").click(); cy.findByLabelText("Remote Name").type("origin"); cy.findByLabelText("Remote URL").type( "https://github.com/user/repo2.git", ); cy.findByText("Add").click(); - cy.findByText("A remote named origin already exists.").should("exist"); + cy.findByText("error: remote origin already exists.").should("exist"); }); }); From f2346fd971b66e1418381a95cdb73c39351e2c66 Mon Sep 17 00:00:00 2001 From: rogermparent Date: Wed, 2 Oct 2024 13:59:03 -0400 Subject: [PATCH 32/32] remove .only --- websites/recipe-website/editor/cypress/e2e/git.cy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/websites/recipe-website/editor/cypress/e2e/git.cy.ts b/websites/recipe-website/editor/cypress/e2e/git.cy.ts index b61a36a..cc2c6a9 100644 --- a/websites/recipe-website/editor/cypress/e2e/git.cy.ts +++ b/websites/recipe-website/editor/cypress/e2e/git.cy.ts @@ -1,6 +1,6 @@ describe("Git content", function () { describe("when empty", function () { - describe.only("Git remote management", function () { + describe("Git remote management", function () { it("should allow creating a new remote", function () { cy.resetData(); cy.initializeContentGit();