Merge pull request #1578 from merico-dev/1566-successfailure-notifica…

…tion-has-unexpected-loading-state 1566 successfailure notification has unexpected loading state
merico-dev · Nov 20, 2024 · da975c9 · da975c9
2 parents acdf6ba + eebe30e
commit da975c9
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 5 deletions.
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "13.44.1",
+  "version": "13.44.2",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "13.44.1",
+  "version": "13.44.2",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "13.44.1",
+  "version": "13.44.2",
   "private": true,
   "workspaces": [
     "api",

diff --git a/settings-form/package.json b/settings-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "13.44.1",
+  "version": "13.44.2",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/settings-form/src/account/add-account.tsx b/settings-form/src/account/add-account.tsx
@@ -49,6 +49,7 @@ function AddAccountForm({ postSubmit, styles = defaultStyles, initialRoleID }: I
         message: t('account.state.added'),
         color: 'green',
         autoClose: true,
+        loading: false,
       });
       postSubmit();
     } catch (error: $TSFixMe) {
@@ -58,6 +59,7 @@ function AddAccountForm({ postSubmit, styles = defaultStyles, initialRoleID }: I
         message: error.message,
         color: 'red',
         autoClose: true,
+        loading: false,
       });
     }
   };

diff --git a/settings-form/src/account/delete-account.tsx b/settings-form/src/account/delete-account.tsx
@@ -36,6 +36,7 @@ export function DeleteAccount({ id, name, onSuccess, styles = defaultStyles }: I
         message: t('account.state.deleted', { name }),
         color: 'green',
         autoClose: true,
+        loading: false,
       });
       onSuccess();
     } catch (error: $TSFixMe) {
@@ -45,6 +46,7 @@ export function DeleteAccount({ id, name, onSuccess, styles = defaultStyles }: I
         message: error.message,
         color: 'red',
         autoClose: true,
+        loading: false,
       });
     }
   };

diff --git a/settings-form/src/account/edit-account.tsx b/settings-form/src/account/edit-account.tsx
@@ -58,6 +58,7 @@ function EditAccountForm({ id, name, email, role_id, postSubmit, styles = defaul
         message: t('account.state.updated'),
         color: 'green',
         autoClose: true,
+        loading: false,
       });
       postSubmit();
     } catch (error: $TSFixMe) {
@@ -67,6 +68,7 @@ function EditAccountForm({ id, name, email, role_id, postSubmit, styles = defaul
         message: error.message,
         color: 'red',
         autoClose: true,
+        loading: false,
       });
     }
   };

diff --git a/settings-form/src/account/login/form.tsx b/settings-form/src/account/login/form.tsx
@@ -43,6 +43,7 @@ export function LoginForm({ postSubmit, styles = defaultStyles }: ILoginForm) {
         message: t('account.state.logged_in'),
         color: 'green',
         autoClose: true,
+        loading: false,
       });
       postSubmit(res);
     } catch (error: $TSFixMe) {
@@ -52,6 +53,7 @@ export function LoginForm({ postSubmit, styles = defaultStyles }: ILoginForm) {
         message: error.message,
         color: 'red',
         autoClose: true,
+        loading: false,
       });
     }
   };

diff --git a/settings-form/src/api-key/add-api-key.tsx b/settings-form/src/api-key/add-api-key.tsx
@@ -46,6 +46,7 @@ function AddAPIKeyForm({ postSubmit, styles = defaultStyles, initialRoleID }: IA
         message: t('api_key.state.added'),
         color: 'green',
         autoClose: true,
+        loading: false,
       });
       postSubmit(app_id, app_secret);
     } catch (error: $TSFixMe) {
@@ -55,6 +56,7 @@ function AddAPIKeyForm({ postSubmit, styles = defaultStyles, initialRoleID }: IA
         message: error.message,
         color: 'red',
         autoClose: true,
+        loading: false,
       });
     }
   };

diff --git a/settings-form/src/api-key/delete-api-key.tsx b/settings-form/src/api-key/delete-api-key.tsx
@@ -36,6 +36,7 @@ export function DeleteAPIKey({ id, name, onSuccess, styles = defaultStyles }: ID
         message: t('global_sql_snippet.state.deleted', { name }),
         color: 'green',
         autoClose: true,
+        loading: false,
       });
       onSuccess();
     } catch (error: $TSFixMe) {
@@ -45,6 +46,7 @@ export function DeleteAPIKey({ id, name, onSuccess, styles = defaultStyles }: ID
         message: error.message,
         color: 'red',
         autoClose: true,
+        loading: false,
       });
     }
   };

diff --git a/website/package.json b/website/package.json
@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "13.44.1",
+  "version": "13.44.2",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"

diff --git a/website/src/pages/dashboard-editor-page/page-content.tsx b/website/src/pages/dashboard-editor-page/page-content.tsx
@@ -64,6 +64,7 @@ export const DashboardEditorPageContent = observer(
           title: 'Successful',
           message: 'This dashboard is updated',
           color: 'green',
+          loading: false,
           autoClose: true,
         });
         await store.currentDetail?.content.load();
@@ -75,6 +76,7 @@ export const DashboardEditorPageContent = observer(
           // @ts-expect-error type of error
           message: error.message,
           color: 'red',
+          loading: false,
           autoClose: true,
         });
       }