Fixing little UI bugs.

5 years ago · 579bce8a6a
2 changed files with 14 additions and 4 deletions
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@ -177,9 +177,11 @@
                Update display columns
              </Button>
            {/if}
-            <Button primary on:click={updateDatasourceSchema}
-              >Fetch Tables From Database</Button
-            >
+            <div>
+              <Button primary on:click={updateDatasourceSchema}>
+                Fetch Tables From Database
+              </Button>
+            </div>
          </div>
        </div>
        <Body>
@ -319,4 +321,8 @@
    grid-gap: var(--spacing-l);
    grid-template-columns: 1fr 1fr;
  }
+
+  .table-buttons div {
+    grid-column-end: -1;
+  }
 </style>
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@ -134,6 +134,7 @@ module PostgresModule {
    /**
     * Fetches the tables from the postgres table and assigns them to the datasource.
     * @param {*} datasourceId - datasourceId to fetch
+     * @param entities - the tables that are to be built
     */
    async buildSchema(datasourceId: string, entities: Record<string, Table>) {
      let tableKeys: { [key: string]: string[] } = {}
@ -169,9 +170,12 @@ module PostgresModule {
          }

          // add the existing relationships from the entities if they exist, to prevent them from being overridden
-          if (entities) {
+          if (entities && entities[tableName]) {
            const existingTableSchema = entities[tableName].schema
            for (let key in existingTableSchema) {
+              if (!existingTableSchema.hasOwnProperty(key)) {
+                continue
+              }
              if (existingTableSchema[key].type === "link") {
                tables[tableName].schema[key] = existingTableSchema[key]
              }