Add extra error message to validation page, fixed: can enter create o…

…ffer page with admin account

.env

@@ -4,10 +4,10 @@ HOST_PORT=443
 REACT_APP_API_HOSTNAME="https://localhost:8087"
 
 # Uncomment to disable devtools
-#REACT_APP_ALLOW_DEV_TOOLS=false
+# REACT_APP_ALLOW_DEV_TOOLS=false
 
 # Google Analytics' Universal ID
 ANALYTICS_ID=
 
 # GeoLocation Rapid Api key
-GEO_API_KEY="APIKEY"
+GEO_API_KEY="APIKEY"

src/components/Apply/Company/CompanyApplicationUtils.js

@@ -35,8 +35,12 @@ const ValidationMessages = Object.freeze({
             " You will need to create a new application.",
     },
     "application-already-validated": {
-        title: "Application is already validated!",
-        text: "This application is already validated. ",
+        title: "Application was already validated!",
+        text: "This application was already validated. ",
+    },
+    "account-already-using-email": {
+        title: "Error! Duplicated Email",
+        text: "There is already an account with this email, please create an application with another email. ",
     },
 });
 

src/components/Offers/Form/form-components/OfferForm.js

@@ -99,10 +99,11 @@ const OfferForm = ({ context, title }) => {
 
     const [state, setState] = useState("APPROVED");
     const session = useSession();
-
+    const companyId = session.data?.company?._id;
     useEffect(() => {
+        if (isAdmin) return;
         if (!session.isValidating && session.isLoggedIn) {
-            fetchCompanyApplication(session.data?.company?._id)
+            fetchCompanyApplication(companyId)
                 .then((application) => {
                     setState(application.state);
                 })
@@ -113,7 +114,7 @@ const OfferForm = ({ context, title }) => {
                     });
                 });
         }
-    }, [session.isValidating, session.isLoggedIn, session.data.company._id]);
+    }, [session.isValidating, session.isLoggedIn, isAdmin, companyId]);
 
     const showOwnerComponent = isAdmin && showCompanyField;
 

src/pages/CompanyOffersManagementPage.js

@@ -19,10 +19,10 @@ const CompanyOffersManagementPage = () => {
     const classes = useStyles(isMobile)();
     const [state, setState_] = useState("APPROVED");
     const session = useSession();
-
+    const companyId = session.data?.company?._id;
     useEffect(() => {
         if (!session.isValidating && session.isLoggedIn) {
-            fetchCompanyApplication(session.data?.company?._id)
+            fetchCompanyApplication(companyId)
                 .then((application) => {
                     setState_(application.state);
                 })
@@ -33,7 +33,7 @@ const CompanyOffersManagementPage = () => {
                     });
                 });
         }
-    }, [session.data.company._id, session.isLoggedIn, session.isValidating]);
+    }, [companyId, session.isLoggedIn, session.isValidating]);
 
     return (
         <CardContent className={classes.content}>

src/pages/ValidationPage.spec.js

@@ -79,4 +79,19 @@ describe("Validation Page", () => {
         const { title } = getValidationMessage("application-already-validated");
         expect(page.queryByText(title)).toBeInTheDocument();
     });
+
+    it("Should show error message if there is an account with the same email of the application", async () => {
+        validateApplication.mockImplementation(() => {
+            throw [{ msg: "account-already-using-email" }];
+        });
+        const page = await render(
+            <BrowserRouter>
+                <ThemeProvider theme={AppTheme}>
+                    <ValidationPage />
+                </ThemeProvider>
+            </BrowserRouter>,
+        );
+        const { title } = getValidationMessage("account-already-using-email");
+        expect(page.queryByText(title)).toBeInTheDocument();
+    });
 });