Adapting URL ROUTE Names and changing NPM Repository Paths

FalkWolsky · FalkWolsky · commit 8847dae01762 · 2024-08-23T12:42:47.000+02:00
diff --git a/client/packages/lowcoder-cli/client.d.ts b/client/packages/lowcoder-cli/client.d.ts
@@ -29,8 +29,8 @@ declare var PUBLIC_URL: string;
 declare var REACT_APP_EDITION: string;
 declare var REACT_APP_LANGUAGES: string;
 declare var REACT_APP_COMMIT_ID: string;
-declare var REACT_APP_API_HOST: string;
-declare var LOWCODER_NODE_SERVICE_URL: string;
+declare var REACT_APP_API_SERVICE_URL: string;
+declare var REACT_APP_NODE_SERVICE_URL: string;
 declare var REACT_APP_ENV: string;
 declare var REACT_APP_BUILD_ID: string;
 declare var REACT_APP_LOG_LEVEL: string;
diff --git a/client/packages/lowcoder-cli/dev-utils/buildVars.js b/client/packages/lowcoder-cli/dev-utils/buildVars.js
@@ -16,11 +16,11 @@ export const buildVars = [
     defaultValue: "00000",
   },
   {
-    name: "REACT_APP_API_HOST",
+    name: "REACT_APP_API_SERVICE_URL",
     defaultValue: "",
   },
   {
-    name: "LOWCODER_NODE_SERVICE_URL",
+    name: "REACT_APP_NODE_SERVICE_URL",
     defaultValue: "",
   },
   {
diff --git a/client/packages/lowcoder-sdk-webpack-bundle/src/dev-utils/buildVars.cjs b/client/packages/lowcoder-sdk-webpack-bundle/src/dev-utils/buildVars.cjs
@@ -16,11 +16,11 @@ const buildVars = [
     defaultValue: "00000",
   },
   {
-    name: "REACT_APP_API_HOST",
+    name: "REACT_APP_API_SERVICE_URL",
     defaultValue: "",
   },
   {
-    name: "LOWCODER_NODE_SERVICE_URL",
+    name: "REACT_APP_NODE_SERVICE_URL",
     defaultValue: "",
   },
   {
diff --git a/client/packages/lowcoder-sdk-webpack-bundle/webpack.config.cjs b/client/packages/lowcoder-sdk-webpack-bundle/webpack.config.cjs
@@ -102,7 +102,7 @@ module.exports = {
   plugins: [
     new webpack.DefinePlugin({
       ...define,
-      REACT_APP_API_HOST: JSON.stringify(apiBaseUrl),
+      REACT_APP_API_SERVICE_URL: JSON.stringify(apiBaseUrl),
       REACT_APP_BUNDLE_TYPE: JSON.stringify("sdk"),
     }),
     new webpack.IgnorePlugin({
diff --git a/client/packages/lowcoder-sdk/src/dev-utils/buildVars.js b/client/packages/lowcoder-sdk/src/dev-utils/buildVars.js
@@ -16,11 +16,11 @@ export const buildVars = [
     defaultValue: "00000",
   },
   {
-    name: "REACT_APP_API_HOST",
+    name: "REACT_APP_API_SERVICE_URL",
     defaultValue: "",
   },
   {
-    name: "LOWCODER_NODE_SERVICE_URL",
+    name: "REACT_APP_NODE_SERVICE_URL",
     defaultValue: "",
   },
   {
diff --git a/client/packages/lowcoder-sdk/vite.config.mts b/client/packages/lowcoder-sdk/vite.config.mts
@@ -21,7 +21,7 @@ const apiBaseUrl = "http://localhost:8000";
 export const viteConfig: UserConfig = {
   define: {
     ...define,
-    REACT_APP_API_HOST: JSON.stringify(apiBaseUrl),
+    REACT_APP_API_SERVICE_URL: JSON.stringify(apiBaseUrl),
     REACT_APP_BUNDLE_TYPE: JSON.stringify("sdk"),
   },
   assetsInclude: ["**/*.md"],
diff --git a/client/packages/lowcoder/src/app-env.d.ts b/client/packages/lowcoder/src/app-env.d.ts
@@ -35,8 +35,8 @@ declare var PUBLIC_URL: string;
 declare var REACT_APP_EDITION: string;
 declare var REACT_APP_LANGUAGES: string;
 declare var REACT_APP_COMMIT_ID: string;
-declare var REACT_APP_API_HOST: string;
-declare var LOWCODER_NODE_SERVICE_URL: string;
+declare var REACT_APP_API_SERVICE_URL: string;
+declare var REACT_APP_NODE_SERVICE_URL: string;
 declare var REACT_APP_ENV: string;
 declare var REACT_APP_BUILD_ID: string;
 declare var REACT_APP_LOG_LEVEL: string;
diff --git a/client/packages/lowcoder/src/constants/apiConstants.ts b/client/packages/lowcoder/src/constants/apiConstants.ts
@@ -51,10 +51,9 @@ export type PaginationParam = {
 export const API_REQUEST_HEADERS: RawAxiosRequestHeaders = {
   "Content-Type": "application/json",
 };
-export const SERVER_HOST = `${REACT_APP_API_HOST ?? ""}`;
+export const SERVER_HOST = `${REACT_APP_API_SERVICE_URL ?? ""}`;
 export const ASSETS_URI = (id: string) => `${SERVER_HOST}/api/v1/assets/${id}`;
 export const USER_HEAD_UPLOAD_URL = `${SERVER_HOST}/api/v1/users/photo`;
-export const ORG_ICON_UPLOAD_URL = (orgId: string) =>
-  `${SERVER_HOST}/api/v1/organizations/${orgId}/logo`;
+export const ORG_ICON_UPLOAD_URL = (orgId: string) => `${SERVER_HOST}/api/v1/organizations/${orgId}/logo`;
 
 export type ApiRequestStatus = "init" | "requesting" | "success" | "error";
diff --git a/client/packages/lowcoder/src/constants/npmPlugins.ts b/client/packages/lowcoder/src/constants/npmPlugins.ts
@@ -1,5 +1,3 @@
-import { sdkConfig } from "./sdkConfig";
-
-const baseUrl = sdkConfig.baseURL || LOWCODER_NODE_SERVICE_URL || "";
-export const NPM_REGISTRY_URL = `${baseUrl}/node-service/api/npm/registry`;
-export const NPM_PLUGIN_ASSETS_BASE_URL = `${baseUrl}/node-service/api/npm/package`;
+export const SERVER_HOST = `${REACT_APP_API_SERVICE_URL ?? ""}`;
+export const NPM_REGISTRY_URL = `${SERVER_HOST}/api/npm/registry`;
+export const NPM_PLUGIN_ASSETS_BASE_URL = `${SERVER_HOST}/api/npm/package`;
diff --git a/client/packages/lowcoder/src/dev-utils/buildVars.js b/client/packages/lowcoder/src/dev-utils/buildVars.js
@@ -16,11 +16,11 @@ export const buildVars = [
     defaultValue: "00000",
   },
   {
-    name: "REACT_APP_API_HOST",
+    name: "REACT_APP_API_SERVICE_URL",
     defaultValue: "",
   },
   {
-    name: "LOWCODER_NODE_SERVICE_URL",
+    name: "REACT_APP_NODE_SERVICE_URL",
     defaultValue: "",
   },
   {
diff --git a/client/packages/lowcoder/src/index.ts b/client/packages/lowcoder/src/index.ts
@@ -32,7 +32,8 @@ function hideLoading() {
 
 debug(`REACT_APP_EDITION: ${REACT_APP_EDITION}`);
 debug(`REACT_APP_LANGUAGES:, ${REACT_APP_LANGUAGES}`);
-debug(`REACT_APP_API_HOST:, ${REACT_APP_API_HOST}`);
+debug(`REACT_APP_API_SERVICE_URL:, ${REACT_APP_API_SERVICE_URL}`);
+debug(`REACT_APP_NODE_SERVICE_URL:, ${REACT_APP_NODE_SERVICE_URL}`);
 debug(`REACT_APP_ENV:, ${REACT_APP_ENV}`);
 debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);
  
diff --git a/client/packages/lowcoder/src/util/bottomResUtils.tsx b/client/packages/lowcoder/src/util/bottomResUtils.tsx
@@ -64,7 +64,7 @@ export const LargeBottomResIconWrapper = styled(IconWrapper)`
 function getBottomResIconInnerByUrl(type: BottomResType, url: string) {
   let fullUrl = url;
   if (!fullUrl.startsWith("http")) {
-    fullUrl = `${LOWCODER_NODE_SERVICE_URL !== "" ? LOWCODER_NODE_SERVICE_URL : REACT_APP_API_HOST}/node-service/plugin-icons/${url}`;
+    fullUrl = `${REACT_APP_NODE_SERVICE_URL !== "" ? REACT_APP_NODE_SERVICE_URL : REACT_APP_API_SERVICE_URL}/node-service/plugin-icons/${url}`;
   }
   return <img style={{ width: "100%", height: "100%" }} src={fullUrl} alt="" />;
 }
diff --git a/client/scripts/buildVars.js b/client/scripts/buildVars.js
@@ -16,11 +16,11 @@ export const buildVars = [
     defaultValue: "00000",
   },
   {
-    name: "REACT_APP_API_HOST",
+    name: "REACT_APP_API_SERVICE_URL",
     defaultValue: "",
   },
   {
-    name: "LOWCODER_NODE_SERVICE_URL",
+    name: "REACT_APP_NODE_SERVICE_URL",
     defaultValue: "",
   },
   {
diff --git a/server/node-service/src/plugins/index.ts b/server/node-service/src/plugins/index.ts
@@ -8,7 +8,7 @@ import couchdbPlugin from "./couchdb";
 import wooCommercePlugin from "./woocommerce";
 import openAiPlugin from "./openAi";
 import athenaPlugin from "./athena";
-import duckdbPlugin from "./duckdb";
+// import duckdbPlugin from "./duckdb";
 import lambdaPlugin from "./lambda";
 import googleCloudStorage from "./googleCloudStorage";
 import stripePlugin from "./stripe";
@@ -43,7 +43,7 @@ let plugins: (DataSourcePlugin | DataSourcePluginFactory)[] = [
   // Databases
   dynamoDBPlugin,
   couchdbPlugin,
-  duckdbPlugin,
+  // duckdbPlugin,
   faunaPlugin,
   tursoPlugin,
 

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ export const buildVars = [`
`16`	`16`	`defaultValue: "00000",`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		`- name: "REACT_APP_API_HOST",`
	`19`	`+ name: "REACT_APP_API_SERVICE_URL",`
`20`	`20`	`defaultValue: "",`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		`- name: "LOWCODER_NODE_SERVICE_URL",`
	`23`	`+ name: "REACT_APP_NODE_SERVICE_URL",`
`24`	`24`	`defaultValue: "",`
`25`	`25`	`},`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ const buildVars = [`
`16`	`16`	`defaultValue: "00000",`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		`- name: "REACT_APP_API_HOST",`
	`19`	`+ name: "REACT_APP_API_SERVICE_URL",`
`20`	`20`	`defaultValue: "",`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		`- name: "LOWCODER_NODE_SERVICE_URL",`
	`23`	`+ name: "REACT_APP_NODE_SERVICE_URL",`
`24`	`24`	`defaultValue: "",`
`25`	`25`	`},`
`26`	`26`	`{`