Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: duplicate page name error does not disappear on navigating to other pages #36320

Merged
merged 9 commits into from
Sep 19, 2024
Merged

fix: duplicate page name error does not disappear on navigating to other pages #36320

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
176f736
#35949: Fix duplicate page name error does not disappear
a6hishekpandey Sep 14, 2024
b167193
Merge branch 'appsmithorg:release' into fix/35949-duplicate-page-name…
a6hishekpandey Sep 17, 2024
13ad713
Address comment use appropriately typed state to avoid assignment to …
a6hishekpandey Sep 17, 2024
91754b7
Merge branch 'appsmithorg:release' into fix/35949-duplicate-page-name…
a6hishekpandey Sep 17, 2024
0300218
Merge branch 'fix/35949-duplicate-page-name-error-does-not-disappear'…
a6hishekpandey Sep 17, 2024
ef98308
Update condition in savePageName
a6hishekpandey Sep 17, 2024
437bc85
Address prettier's style issues
a6hishekpandey Sep 17, 2024
577c74b
Merge branch 'appsmithorg:release' into fix/35949-duplicate-page-name…
a6hishekpandey Sep 17, 2024
a0cffa0
Merge branch 'release' into fix/35949-duplicate-page-name-error-does-…
a6hishekpandey Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ function PageSettings(props: { page: Page }) {

const [pageName, setPageName] = useState(page.pageName);
const [isPageNameSaving, setIsPageNameSaving] = useState(false);
const [isPageNameValid, setIsPageNameValid] = useState<string | undefined>(
undefined,
);
const [pageNameError, setPageNameError] = useState<string | null>(null);

const [customSlug, setCustomSlug] = useState(page.customSlug);
const [isCustomSlugSaving, setIsCustomSlugSaving] = useState(false);
Expand Down Expand Up @@ -126,8 +124,12 @@ function PageSettings(props: { page: Page }) {
}
}, [isUpdatingEntity]);

useEffect(() => {
setPageNameError(null);
}, [page]);

const savePageName = useCallback(() => {
if (!canManagePages || !!isPageNameValid || page.pageName === pageName)
if (!canManagePages || pageNameError !== null || page.pageName === pageName)
return;

const payload: UpdatePageActionPayload = {
Expand All @@ -137,7 +139,7 @@ function PageSettings(props: { page: Page }) {

setIsPageNameSaving(true);
dispatch(updatePageAction(payload));
}, [page.pageId, page.pageName, pageName, isPageNameValid]);
}, [page.pageId, page.pageName, pageName, pageNameError]);

const saveCustomSlug = useCallback(() => {
if (!canManagePages || page.customSlug === customSlug) return;
Expand Down Expand Up @@ -167,15 +169,15 @@ function PageSettings(props: { page: Page }) {
);

const onPageNameChange = (value: string) => {
let isValid = undefined;
let errorMessage = null;

if (!value || value.trim().length === 0) {
isValid = PAGE_SETTINGS_NAME_EMPTY_MESSAGE();
errorMessage = PAGE_SETTINGS_NAME_EMPTY_MESSAGE();
} else if (value !== page.pageName && hasActionNameConflict(value)) {
isValid = PAGE_SETTINGS_ACTION_NAME_CONFLICT_ERROR(value);
errorMessage = PAGE_SETTINGS_ACTION_NAME_CONFLICT_ERROR(value);
}

setIsPageNameValid(isValid);
setPageNameError(errorMessage);
setPageName(toValidPageName(value));
};

Expand All @@ -190,13 +192,13 @@ function PageSettings(props: { page: Page }) {
<div
className={classNames({
"pt-1 pb-2 relative": true,
"pb-4": !isPageNameValid,
"pb-4": !pageNameError,
})}
>
{isPageNameSaving && <TextLoaderIcon />}
<Input
defaultValue={pageName}
errorMessage={isPageNameValid}
errorMessage={pageNameError}
id="t--page-settings-name"
isDisabled={!canManagePages}
label={PAGE_SETTINGS_PAGE_NAME_LABEL()}
Expand Down
Loading