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

Commit156b06a

Browse files
committed
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
2 parentsf02d33f +56f1ae9 commit156b06a

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

‎client/packages/lowcoder/src/comps/comps/timelineComp/timelineComp.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,15 @@ const TimelineComp = (
142142
dispatch(changeChildAction("clickedIndex",index,false));
143143
onEvent("click");
144144
}}
145+
// for responsiveness
145146
style={{
146147
cursor:"pointer",
147148
color:value?.titleColor||style?.titleColor,
149+
whiteSpace:"normal",
150+
wordWrap:"break-word",
151+
textAlign:"left",
152+
height:"auto",
153+
padding:"0"
148154
}}
149155
>
150156
<b>{value?.title}</b>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {
245245
returnorganizationService.createDefault(user,isSuperAdmin).then();
246246
}
247247

248-
protectedMono<Void>onUserLogin(StringorgId,Useruser,Stringsource,StringgroupId) {
248+
protectedMono<Void>onUserLogin(StringorgId,Useruser,Stringsource,StringgroupIdToJoin) {
249249
Mono<String>orgMono;
250250
if(commonConfig.getWorkspace().getMode() ==WorkspaceMode.ENTERPRISE) {
251251
orgMono =organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
@@ -255,12 +255,12 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source, String
255255
}
256256
orgMono =Mono.just(orgId);
257257
}
258-
Mono<GroupMember>groupMember =groupMemberService.getGroupMember(groupId,user.getId()).switchIfEmpty(Mono.defer(() -> {
258+
Mono<GroupMember>groupMember =groupIdToJoin ==null ?Mono.empty() :groupMemberService.getGroupMember(groupIdToJoin,user.getId()).switchIfEmpty(Mono.defer(() -> {
259259
GroupMembergroupMember1 =GroupMember.builder()
260-
.groupId(groupId)
260+
.groupId(groupIdToJoin)
261261
.userId(user.getId())
262262
.build();
263-
returngroupMemberService.addMember(orgId,groupId,user.getId(),MemberRole.MEMBER).thenReturn(groupMember1);
263+
returngroupMemberService.addMember(orgId,groupIdToJoin,user.getId(),MemberRole.MEMBER).thenReturn(groupMember1);
264264
}));
265265
returnorgMono.flatMap(orgId2 ->orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2,user.getId())).then(groupMember).then();
266266
}

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,23 @@ public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String emai
6262
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
6363
Flux<OrgView>flux;
6464
if (commonConfig.getWorkspace().getMode() ==WorkspaceMode.SAAS) {
65-
flux =userService.findByEmailDeep(email).flux().flatMap(user ->orgMemberService.getAllActiveOrgs(user.getId()))
65+
flux =userService.findByEmailDeep(email).flux()
66+
.flatMap(user ->orgMemberService.getAllActiveOrgs(user.getId()))
6667
.flatMap(orgMember ->organizationService.getById(orgMember.getOrgId()))
67-
.map(OrgView::new).cache();
68+
.map(OrgView::new)
69+
.cache();
6870
}else {
69-
flux =organizationService.getOrganizationInEnterpriseMode().flux().map(OrgView::new).cache();
71+
// Not SAAS: check if user exists and is a member of the org
72+
flux =userService.findByEmailDeep(email)
73+
.flatMapMany(user ->
74+
organizationService.getOrganizationInEnterpriseMode().flux()
75+
.flatMap(org ->
76+
orgMemberService.getOrgMember(org.getId(),user.getId())
77+
.filter(orgMember -> !orgMember.isInvalid())
78+
.map(__ ->newOrgView(org))
79+
)
80+
)
81+
.cache();
7082
}
7183
varnewflux =flux.sort((OrgViewo1,OrgViewo2) -> {
7284
if (o1.getOrgName() ==null ||o2.getOrgName() ==null) {

0 commit comments

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