Skip to content

Commit 4b5a56a

Browse files
author
th37rose
authored
Merge branch 'lowcoder-org:main' into feature/generic-oauth
2 parents 28bc24c + e539465 commit 4b5a56a

File tree

156 files changed

+737
-998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+737
-998
lines changed

‎client/packages/lowcoder/src/components/table/EditableCell.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
128128
>
129129
{status === "toSave" && !isEditing && <EditableChip />}
130130
<div
131+
style={{minHeight: '24px'}}
131132
onDoubleClick={enterEditFn}
132133
>
133134
{normalView}

‎client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ const getStyle = (
7272
headerStyle: ContainerHeaderStyleType,
7373
bodyStyle: ContainerBodyStyleType,
7474
) => {
75-
console.log("🚀 ~ style:", style)
7675
return css`
7776
&.ant-tabs {
7877
overflow: hidden;

‎client/packages/lowcoder/src/comps/controls/codeStateControl.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ function stateControlMethodExposing<T extends ExposeMethodCompConstructor<Abstra
210210
return withMethodExposingBase(VariantComp, [
211211
{
212212
method: {
213-
name: trans("eventHandler.set") + _.upperFirst(param.name),
213+
name: "set" + _.upperFirst(param.name),
214214
description: trans("exportMethod.setDesc", { property: param.name }),
215215
params: [param],
216216
},
@@ -222,7 +222,7 @@ function stateControlMethodExposing<T extends ExposeMethodCompConstructor<Abstra
222222
},
223223
{
224224
method: {
225-
name: trans("eventHandler.clear") + _.upperFirst(param.name),
225+
name: "clear" + _.upperFirst(param.name),
226226
description: trans("exportMethod.clearDesc", { property: param.name }),
227227
params: [],
228228
},
@@ -233,7 +233,7 @@ function stateControlMethodExposing<T extends ExposeMethodCompConstructor<Abstra
233233
},
234234
{
235235
method: {
236-
name: trans("eventHandler.reset") + _.upperFirst(param.name),
236+
name: "reset" + _.upperFirst(param.name),
237237
description: trans("exportMethod.resetDesc", { property: param.name }),
238238
params: [],
239239
},

‎client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -277,15 +277,15 @@ const TEXT = {
277277
const STATIC_TEXT = {
278278
name: "staticText",
279279
label: trans("style.staticText"),
280-
depTheme: "canvas",
280+
depTheme: "primarySurface",
281281
depType: DEP_TYPE.CONTRAST_TEXT,
282282
transformer: contrastText,
283283
} as const;
284284

285285
const LABEL = {
286286
name: "label",
287287
label: trans("label"),
288-
depTheme: "canvas",
288+
depTheme: "primarySurface",
289289
depType: DEP_TYPE.CONTRAST_TEXT,
290290
transformer: contrastText,
291291
} as const;
@@ -562,7 +562,7 @@ function replaceAndMergeMultipleStyles(originalArray: any[], styleToReplace: str
562562
}
563563

564564
export const ButtonStyle = [
565-
getBackground('primary'),
565+
getBackground(),
566566
...STYLING_FIELDS_SEQUENCE
567567
] as const;
568568

@@ -1304,14 +1304,7 @@ function handleToHoverLink(color: string) {
13041304
}
13051305

13061306
export const LinkStyle = [
1307-
1308-
{
1309-
name: "background",
1310-
label: trans("style.background"),
1311-
depTheme: "canvas",
1312-
depType: DEP_TYPE.SELF,
1313-
transformer: toSelf,
1314-
},
1307+
getBackground(),
13151308
...replaceAndMergeMultipleStyles(STYLING_FIELDS_SEQUENCE, 'text', [...LinkTextStyle])
13161309
] as const;
13171310

‎client/packages/lowcoder/src/i18n/locales/de.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,6 +2433,8 @@ export const de: typeof en = {
24332433
"home": {
24342434
...en.home,
24352435
"profile": "Profil",
2436+
"news": "News",
2437+
"newsLoading": "Das Laden dauert ein wenig...",
24362438
"allApplications": "Alle Apps",
24372439
"allModules": "Alle Module",
24382440
"allFolders": "Alle Ordner",

‎client/packages/lowcoder/src/i18n/locales/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2917,6 +2917,7 @@ export const en = {
29172917
"home": {
29182918
"profile": "Your Profile",
29192919
"news": "News",
2920+
"newsLoading": "It will load some seconds.",
29202921
"orgHome" : "Homepage (Org)",
29212922
"yourOrg": "Your Organization",
29222923
"orgHomeTitle": "Organization Homepage",

‎client/packages/lowcoder/src/pages/ApplicationV2/NewsLayout.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ export function NewsLayout() {
9393
<h1 style={{color: "#ffffff", marginTop : "12px"}}>Lowcoder {trans("home.news")}</h1>
9494
</StyleNewsCover>
9595
<Card style={{ marginBottom: "20px", minHeight : "800px" }}>
96+
<h4>{trans("home.newsLoading")}</h4>
9697
<iframe
9798
style={{ border: "none" }}
9899
title="Lowcoder News"

‎client/packages/lowcoder/src/pages/ApplicationV2/UserProfileLayout.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import { trans, languageList } from "../../i18n";
1616
import { ALL_APPLICATIONS_URL } from "constants/routesURL";
1717
import { default as Divider } from "antd/es/divider";
1818

19+
import { fullAvatarUrl } from "util/urlUtils";
20+
1921
import { Avatar, Button, Card, Col, Row, Space, Typography, Select, Tooltip } from "antd";
2022

2123
import {
@@ -231,7 +233,7 @@ export function UserProfileLayout(props: UserProfileLayoutProps) {
231233
<StyleProfileContent>
232234
<Row gutter={[24, 24]} style={{ display: 'flex', alignItems: 'end' }}>
233235
<Col lg={4}>
234-
<StyleAvatar src={<img src={user.avatarUrl ?? `https://eu.ui-avatars.com/api/?name=${user.username}&size=250`} alt="avatar" />} shape="square" size={120} />
236+
<StyleAvatar src={<img src={user.avatarUrl ? fullAvatarUrl(user.avatarUrl) : `https://eu.ui-avatars.com/api/?name=${user.username}&size=250`} alt="avatar" />} shape="square" size={120} />
235237
</Col>
236238
<Col lg={20}>
237239
<Space style={{paddingLeft : "80px"}}>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ export default function ApplicationHome() {
365365
routeComp: NewsView,
366366
icon: ({ selected, ...otherProps }) => selected ? <NewsIcon {...otherProps} width={"24px"}/> : <NewsIcon {...otherProps} width={"24px"}/>,
367367
visible: ({ user }) => user.orgDev,
368+
style: { color: "red" },
368369
},
369370
{
370371
text: <TabLabel>{trans("home.orgHome")}</TabLabel>,

‎client/packages/lowcoder/src/pages/userAuth/authComponents.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import styled from "styled-components";
66
import ReactHotkeys from "util/hotkeys";
77
import { StyledLink } from "pages/common/styledComponent";
88
import { trans } from "i18n";
9+
import { favicon } from "assets/images";
910

1011
const AuthCardContainer = styled.div`
1112
display: flex;
@@ -152,7 +153,7 @@ export const AuthContainer = (props: {
152153
<AuthCard>{props.children}</AuthCard>
153154
{ props.subHeading && (
154155
<AuthCardSubFooter>
155-
<img src="/src/assets/images/Lowcoder-Logo.svg" alt={"Lowcoder | " + trans("productDesc")} width="20px"/>
156+
<img src={favicon} alt={"Lowcoder | " + trans("productDesc")} width="20px"/>
156157
<a href="https://lowcoder.cloud" target="_blank" rel="noreferrer">
157158
{props.subHeading}
158159
</a>

‎deploy/docker/docker-compose.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ services:
6262
LOWCODER_MAX_QUERY_TIMEOUT: 120
6363
LOWCODER_WORKSPACE_MODE: SAAS
6464
# Lowcoder notification emails setup
65-
LOWCODER_ADMIN_SMTP_HOST: smtp.gmail.com
65+
LOWCODER_ADMIN_SMTP_HOST: localhost
6666
LOWCODER_ADMIN_SMTP_PORT: 587
6767
LOWCODER_ADMIN_SMTP_USERNAME:
6868
LOWCODER_ADMIN_SMTP_PASSWORD:
69-
LOWCODER_ADMIN_SMTP_AUTH: true
70-
LOWCODER_ADMIN_SMTP_SSL_ENABLED: false
71-
LOWCODER_ADMIN_SMTP_STARTTLS_ENABLED: true
72-
LOWCODER_ADMIN_SMTP_STARTTLS_REQUIRED: true
69+
LOWCODER_ADMIN_SMTP_AUTH: "true"
70+
LOWCODER_ADMIN_SMTP_SSL_ENABLED: "false"
71+
LOWCODER_ADMIN_SMTP_STARTTLS_ENABLED: "true"
72+
LOWCODER_ADMIN_SMTP_STARTTLS_REQUIRED: "true"
7373
# Email used as sender in lost password email
7474
LOWCODER_EMAIL_NOTIFICATIONS_SENDER: info@localhost
7575
volumes:

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.lowcoder.sdk.config.CommonConfig;
1111
import org.lowcoder.sdk.constants.AuthSourceConstants;
1212
import org.lowcoder.sdk.constants.WorkspaceMode;
13-
import org.springframework.beans.factory.annotation.Autowired;
1413
import org.springframework.stereotype.Service;
1514
import reactor.core.publisher.Flux;
1615
import reactor.core.publisher.Mono;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.lowcoder.domain.user.model.User;
1313
import org.lowcoder.sdk.config.MaterialProperties;
1414
import org.lowcoder.sdk.models.HasIdAndAuditing;
15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.context.ApplicationContext;
1716
import org.springframework.context.annotation.Bean;
1817
import org.springframework.context.annotation.Configuration;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationDomain.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
package org.lowcoder.domain.organization.model;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import lombok.Getter;
5+
import lombok.Setter;
66
import org.lowcoder.domain.mongodb.MongodbInterceptorContext;
77
import org.lowcoder.sdk.auth.AbstractAuthConfig;
8-
import org.lowcoder.sdk.config.SerializeConfig.JsonViews;
8+
import org.lowcoder.sdk.config.JsonViews;
99
import org.lowcoder.sdk.util.JsonUtils;
1010
import org.springframework.data.annotation.Transient;
1111

12-
import com.fasterxml.jackson.core.type.TypeReference;
13-
14-
import lombok.Getter;
15-
import lombok.Setter;
12+
import java.util.ArrayList;
13+
import java.util.List;
1614

1715
public class OrganizationDomain implements EnterpriseConnectionConfig {
1816

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
package org.lowcoder.domain.organization.service;
22

3-
import static org.lowcoder.infra.birelation.BiRelationBizType.ORG_MEMBER;
4-
5-
import java.util.Collection;
6-
import java.util.HashSet;
7-
import java.util.List;
8-
import java.util.Map;
9-
103
import lombok.RequiredArgsConstructor;
4+
import lombok.extern.slf4j.Slf4j;
115
import org.apache.commons.lang3.StringUtils;
126
import org.bson.Document;
137
import org.lowcoder.domain.group.model.GroupMember;
148
import org.lowcoder.domain.group.service.GroupMemberService;
159
import org.lowcoder.domain.group.service.GroupService;
16-
import org.lowcoder.domain.organization.model.MemberRole;
17-
import org.lowcoder.domain.organization.model.OrgMember;
18-
import org.lowcoder.domain.organization.model.OrgMemberState;
19-
import org.lowcoder.domain.organization.model.Organization;
20-
import org.lowcoder.domain.organization.model.OrganizationState;
10+
import org.lowcoder.domain.organization.model.*;
2111
import org.lowcoder.infra.annotation.PossibleEmptyMono;
2212
import org.lowcoder.infra.birelation.BiRelation;
2313
import org.lowcoder.infra.birelation.BiRelationService;
@@ -26,15 +16,19 @@
2616
import org.lowcoder.sdk.config.CommonConfig;
2717
import org.lowcoder.sdk.config.CommonConfig.Workspace;
2818
import org.lowcoder.sdk.constants.WorkspaceMode;
29-
import org.springframework.beans.factory.annotation.Autowired;
3019
import org.springframework.context.annotation.Lazy;
3120
import org.springframework.data.domain.PageRequest;
3221
import org.springframework.stereotype.Service;
33-
34-
import lombok.extern.slf4j.Slf4j;
3522
import reactor.core.publisher.Flux;
3623
import reactor.core.publisher.Mono;
3724

25+
import java.util.Collection;
26+
import java.util.HashSet;
27+
import java.util.List;
28+
import java.util.Map;
29+
30+
import static org.lowcoder.infra.birelation.BiRelationBizType.ORG_MEMBER;
31+
3832
@Slf4j
3933
@Service
4034
@RequiredArgsConstructor

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.lowcoder.sdk.models.QueryExecutionResult;
1717
import org.lowcoder.sdk.query.QueryExecutionContext;
1818
import org.lowcoder.sdk.query.QueryVisitorContext;
19-
import org.springframework.beans.factory.annotation.Autowired;
2019
import org.springframework.stereotype.Service;
2120
import reactor.core.publisher.Mono;
2221

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.lowcoder.domain.mongodb.AfterMongodbRead;
1414
import org.lowcoder.domain.mongodb.BeforeMongodbWrite;
1515
import org.lowcoder.domain.mongodb.MongodbInterceptorContext;
16-
import org.lowcoder.sdk.config.SerializeConfig;
16+
import org.lowcoder.sdk.config.JsonViews;
1717
import org.lowcoder.sdk.constants.UiConstants;
1818
import org.lowcoder.sdk.models.HasIdAndAuditing;
1919
import org.lowcoder.sdk.util.JsonUtils;
@@ -143,7 +143,7 @@ public void markAsDeleted() {
143143
public void beforeMongodbWrite(MongodbInterceptorContext context) {
144144
if (CollectionUtils.isNotEmpty(this.apiKeysList)) {
145145
this.apiKeysList.forEach(apiKey -> apiKey.doEncrypt(s -> context.encryptionService().encryptString(s)));
146-
apiKeys = JsonUtils.fromJsonSafely(JsonUtils.toJsonSafely(apiKeysList, SerializeConfig.JsonViews.Internal.class), new TypeReference<>() {
146+
apiKeys = JsonUtils.fromJsonSafely(JsonUtils.toJsonSafely(apiKeysList, JsonViews.Internal.class), new TypeReference<>() {
147147
}, new ArrayList<>());
148148
}
149149
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/EmailCommunicationServiceImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import lombok.RequiredArgsConstructor;
55
import lombok.extern.slf4j.Slf4j;
66
import org.lowcoder.sdk.config.CommonConfig;
7-
import org.springframework.beans.factory.annotation.Autowired;
87
import org.springframework.mail.javamail.JavaMailSender;
98
import org.springframework.mail.javamail.MimeMessageHelper;
109
import org.springframework.stereotype.Service;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
package org.lowcoder.infra.birelation;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
3+
import com.fasterxml.jackson.annotation.JsonCreator;
4+
import com.google.common.base.MoreObjects;
55
import lombok.AllArgsConstructor;
66
import lombok.NoArgsConstructor;
7-
import lombok.Value;
87
import lombok.experimental.SuperBuilder;
98
import lombok.extern.jackson.Jacksonized;
109
import org.lowcoder.sdk.models.HasIdAndAuditing;
1110
import org.springframework.data.mongodb.core.mapping.Document;
1211

13-
import com.fasterxml.jackson.annotation.JsonCreator;
14-
import com.google.common.base.MoreObjects;
15-
16-
import lombok.Builder;
17-
1812
@SuperBuilder
1913
@Jacksonized
2014
@Document

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package org.lowcoder.infra.birelation;
22

3-
import java.util.Collection;
4-
53
import org.springframework.data.domain.Pageable;
64
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
7-
85
import reactor.core.publisher.Flux;
96
import reactor.core.publisher.Mono;
107

8+
import java.util.Collection;
9+
1110
public interface BiRelationRepository extends ReactiveMongoRepository<BiRelation, String> {
1211

1312
Flux<BiRelation> findByBizTypeAndSourceId(BiRelationBizType bizType, String sourceId);

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationServiceImpl.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
package org.lowcoder.infra.birelation;
22

3-
import static com.google.common.base.Strings.nullToEmpty;
4-
import static org.apache.commons.lang3.StringUtils.isNotBlank;
5-
import static org.springframework.data.mongodb.core.query.Criteria.where;
6-
7-
import java.util.Collection;
8-
import java.util.List;
9-
3+
import com.google.common.base.Preconditions;
104
import lombok.RequiredArgsConstructor;
115
import org.lowcoder.infra.mongo.MongoUpsertHelper;
126
import org.springframework.data.domain.Pageable;
137
import org.springframework.data.mongodb.core.query.Criteria;
148
import org.springframework.data.mongodb.core.query.Query;
159
import org.springframework.stereotype.Service;
16-
17-
import com.google.common.base.Preconditions;
18-
1910
import reactor.core.publisher.Flux;
2011
import reactor.core.publisher.Mono;
2112

13+
import java.util.Collection;
14+
import java.util.List;
15+
16+
import static com.google.common.base.Strings.nullToEmpty;
17+
import static org.apache.commons.lang3.StringUtils.isNotBlank;
18+
import static org.springframework.data.mongodb.core.query.Criteria.where;
19+
2220
@Service
2321
@RequiredArgsConstructor
2422
public class BiRelationServiceImpl implements BiRelationService {

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
package org.lowcoder.infra.conditional;
22

3-
import java.lang.annotation.ElementType;
4-
import java.lang.annotation.Retention;
5-
import java.lang.annotation.RetentionPolicy;
6-
import java.lang.annotation.Target;
7-
import java.util.Map;
8-
93
import jakarta.annotation.Nullable;
104
import jakarta.validation.constraints.NotBlank;
11-
125
import org.apache.commons.lang3.StringUtils;
136
import org.lowcoder.infra.conditional.ConditionalOnPropertyNotBlank.OnPropertyNotBlankCondition;
147
import org.springframework.context.annotation.Condition;
158
import org.springframework.context.annotation.ConditionContext;
169
import org.springframework.context.annotation.Conditional;
1710
import org.springframework.core.type.AnnotatedTypeMetadata;
1811

12+
import java.lang.annotation.ElementType;
13+
import java.lang.annotation.Retention;
14+
import java.lang.annotation.RetentionPolicy;
15+
import java.lang.annotation.Target;
16+
import java.util.Map;
17+
1918
@Target({ElementType.TYPE, ElementType.METHOD})
2019
@Retention(RetentionPolicy.RUNTIME)
2120
@Conditional(OnPropertyNotBlankCondition.class)

0 commit comments

Comments
 (0)