Merge branch 'feat/plugins' into dev/plugin-deploy

web/app/components/plugins/plugin-detail-panel/action-list.tsx

@@ -44,7 +44,7 @@ const ActionList = ({
     setShowSettingAuth(false)
   }
 
-  const { mutate: updatePermission } = useUpdateProviderCredentials({
+  const { mutate: updatePermission, isPending } = useUpdateProviderCredentials({
     onSuccess: handleCredentialSettingUpdate,
   })
 
@@ -102,6 +102,7 @@ const ActionList = ({
             credentials: value,
           })}
           onRemove={async () => removePermission(provider.name)}
+          isSaving={isPending}
         />
       )}
     </div>

web/app/components/tools/setting/build-in/config-credentials.tsx

@@ -20,6 +20,7 @@ type Props = {
   onSaved: (value: Record<string, any>) => void
   isHideRemoveBtn?: boolean
   onRemove?: () => void
+  isSaving?: boolean
 }
 
 const ConfigCredential: FC<Props> = ({
@@ -28,6 +29,7 @@ const ConfigCredential: FC<Props> = ({
   onSaved,
   isHideRemoveBtn,
   onRemove = () => { },
+  isSaving,
 }) => {
   const { t } = useTranslation()
   const language = useLanguage()
@@ -54,8 +56,13 @@ const ConfigCredential: FC<Props> = ({
       }
     }
     setIsLoading(true)
-    await onSaved(tempCredential)
-    setIsLoading(false)
+    try {
+      await onSaved(tempCredential)
+      setIsLoading(false)
+    }
+    finally {
+      setIsLoading(false)
+    }
   }
 
   return (
@@ -105,7 +112,7 @@ const ConfigCredential: FC<Props> = ({
                   }
                   < div className='flex space-x-2'>
                     <Button onClick={onCancel}>{t('common.operation.cancel')}</Button>
-                    <Button loading={isLoading} disabled={isLoading} variant='primary' onClick={handleSave}>{t('common.operation.save')}</Button>
+                    <Button loading={isLoading || isSaving} disabled={isLoading || isSaving} variant='primary' onClick={handleSave}>{t('common.operation.save')}</Button>
                   </div>
                 </div>
               </>