Merge pull request #7450 from ashanthamara/actions

Fix server host resolving issue in rule get resources api
wso2 · Jan 29, 2025 · f5c8217 · f5c8217
2 parents 5790e49 + 1d6cd65
commit f5c8217
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/many-kiwis-juggle.md b/.changeset/many-kiwis-juggle.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.rules.v1": patch
+---
+
+Fix server Host resolving issue in rule get resources api
diff --git a/features/admin.rules.v1/api/use-get-resource-details.ts b/features/admin.rules.v1/api/use-get-resource-details.ts
@@ -16,12 +16,12 @@
  * under the License.
  */
 
+import { Config } from "@wso2is/admin.core.v1/configs/app";
 import useRequest, {
     RequestConfigInterface,
     RequestErrorInterface,
     RequestResultInterface
 } from "@wso2is/admin.core.v1/hooks/use-request";
-import { store } from "@wso2is/admin.core.v1/store";
 import { HttpMethods } from "@wso2is/core/models";
 
 /**
@@ -44,7 +44,7 @@ const useGetResourcesList = <Data = any, Error = RequestErrorInterface>(
             "Content-Type": "application/json"
         },
         method: HttpMethods.GET,
-        url: store.getState().config.deployment.idpConfigs.serverOrigin + `/api/server/v1${endpointPath}`
+        url: Config.resolveServerHost() + `/api/server/v1${endpointPath}`
     };
 
     const { data, error, isLoading, isValidating, mutate } = useRequest<Data, Error>(

diff --git a/features/admin.rules.v1/api/use-get-resource.ts b/features/admin.rules.v1/api/use-get-resource.ts
@@ -16,12 +16,12 @@
  * under the License.
  */
 
+import { Config } from "@wso2is/admin.core.v1/configs/app";
 import useRequest, {
     RequestConfigInterface,
     RequestErrorInterface,
     RequestResultInterface
 } from "@wso2is/admin.core.v1/hooks/use-request";
-import { store } from "@wso2is/admin.core.v1/store";
 import { HttpMethods } from "@wso2is/core/models";
 
 /**
@@ -44,7 +44,7 @@ const useGetResourceDetails = <Data = any, Error = RequestErrorInterface>(
             "Content-Type": "application/json"
         },
         method: HttpMethods.GET,
-        url: store.getState().config.deployment.idpConfigs.serverOrigin + `/api/server/v1${endpointPath}`
+        url: Config.resolveServerHost() + `/api/server/v1${endpointPath}`
     };
 
     const { data, error, isLoading, isValidating, mutate } = useRequest<Data, Error>(