Merge pull request #296 from neon-balcony/develop

fix: table date display and add MariaDB support

Author: neon-balcony

client/packages/openblocks-design/src/icons/icon-query-MariaDB.svg

@@ -217,6 +217,7 @@ export { ReactComponent as ToggleButtonCompIcon } from "./icon-toggle-button.svg
 export { ReactComponent as GoogleSheetsIcon } from "./icon-query-GoogleSheets.svg";
 export { ReactComponent as GraphqlIcon } from "./icon-query-Graphql.svg";
 export { ReactComponent as SnowflakeIcon } from "./icon-query-snowflake.svg";
+export { ReactComponent as MariaDBIcon } from "./icon-query-MariaDB.svg";
 export { ReactComponent as imageEditorIcon } from "./icon-insert-imageEditor.svg";
 export { ReactComponent as HomeSettingsIcon } from "./icon-home-settings.svg";
 export { ReactComponent as HomeSettingsActiveIcon } from "./icon-home-settings-active.svg";

client/packages/openblocks-design/src/icons/index.ts

@@ -61,7 +61,7 @@
     "rc-trigger": "^5.3.1",
     "react": "^17.0.2",
     "react-colorful": "^5.5.1",
-    "react-documents": "^1.1.2",
+    "react-documents": "^1.2.1",
     "react-dom": "^17.0.2",
     "react-draggable": "^4.4.4",
     "react-grid-layout": "^1.3.0",

client/packages/openblocks/package.json

@@ -118,9 +118,12 @@ const Wrapper = styled.div`
 `;
 
 export function formatDate(date: string, format: string) {
-  let mom = moment(date, DateParser);
+  let mom = moment(date);
   if (!mom.isValid()) {
-    mom = moment(0, DateParser);
+    mom = moment.utc(date, DateParser).local();
+    if (!mom.isValid()) {
+      mom = moment(0);
+    }
   }
   return mom.isValid() ? mom.format(format) : "";
 }

client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx

@@ -293,7 +293,7 @@ export const QueryGeneralPropertyView = (props: {
               }}
               status={datasourceStatus}
             />
-            {comp instanceof SQLQuery &&
+            {children.comp instanceof SQLQuery &&
               !NOT_SUPPORT_GUI_SQL_QUERY.includes(children.compType.getView()) && (
                 <div style={{ width: "104px", marginLeft: "8px", flexShrink: 0 }}>
                   {/* query comp should not aware of specific queryType  */}

client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx

@@ -196,7 +196,9 @@ const SQLQueryPropertyView = (props: { comp: InstanceType<typeof SQLQuery> }) =>
                   : []),
                 { label: trans("sqlQuery.update"), value: "UPDATE" },
                 { label: trans("sqlQuery.delete"), value: "DELETE" },
-                { label: trans("sqlQuery.bulkInsert"), value: "BULK_INSERT" },
+                ...(context?.resourceType !== "oracle"
+                  ? [{ label: trans("sqlQuery.bulkInsert"), value: "BULK_INSERT" }]
+                  : []),
                 { label: trans("sqlQuery.bulkUpdate"), value: "BULK_UPDATE" },
               ] as const
             }
@@ -251,11 +253,12 @@ export const NOT_SUPPORT_GUI_SQL_QUERY: ResourceType[] = [
   "tdengine",
   "dameng",
 ];
