update execute-query

Author: michelle0927

components/nile_database/actions/execute-query/execute-query.mjs

@@ -8,32 +8,28 @@ export default {
   type: "action",
   props: {
     nile,
+    workspace: {
+      propDefinition: [
+        nile,
+        "workspace",
+      ],
+    },
+    database: {
+      propDefinition: [
+        nile,
+        "database",
+      ],
+    },
     user: {
       type: "string",
       label: "Username",
-      description: "The username of the database user",
+      description: "The username or userId of the database user. Note: Credentials are generated in the Nile Dashboard under Settings -> Credentials",
     },
     password: {
       type: "string",
       label: "Password",
       description: "The password of the database user",
     },
-    host: {
-      type: "string",
-      label: "Host",
-      description: "The host of the database",
-    },
-    port: {
-      type: "string",
-      label: "Port",
-      description: "The port to connect to the database. Example: `5432`",
-    },
-    database: {
-      propDefinition: [
-        nile,
-        "database",
-      ],
-    },
     query: {
       type: "string",
       label: "Query",
@@ -44,8 +40,11 @@ export default {
     const config = {
       user: this.user,
       password: this.password,
-      host: this.host,
-      port: this.port,
+      host: await this.nile.getHost({
+        workspace: this.workspace,
+        database: this.database,
+      }),
+      port: "5432",
       database: this.database,
     };
     const data = await this.nile.executeQuery(config, this.query);

components/nile_database/nile_database.app.mjs

@@ -31,8 +31,7 @@ export default {
     async _getBaseUrl({
       workspace, database, ...opts
     }) {
-      const { apiHost } = await this._makeRequest({
-        url: `${this._globalBaseUrl()}/workspaces/${workspace}/databases/${database}`,
+      const { apiHost } = await this.getDatabase({
         workspace,
         database,
         ...opts,
@@ -59,12 +58,33 @@ export default {
         ...opts,
       });
     },
+    getDatabase({
+      workspace, database, ...opts
+    }) {
+      return this._makeRequest({
+        url: `${this._globalBaseUrl()}/workspaces/${workspace}/databases/${database}`,
+        workspace,
+        database,
+        ...opts,
+      });
+    },
     getAuthenticatedUser(opts = {}) {
       return this._makeRequest({
         url: `${this._globalBaseUrl()}/developers/me/full`,
         ...opts,
       });
     },
+    async getHost({
+      workspace, database, ...opts
+    }) {
+      const { dbHost } = await this.getDatabase({
+        workspace,
+        database,
+        ...opts,
+      });
+      const host = dbHost.match(/postgres:\/\/([^/]+)\//);
+      return host[1];
+    },
     listUsers({
       workspace, database, ...opts
     }) {