Introduce DeploymentID for Subscription-Check

FalkWolsky · FalkWolsky · commit 50b8eb9c621a · 2024-10-26T15:58:41.000+02:00
diff --git a/client/packages/lowcoder/src/redux/sagas/subscriptionSagas.ts b/client/packages/lowcoder/src/redux/sagas/subscriptionSagas.ts
@@ -1,20 +1,32 @@
-import { call, put, select, takeLatest, all } from 'redux-saga/effects';
+import { call, put, select, takeLatest, all, take } from 'redux-saga/effects';
 import { fetchSubscriptionsAction } from 'redux/reduxActions/subscriptionActions';
 import { searchCustomersSubscriptions, Subscription } from 'api/subscriptionApi';
 import { fetchSubscriptionsSuccess, fetchSubscriptionsError } from 'redux/reduxActions/subscriptionActions';
 import { LowcoderSearchCustomer } from 'api/subscriptionApi';
 import { getUser, getCurrentUser } from 'redux/selectors/usersSelectors';
+import { getDeploymentId } from "redux/selectors/configSelectors";
 import { CurrentUser, User } from '@lowcoder-ee/constants/userConstants';
 import { ReduxActionTypes } from '@lowcoder-ee/constants/reduxActionConstants';
 
 function* fetchSubscriptionsSaga(action: ReturnType<typeof fetchSubscriptionsAction>) {
 
   try {
+
+    // wait for deploymentId to be available
+    yield take(ReduxActionTypes.FETCH_DEPLOYMENT_ID_SUCCESS);
+
     const user: User = yield select(getUser);
     const currentUser: CurrentUser = yield select(getCurrentUser); 
     const orgID = user.currentOrgId;
     const domain = `${window.location.protocol}//${window.location.hostname}${window.location.port ? `:${window.location.port}` : ''}`;
-    const hostIdenticator = "lowcoder-test";
+    
+    let hostIdenticator : string = yield select(getDeploymentId);
+
+    // Poll until deploymentId is available
+    while (!hostIdenticator) {
+      yield delay(100); // wait for 100ms
+      hostIdenticator = yield select(getDeploymentId);
+    }
 
     const subscriptionSearchCustomer: LowcoderSearchCustomer = {
       hostname: domain,