-export const SUPPORT_UPSERT_SQL_QUERY: ResourceType[] = [
+const SUPPORT_UPSERT_SQL_QUERY: ResourceType[] = [
   "mysql",
   "oceanBase",
   "tidb",
   "polardbMysql",
   "sequoiadbMysql",
   "starrocks",
+  "mariadb",
 ];

client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx

@@ -14,6 +14,7 @@ export const databasePlugins: Partial<DatasourceType>[] = [
   "oracle",
   "clickHouse",
   "snowflake",
+  "mariadb",
 ];
 
 export const apiPluginsForQueryLibrary: Partial<DatasourceType>[] = [

client/packages/openblocks/src/constants/datasourceConstants.ts

@@ -28,7 +28,8 @@ export type DatasourceType =
   | "clickHouse"
   | "googleSheets"
   | "graphql"
-  | "snowflake";
+  | "snowflake"
+  | "mariadb";
 
 export type ResourceType = DatasourceType | "js" | "libraryQuery" | "view";
 
@@ -50,6 +51,7 @@ export const QueryMap = {
   googleSheets: GoogleSheetsQuery,
   graphql: GraphqlQuery,
   snowflake: SQLQuery,
+  mariadb: SQLQuery,
 };
 
 export const JsPluginQueryMap: Record<string, MultiCompConstructor> = {};

client/packages/openblocks/src/constants/queryConstants.ts

@@ -55,49 +55,8 @@ export const DatasourceFormRegistry: Partial<Record<DatasourceType, DatasourceFo
     form: sqlDatasourceForm({ placeholder: "My OceanBase1", port: "2881" }),
     whitelist: true,
   },
-  tidb: {
-    form: sqlDatasourceForm({ placeholder: "My TiDB1", port: "4000" }),
-    whitelist: true,
-  },
-  openGauss: {
-    form: sqlDatasourceForm({ placeholder: "My OpenGauss1", port: "5432" }),
-    whitelist: true,
-  },
-  gaussdb: {
-    form: sqlDatasourceForm({ placeholder: "My Gauss1", port: "5432" }),
-    whitelist: true,
-  },
-  dameng: {
-    form: sqlDatasourceForm({
-      placeholder: "My DaMeng1",
-      port: "5236",
-      supportSSL: false,
-      supportDatabase: false,
-    }),
-    whitelist: true,
-  },
-  polardbMysql: {
-    form: sqlDatasourceForm({ placeholder: "My PolarDB1", port: "3306" }),
-    whitelist: true,
-  },
-  tdengine: {
-    form: sqlDatasourceForm({
-      placeholder: "My TDengine1",
-      port: "6041",
-      supportPreparedStatement: false,
-    }),
-    whitelist: true,
-  },
-  sequoiadbMysql: {
-    form: sqlDatasourceForm({ placeholder: "My SequoiaDB1", port: "3306" }),
-    whitelist: true,
-  },
-  mogdb: {
-    form: sqlDatasourceForm({ placeholder: "My MogDB1", port: "5432" }),
-    whitelist: true,
-  },
-  starrocks: {
-    form: sqlDatasourceForm({ placeholder: "My StarRocks1", port: "9030" }),
+  mariadb: {
+    form: sqlDatasourceForm({ placeholder: "My MariaDB1", port: "3306" }),
     whitelist: true,
   },
 };

client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx

@@ -2,13 +2,15 @@ import styled from "styled-components";
 import { ResourceType } from "@openblocks-ee/constants/queryConstants";
 import {
   ClickHouseIcon,
+  DataResponderIcon,
   DeleteApiIcon,
   EsIcon,
   GetApiIcon,
   GoogleSheetsIcon,
   GraphqlIcon,
   HeadApiIcon,
   JSIcon,
+  MariaDBIcon,
   MongoIcon,
   MSSQLIcon,
   MysqlIcon,
@@ -27,7 +29,6 @@ import {
   TempStateIcon,
   TraceApiIcon,
   TransformerIcon,
-  DataResponderIcon,
 } from "openblocks-design";
 import { BottomResTypeEnum } from "types/bottomRes";
 import { HttpMethod } from "api/api";
@@ -130,6 +131,8 @@ export const getBottomResIcon = (
         return <OpenBlocksQueryIcon />;
       case "snowflake":
         return <SnowflakeIcon />;
+      case "mariadb":
+        return <MariaDBIcon />;
       default:
         if (defaultIconUrl) {
           return getBottomResIconInnerByUrl(type, defaultIconUrl);