From 2d2d0dffd699419484c99ae5034e395deb562985 Mon Sep 17 00:00:00 2001
From: Kevin Koech <koechkevin92@gmail.com>
Date: Wed, 10 Jul 2024 13:17:27 +0300
Subject: [PATCH] Robots TXT generator requested changes

---
 apps/roboshield/payload-types.ts              |   4 +-
 .../BlockRenderer/BlockRenderer.tsx           |   4 +-
 .../src/components/CommonBots/CommonBots.tsx  |   2 +-
 .../CommonSettings/CommonSettings.tsx         |   2 +-
 .../src/components/Delays/Delays.tsx          |   2 +-
 .../src/components/ExistingRobots/index.ts    |   3 -
 .../ExistingRobotsTxt.tsx}                    |   2 +-
 .../src/components/ExistingRobotsTxt/index.ts |   3 +
 .../src/components/Finish/Finish.tsx          |   2 +-
 apps/roboshield/src/components/Hero/Hero.tsx  |   2 +-
 .../RobotsGenerator/RobotsGenerator.tsx       | 215 ------------------
 .../src/components/RobotsGenerator/index.ts   |   3 -
 .../RobotsTxtGenerator/RobotsTxtGenerator.tsx | 213 +++++++++++++++++
 .../components/RobotsTxtGenerator/index.ts    |   3 +
 .../src/components/Sitemaps/Sitemaps.tsx      |   2 +-
 .../SkipToLastStep/SkipToLastStep.tsx         |   6 +-
 ...botsGenerator.ts => RobotsTxtGenerator.ts} |  44 ++--
 .../src/payload/collections/Pages.ts          |   4 +-
 18 files changed, 260 insertions(+), 256 deletions(-)
 delete mode 100644 apps/roboshield/src/components/ExistingRobots/index.ts
 rename apps/roboshield/src/components/{ExistingRobots/ExistingRobots.tsx => ExistingRobotsTxt/ExistingRobotsTxt.tsx} (99%)
 create mode 100644 apps/roboshield/src/components/ExistingRobotsTxt/index.ts
 delete mode 100644 apps/roboshield/src/components/RobotsGenerator/RobotsGenerator.tsx
 delete mode 100644 apps/roboshield/src/components/RobotsGenerator/index.ts
 create mode 100644 apps/roboshield/src/components/RobotsTxtGenerator/RobotsTxtGenerator.tsx
 create mode 100644 apps/roboshield/src/components/RobotsTxtGenerator/index.ts
 rename apps/roboshield/src/payload/blocks/{RobotsGenerator.ts => RobotsTxtGenerator.ts} (91%)

