Progressing into the implementation of the Account dialog.

src/components/account/Account.tsx

@@ -33,10 +33,7 @@ const Account: Component<{}> = (props) => {
     const newAccounts: any = await dispatch({
       action: 'getAccounts',
     });
-    setAccounts([
+    setAccounts([{ id: '--new--', name: t('newAccount') }, ...newAccounts]);
-      { id: '--new--', name: t('newAccount') },
-      ...newAccounts.rows,
-    ]);
 
     console.log({
       caller: 'Account / handleClickOpen',

src/db/account.ts

@@ -8,10 +8,16 @@ export const initialAccount = {
 };
 
 export const getAccounts = async () => {
-  return await getFamily('account', {}, true);
+  const accountDocs = await getFamily('account', { include_docs: true }, true);
+  return accountDocs.rows.map((row: any) => row.doc.doc);
 };
 
 export const putAccount = async (id: string, account: any) => {
   const uri = getUri('account', { account: id });
   return await put(uri, 'account', (_: any) => account, {}, true);
 };
+
+export const getAccountById = (accounts: any, id: string) => {
+  const targetAccounts: any[] = accounts.filter((acc: any) => acc.id === id);
+  return targetAccounts[0];
+};

src/db/index.ts

@@ -1,8 +1,14 @@
 import _ from 'lodash';
 import PouchDB from 'pouchdb';
 import uri from '../lib/ids';
-import { getAccounts, initialAccount, putAccount } from './account';
+import {
+  getAccountById,
+  getAccounts,
+  initialAccount,
+  putAccount,
+} from './account';
 import changeHandler from './change-handler';
+import { getSettings, putSettings } from './settings';
 
 const dbDefinitionId = uri('dbdef', {});
 
@@ -28,7 +34,7 @@ export const initDb = async (params: any) => {
     });
   }
 
-  const accounts = (await getAccounts()).rows;
+  const accounts = await getAccounts();
   console.log({ caller: 'initDb', accounts });
 
   if (accounts.length === 0) {
@@ -36,6 +42,16 @@ export const initDb = async (params: any) => {
     await putAccount(initialAccount.id, initialAccount);
   }
 
+  const settings = await getSettings();
+  let currentAccount = getAccountById(accounts, settings.currentAccountId);
+  if (currentAccount === undefined) {
+    settings.currentAccountId = accounts[0].id;
+    await putSettings(settings);
+    currentAccount = accounts[0];
+  }
+
+  console.log({ caller: 'initDb', settings, currentAccount });
+
   if (globalThis.db === undefined) {
     globalThis.db = new PouchDB('dyomedea', {
       auto_compaction: false,
@@ -65,7 +81,6 @@ export const initDb = async (params: any) => {
   }
   //await await db.compact();
 
-  
   const sync = PouchDB.sync(
     'dyomedea',
     'http://admin:password@localhost:5984/dyomedea',
@@ -116,5 +131,4 @@ export const initDb = async (params: any) => {
   //  changes.cancel();
 
   globalThis.dbReady = true;
-
 };

src/db/settings.ts

@@ -4,7 +4,7 @@ const emptySettings = {};
 
 export const getSettings = async () => {
   try {
-    return await get('settings', true);
+    return (await get('settings', true)).doc;
   } catch (err) {
     console.error({ caller: 'getSettings', err });
     return emptySettings;