Enterprise Edition API Calls cleanup 2

Author: FalkWolsky

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

@@ -50,11 +50,11 @@ import { trans } from "../../i18n";
 import { foldersSelector } from "../../redux/selectors/folderSelector";
 import Setting from "pages/setting";
 import { Support } from "pages/support";
-import { isEE } from "util/envUtils";
 import { getSubscriptions } from 'redux/selectors/subscriptionSelectors';
 import { SubscriptionProductsEnum } from '@lowcoder-ee/constants/subscriptionConstants';
-import { isEEEnvironment } from "util/envUtils";
 import { EnterpriseProvider } from "@lowcoder-ee/util/context/EnterpriseContext";
+import { selectIsLicenseActive } from "redux/selectors/enterpriseSelectors";
+
 
 // adding App Editor, so we can show Apps inside the Admin Area
 import AppEditor from "../editor/AppEditor";
@@ -102,6 +102,8 @@ export default function ApplicationHome() {
 
   const isOrgAdmin = org?.createdBy == user.id ? true : false;
 
+  const isLicenseActive = useSelector(selectIsLicenseActive);
+
   useEffect(() => {
     if (user.currentOrgId) {
       dispatch(fetchDeploymentIdAction());
@@ -225,7 +227,7 @@ export default function ApplicationHome() {
                   },
                 ],
               },
-              isEE() ? {
+              isLicenseActive ? {
                 items: [
                   {
                     text: <TabLabel>{trans("settings.AppUsage")}</TabLabel>,

client/packages/lowcoder/src/pages/setting/settingHome.tsx

@@ -5,7 +5,6 @@ import { AdvancedSetting } from "./advanced/AdvancedSetting";
 import { currentOrgAdmin } from "util/permissionUtils";
 import { trans } from "i18n";
 import AuditSetting from "@lowcoder-ee/pages/setting/audit";
-import { isEE, isEnterpriseMode, isSelfDomain } from "util/envUtils";
 import { TwoColumnSettingPageContent } from "./styled";
 import SubSideBar from "components/layout/SubSideBar";
 import { 
@@ -34,6 +33,8 @@ import FreeLimitTag from "pages/common/freeLimitTag";
 import { Helmet } from "react-helmet";
 import { Card } from "antd";
 import { Subscription } from "./subscriptions";
+import { selectIsLicenseActive } from "redux/selectors/enterpriseSelectors";
+
 
 enum SettingPageEnum {
   UserGroups = "permission",
@@ -53,6 +54,8 @@ export function SettingHome() {
   const config = useSelector(selectSystemConfig);
   const selectKey = useParams<{ setting: string }>().setting || SettingPageEnum.UserGroups;
 
+  const isLicenseActive = useSelector(selectIsLicenseActive);
+
   const items = [
     {
       key: SettingPageEnum.Organization,
@@ -88,52 +91,52 @@ export function SettingHome() {
       label: (
         <span>
           <span className="text">{trans("settings.environments")}</span>
-          {(!isEE() && (
+          {(!isLicenseActive && (
             <FreeLimitTag text={trans("settings.premium")} />
           ))}
         </span>
       ),
       icon: <EnvironmentsIcon width={"20px"}/>,
-      disabled: !isEE() || !currentOrgAdmin(user),
+      disabled: !isLicenseActive || !currentOrgAdmin(user),
     },
     {
       key: SettingPageEnum.AppUsage,
       label: (
         <span>
           <span className="text">{trans("settings.appUsage")}</span>
-          {(!isEE() && (
+          {(!isLicenseActive && (
             <FreeLimitTag text={trans("settings.premium")} />
           ))}
         </span>
       ),
       icon: <UsageStatisticsIcon width={"20px"}/>,
-      disabled: !isEE() || !currentOrgAdmin(user),
+      disabled: !isLicenseActive || !currentOrgAdmin(user),
     },
     {
       key: SettingPageEnum.Audit,
       label: (
         <span>
           <span className="text">{trans("settings.audit")}</span>
-          {(!isEE() && (
+          {(!isLicenseActive && (
             <FreeLimitTag text={trans("settings.premium")} />
           ))}
         </span>
       ),
       icon: <AutitLogsIcon width={"20px"}/>,
-      disabled: !isEE() || !currentOrgAdmin(user),
+      disabled: !isLicenseActive || !currentOrgAdmin(user),
     },
     {
       key: SettingPageEnum.Branding,
       label: (
         <span>
           <span className="text">{trans("settings.branding")}</span>
-          {(!isEE() && (
+          {(!isLicenseActive && (
             <FreeLimitTag text={trans("settings.premium")} />
           ))}
         </span>
       ),
       icon: <BrandingIcon width={"20px"}/>,
-      disabled: !isEE() || !currentOrgAdmin(user),
+      disabled: !isLicenseActive || !currentOrgAdmin(user),
     },
     { 
       key: SettingPageEnum.Subscription,

client/packages/lowcoder/src/redux/reduxActions/enterpriseActions.ts

@@ -4,7 +4,17 @@ export const fetchEnterpriseLicense = () => ({
     type: ReduxActionTypes.FETCH_ENTERPRISE_LICENSE,
   });
 
-export const setEnterpriseLicense = (licenseData: any) => ({
+interface EnterpriseLicenseResponse {
+    eeActive: boolean;
+    remainingAPICalls: number;
+    eeLicenses: Array<{
+        uuid: string;
+        issuedTo: string;
+        apiCallsLimit: number;
+    }>;
+}
+
+export const setEnterpriseLicense = (licenseData: EnterpriseLicenseResponse) => ({
     type: ReduxActionTypes.SET_ENTERPRISE_LICENSE,
     payload: licenseData,
 });

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

@@ -8,3 +8,8 @@ export const selectRemainingAPICalls = (state: AppState) =>
 
 export const selectEnterpriseLicenses = (state: AppState) =>
     state.ui.enterprise?.eeLicenses ?? [];
+
+export const selectIsLicenseActive = (state: AppState) => {
+    const enterprise = state.ui.enterprise;
+    return enterprise?.eeActive && enterprise?.remainingAPICalls > 0;
+};

client/packages/lowcoder/src/util/context/EnterpriseContext.tsx

@@ -2,7 +2,7 @@ import React, { createContext, useContext, useState, useEffect } from 'react';
 import { fetchEnterpriseLicense } from 'redux/reduxActions/enterpriseActions';
 import { selectEnterpriseEditionStatus } from '@lowcoder-ee/redux/selectors/enterpriseSelectors';
 import { useDispatch, useSelector } from 'react-redux';
-import { setEEActiveState, isEEEnvironment } from "util/envUtils";
+import { isEEEnvironment } from "util/envUtils";
 
 interface EnterpriseContextValue {
     isEnterpriseActive: boolean;
@@ -25,15 +25,15 @@ export const EnterpriseProvider: React.FC<ProviderProps> = ({ children }) => {
         dispatch(fetchEnterpriseLicense());
       } else {
         // Set the state to false for non-EE environments
-        setEEActiveState(false);
+        // setEEActiveState(false);
         setIsEnterpriseActive(false);
       }
     }, [dispatch]);
 
     useEffect(() => {
       if (isEEEnvironment()) {
         // Update the global EE state based on Redux
-        setEEActiveState(isEnterpriseActiveRedux);
+        // setEEActiveState(isEnterpriseActiveRedux);
         setIsEnterpriseActive(isEnterpriseActiveRedux);
       }
     }, [isEnterpriseActiveRedux]);

client/packages/lowcoder/src/util/envUtils.ts

@@ -10,18 +10,6 @@ export function developEnv(): boolean {
   return REACT_APP_ENV === "development" || localEnv();
 }
 
-// Create a global variable to hold the EE state
-let eeActiveState = false;
-
-// Function to dynamically update the EE state
-export function setEEActiveState(isActive: boolean) {
-  eeActiveState = isActive;
-}
-
-export function isEE(): boolean {
-  return eeActiveState;
-}
-
 // Is hosted as Enterprise Edition?
 export function isEEEnvironment(): boolean {
   return REACT_APP_EDITION === "enterprise";