1.0.13 replication tools

package.json

@@ -1,6 +1,6 @@
 {
   "description": "An offline first nutrition planner",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "keywords": [
     "nutrition"
   ],

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nutrition-planner",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "A simple calculator for nutrition",
   "license": "MIT",
   "main": "./dist/main/main.js",

src/main/main.ts

@@ -8,10 +8,10 @@
  * When running `npm run build` or `npm run build:main`, this file is compiled to
  * `./src/main.js` using webpack. This gives us some performance wins.
  */
-import path from 'path';
-import { app, BrowserWindow, shell, ipcMain } from 'electron';
-import { autoUpdater } from 'electron-updater';
+import { BrowserWindow, app, ipcMain, shell } from 'electron';
 import log from 'electron-log';
+import { autoUpdater } from 'electron-updater';
+import path from 'path';
 import MenuBuilder from './menu';
 import { resolveHtmlPath } from './util';
 
@@ -81,7 +81,7 @@ const createWindow = async () => {
     },
   });
 
-  mainWindow.loadURL(resolveHtmlPath('/index.html'));
+  mainWindow.loadURL(resolveHtmlPath('./index.html'));
 
   mainWindow.on('ready-to-show', () => {
     if (!mainWindow) {

src/main/menu.ts

@@ -1,4 +1,4 @@
-import { app, Menu, BrowserWindow, MenuItemConstructorOptions } from 'electron';
+import { BrowserWindow, Menu, MenuItemConstructorOptions, app } from 'electron';
 
 interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
   selector?: string;
@@ -128,6 +128,13 @@ export default class MenuBuilder {
             this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());
           },
         },
+        {
+          label: 'Toggle Developer Tools',
+          accelerator: 'Alt+Command+I',
+          click: () => {
+            this.mainWindow.webContents.toggleDevTools();
+          },
+        },
       ],
     };
     const subMenuWindow: DarwinMenuItemConstructorOptions = {

src/renderer/components/drawers/SettingsDrawer.tsx

@@ -1,6 +1,6 @@
 import { Capacitor } from '@capacitor/core';
 import { Directory, Encoding, Filesystem } from '@capacitor/filesystem';
-import { DeleteIcon, DownloadIcon } from '@chakra-ui/icons';
+import { DeleteIcon, DownloadIcon, WarningIcon } from '@chakra-ui/icons';
 import {
   Button,
   Link as ChakraLink,
@@ -44,7 +44,14 @@ export function SettingsDrawer(props: SettingsDrawerProps) {
   const { isOpen, onClose } = props;
   const { t } = useTranslation();
   const [importLoadingState, setImportLoadingState] = useState(false);
-  const [showDeleteDialogState, setShowDeleteDialogState] = useState(false);
+  const [
+    showRemoveDeleteAlertDialogState,
+    setShowRemoveDeleteAlertDialogState,
+  ] = useState(false);
+  const [
+    showDeleteDeleteAlertDialogState,
+    setShowDeleteDeleteAlertDialogState,
+  ] = useState(false);
 
   const [couchDbUrlLocalStorage, setCouchDbUrlLocalStorage] = useLocalStorage<
     string | undefined
@@ -204,16 +211,50 @@ export function SettingsDrawer(props: SettingsDrawerProps) {
               >
                 {t('importJson')}
               </Button>
+              <Button
+                width="full"
+                disabled={loading}
+                onClick={() => {
+                  window.location.reload();
+                }}
+              >
+                {t('reload')}
+              </Button>
+              <Button
+                width="full"
+                colorScheme="yellow"
+                disabled={loading}
+                onClick={async () => {
+                  await collection?.cleanup(0);
+                  toast({
+                    title: t('success'),
+                    status: 'success',
+                  });
+                }}
+              >
+                {t('cleanup')}
+              </Button>
+              <Button
+                width="full"
+                colorScheme="orange"
+                disabled={loading}
+                leftIcon={<WarningIcon />}
+                onClick={() => {
+                  setShowRemoveDeleteAlertDialogState(true);
+                }}
+              >
+                {t('remove')}
+              </Button>
               <Button
                 width="full"
                 colorScheme="red"
                 disabled={loading}
                 leftIcon={<DeleteIcon />}
                 onClick={() => {
-                  setShowDeleteDialogState(true);
+                  setShowDeleteDeleteAlertDialogState(true);
                 }}
               >
-                {t('reset')}
+                {t('delete')}
               </Button>
               <HStack width="full" justify="space-between">
                 <ChakraLink
@@ -243,9 +284,9 @@ export function SettingsDrawer(props: SettingsDrawerProps) {
         </DrawerContent>
       </Drawer>
       <DeleteAlertDialog
-        isOpen={showDeleteDialogState}
+        isOpen={showRemoveDeleteAlertDialogState}
         onResult={async (result) => {
-          setShowDeleteDialogState(false);
+          setShowRemoveDeleteAlertDialogState(false);
           if (result) {
             await collection?.find().remove();
             toast({
@@ -255,6 +296,23 @@ export function SettingsDrawer(props: SettingsDrawerProps) {
           }
         }}
       />
+      <DeleteAlertDialog
+        isOpen={showDeleteDeleteAlertDialogState}
+        onResult={async (result) => {
+          setShowDeleteDeleteAlertDialogState(false);
+          if (result) {
+            const databases = await indexedDB.databases();
+
+            // Iterate through the databases and delete them
+            databases.forEach((db) => {
+              if (db.name) {
+                indexedDB.deleteDatabase(db.name);
+              }
+            });
+            window.location.reload();
+          }
+        }}
+      />
     </>
   );
 }

src/renderer/data/rxnp/RxNPDatabaseHelpers.ts

@@ -1,14 +1,14 @@
-import { createRxDatabase, RxStorage, RxCollection } from 'rxdb';
+import { RxCollection, RxStorage, createRxDatabase } from 'rxdb';
+import { dataid } from '../../utilities/dataid';
+import { ItemInterface } from '../interfaces/ItemInterface';
+import { ItemTypeEnum } from '../interfaces/ItemTypeEnum';
+import { RxNPDatabaseCollections } from './RxNPDatabaseCollections';
+import { RxNPDatabaseType } from './RxNPDatabaseType';
 import {
   RxNPItemDocument,
   rxnpItemDocumentMethods,
   rxnpItemSchema,
 } from './RxNPItemSchema';
-import { RxNPDatabaseCollections } from './RxNPDatabaseCollections';
-import { RxNPDatabaseType } from './RxNPDatabaseType';
-import { ItemInterface } from '../interfaces/ItemInterface';
-import { dataid } from '../../utilities/dataid';
-import { ItemTypeEnum } from '../interfaces/ItemTypeEnum';
 
 export async function initRxNPDatabase(
   name: string,
@@ -20,8 +20,16 @@ export async function initRxNPDatabase(
     database = await createRxDatabase<RxNPDatabaseCollections>({
       name,
       storage,
+      cleanupPolicy: {
+        minimumDeletedTime: 1000 * 60 * 60 * 24 * 31, // one month,
+        minimumCollectionAge: 1000 * 60, // 60 seconds
+        runEach: 1000 * 60 * 5, // 5 minutes
+        awaitReplicationsInSync: true,
+        waitForLeadership: true,
+      },
     });
   } catch (error) {
+    // eslint-disable-next-line no-console
     console.log(error);
   }
 

src/renderer/data/rxnp/useRxNPDatabase.ts

@@ -1,5 +1,6 @@
 import { useEffect, useState } from 'react';
 import { addRxPlugin } from 'rxdb';
+import { RxDBCleanupPlugin } from 'rxdb/plugins/cleanup';
 import { RxDBJsonDumpPlugin } from 'rxdb/plugins/json-dump';
 import { RxDBLeaderElectionPlugin } from 'rxdb/plugins/leader-election';
 import { RxDBQueryBuilderPlugin } from 'rxdb/plugins/query-builder';
@@ -28,7 +29,11 @@ export const useRxNPDatabase = () => {
 
   useEffect(() => {
     async function replicate() {
-      if (couchDbUrlLocalStorage != null && database != null) {
+      if (
+        couchDbUrlLocalStorage != null &&
+        couchDbUrlLocalStorage.length > 0 &&
+        database != null
+      ) {
         try {
           setReplicationState(
             replicateCouchDB({
@@ -46,8 +51,10 @@ export const useRxNPDatabase = () => {
           // eslint-disable-next-line no-console
           console.log(error);
         }
-      } else if (replicationState !== null) {
+      } else if (replicationState != null) {
         replicationState.cancel();
+        // eslint-disable-next-line no-console
+        console.log('Replication cancelled');
       }
     }
     replicate();
@@ -56,10 +63,11 @@ export const useRxNPDatabase = () => {
 
   useEffect(() => {
     if (!database) {
-      // addRxPlugin(RxDBDevModePlugin);
+      //addRxPlugin(RxDBDevModePlugin);
       addRxPlugin(RxDBQueryBuilderPlugin);
       addRxPlugin(RxDBJsonDumpPlugin);
       addRxPlugin(RxDBLeaderElectionPlugin);
+      addRxPlugin(RxDBCleanupPlugin);
       // eslint-disable-next-line promise/catch-or-return
       initRxNPDatabase('nutrition-planner-db', getRxStorageDexie()).then(
         setDatabase,

src/renderer/i18n/dictionaries/ar.json

@@ -13,6 +13,7 @@
   "carbs": "كربوهيدرات",
   "CHF": "فرنك سويسري",
   "cholesterol": "كوليسترول",
+  "cleanup": "تنظيف",
   "cmCentimeters": "سم",
   "CNY": "يوان صيني",
   "copied": "تم النسخ",
@@ -72,7 +73,8 @@
   "privacy": "الخصوصية",
   "protein": "بروتين",
   "proteinTarget": "هدف البروتين",
-  "reset": "إعادة تعيين",
+  "reload": "إعادة تحميل",
+  "remove": "إعادة تعيين",
   "saturatedFat": "دهون مشبعة",
   "sedentary": "قليل النشاط",
   "servingPrice": "سعر الحصة",

src/renderer/i18n/dictionaries/cmn.json

@@ -13,6 +13,7 @@
   "carbs": "碳水",
   "CHF": "瑞士法郎",
   "cholesterol": "胆固醇",
+  "cleanup": "清理",
   "cmCentimeters": "厘米",
   "CNY": "人民币",
   "copied": "已复制",
@@ -72,7 +73,8 @@
   "privacy": "隐私",
   "protein": "蛋白质",
   "proteinTarget": "蛋白质目标",
-  "reset": "重置",
+  "reload": "重新加载",
+  "remove": "重置",
   "saturatedFat": "饱和脂肪",
   "sedentary": "久坐",
   "servingPrice": "每份价格",

src/renderer/i18n/dictionaries/en.json

@@ -13,6 +13,7 @@
   "carbs": "Carbs",
   "CHF": "Swiss Franc",
   "cholesterol": "Cholesterol",
+  "cleanup": "Cleanup",
   "cmCentimeters": "cm",
   "CNY": "Chinese Yuan",
   "copied": "Copied",
@@ -72,7 +73,8 @@
   "privacy": "Privacy",
   "protein": "Protein",
   "proteinTarget": "Protein target",
-  "reset": "Reset",
+  "reload": "Reload",
+  "remove": "Remove",
   "saturatedFat": "Saturated Fat",
   "sedentary": "Sedentary",
   "servingPrice": "Serving price",

src/renderer/i18n/dictionaries/es.json

@@ -13,6 +13,7 @@
   "carbs": "Carbos",
   "CHF": "Franco suizo",
   "cholesterol": "Colesterol",
+  "cleanup": "Limpieza",
   "cmCentimeters": "cm",
   "CNY": "Yuan chino",
   "copied": "已复制",
@@ -72,7 +73,8 @@
   "privacy": "Privacidad",
   "protein": "Proteína",
   "proteinTarget": "Objetivo de proteínas",
-  "reset": "Reiniciar",
+  "reload": "Recargar",
+  "remove": "Reiniciar",
   "saturatedFat": "Grasa saturada",
   "sedentary": "Sedentario",
   "servingPrice": "Precio por porción",

src/renderer/i18n/dictionaries/fr.json

@@ -13,6 +13,7 @@
   "carbs": "Glucides",
   "CHF": "Franc suisse",
   "cholesterol": "Cholestérol",
+  "cleanup": "Nettoyage",
   "cmCentimeters": "cm",
   "CNY": "Yuan chinois",
   "copied": "Copié",
@@ -72,7 +73,7 @@
   "privacy": "Confidentialité",
   "protein": "Protéine",
   "proteinTarget": "Objectif de protéines",
-  "reset": "Réinitialiser",
+  "remove": "Réinitialiser",
   "saturatedFat": "Graisse saturée",
   "sedentary": "Sédentaire",
   "servingPrice": "Prix par portion",

src/renderer/i18n/dictionaries/hi.json

@@ -13,6 +13,7 @@
   "carbs": "कार्ब्स",
   "CHF": "स्विस फ्रैंक",
   "cholesterol": "कोलेस्ट्रॉल",
+  "cleanup": "सफाई",
   "cmCentimeters": "सेंटीमीटर",
   "CNY": "चीनी युआन",
   "copied": "कॉपी किया गया",
@@ -72,7 +73,8 @@
   "privacy": "गोपनीयता",
   "protein": "प्रोटीन",
   "proteinTarget": "प्रोटीन लक्ष्य",
-  "reset": "रीसेट",
+  "reload": "पुनः लोड करें",
+  "remove": "रीसेट",
   "saturatedFat": "संतृप्त वसा",
   "sedentary": "गतिहीन",
   "servingPrice": "प्रति सर्विंग मूल्य",