Removing LowcoderAPI as AdHoc DataSource

FalkWolsky · FalkWolsky · commit 9311e810993b · 2025-01-11T16:21:20.000+01:00
diff --git a/client/packages/lowcoder/src/components/ResCreatePanel.tsx b/client/packages/lowcoder/src/components/ResCreatePanel.tsx
@@ -15,8 +15,6 @@ import type { PageType } from "../constants/pageConstants";
 import type { SizeType } from "antd/es/config-provider/SizeContext";
 import { Datasource } from "constants/datasourceConstants";
 import {
-  LOWCODER_API_ID,
-  LOWCODER_API_INFO,
   QUICK_GRAPHQL_ID,
   QUICK_REST_API_ID,
 } from "../constants/datasourceConstants";
@@ -179,15 +177,6 @@ const ResButton = (props: {
         dataSourceId: QUICK_GRAPHQL_ID,
       },
     },
-    lowcoderApi: {
-      icon: LOWCODER_API_INFO.icon,
-      label: LOWCODER_API_INFO.name,
-      type: BottomResTypeEnum.Query,
-      extra: {
-        compType: "lowcoderApi",
-        dataSourceId: LOWCODER_API_ID,
-      },
-    },
   };
 
   if (typeof props.identifier === "object") {
@@ -331,10 +320,6 @@ export function ResCreatePanel(props: ResCreateModalProps) {
                 <ResButton size={buttonSize} identifier={"restApi"} onSelect={onSelect} />
                 <ResButton size={buttonSize} identifier={"streamApi"} onSelect={onSelect} />
                 <ResButton size={buttonSize} identifier={"graphql"} onSelect={onSelect} />
-                {placement === "editor" && (
-                  <ResButton size={buttonSize} identifier={"lowcoderApi"} onSelect={onSelect} />
-                )}
-
                 {datasource.map((i) => (
                   <ResButton size={buttonSize} key={i.id} identifier={i} onSelect={onSelect} />
                 ))}
diff --git a/client/packages/lowcoder/src/comps/queries/queryComp/queryPropertyView.tsx b/client/packages/lowcoder/src/comps/queries/queryComp/queryPropertyView.tsx
@@ -3,7 +3,6 @@ import { manualTriggerResource, ResourceType } from "@lowcoder-ee/constants/quer
 import { PreparedStatementConfig } from "api/datasourceApi";
 import { isCompWithPropertyView } from "comps/utils/propertyUtils";
 import {
-  LOWCODER_API_ID,
   QUICK_GRAPHQL_ID,
   QUICK_REST_API_ID,
 } from "constants/datasourceConstants";
@@ -197,17 +196,6 @@ export const QueryGeneralPropertyView = (props: {
       )?.datasource.id,
     [datasource]
   );
-  if (datasourceId === oldLowcoderId) {
-    datasourceId = LOWCODER_API_ID;
-    datasourceType = "lowcoderApi";
-    dispatch(
-      comp.changeValueAction({
-        ...comp.toJsonValue(),
-        datasourceId: LOWCODER_API_ID,
-        compType: "lowcoderApi",
-      } as any)
-    );
-  }
 
   return (
     <QueryPropertyViewWrapper>
@@ -445,8 +433,7 @@ function useDatasourceStatus(datasourceId: string, datasourceType: ResourceType)
       datasourceType === "streamApi" ||
       datasourceType === "libraryQuery" ||
       datasourceId === QUICK_REST_API_ID ||
-      datasourceId === QUICK_GRAPHQL_ID ||
-      datasourceId === LOWCODER_API_ID
+      datasourceId === QUICK_GRAPHQL_ID
     ) {
       return "";
     }
diff --git a/client/packages/lowcoder/src/comps/queries/resourceDropdown.tsx b/client/packages/lowcoder/src/comps/queries/resourceDropdown.tsx
@@ -13,8 +13,6 @@ import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils";
 import { trans } from "i18n";
 import { DatasourceType, ResourceType } from "@lowcoder-ee/constants/queryConstants";
 import {
-  LOWCODER_API_ID,
-  LOWCODER_API_INFO,
   QUICK_GRAPHQL_ID,
   QUICK_REST_API_ID,
 } from "constants/datasourceConstants";
@@ -104,11 +102,6 @@ const QuickGraphqlValue: ResourceOptionValue = {
   type: "graphql",
 };
 
-const LowcoderAPIValue: ResourceOptionValue = {
-  id: LOWCODER_API_ID,
-  type: "lowcoderApi",
-};
-
 interface ResourceDropdownProps {
   changeResource: (datasourceId: string, value: string) => void;
   selectedResource: ResourceOptionValue;
@@ -286,17 +279,6 @@ export const ResourceDropdown = (props: ResourceDropdownProps) => {
 
         {context?.placement !== "queryLibrary" && (
           <>
-            <SelectOption
-              key={JSON.stringify(LowcoderAPIValue)}
-              label={LOWCODER_API_INFO.name}
-              value={JSON.stringify(LowcoderAPIValue)}
-            >
-              <SelectOptionContains>
-                {LOWCODER_API_INFO.icon}
-                <SelectOptionLabel>{LOWCODER_API_INFO.name} </SelectOptionLabel>
-              </SelectOptionContains>
-            </SelectOption>
-
             <SelectOption
               key={JSON.stringify(JSOptionValue)}
               label={trans("query.executeJSCode")}
diff --git a/client/packages/lowcoder/src/constants/datasourceConstants.ts b/client/packages/lowcoder/src/constants/datasourceConstants.ts
@@ -42,9 +42,4 @@ export interface Datasource {
 
 export const QUICK_REST_API_ID = "#QUICK_REST_API";
 export const QUICK_GRAPHQL_ID = "#QUICK_GRAPHQL";
-export const LOWCODER_API_ID = "#LOWCODER_API";
-export const LOWCODER_API_INFO = {
-  icon: getBottomResIcon("lowcoderApi"),
-  name: trans("query.lowcoderAPI"),
-};
 export const OLD_LOWCODER_DATASOURCE: Partial<DatasourceType>[] = [];
diff --git a/client/packages/lowcoder/src/constants/queryConstants.ts b/client/packages/lowcoder/src/constants/queryConstants.ts
@@ -3,7 +3,6 @@ import { SQLQuery } from "../comps/queries/sqlQuery/SQLQuery";
 import { HttpQuery } from "../comps/queries/httpQuery/httpQuery";
 import { StreamQuery } from "../comps/queries/httpQuery/streamQuery";
 import { MongoQuery } from "../comps/queries/mongoQuery";
-import { LowcoderQuery } from "../comps/queries/lowcoderQuery";
 import { RedisQuery } from "../comps/queries/redisQuery";
 import { EsQuery } from "../comps/queries/esQuery";
 import { SMTPQuery } from "../comps/queries/smtpQuery";
@@ -21,7 +20,6 @@ export type DatasourceType =
   | "restApi"
   | "streamApi"
   | "postgres"
-  | "lowcoderApi"
   | "redis"
   | "es"
   | "mssql"
@@ -42,7 +40,6 @@ export const QueryMap = {
   streamApi: StreamQuery,
   mongodb: MongoQuery,
   postgres: SQLQuery,
-  lowcoderApi: LowcoderQuery,
   redis: RedisQuery,
   es: EsQuery,
   mssql: SQLQuery,
diff --git a/client/packages/lowcoder/src/util/bottomResUtils.tsx b/client/packages/lowcoder/src/util/bottomResUtils.tsx
@@ -15,7 +15,6 @@ import {
   MongoIcon,
   MSSQLIcon,
   MysqlIcon,
-  LowcoderQueryIcon,
   OptionsApiIcon,
   OracleIcon,
   PatchApiIcon,
@@ -131,8 +130,6 @@ export const getBottomResIcon = (
         return <GoogleSheetsIcon />;
       case "graphql":
         return <GraphqlIcon />;
-      case "lowcoderApi":
-        return <LowcoderQueryIcon />;
       case "snowflake":
         return <SnowflakeIcon />;
       case "mariadb":
