Commit 156b06a

committed

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

2 parents f02d33f + 56f1ae9 commit 156b06aCopy full SHA for 156b06a

File tree

3 files changed

+25

-7

lines changed

client/packages/lowcoder/src/comps/comps/timelineComp
- timelineComp.tsx
server/api-service/lowcoder-server/src/main/java/org/lowcoder/api
- authentication/service
  - AuthenticationApiServiceImpl.java
- usermanagement
  - OrganizationController.java

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 number	Diff line number	Diff line change
`@@ -142,9 +142,15 @@ const TimelineComp = (`
`142`	`142`	`dispatch(changeChildAction("clickedIndex", index, false));`
`143`	`143`	`onEvent("click");`
`144`	`144`	`}}`
	`145`	`+ // for responsiveness`
`145`	`146`	`style={{`
`146`	`147`	`cursor: "pointer",`
`147`	`148`	`color: value?.titleColor \|\| style?.titleColor,`
	`149`	`+ whiteSpace: "normal",`
	`150`	`+ wordWrap: "break-word",`
	`151`	`+ textAlign: "left",`
	`152`	`+ height: "auto",`
	`153`	`+ padding: "0"`
`148`	`154`	`}}`
`149`	`155`	`>`
`150`	`156`	`<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 number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {`
`245`	`245`	`return organizationService.createDefault(user, isSuperAdmin).then();`
`246`	`246`	`}`
`247`	`247`
`248`		`- protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupId) {`
	`248`	`+ protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupIdToJoin) {`
`249`	`249`	`Mono<String> orgMono;`
`250`	`250`	`if(commonConfig.getWorkspace().getMode() == WorkspaceMode.ENTERPRISE) {`
`251`	`251`	`orgMono = organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);`
`@@ -255,12 +255,12 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source, String`
`255`	`255`	`}`
`256`	`256`	`orgMono = Mono.just(orgId);`
`257`	`257`	`}`
`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(() -> {`
`259`	`259`	`GroupMember groupMember1 = GroupMember.builder()`
`260`		`- .groupId(groupId)`
	`260`	`+ .groupId(groupIdToJoin)`
`261`	`261`	`.userId(user.getId())`
`262`	`262`	`.build();`
`263`		`- return groupMemberService.addMember(orgId, groupId, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);`
	`263`	`+ return groupMemberService.addMember(orgId, groupIdToJoin, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);`
`264`	`264`	`}));`
`265`	`265`	`return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then(groupMember).then();`
`266`	`266`	`}`

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

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,23 @@ public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String emai`
`62`	`62`	`@RequestParam(required = false, defaultValue = "0") Integer pageSize) {`
`63`	`63`	`Flux<OrgView> flux;`
`64`	`64`	`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()))`
`66`	`67`	`.flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))`
`67`		`- .map(OrgView::new).cache();`
	`68`	`+ .map(OrgView::new)`
	`69`	`+ .cache();`
`68`	`70`	`} 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(__ -> new OrgView(org))`
	`79`	`+ )`
	`80`	`+ )`
	`81`	`+ .cache();`
`70`	`82`	`}`
`71`	`83`	`var newflux = flux.sort((OrgView o1, OrgView o2) -> {`
`72`	`84`	`if (o1.getOrgName() == null \|\| o2.getOrgName() == null) {`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 156b06a

File tree

3 files changed

3 files changed

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

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

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

0 commit comments