From 93569ccc8736c64a7fa6b751109304772054371f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 1 Jul 2021 18:24:43 +0100
Subject: [PATCH] simplify relationship configuration UI

---
 .../DataTable/modals/CreateEditColumn.svelte  |   5 -
 .../CreateEditRelationship.svelte             | 112 +++++++++++++-----
 packages/server/.vscode/launch.json           |  14 ++-
 3 files changed, 93 insertions(+), 38 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 35722481db..7f02b3c215 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -172,11 +172,6 @@
         alt: `Many ${table.name} rows → many ${linkTable.name} rows`,
         value: RelationshipTypes.MANY_TO_MANY,
       },
-      {
-        name: `One ${linkName} row → many ${thisName} rows`,
-        alt: `One ${linkTable.name} rows → many ${table.name} rows`,
-        value: RelationshipTypes.ONE_TO_MANY,
-      },
       {
         name: `One ${thisName} row → many ${linkName} rows`,
         alt: `One ${table.name} rows → many ${linkTable.name} rows`,
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
index 19c5f274d2..a30c08c135 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
@@ -1,6 +1,6 @@
 <script>
   import { RelationshipTypes } from "constants/backend"
-  import { Menu, MenuItem, MenuSection, Button, Input, Icon, ModalContent, RadioGroup, Heading } from "@budibase/bbui"
+  import { Menu, MenuItem, MenuSection, Button, Input, Icon, ModalContent, RadioGroup, Heading, Select } from "@budibase/bbui"
   import { tables } from "stores/backend"
 
   export let save
@@ -12,6 +12,7 @@
   let originalName = relationship.name
 
   $: console.log(relationship)
+  $: tableOptions = plusTables.map(table => ({ label: table.name, value: table._id }))
   $: valid = relationship.name && relationship.tableId && relationship.relationshipType
   $: from = plusTables.find(table => table._id === relationship.source)
   $: to = plusTables.find(table => table._id === relationship.tableId)
@@ -30,6 +31,17 @@
         value: RelationshipTypes.ONE_TO_MANY,
       }
     ] : []
