From 0fa7f33bfe5a766f4ddc22fecd177edbbfe14ea6 Mon Sep 17 00:00:00 2001 From: Rishabh Rathod Date: Thu, 26 Aug 2021 13:22:57 +0530 Subject: [PATCH] fix: Show button when fetching columns (#6891) Improve UX when entering `Table Header Index` value BEFORE: Generate Template Button was hidden when the new column header is getting fetched. There was no loader for a user to understand that data is being fetched. NOW: Generate Template Button is always visible and goes in a loading state when user data is being fetched. --- app/client/src/components/ads/Button.tsx | 1 + .../components/GeneratePageForm/GeneratePageForm.tsx | 2 -- .../components/GeneratePageForm/GoogleSheetForm.tsx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/client/src/components/ads/Button.tsx b/app/client/src/components/ads/Button.tsx index b3a0d6cc02..ba0d1107dc 100644 --- a/app/client/src/components/ads/Button.tsx +++ b/app/client/src/components/ads/Button.tsx @@ -293,6 +293,7 @@ const btnFontStyles = (props: ThemeProp & ButtonProps): BtnFontType => { }; const ButtonStyles = css` + user-select: none; width: ${(props) => props.width ? props.width : props.fill ? "100%" : "auto"}; height: ${(props) => btnFontStyles(props).height}px; diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx index adbcb4e4ca..1327295cfe 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx @@ -128,8 +128,6 @@ const GENERATE_PAGE_MODE = { REPLACE_EMPTY: "REPLACE_EMPTY", // current page's content (DSL) is updated to template DSL. (same pageId) }; -// - function GeneratePageSubmitBtn({ disabled, isLoading, diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx index 8178401897..408bcdf249 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx @@ -361,7 +361,7 @@ function GoogleSheetForm(props: Props) { ) : null} - {selectedSheet.value && columnHeaderList.length + {selectedSheet.value ? renderSubmitButton({ onSubmit, disabled: !columnHeaderList.length || isFetchingColumnHeaderList,