actions and selectors for deploymentId

Author: raheeliftikhar5

client/packages/lowcoder/src/api/subscriptionApi.ts

@@ -4,6 +4,7 @@ import { useSelector } from "react-redux";
 import { getUser, getCurrentUser } from "redux/selectors/usersSelectors";
 import { useEffect, useState } from "react";
 import { calculateFlowCode }  from "./apiUtils";
+import { getDeploymentId } from "@lowcoder-ee/redux/selectors/configSelectors";
 
 // Interfaces
 export interface CustomerAddress {
@@ -213,10 +214,7 @@ export const searchCustomersSubscriptions = async (Customer: LowcoderSearchCusto
     if (result?.data?.data?.length > 0) {
       return result?.data?.data;
     }
-    else if (result.data.success == "false" && (
-      result.data.reason == "customerNotFound"
-      || result.data.reason === "userSubscriptionNotFound"
-    )) {
+    else if (result.data.success == "false" && result.data.reason == "customerNotFound") {
       return [];
     }
     else if (result.data.success == "false" && result.data.reason == "userSubscriptionNotFound") {
@@ -225,6 +223,7 @@ export const searchCustomersSubscriptions = async (Customer: LowcoderSearchCusto
     else if (result.data.success == "false" && result.data.reason == "orgSubscriptionNotFound") {
       return [];
     }
+    return [];
   } catch (error) {
     console.error("Error searching customer:", error);
     throw error;
@@ -404,23 +403,24 @@ export const InitializeSubscription = () => {
 
   const user = useSelector(getUser);
   const currentUser = useSelector(getCurrentUser);
+  const deploymentId = useSelector(getDeploymentId);
   const currentOrg = user.orgs.find(org => org.id === user.currentOrgId);
   const orgID = user.currentOrgId;
   const domain = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
-  const hostIdenticator = "lowcoder-test";
+  // const hostIdenticator = "lowcoder-test";
   const admin = user.orgRoleMap.get(orgID) === "admin" ? "admin" : "member";
 
   const subscriptionSearchCustomer: LowcoderSearchCustomer = {
     hostname: domain,
-    hostId: hostIdenticator,
+    hostId: deploymentId,
     email: currentUser.email,
     orgId: orgID,
     userId: user.id,
   };
 
   const subscriptionNewCustomer: LowcoderNewCustomer = {
     hostname: domain,
-    hostId: hostIdenticator,
+    hostId: deploymentId,
     email: currentUser.email,
     orgId: orgID,
     userId: user.id,
@@ -447,8 +447,10 @@ export const InitializeSubscription = () => {
       }
     };
 
-    initializeCustomer();
-  }, []);
+    if (Boolean(deploymentId)) {
+      initializeCustomer();
+    }
+  }, [deploymentId]);
 
   useEffect(() => {
     const fetchSubscriptions = async () => {
@@ -547,13 +549,14 @@ export const CheckSubscriptions = () => {
 
   const user = useSelector(getUser);
   const currentUser = useSelector(getCurrentUser);
+  const deploymentId = useSelector(getDeploymentId);
   const orgID = user.currentOrgId;
   const domain = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
-  const hostIdenticator = "lowcoder-test";
+  // const hostIdenticator = "lowcoder-test";
 
   const subscriptionSearchCustomer: LowcoderSearchCustomer = {
     hostname: domain,
-    hostId: hostIdenticator,
+    hostId: deploymentId,
     email: currentUser.email,
     orgId: orgID,
     userId: user.id,
@@ -571,6 +574,12 @@ export const CheckSubscriptions = () => {
         setLoading(false);
       }
     };
+    if (
+      Boolean(currentUser.email)
+      && Boolean(orgID)
+      && Boolean(user.id)
+      && Boolean(deploymentId)
+    )
     fetchCustomerAndSubscriptions();
   }, [subscriptionSearchCustomer]);
 

client/packages/lowcoder/src/pages/ApplicationV2/index.tsx

@@ -72,6 +72,7 @@ import { ReduxActionTypes } from '@lowcoder-ee/constants/reduxActionConstants';
 // adding App Editor, so we can show Apps inside the Admin Area
 import AppEditor from "../editor/AppEditor";
 import { set } from "lodash";
+import { fetchDeploymentIdAction } from "@lowcoder-ee/redux/reduxActions/configActions";
 
 const TabLabel = styled.div`
   font-weight: 500;
@@ -172,6 +173,7 @@ export default function ApplicationHome() {
     if (user.currentOrgId) {
       dispatch(fetchHomeData({}));
       dispatch(fetchSubscriptionsAction());
+      dispatch(fetchDeploymentIdAction());
     }
   }, [user.currentOrgId]);
 

client/packages/lowcoder/src/redux/reducers/uiReducers/configReducer.ts

@@ -10,6 +10,7 @@ import { ExternalEditorContextState } from "util/context/ExternalEditorContext";
 const initialState: ConfigState = {
   fetchingConfig: false,
   editorExternalState: {},
+  deploymentId: '',
 };
 
 const configReducer = createReducer(initialState, {
@@ -40,12 +41,22 @@ const configReducer = createReducer(initialState, {
       editorExternalState: action.payload,
     };
   },
+  [ReduxActionTypes.FETCH_DEPLOYMENT_ID_SUCCESS]: (
+    state: ConfigState,
+    action: ReduxAction<string>
+  ): ConfigState => {
+    return {
+      ...state,
+      deploymentId: action.payload,
+    };
+  },
 });
 
 export interface ConfigState {
   fetchingConfig: boolean;
   systemConfig?: SystemConfig;
   editorExternalState: Partial<ExternalEditorContextState>;
+  deploymentId: string;
 }
 
 export default configReducer;

client/packages/lowcoder/src/redux/sagas/configSagas.ts

@@ -37,8 +37,7 @@ export function* fetchDeploymentIdSaga(action: ReduxAction<undefined>) {
     const response: AxiosResponse<ConfigResponse> = yield call(
       ConfigApi.fetchDeploymentId,
     );
-    const isValidResponse: boolean = validateResponse(response);
-    if (isValidResponse) {
+    if (Boolean(response.data)) {
       yield put({
         type: ReduxActionTypes.FETCH_DEPLOYMENT_ID_SUCCESS,
         payload: response.data,

client/packages/lowcoder/src/redux/selectors/configSelectors.ts

@@ -16,3 +16,7 @@ export const getBrandingConfig = (state: AppState) => {
 export const getExternalEditorState = (state: AppState) => {
   return state.ui.config.editorExternalState;
 };
+
+export const getDeploymentId = (state: AppState) => {
+  return state.ui.config.deploymentId;
+};