Merge branch 'dev' of github.com:lowcoder-org/lowcoder into environments-translations

iamfaran · iamfaran · commit 42fa2087b594 · 2025-05-31T01:42:42.000+05:00
diff --git a/client/packages/lowcoder/src/pages/setting/environments/components/UnlicensedEnvironmentView.tsx b/client/packages/lowcoder/src/pages/setting/environments/components/UnlicensedEnvironmentView.tsx
@@ -93,6 +93,22 @@ const UnlicensedEnvironmentView: React.FC<UnlicensedEnvironmentViewProps> = ({
 
   return (
     <Level1SettingPageContent style={{ minWidth: "1000px" }}>
+
+      {/* Breadcrumbs */}
+       <ModernBreadcrumbs 
+        items={[
+          {
+            key: 'environments',
+            title: trans("enterprise.environments.title"),  
+            onClick: () => history.push('/setting/environments')
+          },
+          {
+            key: 'current',
+            title: environment.environmentName || trans("enterprise.environments.detail.environmentDetail")
+          }
+        ]}
+      />
+
       {/* Environment Header Component */}
       <EnvironmentHeader 
         environment={environment} 
@@ -113,20 +129,7 @@ const UnlicensedEnvironmentView: React.FC<UnlicensedEnvironmentViewProps> = ({
         ))}
       </Row>
 
-      {/* Breadcrumbs */}
-      <ModernBreadcrumbs 
-        items={[
-          {
-            key: 'environments',
-            title: trans("enterprise.environments.title"),
-            onClick: () => history.push('/setting/environments')
-          },
-          {
-            key: 'current',
-            title: environment.environmentName || trans("enterprise.environments.detail.environmentDetail")
-          }
-        ]}
-      />
+     
 
       {/* License Issue Card */}
       <Card
@@ -170,7 +173,6 @@ const UnlicensedEnvironmentView: React.FC<UnlicensedEnvironmentViewProps> = ({
                 <Button
                   type="primary"
                   size="large"
-                  icon={<CustomerServiceOutlined />}
                   onClick={() => setIsContactModalVisible(true)}
                   style={{
                     width: '100%',
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/environments.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/environments.service.ts
@@ -8,9 +8,7 @@ import {App} from "../types/app.types";
 import { DataSourceWithMeta } from '../types/datasource.types';
 import { Query, QueryResponse } from "../types/query.types";
 import { checkEnvironmentLicense } from './license.service';
-
-
-
+import { trans } from "i18n";
 
 export async function updateEnvironment(
   environmentId: string, 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java
@@ -173,6 +173,7 @@ public Mono<FolderInfoView> update(Folder folder) {
         newFolder.setDescription(folder.getDescription());
         newFolder.setImage(folder.getImage());
         return checkManagePermission(folder.getId())
+                .flatMap(orgMember -> checkFolderNameUnique(newFolder.getId(), folder.getName(), orgMember.getOrgId()))
                 .then(folderService.updateById(folder.getId(), newFolder))
                 .then(folderService.findById(folder.getId()))
                 .flatMap(f -> buildFolderInfoView(f, true, true));
