Merge pull request lowcoder-org#252 from sarike/ds-firebase

hanshuai · web-flow · commit 643a10899ad9 · 2023-02-13T17:09:01.000+08:00
fix: add some tooltips for firebase datasource
diff --git a/server/node-service/src/plugins/firebase/dataSourceConfig.ts b/server/node-service/src/plugins/firebase/dataSourceConfig.ts
@@ -5,14 +5,15 @@ const dataSourceConfig = {
   params: [
     {
       key: "databaseUrl",
-      label: "Firebase Database URL",
+      label: "Database URL",
       tooltip:
-        "You can find your database URL and Firestore ID in your [Firebase project console](https://console.firebase.google.com/)",
+        "You can find your database URL and Firestore ID in your [Firebase project console](https://console.firebase.google.com/). Required for Realtime database.",
       type: "textInput",
     },
     {
       key: "firestoreId",
-      label: "Firestore Project ID",
+      label: "Project ID",
+      tooltip: "Firebase project ID, Optional when the Database URL is filled.",
       type: "textInput",
     },
     {
diff --git a/server/node-service/src/plugins/firebase/run.ts b/server/node-service/src/plugins/firebase/run.ts
@@ -15,12 +15,13 @@ export async function runFirebasePlugin(
   dataSourceConfig: DataSourceDataType
 ) {
   const { actionName } = actionData;
-  const { privateKey, databaseUrl } = dataSourceConfig;
+  const { privateKey, databaseUrl, firestoreId } = dataSourceConfig;
   const serviceAccount = JSON.parse(privateKey);
 
   const app = initializeApp({
     credential: cert(serviceAccount),
     databaseURL: databaseUrl,
+    projectId: firestoreId,
   });
 
   const witDbRef = <T>(fn: (ref: Reference) => T): T => {

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,15 @@ const dataSourceConfig = {`
`5`	`5`	`params: [`
`6`	`6`	`{`
`7`	`7`	`key: "databaseUrl",`
`8`		`- label: "Firebase Database URL",`
	`8`	`+ label: "Database URL",`
`9`	`9`	`tooltip:`
`10`		`- "You can find your database URL and Firestore ID in your [Firebase project console](https://console.firebase.google.com/)",`
	`10`	`+ "You can find your database URL and Firestore ID in your [Firebase project console](https://console.firebase.google.com/). Required for Realtime database.",`
`11`	`11`	`type: "textInput",`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`key: "firestoreId",`
`15`		`- label: "Firestore Project ID",`
	`15`	`+ label: "Project ID",`
	`16`	`+ tooltip: "Firebase project ID, Optional when the Database URL is filled.",`
`16`	`17`	`type: "textInput",`
`17`	`18`	`},`
`18`	`19`	`{`