Merge branch 'openblocks-dev:develop' into develop

ludomikula · web-flow · commit ddadf776d0a9 · 2023-01-20T18:44:12.000+01:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <div align="center">
 <h1 style="border-bottom: none">
-    <b><a href="https://cloud.openblocks.dev">Openblocks</a></b><br />
+    <b><a href="https://openblocks.dev/">Openblocks</a></b><br />
     The Open Source Retool Alternative
 </h1>
 <p>
@@ -76,9 +76,11 @@ You can access Openblocks from [cloud-hosted version](https://cloud.openblocks.d
 - [JSON schema parsing using a third-party lib](https://cloud.openblocks.dev/apps/638dc95c75cfb658566143c5/view)
 - [Custom Echarts demo](https://cloud.openblocks.dev/apps/63779dd6c54c5224c70ea537/view), [Echarts source](https://echarts.apache.org/examples/en/editor.html?c=area-stack)
 - [Periodically user action report demo](https://cloud.openblocks.dev/apps/637f38daa899fe1ffcb17f0b/view)
-- [generate PDF using jsPdf](https://cloud.openblocks.dev/apps/6388610b0a254922d92e3882/view)
+- [Generate PDF using jsPdf](https://cloud.openblocks.dev/apps/6388610b0a254922d92e3882/view)
 - [Excel Explorer](https://cloud.openblocks.dev/apps/6392ff5d51cd8a59114b0c2c/view)
 - [File upload with REST API](https://cloud.openblocks.dev/apps/63a2651e660ad97d59eb4a51/view)
 - [Shopping cart demo using transformers/state/drawer](https://cloud.openblocks.dev/apps/63a422a344075b798fe3ae06/view)
 - [Module demo: color picker](https://cloud.openblocks.dev/apps/63a58f1e85d4cb49cebad1d4/view)
 - [S3 File Management](https://cloud.openblocks.dev/apps/63c7aa55686c4f301cf4d755/view)
+- [Custom Markdown Style](https://cloud.openblocks.dev/apps/63c8bdb9de760726cd253c90/view)
+- [Use JS query to orchestrate other queries](https://cloud.openblocks.dev/apps/63c8fb1e0279b679be2b5a09/view)
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java
@@ -158,8 +158,7 @@ public List<DatasourceMetaInfo> getJavaBasedSupportedDatasourceMetaInfos() {
 
     @Override
     public boolean isJavaDatasourcePlugin(String type) {
-        return "majiangInternal".equals(type)
-                || "openblocksApi".equals(type)
+        return "openblocksApi".equals(type)
                 || getJavaBasedSupportedDatasourceMetaInfos()
                 .stream()
                 .anyMatch(datasourceMetaInfo -> datasourceMetaInfo.getType().equals(type));
diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderApiService.java b/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderApiService.java
@@ -157,7 +157,7 @@ public Mono<Folder> delete(@Nonnull String folderId) {
         return checkManagePermission(folderId)
                 .flatMap(orgMember -> buildFolderTree(orgMember.getOrgId()))
                 .flatMap(tree -> {
-                    FolderNode<?, Folder> folderNode = tree.get(folderId);
+                    FolderNode<Object, Folder> folderNode = tree.get(folderId);
                     if (folderNode == null) {
                         return Mono.error(new BizException(FOLDER_NOT_EXIST, "FOLDER_NOT_EXIST", folderId));
                     }
@@ -260,7 +260,7 @@ public Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType
                 });
     }
 
-    private <T> Mono<Tree<T, Folder>> buildFolderTree(String orgId) {
+    private Mono<Tree<Object, Folder>> buildFolderTree(String orgId) {
         return folderService.findByOrganizationId(orgId)
                 .collectList()
                 .map(folders -> new Tree<>(folders, Folder::getId, Folder::getParentFolderId, Collections.emptyList(), null, null));
