From bdecbf1e8257383de0777690e5a9e5dd21c0bacc Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 25 Mar 2020 16:59:32 +0000
Subject: [PATCH] userslist

---
 .../ModelDataTable/ModelDataTable.svelte      | 38 ++++++++++++++++---
 .../src/database/ModelDataTable/api.js        |  1 +
 packages/builder/src/nav/UsersList.svelte     |  4 +-
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/database/ModelDataTable/ModelDataTable.svelte b/packages/builder/src/database/ModelDataTable/ModelDataTable.svelte
index e4f87f35ed..5feacf5608 100644
--- a/packages/builder/src/database/ModelDataTable/ModelDataTable.svelte
+++ b/packages/builder/src/database/ModelDataTable/ModelDataTable.svelte
@@ -1,7 +1,17 @@
 <script>
   import { onMount } from "svelte"
   import { store, backendUiStore } from "../../builderStore"
-  import { tap, get, find, last, compose, flatten, map } from "lodash/fp"
+  import {
+    tap,
+    get,
+    find,
+    last,
+    compose,
+    flatten,
+    map,
+    remove,
+    keys
+  } from "lodash/fp"
   import Select from "../../common/Select.svelte"
   import { getIndexSchema } from "../../common/core"
   import ActionButton from "../../common/ActionButton.svelte"
@@ -12,6 +22,14 @@
   export let selectRecord
 
   const ITEMS_PER_PAGE = 10
+  // Internal headers we want to hide from the user
+  const INTERNAL_HEADERS = [
+    "key",
+    "sortKey",
+    "type",
+    "id",
+    "isNew"
+  ]
 
   let modalOpen = false
   let data = []
@@ -33,7 +51,7 @@
     $backendUiStore.selectedDatabase
   ).then(records => {
     data = records || []
-    headers = getSchema($backendUiStore.selectedView).map(get("name"))
+    headers = hideInternalHeaders($backendUiStore.selectedView)
   })
 
   $: paginatedData = data.slice(
@@ -41,13 +59,19 @@
     currentPage * ITEMS_PER_PAGE + ITEMS_PER_PAGE
   )
 
+  const getSchema = getIndexSchema($store.hierarchy)
+
   const childViewsForRecord = compose(
     flatten,
     map("indexes"),
     get("children")
   )
 
-  const getSchema = getIndexSchema($store.hierarchy)
+  const hideInternalHeaders = compose(
+    remove(headerName => INTERNAL_HEADERS.includes(headerName)),
+    map(get("name")),
+    getSchema
+  )
 
   async function fetchRecordsForView(view, instance) {
     if (!view.name) return
@@ -66,10 +90,15 @@
     backendUiStore.update(state => {
       state.selectedRecord = record
       state.breadcrumbs = [state.selectedDatabase.name, record.id]
+      state.selectedView = childViewsForRecord($store.hierarchy)[0]
       return state
     })
   }
 
+  $: {
+    console.log($backendUiStore.selectedView)
+  }
+
   onMount(() => {
     if (views.length) {
       backendUiStore.actions.views.select(views[0])
@@ -140,8 +169,7 @@
     {data}
     bind:currentPage
     pageItemCount={data.length}
-    {ITEMS_PER_PAGE} 
-  />
+    {ITEMS_PER_PAGE} />
 </section>
 
 <style>
diff --git a/packages/builder/src/database/ModelDataTable/api.js b/packages/builder/src/database/ModelDataTable/api.js
index 8d71fdf8a5..c4a8062971 100644
--- a/packages/builder/src/database/ModelDataTable/api.js
+++ b/packages/builder/src/database/ModelDataTable/api.js
@@ -24,6 +24,7 @@ export async function saveRecord(record, { appname, instanceId }) {
   let recordBase = { ...record }
 
   // brand new record
+  // car-model-id or name/specific-car-id/manus
   if (record.collectionName) {
     const collectionKey = `/${record.collectionName}`
     recordBase = getNewRecord(recordBase, collectionKey)
diff --git a/packages/builder/src/nav/UsersList.svelte b/packages/builder/src/nav/UsersList.svelte
index fa6925e6e2..275f020a9e 100644
--- a/packages/builder/src/nav/UsersList.svelte
+++ b/packages/builder/src/nav/UsersList.svelte
@@ -18,8 +18,8 @@
   }
 
   async function fetchUsers() {
-    const DELETE_RECORDS_URL = `/_builder/instance/${currentAppInfo.appname}/${currentAppInfo.instanceId}/api/users`
-    const response = await api.get(DELETE_RECORDS_URL);
+    const FETCH_USERS_URL = `/_builder/instance/${currentAppInfo.appname}/${currentAppInfo.instanceId}/api/users`
+    const response = await api.get(FETCH_USERS_URL);
     users = await response.json()
   }