From 7acdf9cb3dd63a5717a2e5d57bfcf288948d83c7 Mon Sep 17 00:00:00 2001
From: tristanliu <37809633+sevenliu1896@users.noreply.github.com>
Date: Wed, 18 Oct 2023 03:39:48 -0500
Subject: [PATCH] [improvement][semantic-fe] Fix the issue of database changes
 not taking effect when creating based on an SQL data source. (#255)

* [improvement][semantic-fe] Add model alias setting & Add view permission restrictions to the model permission management tab.
[improvement][semantic-fe] Add permission control to the action buttons for the main domain; apply high sensitivity filtering to the authorization of metrics/dimensions.
[improvement][semantic-fe] Optimize the editing mode in the dimension/metric/datasource components to use the modelId stored in the database for data, instead of relying on the data from the state manager.

* [improvement][semantic-fe] Add time granularity setting in the data source configuration.

* [improvement][semantic-fe] Dictionary import for dimension values supported in Q&A visibility

* [improvement][semantic-fe] Modification of data source creation prompt wording"

* [improvement][semantic-fe] metric market experience optimization

* [improvement][semantic-fe] enhance the analysis of metric trends

* [improvement][semantic-fe] optimize the presentation of metric trend permissions

* [improvement][semantic-fe] add metric trend download functionality

* [improvement][semantic-fe] fix the dimension initialization issue in metric correlation

* [improvement][semantic-fe] Fix the issue of database changes not taking effect when creating based on an SQL data source.
---
 .../Datasource/components/DataSourceCreateForm.tsx            | 2 +-
 .../SemanticModel/Metric/components/MetricTrendSection.tsx    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx
index 2edccc944..059d76c6b 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx
@@ -163,7 +163,7 @@ const DataSourceCreateForm: React.FC<CreateFormProps> = ({
       const queryParams = {
         ...submitForm,
         sqlQuery: sql,
-        databaseId: dataSourceItem?.databaseId || formDatabaseId || databaseItem?.key,
+        databaseId: databaseItem?.key || dataSourceItem?.databaseId || formDatabaseId,
         queryType: basicInfoFormMode === 'fast' ? 'table_query' : 'sql_query',
         tableQuery: dbName && tableName ? `${dbName}.${tableName}` : '',
         modelId: isEdit ? dataSourceItem.modelId : modelId,
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx
index ac20c41af..73c725133 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx
@@ -26,6 +26,7 @@ const MetricTrendSection: React.FC<Props> = ({ nodeData }) => {
   const [metricColumnConfig, setMetricColumnConfig] = useState<ISemantic.IMetricTrendColumn>();
   const [authMessage, setAuthMessage] = useState<string>('');
   const [downloadLoding, setDownloadLoding] = useState<boolean>(false);
+  const [downloadBtnDisabledState, setDownloadBtnDisabledState] = useState<boolean>(true);
   const [periodDate, setPeriodDate] = useState<{
     startDate: string;
     endDate: string;
@@ -72,12 +73,14 @@ const MetricTrendSection: React.FC<Props> = ({ nodeData }) => {
       if (targetConfig) {
         setMetricColumnConfig(targetConfig);
       }
+      setDownloadBtnDisabledState(false);
     } else {
       if (code === 401 || code === 400) {
         setAuthMessage(msg);
       } else {
         message.error(msg);
       }
+      setDownloadBtnDisabledState(true);
       setMetricTrendData([]);
       setMetricColumnConfig(undefined);
     }
@@ -128,6 +131,7 @@ const MetricTrendSection: React.FC<Props> = ({ nodeData }) => {
             <Button
               type="primary"
               loading={downloadLoding}
+              disabled={downloadBtnDisabledState}
               onClick={() => {
                 getMetricTrendData(true);
               }}