diff --git a/apps/roboshield/payload-types.ts b/apps/roboshield/payload-types.ts
index 63dda496e..25d346789 100644
--- a/apps/roboshield/payload-types.ts
+++ b/apps/roboshield/payload-types.ts
@@ -108,7 +108,7 @@ export interface Page {
             blockType: "statistics";
           }
         | {
-            toolTipText: string;
+            showRobotsTxt: string;
             steps?:
               | (
                   | {
@@ -227,7 +227,7 @@ export interface Page {
             };
             id?: string | null;
             blockName?: string | null;
-            blockType: "robots-generator";
+            blockType: "robots-txt-generator";
           }
       )[]
     | null;
diff --git a/apps/roboshield/src/components/BlockRenderer/BlockRenderer.tsx b/apps/roboshield/src/components/BlockRenderer/BlockRenderer.tsx
index 6c60bd6a3..0f52ee963 100644
--- a/apps/roboshield/src/components/BlockRenderer/BlockRenderer.tsx
+++ b/apps/roboshield/src/components/BlockRenderer/BlockRenderer.tsx
@@ -3,7 +3,7 @@ import Content from "@/roboshield/components/Content";
 import Statistics from "@/roboshield/components/Statistics";
 import { Page } from "@/root/payload-types";
 import Hero from "@/roboshield/components/Hero";
-import RobotsGenerator from "@/roboshield/components/RobotsGenerator";
+import RobotsTxtGenerator from "@/roboshield/components/RobotsTxtGenerator";
 import { FC } from "react";
 
 interface BlockRendererProps extends Pick<Page, "blocks"> {}
@@ -13,7 +13,7 @@ const components = {
   "page-hero": Hero,
   content: Content,
   statistics: Statistics,
-  "robots-generator": RobotsGenerator,
+  "robots-txt-generator": RobotsTxtGenerator,
 };
 
 export default function BlockRenderer({ blocks }: BlockRendererProps) {
diff --git a/apps/roboshield/src/components/CommonBots/CommonBots.tsx b/apps/roboshield/src/components/CommonBots/CommonBots.tsx
index 29e211965..cc01c11fb 100644
--- a/apps/roboshield/src/components/CommonBots/CommonBots.tsx
+++ b/apps/roboshield/src/components/CommonBots/CommonBots.tsx
@@ -87,7 +87,7 @@ export default function CommonBots({
       <SkipToLastStep
         handleSkipToLast={skipToLast}
         lastStep={lastStep}
-        toolTipText={actions?.toolTipText}
+        showRobotsTxt={actions?.showRobotsTxt}
       />
       <StepHint hint={hint} />
       <Box sx={{ py: 2 }}>
diff --git a/apps/roboshield/src/components/CommonSettings/CommonSettings.tsx b/apps/roboshield/src/components/CommonSettings/CommonSettings.tsx
index 3bf396c46..0592d4a70 100644
--- a/apps/roboshield/src/components/CommonSettings/CommonSettings.tsx
+++ b/apps/roboshield/src/components/CommonSettings/CommonSettings.tsx
@@ -96,7 +96,7 @@ export default function CommonSettings({
       <SkipToLastStep
         handleSkipToLast={skipToLast}
         lastStep={lastStep}
-        toolTipText={actions?.toolTipText}
+        showRobotsTxt={actions?.showRobotsTxt}
       />
       <StepHint hint={hint} />
       <Box
diff --git a/apps/roboshield/src/components/Delays/Delays.tsx b/apps/roboshield/src/components/Delays/Delays.tsx
index fe366d913..f6d63b169 100644
--- a/apps/roboshield/src/components/Delays/Delays.tsx
+++ b/apps/roboshield/src/components/Delays/Delays.tsx
@@ -84,7 +84,7 @@ export default function Delays({
       <SkipToLastStep
         handleSkipToLast={skipToLast}
         lastStep={lastStep}
-        toolTipText={actions?.toolTipText}
+        showRobotsTxt={actions?.showRobotsTxt}
       />
       <StepHint hint={hint} />
       <Box
diff --git a/apps/roboshield/src/components/ExistingRobots/index.ts b/apps/roboshield/src/components/ExistingRobots/index.ts
deleted file mode 100644
index a3feb9a3b..000000000
--- a/apps/roboshield/src/components/ExistingRobots/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import ExistingRobots from "./ExistingRobots";
-
-export default ExistingRobots;
diff --git a/apps/roboshield/src/components/ExistingRobots/ExistingRobots.tsx b/apps/roboshield/src/components/ExistingRobotsTxt/ExistingRobotsTxt.tsx
similarity index 99%
rename from apps/roboshield/src/components/ExistingRobots/ExistingRobots.tsx
rename to apps/roboshield/src/components/ExistingRobotsTxt/ExistingRobotsTxt.tsx
index f0dcaae0b..696d9223a 100644
--- a/apps/roboshield/src/components/ExistingRobots/ExistingRobots.tsx
+++ b/apps/roboshield/src/components/ExistingRobotsTxt/ExistingRobotsTxt.tsx
@@ -101,7 +101,7 @@ export default function ExistingRobots({
       <SkipToLastStep
         handleSkipToLast={skipToLast}
         lastStep={lastStep}
-        toolTipText={actions?.toolTipText}
+        showRobotsTxt={actions?.showRobotsTxt}
       />
       <StepHint hint={hint} />
       <Box sx={{ py: 2 }}>
diff --git a/apps/roboshield/src/components/ExistingRobotsTxt/index.ts b/apps/roboshield/src/components/ExistingRobotsTxt/index.ts
new file mode 100644
index 000000000..0855e9ff2
--- /dev/null
+++ b/apps/roboshield/src/components/ExistingRobotsTxt/index.ts
@@ -0,0 +1,3 @@
+import ExistingRobotsTxt from "./ExistingRobotsTxt";
+
+export default ExistingRobotsTxt;
diff --git a/apps/roboshield/src/components/Finish/Finish.tsx b/apps/roboshield/src/components/Finish/Finish.tsx
index d309a9474..a9d04d428 100644
--- a/apps/roboshield/src/components/Finish/Finish.tsx
+++ b/apps/roboshield/src/components/Finish/Finish.tsx
@@ -79,7 +79,7 @@ export default function Finish({
       <SkipToLastStep
         handleSkipToLast={() => {}}
         lastStep={lastStep}
-        toolTipText={actions?.toolTipText}
+        showRobotsTxt={actions?.showRobotsTxt}
       />
       <StepHint hint={hint} />
       <Box
diff --git a/apps/roboshield/src/components/Hero/Hero.tsx b/apps/roboshield/src/components/Hero/Hero.tsx
index cb1862f8a..cabe8b769 100644
--- a/apps/roboshield/src/components/Hero/Hero.tsx
+++ b/apps/roboshield/src/components/Hero/Hero.tsx
@@ -110,7 +110,7 @@ const Hero = (props: PageHero) => {
 
         <Button
           onClick={() => {
-            const element = document.getElementById("robots-generator");
+            const element = document.getElementById("robots-txt-generator");
             element?.scrollIntoView({
               behavior: "smooth",
             });
diff --git a/apps/roboshield/src/components/RobotsGenerator/RobotsGenerator.tsx b/apps/roboshield/src/components/RobotsGenerator/RobotsGenerator.tsx
deleted file mode 100644
index 6d94cf31e..000000000
--- a/apps/roboshield/src/components/RobotsGenerator/RobotsGenerator.tsx
+++ /dev/null
@@ -1,215 +0,0 @@
-import { Section } from "@commons-ui/core";
-import { Box, Paper, Stack, Step, StepButton, Stepper } from "@mui/material";
-import { FC, useEffect } from "react";
-import React from "react";
-import { useState } from "react";
-
-import Delays from "@/roboshield/components/Delays";
-import Sitemaps from "@/roboshield/components/Sitemaps";
-
-import CommonBots from "@/roboshield/components/CommonBots";
-import CommonSettings from "@/roboshield/components/CommonSettings";
-import ExistingRobots from "@/roboshield/components/ExistingRobots";
-import Finish from "@/roboshield/components/Finish";
-import {
-  useGlobalState,
-  defaultState,
-} from "@/roboshield/context/GlobalContext";
-import { generateRobots } from "@/roboshield/lib/robots";
-import RichText, { Children } from "@/roboshield/components/RichText";
-
-type Props = { [key: string]: string } & {
-  steps: {
-    title: string;
-    hint?: Children;
-    blockType:
-      | "existing-robots"
-      | "delays"
-      | "path"
-      | "block-bots"
-      | "site-maps"
-      | "finish";
-  }[];
-  actions: {
-    toolTipText: string;
-    back: string;
-    continue: string;
-    copyToClipboard: string;
-    download: string;
-    fetch: string;
-    reset: string;
-  };
-};
-
-const slugComponentsMap = {
-  "existing-robots": ExistingRobots,
-  delays: Delays,
-  path: CommonSettings,
-  "block-bots": CommonBots,
-  "site-maps": Sitemaps,
-  finish: Finish,
-};
-const RobotsGenerator: FC<Props> = React.forwardRef(
-  function RobotsGenerator(props, ref) {
-    const { steps, actions } = props;
-    const [activeStep, setActiveStep] = useState(0);
-    const { state, setState } = useGlobalState();
-    const [code, setCode] = useState(state.robots || "");
-
-    const handleNext = () => {
-      setActiveStep((prevActiveStep) => prevActiveStep + 1);
-    };
-
-    const handleBack = () => {
-      setActiveStep((prevActiveStep) => prevActiveStep - 1);
-    };
-
-    const handleReset = () => {
-      setState(defaultState);
-      setActiveStep(0);
-    };
-
-    const handleNextStep = (data: any) => {
-      const newState = { ...state, ...data };
-      setState(newState);
-      handleNext();
-    };
-
-    const handleSkipToLast = (data: any) => {
-      const newState = { ...state, ...data };
-      setState(newState);
-      setActiveStep(props.steps.length - 1);
-    };
-
-    const handleStep = (step: number) => () => {
-      setActiveStep(step);
-    };
-
-    useEffect(() => {
-      const generateRobotsFile = async () => {
-        const robots = await generateRobots(state);
-        setCode(robots);
-      };
-
-      generateRobotsFile();
-    }, [state]);
-
-    const activeStepSlug:
-      | "existing-robots"
-      | "delays"
-      | "path"
-      | "block-bots"
-      | "site-maps"
-      | "finish" = steps[activeStep]?.blockType;
-    const ActiveComponent = slugComponentsMap[activeStepSlug] ?? null;
-    const { hint, ...activeComponentProps } = steps[activeStep] ?? {};
-    return (
-      <>
-        <Section
-          sx={{ px: { xs: 2.5, sm: 0 }, py: 10 }}
-          ref={ref}
-          id="robots-generator"
-        >
-          <Stack
-            direction={{
-              xs: "column",
-              md: "row",
-            }}
-            justifyContent="space-between"
-            height="100%"
-          >
-            <Box
-              sx={{
-                p: 1,
-                width: "100%",
-                background:
-                  "linear-gradient(180deg, rgba(243, 246, 253, 0.7) 0%, rgba(243, 246, 253, 0) 86.26%);",
-                borderRadius: 2,
-                my: 0,
-              }}
-            >
-              <Box
-                sx={{
-                  width: "100%",
-                  border: "1px solid rgb(19 81 216 / 10%);",
-                  p: { md: 6 },
-                  borderRadius: 2,
-                  background:
-                    "linear-gradient(0deg, rgba(19, 81, 216, 0.01), rgba(19, 81, 216, 0.01)), linear-gradient(0deg, rgba(19, 81, 216, 0.05), rgba(19, 81, 216, 0.05));",
-                }}
-              >
-                <Box
-                  sx={{
-                    width: "100%",
-                    px: { md: 6 },
-                    paddingBottom: 8,
-                    paddingTop: 4,
-                    background: "#FFFFFF",
-                    borderRadius: 2,
-                  }}
-                >
-                  <Box
-                    sx={{
-                      px: { xs: 2, md: 0 },
-                      py: "10px",
-                      mb: 5,
-                    }}
-                  ></Box>
-
-                  <Stepper nonLinear activeStep={activeStep}>
-                    {steps?.map((step, index) => (
-                      <Step key={step.title}>
-                        <StepButton
-                          color="inherit"
-                          onClick={handleStep(index)}
-                          sx={{
-                            "& .MuiStepLabel-label": {
-                              color:
-                                index === activeStep
-                                  ? "primary.main"
-                                  : "secondary.main",
-                              display: { xs: "none", md: "block" },
-                            },
-                            fontSize: {
-                              xs: "1rem",
-                              md: "1.2rem",
-                            },
-                            fontWeight: { xs: 500, md: 600 },
-                          }}
-                        >
-                          {step?.title}
-                        </StepButton>
-                      </Step>
-                    ))}
-                  </Stepper>
-                  {ActiveComponent && (
-                    <Paper
-                      sx={{
-                        p: 3,
-                        mt: 3,
-                        boxShadow: 0,
-                      }}
-                    >
-                      <ActiveComponent
-                        hint={<RichText elements={hint} />}
-                        handleNext={handleNextStep}
-                        handleBack={handleBack}
-                        handleSkipToLast={handleSkipToLast}
-                        lastStep={activeStep === steps.length - 1}
-                        handleReset={handleReset}
-                        actions={actions}
-                        {...activeComponentProps}
-                      />
-                    </Paper>
-                  )}
-                </Box>
-              </Box>
-            </Box>
-          </Stack>
-        </Section>
-      </>
-    );
-  },
-);
-
-export default RobotsGenerator;
diff --git a/apps/roboshield/src/components/RobotsGenerator/index.ts b/apps/roboshield/src/components/RobotsGenerator/index.ts
deleted file mode 100644
index b583e5aea..000000000
--- a/apps/roboshield/src/components/RobotsGenerator/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import RobotsGenerator from "./RobotsGenerator";
-
-export default RobotsGenerator;
diff --git a/apps/roboshield/src/components/RobotsTxtGenerator/RobotsTxtGenerator.tsx b/apps/roboshield/src/components/RobotsTxtGenerator/RobotsTxtGenerator.tsx
new file mode 100644
index 000000000..344e0eb45
--- /dev/null
+++ b/apps/roboshield/src/components/RobotsTxtGenerator/RobotsTxtGenerator.tsx
@@ -0,0 +1,213 @@
+import { Section } from "@commons-ui/core";
+import { Box, Paper, Stack, Step, StepButton, Stepper } from "@mui/material";
+import { FC, useEffect } from "react";
+import React from "react";
+import { useState } from "react";
+
+import Delays from "@/roboshield/components/Delays";
+import Sitemaps from "@/roboshield/components/Sitemaps";
+
+import CommonBots from "@/roboshield/components/CommonBots";
+import CommonSettings from "@/roboshield/components/CommonSettings";
+import ExistingRobotsTxt from "@/roboshield/components/ExistingRobotsTxt";
+import Finish from "@/roboshield/components/Finish";
+import {
+  useGlobalState,
+  defaultState,
+} from "@/roboshield/context/GlobalContext";
+import { generateRobots } from "@/roboshield/lib/robots";
+import RichText, { Children } from "@/roboshield/components/RichText";
+
+type Props = { [key: string]: string } & {
+  steps: {
+    title: string;
+    hint?: Children;
+    blockType:
+      | "existing-robots"
+      | "delays"
+      | "paths"
+      | "block-bots"
+      | "site-maps"
+      | "finish";
+  }[];
+  actions: {
+    showRobotsTxt: string;
+    back: string;
+    continue: string;
+    copyToClipboard: string;
+    download: string;
+    fetch: string;
+    reset: string;
+  };
+};
+
+const slugComponentsMap = {
+  "existing-robots": ExistingRobotsTxt,
+  delays: Delays,
+  paths: CommonSettings,
+  "block-bots": CommonBots,
+  "site-maps": Sitemaps,
+  finish: Finish,
+};
+const RobotsGenerator: FC<Props> = React.forwardRef(
+  function RobotsGenerator(props, ref) {
+    const { steps, actions } = props;
+    const [activeStep, setActiveStep] = useState(0);
+    const { state, setState } = useGlobalState();
+    const [code, setCode] = useState(state.robots || "");
+
+    const handleNext = () => {
+      setActiveStep((prevActiveStep) => prevActiveStep + 1);
+    };
+
+    const handleBack = () => {
+      setActiveStep((prevActiveStep) => prevActiveStep - 1);
+    };
+
+    const handleReset = () => {
+      setState(defaultState);
+      setActiveStep(0);
+    };
+
+    const handleNextStep = (data: any) => {
+      const newState = { ...state, ...data };
+      setState(newState);
+      handleNext();
+    };
+
+    const handleSkipToLast = (data: any) => {
+      const newState = { ...state, ...data };
+      setState(newState);
+      setActiveStep(props.steps.length - 1);
+    };
+
+    const handleStep = (step: number) => () => {
+      setActiveStep(step);
+    };
+
+    useEffect(() => {
+      const generateRobotsFile = async () => {
+        const robots = await generateRobots(state);
+        setCode(robots);
+      };
+
+      generateRobotsFile();
+    }, [state]);
+
+    const activeStepSlug:
+      | "existing-robots"
+      | "delays"
+      | "paths"
+      | "block-bots"
+      | "site-maps"
+      | "finish" = steps[activeStep]?.blockType;
+    const ActiveComponent = slugComponentsMap[activeStepSlug] ?? null;
+    const { hint, ...activeComponentProps } = steps[activeStep] ?? {};
+    return (
+      <Section
+        sx={{ px: { xs: 2.5, sm: 0 }, py: 10 }}
+        ref={ref}
+        id="robots-txt-generator"
+      >
+        <Stack
+          direction={{
+            xs: "column",
+            md: "row",
+          }}
+          justifyContent="space-between"
+          height="100%"
+        >
+          <Box
+            sx={{
+              p: 1,
+              width: "100%",
+              background:
+                "linear-gradient(180deg, rgba(243, 246, 253, 0.7) 0%, rgba(243, 246, 253, 0) 86.26%);",
+              borderRadius: 2,
+              my: 0,
+            }}
+          >
+            <Box
+              sx={{
+                width: "100%",
+                border: "1px solid rgb(19 81 216 / 10%);",
+                p: { md: 6 },
+                borderRadius: 2,
+                background:
+                  "linear-gradient(0deg, rgba(19, 81, 216, 0.01), rgba(19, 81, 216, 0.01)), linear-gradient(0deg, rgba(19, 81, 216, 0.05), rgba(19, 81, 216, 0.05));",
+              }}
+            >
+              <Box
+                sx={{
+                  width: "100%",
+                  px: { md: 6 },
+                  paddingBottom: 8,
+                  paddingTop: 4,
+                  background: "#FFFFFF",
+                  borderRadius: 2,
+                }}
+              >
+                <Box
+                  sx={{
+                    px: { xs: 2, md: 0 },
+                    py: "10px",
+                    mb: 5,
+                  }}
+                ></Box>
+
+                <Stepper nonLinear activeStep={activeStep}>
+                  {steps?.map((step, index) => (
+                    <Step key={step.title}>
+                      <StepButton
+                        color="inherit"
+                        onClick={handleStep(index)}
+                        sx={{
+                          "& .MuiStepLabel-label": {
+                            color:
+                              index === activeStep
+                                ? "primary.main"
+                                : "secondary.main",
+                            display: { xs: "none", md: "block" },
+                          },
+                          fontSize: {
+                            xs: "1rem",
+                            md: "1.2rem",
+                          },
+                          fontWeight: { xs: 500, md: 600 },
+                        }}
+                      >
+                        {step?.title}
+                      </StepButton>
+                    </Step>
+                  ))}
+                </Stepper>
+                {ActiveComponent && (
+                  <Paper
+                    sx={{
+                      p: 3,
+                      mt: 3,
+                      boxShadow: 0,
+                    }}
+                  >
+                    <ActiveComponent
+                      hint={<RichText elements={hint} />}
+                      handleNext={handleNextStep}
+                      handleBack={handleBack}
+                      handleSkipToLast={handleSkipToLast}
+                      lastStep={activeStep === steps.length - 1}
+                      handleReset={handleReset}
+                      actions={actions}
+                      {...activeComponentProps}
+                    />
+                  </Paper>
+                )}
+              </Box>
+            </Box>
+          </Box>
+        </Stack>
+      </Section>
+    );
+  },
+);
+
+export default RobotsGenerator;
diff --git a/apps/roboshield/src/components/RobotsTxtGenerator/index.ts b/apps/roboshield/src/components/RobotsTxtGenerator/index.ts
new file mode 100644
index 000000000..3570c2416
--- /dev/null
+++ b/apps/roboshield/src/components/RobotsTxtGenerator/index.ts
@@ -0,0 +1,3 @@
+import RobotsTxtGenerator from "./RobotsTxtGenerator";
+
+export default RobotsTxtGenerator;
diff --git a/apps/roboshield/src/components/Sitemaps/Sitemaps.tsx b/apps/roboshield/src/components/Sitemaps/Sitemaps.tsx
index 8c5714706..4f5995f67 100644
--- a/apps/roboshield/src/components/Sitemaps/Sitemaps.tsx
+++ b/apps/roboshield/src/components/Sitemaps/Sitemaps.tsx
@@ -45,7 +45,7 @@ export default function Sitemaps({
       <SkipToLastStep
         handleSkipToLast={skipToLast}
         lastStep={lastStep}
-        toolTipText={actions?.toolTipText}
+        showRobotsTxt={actions?.showRobotsTxt}
       />
       <StepHint hint={hint} />
       <Box
diff --git a/apps/roboshield/src/components/SkipToLastStep/SkipToLastStep.tsx b/apps/roboshield/src/components/SkipToLastStep/SkipToLastStep.tsx
index ecada2e94..5bdbfc138 100644
--- a/apps/roboshield/src/components/SkipToLastStep/SkipToLastStep.tsx
+++ b/apps/roboshield/src/components/SkipToLastStep/SkipToLastStep.tsx
@@ -5,13 +5,13 @@ import CodeIcon from "@mui/icons-material/Code";
 interface SkipToLastStepProps {
   handleSkipToLast: () => void;
   lastStep: boolean;
-  toolTipText: string;
+  showRobotsTxt: string;
 }
 
 const SkipToLastStep = ({
   handleSkipToLast,
   lastStep,
-  toolTipText,
+  showRobotsTxt,
 }: SkipToLastStepProps) => {
   return (
     <Box
@@ -24,7 +24,7 @@ const SkipToLastStep = ({
         top: "-150px",
       }}
     >
-      <Tooltip title={toolTipText}>
+      <Tooltip title={showRobotsTxt}>
         <IconButton
           onClick={handleSkipToLast}
           sx={{
diff --git a/apps/roboshield/src/payload/blocks/RobotsGenerator.ts b/apps/roboshield/src/payload/blocks/RobotsTxtGenerator.ts
similarity index 91%
rename from apps/roboshield/src/payload/blocks/RobotsGenerator.ts
rename to apps/roboshield/src/payload/blocks/RobotsTxtGenerator.ts
index 6b0f6830e..8e576bf36 100644
--- a/apps/roboshield/src/payload/blocks/RobotsGenerator.ts
+++ b/apps/roboshield/src/payload/blocks/RobotsTxtGenerator.ts
@@ -1,7 +1,25 @@
-import { Block, Field } from "payload/types";
+import { Block, Field, Validate } from "payload/types";
 import richText from "../fields/richText";
 import { blocks } from "payload/dist/fields/validations";
 
+const validateSteps: Validate = (value = [], args) => {
+  const requiredSteps: string[] = ["finish"];
+  const missingSteps = requiredSteps.filter(
+    (slug) =>
+      !value?.find(
+        ({ blockType }: { blockType: string }) => blockType === slug,
+      ),
+  );
+  if (missingSteps.length) {
+    return `The following steps are missing: ${missingSteps.join(", ")}`;
+  }
+  const lastBlock = value[value.length - 1];
+  if (lastBlock?.blockType !== "finish") {
+    return "Finish Step should appear last";
+  }
+  return blocks(value, args);
+};
+
 const ExistingRobots: Block = {
   slug: "existing-robots",
   labels: { singular: "Existing Robots", plural: "Existing Robots" },
@@ -357,7 +375,7 @@ const Labels: Field = {
   type: "group",
   fields: [
     {
-      name: "toolTipText",
+      name: "showRobotsTxt",
       type: "text",
       required: true,
       defaultValue: "View current robots.txt file",
@@ -394,9 +412,9 @@ const Labels: Field = {
     },
   ],
 };
-const RobotsGenerator: Block = {
-  slug: "robots-generator",
-  labels: { singular: "Robots Generator", plural: "Robots Generator" },
+const RobotsTxtGenerator: Block = {
+  slug: "robots-txt-generator",
+  labels: { singular: "robots.txt Generator", plural: "robots.txt Generator" },
   fields: [
     {
       type: "blocks",
@@ -405,22 +423,10 @@ const RobotsGenerator: Block = {
       admin: {
         initCollapsed: true,
       },
-      validate: (value, args) => {
-        const requiredSteps: string[] = ["finish"];
-        const missingSteps = requiredSteps.filter(
-          (slug) =>
-            !value?.find(
-              ({ blockType }: { blockType: string }) => blockType === slug,
-            ),
-        );
-        if (missingSteps.length) {
-          return `The following steps are missing: ${missingSteps.join(", ")}`;
-        }
-        return blocks(value, args);
-      },
+      validate: validateSteps,
     },
     Labels,
   ],
 };
 
-export default RobotsGenerator;
+export default RobotsTxtGenerator;
diff --git a/apps/roboshield/src/payload/collections/Pages.ts b/apps/roboshield/src/payload/collections/Pages.ts
index 5353fcac7..eaf47b380 100644
--- a/apps/roboshield/src/payload/collections/Pages.ts
+++ b/apps/roboshield/src/payload/collections/Pages.ts
@@ -1,7 +1,7 @@
 import { CollectionConfig } from "payload/types";
 import fullTitle from "../fields/fullTitle";
 import slug from "../fields/slug";
-import RobotsGenerator from "../blocks/RobotsGenerator";
+import RobotsTxtGenerator from "../blocks/RobotsTxtGenerator";
 import { PageHeader } from "../blocks/PageHeader";
 import { PageHero } from "../blocks/PageHero";
 import { Content } from "../blocks/Content";
@@ -30,7 +30,7 @@ const Pages: CollectionConfig = {
     {
       name: "blocks",
       type: "blocks",
-      blocks: [PageHeader, PageHero, Content, Statistics, RobotsGenerator],
+      blocks: [PageHeader, PageHero, Content, Statistics, RobotsTxtGenerator],
       localized: true,
       admin: {
         initCollapsed: true,