Skip to content

Commit

Permalink
feat: add htmlPageTitle hook and use it in login and sign up pages (#…
Browse files Browse the repository at this point in the history
…24458)

## Description

This is a supportive PR for
https://github.com/appsmithorg/appsmith-ee/pull/1606

Please see [this
comment](https://github.com/appsmithorg/appsmith-ee/pull/1606#issuecomment-1590634326).

#### PR fixes following issue(s)
Fixes # (issue number)
> if no issue exists, please create an issue and ask the maintainers
about this first
>
>
#### Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
>
>
#### Type of change
> Please delete options that are not relevant.
- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- Chore (housekeeping or task changes that don't impact user perception)
- This change requires a documentation update
>
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [ ] Manual
- [ ] Jest
- [ ] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag

#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed

(cherry picked from commit 9f3c24d)
  • Loading branch information
dhruvikn committed Jun 15, 2023
1 parent e6fccb8 commit 9c8b05b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
7 changes: 7 additions & 0 deletions app/client/src/ce/pages/UserAuth/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ import {
getThirdPartyAuths,
getIsFormLoginEnabled,
} from "@appsmith/selectors/tenantSelectors";
import Helmet from "react-helmet";
import { useHtmlPageTitle } from "@appsmith/utils";

const validate = (values: LoginFormValues, props: ValidateProps) => {
const errors: LoginFormValues = {};
Expand Down Expand Up @@ -86,6 +88,7 @@ export function Login(props: LoginFormProps) {
const isFormLoginEnabled = useSelector(getIsFormLoginEnabled);
const socialLoginList = useSelector(getThirdPartyAuths);
const queryParams = new URLSearchParams(location.search);
const htmlPageTitle = useHtmlPageTitle();
const invalidCredsForgotPasswordLinkText = createMessage(
LOGIN_PAGE_INVALID_CREDS_FORGOT_PASSWORD_LINK,
);
Expand Down Expand Up @@ -133,6 +136,10 @@ export function Login(props: LoginFormProps) {
subtitle={createMessage(LOGIN_PAGE_SUBTITLE)}
title={createMessage(LOGIN_PAGE_TITLE)}
>
<Helmet>
<title>{htmlPageTitle}</title>
</Helmet>

{showError && (
<Callout
kind="error"
Expand Down
7 changes: 7 additions & 0 deletions app/client/src/ce/pages/UserAuth/SignUp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ import {
getIsFormLoginEnabled,
getThirdPartyAuths,
} from "@appsmith/selectors/tenantSelectors";
import Helmet from "react-helmet";
import { useHtmlPageTitle } from "@appsmith/utils";

declare global {
interface Window {
Expand Down Expand Up @@ -93,6 +95,7 @@ export function SignUp(props: SignUpFormProps) {
const socialLoginList = useSelector(getThirdPartyAuths);
const shouldDisableSignupButton = pristine || !isFormValid;
const location = useLocation();
const htmlPageTitle = useHtmlPageTitle();

const recaptchaStatus = useScript(
`https://www.google.com/recaptcha/api.js?render=${googleRecaptchaSiteKey.apiKey}`,
Expand Down Expand Up @@ -166,6 +169,10 @@ export function SignUp(props: SignUpFormProps) {
subtitle={createMessage(SIGNUP_PAGE_SUBTITLE)}
title={createMessage(SIGNUP_PAGE_TITLE)}
>
<Helmet>
<title>{htmlPageTitle}</title>
</Helmet>

{showError && <Callout kind="error">{errorMessage}</Callout>}
{socialLoginList.length > 0 && (
<ThirdPartyAuth logins={socialLoginList} type={"SIGNUP"} />
Expand Down
4 changes: 4 additions & 0 deletions app/client/src/ce/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ export const addItemsInContextMenu = (
) => {
return moreActionItems;
};

export const useHtmlPageTitle = () => {
return "Appsmith";
};

0 comments on commit 9c8b05b

Please sign in to comment.