From 7403ada51ee264db63e379fbd13639a748665920 Mon Sep 17 00:00:00 2001 From: Rishabh-Rathod Date: Thu, 26 Aug 2021 00:24:00 +0530 Subject: [PATCH 1/2] Fix: Show button when fetching columns --- app/client/src/components/ads/Button.tsx | 1 + .../components/GeneratePageForm/GoogleSheetForm.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/client/src/components/ads/Button.tsx b/app/client/src/components/ads/Button.tsx index b3a0d6cc0200..ba0d1107dc12 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/GoogleSheetForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx index 817840189796..408bcdf2491d 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, From 182a0002a9401e514be0f94693a1ec5709b5b1da Mon Sep 17 00:00:00 2001 From: Rishabh-Rathod Date: Thu, 26 Aug 2021 00:27:55 +0530 Subject: [PATCH 2/2] fix: commit to fix semantic issue --- .../components/GeneratePageForm/GeneratePageForm.tsx | 2 -- 1 file changed, 2 deletions(-) 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 adbcb4e4caa3..1327295cfe14 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,