Skip to content

Environments translations + Merge Conflicts Resolve #1729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 31, 2025
Merged

Environments translations + Merge Conflicts Resolve #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b7ee9c6
Add trasns for Environments List and Table
iamfaran May 30, 2025
e920c68
Add trans for Create Env Modal
iamfaran May 30, 2025
7fc7716
add trans for error component
iamfaran May 30, 2025
65ae08c
add trans for unlicensed view
iamfaran May 30, 2025
352d715
Add trans for Environment Detail Page
iamfaran May 30, 2025
4ea9653
Add trans for Edit Environment Modal
iamfaran May 30, 2025
6e3ba72
add translations for workspace and usergroup tabs
iamfaran May 30, 2025
1eddf6d
Add trans for Apps, queries and DS tab
iamfaran May 30, 2025
5b241f8
add trans for environments services
iamfaran May 30, 2025
7daf6d5
Add deployment related trans
iamfaran May 30, 2025
d193eff
add apps services
iamfaran May 30, 2025
f4bca62
add more services in trans
iamfaran May 30, 2025
42fa208
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into environme…
iamfaran May 30, 2025
bbc0828
remove duplicate trans import
iamfaran May 30, 2025
bf0cfab
Merge branch 'dev' into environments-translations
FalkWolsky May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
420 changes: 417 additions & 3 deletions client/packages/lowcoder/src/i18n/locales/en.ts
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 37 additions & 36 deletions client/packages/lowcoder/src/pages/setting/environments/EnvironmentDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import { getEnvironmentTagColor } from "./utils/environmentUtils";
import { formatAPICalls, getAPICallsStatusColor } from "./services/license.service";
import ErrorComponent from './components/ErrorComponent';
import { Level1SettingPageContent } from "../styled";
import { trans } from "i18n";

