Add licensed/unlicensed selectors

iamfaran · iamfaran · commit b4c50b3eef22 · 2025-05-27T21:37:51.000+05:00
diff --git a/client/packages/lowcoder/src/pages/setting/environments/components/DeployItemModal.tsx b/client/packages/lowcoder/src/pages/setting/environments/components/DeployItemModal.tsx
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { Modal, Form, Select, Checkbox, Button, Spin, Input, Tag, Space, Alert } from 'antd';
 import { messageInstance } from 'lowcoder-design/src/components/GlobalInstances';
 import { useSelector } from 'react-redux';
-import { selectEnvironments, selectEnvironmentsLoading } from 'redux/selectors/enterpriseSelectors';
+import { selectLicensedEnvironments, selectEnvironmentsLoading } from 'redux/selectors/enterpriseSelectors';
 import { Environment } from '../types/environment.types';
 import { DeployableItemConfig } from '../types/deployable-item.types';
 import { getEnvironmentTagColor, formatEnvironmentType } from '../utils/environmentUtils';
@@ -28,7 +28,7 @@ function DeployItemModal({
   onSuccess
 }: DeployItemModalProps) {
   const [form] = Form.useForm();
-  const environments = useSelector(selectEnvironments);
+  const licensedEnvironments = useSelector(selectLicensedEnvironments);
   const isLoading = useSelector(selectEnvironmentsLoading);
   const [deploying, setDeploying] = useState(false);
   const [credentialConfirmationStep, setCredentialConfirmationStep] = useState(0); // 0: not started, 1: first confirmation, 2: confirmed
@@ -41,8 +41,8 @@ function DeployItemModal({
   }, [visible, form]);
   
   // Filter out source environment from target list
-  const targetEnvironments = environments.filter(
-    (env: Environment) => env.environmentId !== sourceEnvironment.environmentId && env.isLicensed !== false
+  const targetEnvironments = licensedEnvironments.filter(
+    (env: Environment) => env.environmentId !== sourceEnvironment.environmentId
   );
   
   // Handle credential checkbox change with double confirmation
@@ -84,7 +84,7 @@ function DeployItemModal({
     
     try {
       const values = await form.validateFields();
-      const targetEnv = environments.find(env => env.environmentId === values.targetEnvId);
+      const targetEnv = licensedEnvironments.find(env => env.environmentId === values.targetEnvId);
       
       if (!targetEnv) {
         messageInstance.error('Target environment not found');
diff --git a/client/packages/lowcoder/src/redux/selectors/enterpriseSelectors.ts b/client/packages/lowcoder/src/redux/selectors/enterpriseSelectors.ts
@@ -34,4 +34,15 @@ export const selectEnvironmentsLoading = (state: AppState) =>
   state.ui.enterprise?.environmentsLoading ?? false;
 
 export const selectEnvironmentsError = (state: AppState) =>
-  state.ui.enterprise?.environmentsError ?? null;
+  state.ui.enterprise?.environmentsError ?? null;
+
+export const selectUnlicensedEnvironments = (state: AppState) => {
+  const environments = state.ui.enterprise?.environments ?? [];
+  return environments.filter(env => env.isLicensed === false);
+};
+
+export const selectLicensedEnvironments = (state: AppState) => {
+  const environments = state.ui.enterprise?.environments ?? [];
+  return environments.filter(env => env.isLicensed !== false); // licensed or unknown (default to licensed)
+};
+
