Merge pull request #6405 from savindi7/fix-sms-provider-tab-switch

Remove duplicate API call and improve tab switching in SMS Providers

.changeset/violet-falcons-camp.md

@@ -0,0 +1,6 @@
+---
+"@wso2is/admin.sms-providers.v1": patch
+"@wso2is/admin.extensions.v1": patch
+---
+
+Remove duplicated API call and improve tab switching in SMS Providers.

features/admin.extensions.v1/configs/models/sms-provider.ts

@@ -16,11 +16,17 @@
  * under the License.
  */
 
+import { RequestErrorInterface } from "@wso2is/admin.core.v1/hooks/use-request";
+import { SMSProviderAPIResponseInterface } from "@wso2is/admin.sms-providers.v1/models/sms-providers";
+import { AxiosError } from "axios";
 import { ReactNode } from "react";
 
 interface SmsProviderConfig {
     renderAlternativeSmsProviderOptions: (options?: {
         existingSMSProviders: string[]
+        mutateGetSMSProviderConfig: () => void,
+        originalSMSProviderConfig: SMSProviderAPIResponseInterface[],
+        smsProviderConfigFetchRequestError: AxiosError<RequestErrorInterface>,
     }) => ReactNode
 }
 

features/admin.extensions.v1/package.json

@@ -35,6 +35,7 @@
         "@wso2is/admin.provisioning.v1": "^2.20.19",
         "@wso2is/admin.roles.v2": "^2.20.19",
         "@wso2is/admin.server-configurations.v1": "^2.20.19",
+        "@wso2is/admin.sms-providers.v1": "^2.20.19",
         "@wso2is/admin.tenants.v1": "^2.20.19",
         "@wso2is/admin.users.v1": "^2.20.19",
         "@wso2is/admin.userstores.v1": "^2.20.19",

features/admin.sms-providers.v1/pages/sms-providers.tsx

@@ -24,9 +24,6 @@ import {
     FeatureConfigInterface
 } from "@wso2is/admin.core.v1";
 import { history } from "@wso2is/admin.core.v1/helpers";
-import {
-    useSMSNotificationSenders
-}from "@wso2is/admin.extensions.v1/components/identity-providers/api/identity-provider";
 import smsProviderConfig from "@wso2is/admin.extensions.v1/configs/sms-provider";
 import { IdentityAppsApiException } from "@wso2is/core/exceptions";
 import { hasRequiredScopes } from "@wso2is/core/helpers";
@@ -126,9 +123,6 @@ const SMSProviders: FunctionComponent<SMSProviderPageInterface> = (
         mutate: mutateSMSProviderConfig,
         error: smsProviderConfigFetchRequestError
     } = useSMSProviders();
-    const {
-        mutate: mutateNotificationSendersFetchRequest
-    } = useSMSNotificationSenders();
 
     const [ isLoading, setIsLoading ] = useState(true);
     const [ isChoreoSMSOTPProvider, setChoreoSMSOTPProvider ] = useState<boolean>(false);
@@ -215,6 +209,10 @@ const SMSProviders: FunctionComponent<SMSProviderPageInterface> = (
 
     }, [ originalSMSProviderConfig ]);
 
+    const mutateGetSMSProviderConfig = (): void => {
+        mutateSMSProviderConfig();
+    };
+
     /**
      * Displays the error banner when unable to fetch sms provider configuration.
      */
@@ -365,7 +363,6 @@ const SMSProviders: FunctionComponent<SMSProviderPageInterface> = (
             }).finally(() => {
                 setIsSubmitting(false);
                 mutateSMSProviderConfig();
-                mutateNotificationSendersFetchRequest();
             });
     };
 
@@ -611,7 +608,10 @@ const SMSProviders: FunctionComponent<SMSProviderPageInterface> = (
                                                     data-componentid={ "custom-sms-provider" }
                                                 />
                                                 { smsProviderConfig.renderAlternativeSmsProviderOptions({
-                                                    existingSMSProviders
+                                                    existingSMSProviders,
+                                                    mutateGetSMSProviderConfig,
+                                                    originalSMSProviderConfig,
+                                                    smsProviderConfigFetchRequestError
                                                 }) }
                                             </>
                                         ) }