The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Show a spinner button for the Download button when exporting (#66824)
Timofey Kachalovf3318cab6d9e
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsxindex 747f12b85da..82a9b77169f 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx@@ -106,9 +106,10 @@ export const DashCardMenu = ({<QuestionDownloadWidgetquestion={question}result={result}- onDownload={(opts) => {+ onDownload={async (opts) => {close();- handleDownload(opts);++ await handleDownload(opts);}}/>);diff --git a/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsxindex c78ea81d4b2..3b328a817ab 100644--- a/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx@@ -76,9 +76,10 @@ export const PublicOrEmbeddedDashCardMenu = ({<QuestionDownloadWidgetquestion={question}result={result}- onDownload={(opts) => {+ onDownload={async (opts) => {close();- handleDownload(opts);++ await handleDownload(opts);}}/>) : (diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsxindex f12b95d6686..7a7bf47e60f 100644--- a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx@@ -87,9 +87,10 @@ const BaseQuestionDownloadPopover = ({question={question}result={result}formatPreference={formatPreference}- onDownload={(opts) => {+ onDownload={async (opts) => {setIsPopoverOpen(false);- handleDownload(opts);++ await handleDownload(opts);}}/></Popover.Dropdown>diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.tsxindex fbf29c84fb7..2e64f9ca1fb 100644--- a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx@@ -35,7 +35,7 @@ type QuestionDownloadWidgetProps = {type: string;enableFormatting: boolean;enablePivot: boolean;- }) => void;+ }) => Promise<void>;disabled?: boolean;formatPreference?: FormatPreference;} & StackProps;@@ -106,6 +106,8 @@ export const QuestionDownloadWidget = ({PLUGIN_FEATURE_LEVEL_PERMISSIONS.getDownloadWidgetMessageOverride(result) ??t`The maximum download size is 1 million rows.`;+ const [loading, setLoading] = useState(false);+const handleFormatChange = (newFormat: ExportFormat) => {setUserSelectedFormat(newFormat);@@ -132,12 +134,16 @@ export const QuestionDownloadWidget = ({setDismissedExcelPivotExportsBanner,] = useUserSetting("dismissed-excel-pivot-exports-banner");- const handleDownload = () => {- onDownload({+ const handleDownload = async () => {+ setLoading(true);++ await onDownload({type: format,enableFormatting: isFormatted,enablePivot: isPivoted,});++ setLoading(false);};const showPivotXlsxExportHint =@@ -215,6 +221,7 @@ export const QuestionDownloadWidget = ({mt="auto"ml="auto"variant="filled"+ loading={loading}onClick={handleDownload}disabled={disabled}>{t`Download`}</Button>diff --git a/frontend/src/metabase/redux/downloads.ts b/frontend/src/metabase/redux/downloads.tsindex c69fef3876d..f7e9583705b 100644--- a/frontend/src/metabase/redux/downloads.ts+++ b/frontend/src/metabase/redux/downloads.ts@@ -161,7 +161,7 @@ export const downloadQueryResults = createAsyncThunk(dispatch(downloadToImage(false));}} else {- dispatch(downloadDataset({ opts, id: Date.now() }));+ await dispatch(downloadDataset({ opts, id: Date.now() }));}},);diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedMenuDropdown.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedMenuDropdown.tsxindex 37ad54be67a..adac6f24bb8 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedMenuDropdown.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedMenuDropdown.tsx@@ -23,7 +23,7 @@ export interface CardEmbedMenuActions {type: string;enableFormatting: boolean;enablePivot: boolean;- }) => void;+ }) => Promise<void>;handleEditVisualizationSettings: () => void;setIsModifyModalOpen: (open: boolean) => void;handleReplaceQuestion: () => void;@@ -66,9 +66,10 @@ export const CardEmbedMenuDropdown = ({<QuestionDownloadWidgetquestion={question}result={dataset}- onDownload={(opts) => {+ onDownload={async (opts) => {setMenuView(null);- handleDownload(opts);++ await handleDownload(opts);}}/>);diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsxindex 540eec76a28..1f052b7386d 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx@@ -70,9 +70,10 @@ export const PublicDocumentCardMenu = ({<QuestionDownloadWidgetquestion={question}result={dataset}- onDownload={(opts) => {+ onDownload={async (opts) => {close();- handleDownload(opts);++ await handleDownload(opts);}}/>) : (