Merge pull request #6430 from DonOmalVindula/fix/sms-provider-loading

wso2 · Jun 11, 2024 · c1363ad · c1363ad
2 parents 4b2b96b + 69799c3
commit c1363ad
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/.changeset/perfect-tips-work.md b/.changeset/perfect-tips-work.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.sms-providers.v1": patch
+---
+
+Add loading state to sms provider form
diff --git a/features/admin.sms-providers.v1/pages/custom-sms-provider.tsx b/features/admin.sms-providers.v1/pages/custom-sms-provider.tsx
@@ -29,6 +29,7 @@ import { Divider, Grid } from "semantic-ui-react";
 import { SMSProviderConstants } from "../constants";
 
 interface CustomSMSProviderPageInterface extends IdentifiableComponentInterface {
+    isLoading?: boolean;
     isReadOnly: boolean;
     "data-componentid": string;
     onSubmit: (values: any) => void;
@@ -40,6 +41,7 @@ const CustomSMSProvider: FunctionComponent<CustomSMSProviderPageInterface> = (
 
     const {
         ["data-componentid"]: componentId,
+        isLoading,
         isReadOnly,
         onSubmit
     } = props;
@@ -228,6 +230,7 @@ const CustomSMSProvider: FunctionComponent<CustomSMSProviderPageInterface> = (
                                         onClick={ onSubmit }
                                         ariaLabel="SMS provider form update button"
                                         data-componentid={ `${componentId}-update-button` }
+                                        loading={ isLoading }
                                     >
                                         { "Submit" }
                                     </PrimaryButton>

diff --git a/features/admin.sms-providers.v1/pages/sms-providers.tsx b/features/admin.sms-providers.v1/pages/sms-providers.tsx
@@ -603,6 +603,7 @@ const SMSProviders: FunctionComponent<SMSProviderPageInterface> = (
                                                         SMSProviderConstants.CUSTOM_SMS_PROVIDER && (
                                             <>
                                                 <CustomSMSProvider
+                                                    isLoading={ isSubmitting }
                                                     isReadOnly={ isReadOnly }
                                                     onSubmit={ handleSubmit }
                                                     data-componentid={ "custom-sms-provider" }
@@ -618,6 +619,7 @@ const SMSProviders: FunctionComponent<SMSProviderPageInterface> = (
                                         { smsProviderSettings?.selectedProvider ===
                                                         SMSProviderConstants.TWILIO_SMS_PROVIDER && (
                                             <TwilioSMSProvider
+                                                isLoading={ isSubmitting }
                                                 isReadOnly={ isReadOnly }
                                                 onSubmit={ handleSubmit }
                                                 data-componentid={ "twilio-sms-provider" }
@@ -626,6 +628,7 @@ const SMSProviders: FunctionComponent<SMSProviderPageInterface> = (
                                         { smsProviderSettings?.selectedProvider ===
                                                         SMSProviderConstants.VONAGE_SMS_PROVIDER && (
                                             <VonageSMSProvider
+                                                isLoading={ isSubmitting }
                                                 isReadOnly={ isReadOnly }
                                                 onSubmit={ handleSubmit }
                                                 data-componentid={ "vonage-sms-provider" }

diff --git a/features/admin.sms-providers.v1/pages/twilio-sms-provider.tsx b/features/admin.sms-providers.v1/pages/twilio-sms-provider.tsx
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -32,6 +32,7 @@ import { SMSProviderConstants } from "../constants";
 interface TwilioSMSProviderPageInterface extends IdentifiableComponentInterface {
     "data-componentid": string;
     isReadOnly: boolean;
+    isLoading?: boolean;
     onSubmit: (values: any) => void;
 }
 
@@ -41,6 +42,7 @@ const TwilioSMSProvider: FunctionComponent<TwilioSMSProviderPageInterface> = (
     const {
         ["data-componentid"]: componentId,
         onSubmit,
+        isLoading,
         isReadOnly
     } = props;
     const { t } = useTranslation();
@@ -171,6 +173,7 @@ const TwilioSMSProvider: FunctionComponent<TwilioSMSProviderPageInterface> = (
                                         onClick={ onSubmit }
                                         ariaLabel="SMS provider form update button"
                                         data-componentid={ `${componentId}-update-button` }
+                                        loading={ isLoading }
                                     >
                                         { "Submit" }
                                     </PrimaryButton>

diff --git a/features/admin.sms-providers.v1/pages/vonage-sms-provider.tsx b/features/admin.sms-providers.v1/pages/vonage-sms-provider.tsx
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -31,6 +31,7 @@ import { SMSProviderConstants } from "../constants";
 
 interface VonageSMSProviderPageInterface extends IdentifiableComponentInterface {
     "data-componentid": string;
+    isLoading?: boolean;
     isReadOnly: boolean;
     onSubmit: (values: any) => void;
 }
@@ -40,6 +41,7 @@ const VonageSMSProvider: FunctionComponent<VonageSMSProviderPageInterface> = (
 ): ReactElement => {
     const {
         ["data-componentid"]: componentId,
+        isLoading,
         isReadOnly,
         onSubmit
     } = props;
@@ -171,6 +173,7 @@ const VonageSMSProvider: FunctionComponent<VonageSMSProviderPageInterface> = (
                                         onClick={ onSubmit }
                                         ariaLabel="SMS provider form update button"
                                         data-componentid={ `${componentId}-update-button` }
+                                        loading={ isLoading }
                                     >
                                         { "Submit" }
                                     </PrimaryButton>