Skip to content

Commit b19ebe7

Browse files
author
FalkWolsky
committed
Updating API-Service to drop legacy lowcoderAPIPlugin and publish new lowcoder-comps version
1 parent 085c802 commit b19ebe7

File tree

15 files changed

+79
-337
lines changed

15 files changed

+79
-337
lines changed

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.6.6",
3+
"version": "2.7.0",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder/src/components/ResCreatePanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { Datasource } from "constants/datasourceConstants";
1717
import {
1818
QUICK_GRAPHQL_ID,
1919
QUICK_REST_API_ID,
20+
JS_CODE_ID,
2021
} from "../constants/datasourceConstants";
2122
import { ResourceType } from "constants/queryConstants";
2223
import { default as Upload } from "antd/es/upload";
@@ -25,7 +26,6 @@ import { getUser } from "../redux/selectors/usersSelectors";
2526
import DataSourceIcon from "./DataSourceIcon";
2627
import { genRandomKey } from "comps/utils/idGenerator";
2728
import { isPublicApplication } from "@lowcoder-ee/redux/selectors/applicationSelector";
28-
import { JS_CODE_ID } from "constants/datasourceConstants";
2929

3030
const Wrapper = styled.div<{ $placement: PageType }>`
3131
width: 100%;

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.lowcoder.sdk.models.HasIdAndAuditing;
1616
import org.lowcoder.sdk.models.JsDatasourceConnectionConfig;
1717
import org.lowcoder.sdk.plugin.graphql.GraphQLDatasourceConfig;
18-
import org.lowcoder.sdk.plugin.lowcoderapi.LowcoderApiDatasourceConfig;
1918
import org.lowcoder.sdk.plugin.restapi.RestApiDatasourceConfig;
2019
import org.lowcoder.sdk.util.LocaleUtils;
2120
import org.springframework.data.annotation.Transient;
@@ -26,8 +25,7 @@
2625

2726
import static org.lowcoder.domain.datasource.model.DatasourceCreationSource.LEGACY_WORKSPACE_PREDEFINED;
2827
import static org.lowcoder.domain.datasource.model.DatasourceCreationSource.SYSTEM_STATIC;
29-
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.GRAPHQL_API;
30-
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.REST_API;
28+
import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.*;
3129

3230
@Getter
3331
@Setter
@@ -37,16 +35,23 @@
3735
public class Datasource extends HasIdAndAuditing {
3836

3937
private static final DatasourceStatus DEFAULT_STATUS = DatasourceStatus.NORMAL;
38+
4039
public static final String QUICK_REST_API_ID = "#QUICK_REST_API";
4140
public static final String QUICK_GRAPHQL_ID = "#QUICK_GRAPHQL";
42-
public static final String LOWCODER_API_ID = "#LOWCODER_API";
41+
// public static final String LOWCODER_API_ID = "#LOWCODER_API";
42+
public static final String JS_CODE_ID = "#JS_CODE";
4343

44-
private static final Set<String> SYSTEM_STATIC_IDS = Set.of(QUICK_REST_API_ID,
45-
QUICK_GRAPHQL_ID, LOWCODER_API_ID);
44+
private static final Set<String> SYSTEM_STATIC_IDS = Set.of(
45+
QUICK_REST_API_ID,
46+
QUICK_GRAPHQL_ID,
47+
// LOWCODER_API_ID,
48+
JS_CODE_ID
49+
);
4650

4751
public static final Datasource QUICK_REST_API;
4852
public static final Datasource QUICK_GRAPHQL_API;
49-
public static final Datasource LOWCODER_API;
53+
// public static final Datasource LOWCODER_API;
54+
public static final Datasource JS_CODE;
5055

5156
static {
5257
QUICK_REST_API = new Datasource();
@@ -63,12 +68,19 @@ public class Datasource extends HasIdAndAuditing {
6368
QUICK_GRAPHQL_API.setCreationSource(SYSTEM_STATIC.getValue());
6469
QUICK_GRAPHQL_API.setDetailConfig(GraphQLDatasourceConfig.EMPTY_CONFIG);
6570

66-
LOWCODER_API = new Datasource();
71+
/* LOWCODER_API = new Datasource();
6772
LOWCODER_API.setId(LOWCODER_API_ID);
6873
LOWCODER_API.setName("Lowcoder API");
69-
LOWCODER_API.setType(DatasourceMetaInfoConstants.LOWCODER_API);
74+
LOWCODER_API.setType(LOWCODER_API);
7075
LOWCODER_API.setCreationSource(SYSTEM_STATIC.getValue());
71-
LOWCODER_API.setDetailConfig(LowcoderApiDatasourceConfig.INSTANCE);
76+
LOWCODER_API.setDetailConfig(LowcoderApiDatasourceConfig.INSTANCE); */
77+
78+
JS_CODE = new Datasource();
79+
JS_CODE.setId(JS_CODE_ID);
80+
JS_CODE.setName("JS Code");
81+
JS_CODE.setType(JS_CODE_EXECUTION);
82+
JS_CODE.setCreationSource(SYSTEM_STATIC.getValue());
83+
JS_CODE.setDetailConfig(RestApiDatasourceConfig.EMPTY_CONFIG); // no configuration
7284
}
7385

7486
private String gid;
@@ -77,7 +89,7 @@ public class Datasource extends HasIdAndAuditing {
7789
private String organizationId;
7890
private int creationSource;
7991
private DatasourceStatus datasourceStatus;
80-
// for js data source plugin
92+
8193
@Nullable
8294
@Transient
8395
private DatasourcePluginDefinition pluginDefinition;
@@ -115,9 +127,14 @@ public static String getDisplayName(String datasourceId, Locale locale) {
115127
return LocaleUtils.getMessage(locale, "QUICK_GRAPHQL_DATASOURCE_NAME");
116128
}
117129

118-
if (LOWCODER_API_ID.equals(datasourceId)) {
130+
/* if (LOWCODER_API_ID.equals(datasourceId)) {
119131
return LocaleUtils.getMessage(locale, "LOWCODER_DATASOURCE_NAME");
132+
} */
133+
134+
if (JS_CODE_ID.equals(datasourceId)) {
135+
return LocaleUtils.getMessage(locale, "JS_CODE_DATASOURCE_NAME");
120136
}
137+
121138
return "";
122139
}
123140

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceServiceImpl.java

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public Mono<Datasource> update(String datasourceId, Datasource updatedDatasource
8585

8686
@Override
8787
public Mono<Datasource> getById(String id) {
88-
8988
if (StringUtils.equals(id, Datasource.QUICK_REST_API_ID)) {
9089
return Mono.just(Datasource.QUICK_REST_API);
9190
}
@@ -94,39 +93,54 @@ public Mono<Datasource> getById(String id) {
9493
return Mono.just(Datasource.QUICK_GRAPHQL_API);
9594
}
9695

97-
if (StringUtils.equals(id, Datasource.LOWCODER_API_ID)) {
98-
return Mono.just(Datasource.LOWCODER_API);
96+
if (StringUtils.equals(id, Datasource.JS_CODE_ID)) {
97+
return Mono.just(Datasource.JS_CODE);
9998
}
10099

100+
// if (StringUtils.equals(id, Datasource.LOWCODER_API_ID)) {
101+
// return Mono.just(Datasource.LOWCODER_API);
102+
// }
103+
101104
return repository.findById(id);
102105
}
103106

104107
@Override
105108
public Flux<Datasource> getByIds(Collection<String> ids) {
106-
Flux<Datasource> builtDatasourceFlux = Flux.fromStream(ids.stream().filter(id-> StringUtils.equals(id, Datasource.QUICK_REST_API_ID)
107-
|| StringUtils.equals(id, Datasource.QUICK_GRAPHQL_ID)
108-
|| StringUtils.equals(id, Datasource.LOWCODER_API_ID)
109-
).map(id-> {
110-
if (StringUtils.equals(id, Datasource.QUICK_REST_API_ID)) {
111-
return Datasource.QUICK_REST_API;
112-
}
113-
114-
if (StringUtils.equals(id, Datasource.QUICK_GRAPHQL_ID)) {
115-
return Datasource.QUICK_GRAPHQL_API;
116-
}
117-
118-
if (StringUtils.equals(id, Datasource.LOWCODER_API_ID)) {
119-
return Datasource.LOWCODER_API;
120-
}
121-
return Datasource.LOWCODER_API;
122-
}));
123-
124-
return Flux.concat(builtDatasourceFlux, repository.findByIds(ids.stream().filter(id-> !(StringUtils.equals(id, Datasource.QUICK_REST_API_ID)
125-
|| StringUtils.equals(id, Datasource.QUICK_GRAPHQL_ID)
126-
|| StringUtils.equals(id, Datasource.LOWCODER_API_ID))
127-
).toList()));
109+
Flux<Datasource> builtDatasourceFlux = Flux.fromStream(ids.stream()
110+
.filter(id ->
111+
StringUtils.equals(id, Datasource.QUICK_REST_API_ID) ||
112+
StringUtils.equals(id, Datasource.QUICK_GRAPHQL_ID) ||
113+
StringUtils.equals(id, Datasource.JS_CODE_ID)
114+
// || StringUtils.equals(id, Datasource.LOWCODER_API_ID)
115+
)
116+
.map(id -> {
117+
if (StringUtils.equals(id, Datasource.QUICK_REST_API_ID)) {
118+
return Datasource.QUICK_REST_API;
119+
}
120+
if (StringUtils.equals(id, Datasource.QUICK_GRAPHQL_ID)) {
121+
return Datasource.QUICK_GRAPHQL_API;
122+
}
123+
if (StringUtils.equals(id, Datasource.JS_CODE_ID)) {
124+
return Datasource.JS_CODE;
125+
}
126+
return null; // fallback
127+
})
128+
.filter(ds -> ds != null)
129+
);
130+
131+
return Flux.concat(
132+
builtDatasourceFlux,
133+
repository.findByIds(ids.stream().filter(id ->
134+
!(StringUtils.equals(id, Datasource.QUICK_REST_API_ID) ||
135+
StringUtils.equals(id, Datasource.QUICK_GRAPHQL_ID) ||
136+
StringUtils.equals(id, Datasource.JS_CODE_ID)
137+
// || StringUtils.equals(id, Datasource.LOWCODER_API_ID)
138+
)
139+
).toList())
140+
);
128141
}
129142

143+
130144
private Mono<Datasource> validateDatasource(Datasource datasource) {
131145

132146
if (datasource.getOrganizationId() == null) {

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/DatasourceMetaInfoConstants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ public final class DatasourceMetaInfoConstants {
44

55
public static final String REST_API = "restApi";
66
public static final String GRAPHQL_API = "graphql";
7+
public static final String JS_CODE_EXECUTION = "javaScriptCode";
78
public static final String MYSQL = "mysql";
8-
public static final String LOWCODER_API = "lowcoderApi";
9+
// public static final String LOWCODER_API = "lowcoderApi";
910

1011
private DatasourceMetaInfoConstants() {
1112
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ public class DatasourceMetaInfoServiceImpl implements DatasourceMetaInfoService
6363
.connectionPool(ClientBasedConnectionPool.class)
6464
.build();
6565

66-
private static final DatasourceMetaInfo LOWCODER_API = DatasourceMetaInfo.builder()
66+
/* private static final DatasourceMetaInfo LOWCODER_API = DatasourceMetaInfo.builder()
6767
.type(DatasourceMetaInfoConstants.LOWCODER_API)
6868
.displayName("Lowcoder API")
6969
.pluginExecutorKey("lowcoder-api-plugin")
7070
.connectionPool(StatelessConnectionPool.class)
71-
.build();
71+
.build(); */
7272

7373
private static final DatasourceMetaInfo ES = DatasourceMetaInfo.builder()
7474
.type("es")

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolutionServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ private Mono<String> doCopyDatasource(String organizationId, String datasourceId
125125
return Mono.just(Datasource.QUICK_REST_API.getId());
126126
}
127127

128-
if (datasource.isLegacyLowcoderApi()) {
128+
/* if (datasource.isLegacyLowcoderApi()) {
129129
return Mono.just(Datasource.LOWCODER_API.getId());
130-
}
130+
} */
131131
return createNewDatasourceFrom(organizationId, visitorId, datasource);
132132
});
133133

‎server/api-service/lowcoder-plugins/lowcoderApiPlugin/pom.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiConnector.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)