+
+  $: relationshipTypes = [
+      {
+        label: "Many",
+        value: RelationshipTypes.MANY_TO_MANY,
+      },
+      {
+        label: "One",
+        value: RelationshipTypes.ONE_TO_MANY,
+      }
+    ]
   
   function onChangeRelationshipType(evt) {
     if (evt.detail === RelationshipTypes.ONE_TO_MANY) {
@@ -38,17 +50,25 @@
   }
 
   // save the relationship on to the datasource
-  function saveRelationship() {
+  async function saveRelationship() {
+    // source of relationship
     datasource.entities[from.name].schema[relationship.name] = {
       type: "link",
       ...relationship
     }
-    if (originalName) {
-      delete datasource.entities[from.name].schema[originalName]
+    // if (originalName !== from.name) {
+    //   delete datasource.entities[from.name].schema[originalName]
+    // }
+
+    // save other side of relationship in the other schema
+    datasource.entities[to.name].schema[relationship.name] = {
+      type: "link",
+      relationshipType: relationship.relationshipType === RelationshipTypes.MANY_TO_MANY ? RelationshipTypes.MANY_TO_MANY : RelationshipTypes.MANY_TO_ONE,
+      tableId: to._id
     }
 
-    save()
-    tables.fetch()
+    await save()
+    await tables.fetch()
   }
 </script>
 
@@ -62,7 +82,41 @@
   <Input label="Relationship Name" bind:value={relationship.name} />
 
   <div class="table-selector">
-    <Menu>
+    <Select 
+      label="Relationship"
+      options={relationshipTypes}
+      bind:value={relationship.relationshipType}
+    />
+
+    <Select 
+      label="From"
+      options={tableOptions}
+      bind:value={relationship.source}
+    />
+
+    <Select 
+      label={"Has many"}
+      options={tableOptions}
+      bind:value={relationship.tableId}
+    />
+
+    {#if relationship?.relationshipType === RelationshipTypes.MANY_TO_MANY}
+      <Select 
+        label={"Through"}
+        options={tableOptions}
+        bind:value={relationship.through}
+      />
+    {/if}
+
+    {#if relationship?.relationshipType === RelationshipTypes.ONE_TO_MANY}
+      <Select 
+        label={"Foreign Key"}
+        options={Object.keys(linkTable.schema)}
+        bind:value={relationship.foreignKey}
+      />
+    {/if}
+
+    <!-- <Menu>
       <MenuSection heading="From">
         {#each plusTables as table}
           <MenuItem noClose icon="Table" on:click={() => (relationship.source = table._id)}>
@@ -73,8 +127,8 @@
           </MenuItem>
         {/each}
       </MenuSection>
-    </Menu>
-    <Menu>
+    </Menu> -->
+    <!-- <Menu>
       <MenuSection heading="To">
         {#each plusTables as table}
           <MenuItem noClose icon="Table" on:click={() => (relationship.tableId = table._id)}>
@@ -85,11 +139,9 @@
           </MenuItem>
         {/each}
       </MenuSection>
-    </Menu>
-  </div>
-
+    </Menu> -->
   {#if from && to}
-    <div class="cardinality">
+    <!-- <div class="cardinality">
       <RadioGroup
         label="Define the relationship"
         bind:value={relationship.relationshipType}
@@ -98,25 +150,15 @@
         getOptionLabel={option => option.name}
         getOptionValue={option => option.value}
       />
-    </div>
+    </div> -->
 
-  {#if relationship?.relationshipType === RelationshipTypes.MANY_TO_MANY}
-    <Menu>
-      <MenuSection heading="Join Table">
-        {#each plusTables as table}
-          <MenuItem noClose icon="Table" on:click={() => (relationship.through = table._id)}>
-            {table.name}
-              {#if relationship.through === table._id}
-              <Icon size="S" name="Checkmark" />
-              {/if}
-          </MenuItem>
-        {/each}
-      </MenuSection>
-    </Menu>
-  {/if}
+    <!-- <Select 
+      label={`${linkTable.name} Column`}
+      options={Object.keys(linkTable.schema)}
+      bind:value={relationship.fieldName}
+    /> -->
 
-
-    <div class="table-selector">
+    <!-- <div class="table-selector">
       <Menu>
         <MenuSection heading={`${linkTable.name} Column`}>
           {#each Object.keys(linkTable.schema) as column}
@@ -129,15 +171,21 @@
           {/each}
         </MenuSection>
       </Menu>
-    </div>
+    </div> -->
   {/if}
+  </div>
+
 
 </ModalContent>
 
 <style>
   .table-selector {
     display: grid;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: repeat(4, 1fr);
     grid-gap: var(--spacing-xl);
   }
+
+  .cardinality {
+    padding: 10px;
+  }
 </style>
\ No newline at end of file
diff --git a/packages/server/.vscode/launch.json b/packages/server/.vscode/launch.json
index 7417938376..d1774752cb 100644
--- a/packages/server/.vscode/launch.json
+++ b/packages/server/.vscode/launch.json
@@ -8,7 +8,19 @@
         "type": "node",
         "request": "launch",
         "name": "Start Server",
-        "program": "${workspaceFolder}/src/index.js"
+        "sourceMaps": true,
+        "program": "${workspaceFolder}/src/index.ts",
+        "preLaunchTask": "npm: build",
+        "outFiles": ["${workspaceFolder}/dist/**/*.js"]
+      },
+      {
+        "name": "TS",
+        "type": "node",
+        "request": "launch",
+        "runtimeExecutable": "node",
+        "runtimeArgs": ["--nolazy", "-r", "ts-node/register/transpile-only"],
+        "args": ["src/index.ts"],
+        "cwd": "${workspaceRoot}",
       },
       {
         "type": "node",