Merge branch 'master' into centralize-use-meta-theme-color

actualbudget · Sep 28, 2024 · 74eb106 · 74eb106
2 parents 3be90b6 + 545c8d5
commit 74eb106
Show file tree

Hide file tree

Showing 21 changed files with 309 additions and 359 deletions.
diff --git a/.github/workflows/electron-master.yml b/.github/workflows/electron-master.yml
@@ -40,6 +40,7 @@ jobs:
           python3 -m pip install setuptools
       - if: ${{ startsWith(matrix.os, 'ubuntu') }}
         run: |
+          sudo apt-get update
           sudo apt-get install flatpak -y
           sudo apt-get install flatpak-builder -y
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo

diff --git a/.github/workflows/electron-pr.yml b/.github/workflows/electron-pr.yml
@@ -35,6 +35,7 @@ jobs:
           python3 -m pip install setuptools
       - if: ${{ startsWith(matrix.os, 'ubuntu') }}
         run: |
+          sudo apt-get update
           sudo apt-get install flatpak -y
           sudo apt-get install flatpak-builder -y
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo

diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.jsx b/packages/desktop-client/src/components/filters/FiltersMenu.jsx
@@ -19,7 +19,7 @@ import {
   getFieldError,
   unparse,
   FIELD_TYPES,
-  TYPE_INFO,
+  getValidOps,
 } from 'loot-core/src/shared/rules';
 import { titleFirst } from 'loot-core/src/shared/util';
 
@@ -77,7 +77,7 @@ function ConfigureField({
   }, [op]);
 
   const type = FIELD_TYPES.get(field);
-  let ops = TYPE_INFO[type].ops.filter(op => op !== 'isbetween');
+  let ops = getValidOps(field).filter(op => op !== 'isbetween');
 
   // Month and year fields are quite hacky right now! Figure out how
   // to clean this up later
@@ -259,7 +259,7 @@ export function FilterButton({ onApply, compact, hover, exclude }) {
         case 'configure': {
           const { field } = deserializeField(action.field);
           const type = FIELD_TYPES.get(field);
-          const ops = TYPE_INFO[type].ops;
+          const ops = getValidOps(field);
           return {
             ...state,
             fieldsOpen: false,

diff --git a/packages/desktop-client/src/components/filters/updateFilterReducer.ts b/packages/desktop-client/src/components/filters/updateFilterReducer.ts
@@ -11,7 +11,7 @@ export function updateFilterReducer(
   switch (action.type) {
     case 'set-op': {
       const type = FIELD_TYPES.get(state.field);
-      let value = state.value;
+      let value: RuleConditionEntity['value'] | null = state.value;
       if (
         (type === 'id' || type === 'string') &&
         (action.op === 'contains' ||

diff --git a/packages/desktop-client/src/components/modals/EditRuleModal.jsx b/packages/desktop-client/src/components/modals/EditRuleModal.jsx
@@ -26,8 +26,9 @@ import {
   unparse,
   makeValue,
   FIELD_TYPES,
-  TYPE_INFO,
   ALLOCATION_METHODS,
+  isValidOp,
+  getValidOps,
 } from 'loot-core/src/shared/rules';
 import {
   integerToCurrency,
@@ -580,14 +581,15 @@ function ConditionsList({
           if (
             (prevType === 'string' || prevType === 'number') &&
             prevType === newCond.type &&
-            cond.op !== 'isbetween'
+            cond.op !== 'isbetween' &&
+            isValidOp(newCond.field, cond.op)
           ) {
             // Don't clear the value & op if the type is string/number and
             // the type hasn't changed
             newCond.op = cond.op;
             return newInput(makeValue(cond.value, newCond));
           } else {
-            newCond.op = TYPE_INFO[newCond.type].ops[0];
+            newCond.op = getValidOps(newCond.field)[0];
             return newInput(makeValue(null, newCond));
           }
         } else if (field === 'op') {
@@ -654,7 +656,7 @@ function ConditionsList({
   ) : (
     <Stack spacing={2} data-testid="condition-list">
       {conditions.map((cond, i) => {
-        let ops = TYPE_INFO[cond.type].ops;
+        let ops = getValidOps(cond.field);
 
         // Hack for now, these ops should be the only ones available
         // for recurring dates

diff --git a/packages/desktop-client/src/components/util/LoadComponent.tsx b/packages/desktop-client/src/components/util/LoadComponent.tsx
@@ -34,6 +34,7 @@ function LoadComponentInner<K extends string>({
     localModuleCache.get(name) ?? null,
   );
   const [failedToLoad, setFailedToLoad] = useState(false);
+  const [failedToLoadException, setFailedToLoadException] = useState(null);
 
   useEffect(() => {
     if (localModuleCache.has(name)) {
@@ -55,13 +56,14 @@ function LoadComponentInner<K extends string>({
       {
         retries: 5,
       },
-    ).catch(() => {
+    ).catch(e => {
       setFailedToLoad(true);
+      setFailedToLoadException(e);
     });
   }, [name, importer]);
 
   if (failedToLoad) {
-    throw new LazyLoadFailedError(name);
+    throw new LazyLoadFailedError(name, failedToLoadException);
   }
 
   if (!Component) {

diff --git a/packages/desktop-client/src/gocardless.ts b/packages/desktop-client/src/gocardless.ts
@@ -45,12 +45,14 @@ export async function authorizeBank(
 ) {
   _authorize(dispatch, upgradingAccountId, {
     onSuccess: async data => {
-      pushModal('select-linked-accounts', {
-        accounts: data.accounts,
-        requisitionId: data.id,
-        upgradingAccountId,
-        syncSource: 'goCardless',
-      });
+      dispatch(
+        pushModal('select-linked-accounts', {
+          accounts: data.accounts,
+          requisitionId: data.id,
+          upgradingAccountId,
+          syncSource: 'goCardless',
+        }),
+      );
     },
   });
 }