/**
* Environment Detail Page Component
Expand Down Expand Up @@ -105,9 +106,9 @@ const EnvironmentDetail: React.FC = () => {
if (error || !environment) {
return (
<ErrorComponent
errorMessage={"Environment Not Found"}
errorMessage={trans("enterprise.environments.detail.environmentNotFound")}
returnPath="/setting/environments"
returnLabel="Return to Environments List"
returnLabel={trans("enterprise.environments.detail.returnToEnvironmentsList")}
/>
);
}
Expand Down Expand Up @@ -138,26 +139,26 @@ const EnvironmentDetail: React.FC = () => {
// Stats data for the cards
const statsData = [
{
title: "Type",
value: environment.environmentType || "Unknown",
title: trans("enterprise.environments.detail.type"),
value: environment.environmentType || trans("enterprise.environments.detail.unknown"),
icon: <CloudServerOutlined />,
color: getEnvironmentTagColor(environment.environmentType)
},
{
title: "Status",
value: environment.isLicensed ? "Licensed" : "Unlicensed",
title: trans("enterprise.environments.detail.status"),
value: environment.isLicensed ? trans("enterprise.environments.detail.licensed") : trans("enterprise.environments.detail.unlicensed"),
icon: environment.isLicensed ? <CheckCircleOutlined /> : <CloseCircleOutlined />,
color: environment.isLicensed ? "#52c41a" : "#ff4d4f"
},
{
title: "API Key",
value: environment.environmentApikey ? "Configured" : "Not Set",
title: trans("enterprise.environments.detail.apiKey"),
value: environment.environmentApikey ? trans("enterprise.environments.detail.configured") : trans("enterprise.environments.detail.notSet"),
icon: <SafetyOutlined />,
color: environment.environmentApikey ? "#1890ff" : "#faad14"
},
{
title: "Master Env",
value: environment.isMaster ? "Yes" : "No",
title: trans("enterprise.environments.detail.masterEnv"),
value: environment.isMaster ? trans("enterprise.environments.yes") : trans("enterprise.environments.no"),
icon: <UserOutlined />,
color: environment.isMaster ? "#722ed1" : "#8c8c8c"
}
Expand All @@ -168,7 +169,7 @@ const EnvironmentDetail: React.FC = () => {
key: 'workspaces',
label: (
<span>
<AppstoreOutlined /> Workspaces
<AppstoreOutlined /> {trans("enterprise.environments.detail.workspaces")}
</span>
),
children: <WorkspacesTab environment={environment} />
Expand All @@ -177,7 +178,7 @@ const EnvironmentDetail: React.FC = () => {
key: 'userGroups',
label: (
<span>
<UsergroupAddOutlined /> User Groups
<UsergroupAddOutlined /> {trans("enterprise.environments.detail.userGroups")}
</span>
),
children: <UserGroupsTab environment={environment} />
Expand All @@ -192,12 +193,12 @@ const EnvironmentDetail: React.FC = () => {
items={[
{
key: 'environments',
title: 'Environments',
title: trans("enterprise.environments.title"),
onClick: () => history.push('/setting/environments')
},
{
key: 'current',
title: environment.environmentName || "Environment Detail"
title: environment.environmentName || trans("enterprise.environments.detail.environmentDetail")
}
]}
/>
Expand All @@ -224,7 +225,7 @@ const EnvironmentDetail: React.FC = () => {

{/* Basic Environment Information Card */}
<Card
title="Environment Overview"
title={trans("enterprise.environments.detail.environmentOverview")}
style={{
marginBottom: "24px",
borderRadius: '4px',
Expand All @@ -238,7 +239,7 @@ const EnvironmentDetail: React.FC = () => {
column={{ xxl: 4, xl: 3, lg: 3, md: 2, sm: 1, xs: 1 }}
size="small"
>
<Descriptions.Item label="Domain">
<Descriptions.Item label={trans("enterprise.environments.domain")}>
{environment.environmentFrontendUrl ? (
<a
href={environment.environmentFrontendUrl}
Expand All @@ -248,32 +249,32 @@ const EnvironmentDetail: React.FC = () => {
{environment.environmentFrontendUrl} <LinkOutlined />
</a>
) : (
"No domain set"
trans("enterprise.environments.detail.noDomainSet")
)}
</Descriptions.Item>
<Descriptions.Item label="Environment ID">
<Descriptions.Item label={trans("enterprise.environments.detail.environmentId")}>
<code style={{ padding: '2px 6px', background: '#f5f5f5', borderRadius: '3px' }}>
{environment.environmentId}
</code>
</Descriptions.Item>
<Descriptions.Item label="License Status">
<Descriptions.Item label={trans("enterprise.environments.detail.licenseStatus")}>
{(() => {
switch (environment.licenseStatus) {
case 'checking':
return <Tag icon={<SyncOutlined spin />} color="blue" style={{ borderRadius: '4px' }}>Checking...</Tag>;
return <Tag icon={<SyncOutlined spin />} color="blue" style={{ borderRadius: '4px' }}>{trans("enterprise.environments.licenseStatus.checking")}</Tag>;
case 'licensed':
return <Tag icon={<CheckCircleOutlined />} color="green" style={{ borderRadius: '4px' }}>Licensed</Tag>;
return <Tag icon={<CheckCircleOutlined />} color="green" style={{ borderRadius: '4px' }}>{trans("enterprise.environments.licenseStatus.licensed")}</Tag>;
case 'unlicensed':
return <Tag icon={<CloseCircleOutlined />} color="orange" style={{ borderRadius: '4px' }}>License Needed</Tag>;
return <Tag icon={<CloseCircleOutlined />} color="orange" style={{ borderRadius: '4px' }}>{trans("enterprise.environments.detail.licenseNeeded")}</Tag>;
case 'error':
return <Tag icon={<ExclamationCircleOutlined />} color="orange" style={{ borderRadius: '4px' }}>Setup Required</Tag>;
return <Tag icon={<ExclamationCircleOutlined />} color="orange" style={{ borderRadius: '4px' }}>{trans("enterprise.environments.detail.setupRequired")}</Tag>;
default:
return <Tag color="default" style={{ borderRadius: '4px' }}>Unknown</Tag>;
return <Tag color="default" style={{ borderRadius: '4px' }}>{trans("enterprise.environments.detail.unknown")}</Tag>;
}
})()}
</Descriptions.Item>
<Descriptions.Item label="Created">
{environment.createdAt ? new Date(environment.createdAt).toLocaleDateString() : "Unknown"}
<Descriptions.Item label={trans("enterprise.environments.detail.created")}>
{environment.createdAt ? new Date(environment.createdAt).toLocaleDateString() : trans("enterprise.environments.detail.unknown")}
</Descriptions.Item>
</Descriptions>
</Card>
Expand All @@ -285,7 +286,7 @@ const EnvironmentDetail: React.FC = () => {
title={
<span>
<CrownOutlined style={{ color: '#52c41a', marginRight: '8px' }} />
License Details
{trans("enterprise.environments.detail.licenseDetails")}
</span>
}
style={{
Expand All @@ -304,7 +305,7 @@ const EnvironmentDetail: React.FC = () => {
styles={{ body: { padding: '16px' } }}
>
<Statistic
title="API Calls Remaining"
title={trans("enterprise.environments.detail.apiCallsRemaining")}
value={environment.licenseDetails.remainingAPICalls}
formatter={(value) => (
<span style={{
Expand Down Expand Up @@ -333,7 +334,7 @@ const EnvironmentDetail: React.FC = () => {
color: '#8c8c8c',
marginTop: '4px'
}}>
{environment.licenseDetails.apiCallsUsage || 0}% used
{trans("enterprise.environments.percentUsed", { percent: environment.licenseDetails.apiCallsUsage || 0 })}
</div>
</div>
</Card>
Expand All @@ -347,7 +348,7 @@ const EnvironmentDetail: React.FC = () => {
styles={{ body: { padding: '16px' } }}
>
<Statistic
title="Total API Calls Limit"
title={trans("enterprise.environments.detail.totalApiCallsLimit")}
value={environment.licenseDetails.totalAPICallsLimit}
formatter={(value) => value?.toLocaleString()}
prefix={<ApiOutlined />}
Expand All @@ -356,7 +357,7 @@ const EnvironmentDetail: React.FC = () => {
color="blue"
style={{ marginTop: '12px' }}
>
{environment.licenseDetails.eeLicenses.length} License{environment.licenseDetails.eeLicenses.length !== 1 ? 's' : ''}
{environment.licenseDetails.eeLicenses.length} {environment.licenseDetails.eeLicenses.length !== 1 ? trans("enterprise.environments.detail.licenses") : trans("enterprise.environments.detail.license")}
</Tag>
</Card>
</Col>
Expand All @@ -369,8 +370,8 @@ const EnvironmentDetail: React.FC = () => {
styles={{ body: { padding: '16px' } }}
>
<Statistic
title="Enterprise Edition"
value={environment.licenseDetails.eeActive ? "Active" : "Inactive"}
title={trans("enterprise.environments.detail.enterpriseEdition")}
value={environment.licenseDetails.eeActive ? trans("enterprise.environments.detail.active") : trans("enterprise.environments.detail.inactive")}
formatter={(value) => (
<Tag
color={environment.licenseDetails?.eeActive ? "green" : "red"}
Expand All @@ -388,7 +389,7 @@ const EnvironmentDetail: React.FC = () => {
<div style={{ marginTop: '24px' }}>
<Typography.Title level={5} style={{ marginBottom: '16px' }}>
<UserOutlined style={{ marginRight: '8px' }} />
License Information
{trans("enterprise.environments.detail.licenseInformation")}
</Typography.Title>

<Row gutter={[16, 16]}>
Expand All @@ -408,13 +409,13 @@ const EnvironmentDetail: React.FC = () => {
</strong>
</div>
<div style={{ fontSize: '12px', color: '#8c8c8c', marginBottom: '8px' }}>
ID: {license.customerId}
{trans("enterprise.environments.id")}: {license.customerId}
</div>
<div style={{ fontSize: '12px', color: '#8c8c8c', marginBottom: '8px' }}>
UUID: <span style={{ fontFamily: 'monospace' }}>{license.uuid.substring(0, 8)}...</span>
</div>
<Tag color="blue">
{license.apiCallsLimit.toLocaleString()} calls
{license.apiCallsLimit.toLocaleString()} {trans("enterprise.environments.detail.calls")}
</Tag>
</Card>
</Col>
Expand Down
17 changes: 9 additions & 8 deletions client/packages/lowcoder/src/pages/setting/environments/EnvironmentsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import StatsCard from "./components/StatsCard";
import { buildEnvironmentId } from "@lowcoder-ee/constants/routesURL";
import { createEnvironment } from "./services/environments.service";
import { getEnvironmentTagColor } from "./utils/environmentUtils";
import { trans } from "i18n";
import styled from "styled-components";

const EnvironmentsWrapper = styled.div`
Expand Down Expand Up @@ -157,9 +158,9 @@ const EnvironmentsList: React.FC = () => {
return (
<EnvironmentsWrapper>
<HeaderWrapper>
<Title>Environments</Title>
<Title>{trans("enterprise.environments.title")}</Title>
<Search
placeholder="Search"
placeholder={trans("enterprise.environments.search")}
value={searchText}
onChange={(e) => setSearchText(e.target.value)}
style={{ width: "192px", height: "32px", margin: "0 12px 0 0" }}
Expand All @@ -169,14 +170,14 @@ const EnvironmentsList: React.FC = () => {
icon={<SyncOutlined spin={isLoading} />}
onClick={handleRefresh}
>
Refresh
{trans("enterprise.environments.refresh")}
</RefreshBtn>
<AddBtn
buttonType="primary"
icon={<AddIcon />}
onClick={() => setIsCreateModalVisible(true)}
>
Add Environment
{trans("enterprise.environments.addEnvironment")}
</AddBtn>
</HeaderWrapper>

Expand All @@ -187,7 +188,7 @@ const EnvironmentsList: React.FC = () => {
{environmentStats.map(([type, count]) => (
<Col xs={24} sm={12} md={8} lg={6} key={type}>
<StatsCard
title={`${type} Environments`}
title={trans("enterprise.environments.environmentsTypeLabel", { type })}
value={count}
icon={getEnvironmentIcon(type)}
color={getEnvironmentTagColor(type)}
Expand All @@ -199,7 +200,7 @@ const EnvironmentsList: React.FC = () => {

{error && (
<Alert
message="Error loading environments"
message={trans("enterprise.environments.errorLoadingEnvironments")}
description={error}
type="error"
showIcon
Expand All @@ -209,14 +210,14 @@ const EnvironmentsList: React.FC = () => {

{!isLoading && !error && filteredEnvironments.length === 0 && searchText && (
<Empty
description={`No environments found matching "${searchText}"`}
description={trans("enterprise.environments.noEnvironmentsFoundMatching", { searchText })}
style={{ margin: "60px 0" }}
/>
)}

{!isLoading && !error && environments.length === 0 && !searchText && (
<Empty
description="No environments found. Create your first environment to get started."
description={trans("enterprise.environments.noEnvironmentsFound")}
style={{ margin: "60px 0" }}
/>
)}
Expand Down
Loading
Loading