Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb4c50b3

Browse files
committed
Add licensed/unlicensed selectors
1 parentabd6c36 commitb4c50b3

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

‎client/packages/lowcoder/src/pages/setting/environments/components/DeployItemModal.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
33
import{Modal,Form,Select,Checkbox,Button,Spin,Input,Tag,Space,Alert}from'antd';
44
import{messageInstance}from'lowcoder-design/src/components/GlobalInstances';
55
import{useSelector}from'react-redux';
6-
import{selectEnvironments,selectEnvironmentsLoading}from'redux/selectors/enterpriseSelectors';
6+
import{selectLicensedEnvironments,selectEnvironmentsLoading}from'redux/selectors/enterpriseSelectors';
77
import{Environment}from'../types/environment.types';
88
import{DeployableItemConfig}from'../types/deployable-item.types';
99
import{getEnvironmentTagColor,formatEnvironmentType}from'../utils/environmentUtils';
@@ -28,7 +28,7 @@ function DeployItemModal({
2828
onSuccess
2929
}:DeployItemModalProps){
3030
const[form]=Form.useForm();
31-
constenvironments=useSelector(selectEnvironments);
31+
constlicensedEnvironments=useSelector(selectLicensedEnvironments);
3232
constisLoading=useSelector(selectEnvironmentsLoading);
3333
const[deploying,setDeploying]=useState(false);
3434
const[credentialConfirmationStep,setCredentialConfirmationStep]=useState(0);// 0: not started, 1: first confirmation, 2: confirmed
@@ -41,8 +41,8 @@ function DeployItemModal({
4141
},[visible,form]);
4242

4343
// Filter out source environment from target list
44-
consttargetEnvironments=environments.filter(
45-
(env:Environment)=>env.environmentId!==sourceEnvironment.environmentId&&env.isLicensed!==false
44+
consttargetEnvironments=licensedEnvironments.filter(
45+
(env:Environment)=>env.environmentId!==sourceEnvironment.environmentId
4646
);
4747

4848
// Handle credential checkbox change with double confirmation
@@ -84,7 +84,7 @@ function DeployItemModal({
8484

8585
try{
8686
constvalues=awaitform.validateFields();
87-
consttargetEnv=environments.find(env=>env.environmentId===values.targetEnvId);
87+
consttargetEnv=licensedEnvironments.find(env=>env.environmentId===values.targetEnvId);
8888

8989
if(!targetEnv){
9090
messageInstance.error('Target environment not found');

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,15 @@ export const selectEnvironmentsLoading = (state: AppState) =>
3434
state.ui.enterprise?.environmentsLoading??false;
3535

3636
exportconstselectEnvironmentsError=(state:AppState)=>
37-
state.ui.enterprise?.environmentsError??null;
37+
state.ui.enterprise?.environmentsError??null;
38+
39+
exportconstselectUnlicensedEnvironments=(state:AppState)=>{
40+
constenvironments=state.ui.enterprise?.environments??[];
41+
returnenvironments.filter(env=>env.isLicensed===false);
42+
};
43+
44+
exportconstselectLicensedEnvironments=(state:AppState)=>{
45+
constenvironments=state.ui.enterprise?.environments??[];
46+
returnenvironments.filter(env=>env.isLicensed!==false);// licensed or unknown (default to licensed)
47+
};
48+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp