Fix: Reload was not working due to changes in how Signals and inputs work. On reload, the input does not change so the resource does not fetch new data.

.vscode/settings.json

@@ -1,13 +1,24 @@
 {
-  // Use WSL paths + Poetry venv interpreter
+  "python.defaultInterpreterPath": "/brewman/.venv/bin/python",
-  "python.defaultInterpreterPath": "${workspaceFolder}/brewman/.venv/bin/python",
+  "python.terminal.useEnvFile": true,
+  "python.venvFolders": [
+    "barker/.venv",
+    "frank/.venv",
+    ".venv"
+  ],
+  "python.venvPath": "${workspaceFolder}/barker",
   "python.terminal.activateEnvironment": true,
-  // Quality-of-life
+   // Quality-of-life
   /* --- Pylance: keep IntelliSense, disable type checking --- */
   // "python.analysis.typeCheckingMode": "off",
   // "python.analysis.diagnosticMode": "openFilesOnly",
   "python.analysis.typeCheckingMode": "basic",
   "python.analysis.extraPaths": [
+    "${workspaceFolder}/brewman",
+    "./brewman"
+  ],
+  "python.autoComplete.extraPaths": [
+    "${workspaceFolder}/brewman",
     "./brewman"
   ],
   // Ruff (you have ruff installed via poetry)

overlord/src/app/app.config.ts

@@ -10,7 +10,7 @@ import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core';
 import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
 import { BrowserModule } from '@angular/platform-browser';
-import { provideRouter, withComponentInputBinding, withRouterConfig } from '@angular/router';
+import { provideRouter, withComponentInputBinding } from '@angular/router';
 
 import { dateFormat } from './app.environment';
 import { routes } from './app.routes';
@@ -33,13 +33,7 @@ export const appConfig: ApplicationConfig = {
         ...(isDevMode() ? [delayInterceptor] : []),
       ]),
     ),
-    provideRouter(
+    provideRouter(routes, withComponentInputBinding()),
-      routes,
-      withRouterConfig({
-        onSameUrlNavigation: 'reload',
-      }),
-      withComponentInputBinding(),
-    ),
     { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
     { provide: MAT_DATE_FORMATS, useValue: dateFormat },
     { provide: MAT_SNACK_BAR_DEFAULT_OPTIONS, useValue: { duration: 3000 } },

overlord/src/app/attendance/attendance.component.ts

@@ -99,7 +99,11 @@ export class AttendanceComponent {
 
   show() {
     const date = moment(this.model().date).format('DD-MMM-YYYY');
-    this.router.navigate(['/attendance', date]);
+    if (this.date() === date) {
+      this.infoResource.reload();
+    } else {
+      this.router.navigate(['/attendance', date]);
+    }
   }
 
   save() {

overlord/src/app/attendance/attendance.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Attendance',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':date',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Attendance',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/balance-sheet/balance-sheet.component.ts

@@ -112,7 +112,11 @@ export class BalanceSheetComponent {
 
   show() {
     const date = this.getDate();
-    this.router.navigate(['balance-sheet', date]);
+    if (this.date() === date) {
+      this.infoResource.reload();
+    } else {
+      this.router.navigate(['balance-sheet', date]);
+    }
   }
 
   getDate(): string {

overlord/src/app/balance-sheet/balance-sheet.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Balance Sheet',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':date',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Balance Sheet',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/batch-integrity-report/batch-integrity-report.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Product Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/cash-flow/cash-flow.component.ts

@@ -105,12 +105,16 @@ export class CashFlowComponent {
 
   show() {
     const info = this.getInfo();
-    this.router.navigate(['cash-flow'], {
+    if (this.startDate() === info.startDate && this.finishDate() === info.finishDate) {
-      queryParams: {
+      this.infoResource.reload();
-        startDate: info.startDate,
+    } else {
-        finishDate: info.finishDate,
+      this.router.navigate(['cash-flow'], {
-      },
+        queryParams: {
-    });
+          startDate: info.startDate,
+          finishDate: info.finishDate,
+        },
+      });
+    }
   }
 
   getInfo(): CashFlow {

overlord/src/app/cash-flow/cash-flow.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Cash Flow',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Cash Flow',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/closing-stock/closing-stock.component.ts

@@ -151,11 +151,15 @@ export class ClosingStockComponent {
       return;
     }
     const info = this.getInfo();
-    this.router.navigate(['closing-stock', info.date], {
+    if (this.date() === info.date && this.d() === info.costCentre.id) {
-      queryParams: {
+      this.infoResource.reload();
-        d: info.costCentre.id,
+    } else {
-      },
+      this.router.navigate(['closing-stock', info.date], {
-    });
+        queryParams: {
+          d: info.costCentre.id,
+        },
+      });
+    }
   }
 
   save() {

overlord/src/app/closing-stock/closing-stock.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Closing Stock',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':date',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Closing Stock',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/daybook/daybook.component.ts

@@ -127,12 +127,16 @@ export class DaybookComponent {
 
   show() {
     const l = this.prepareSubmit();
-    this.router.navigate(['daybook'], {
+    if (this.startDate() === l.startDate && this.finishDate() === l.finishDate) {
-      queryParams: {
+      this.infoResource.reload();
-        startDate: l.startDate,
+    } else {
-        finishDate: l.finishDate,
+      this.router.navigate(['daybook'], {
-      },
+        queryParams: {
-    });
+          startDate: l.startDate,
+          finishDate: l.finishDate,
+        },
+      });
+    }
   }
 
   prepareSubmit(): Daybook {

overlord/src/app/daybook/daybook.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Daybook',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/employee-attendance/employee-attendance.component.ts

@@ -126,12 +126,20 @@ export class EmployeeAttendanceComponent {
     currentInfo.employee =
       typeof formValue.employee !== 'string' && formValue.employee ? formValue.employee : undefined;
     if (currentInfo.employee) {
-      this.router.navigate(['/employee-attendance', currentInfo.employee.id], {
+      if (
-        queryParams: {
+        this.id() === currentInfo.employee.id &&
-          startDate: currentInfo.startDate,
+        this.startDate() === currentInfo.startDate &&
-          finishDate: currentInfo.finishDate,
+        this.finishDate() === currentInfo.finishDate
-        },
+      ) {
-      });
+        this.infoResource.reload();
+      } else {
+        this.router.navigate(['/employee-attendance', currentInfo.employee.id], {
+          queryParams: {
+            startDate: currentInfo.startDate,
+            finishDate: currentInfo.finishDate,
+          },
+        });
+      }
     }
   }
 

overlord/src/app/employee-attendance/employee-attendance.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Attendance',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Attendance',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/employee-benefits/employee-benefits.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'employee-benefit',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'employee-benefit',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/employee-functions/employee-functions.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'employee-benefit',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/entries/entries.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/incentive/incentive.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'incentive',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'incentive',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/issue/issue.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Issue',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Issue',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/journal/journal.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Journal',
     },
-    runGuardsAndResolvers: 'paramsChange',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Journal',
     },
-    runGuardsAndResolvers: 'paramsChange',
   },
 ];

overlord/src/app/ledger/ledger.component.ts

@@ -260,7 +260,13 @@ export class LedgerComponent {
 
   show() {
     const info = this.getInfo();
-    if (info.account) {
+    if (
+      this.id() === info.account?.id &&
+      this.startDate() === info.startDate &&
+      this.finishDate() === info.finishDate
+    ) {
+      this.infoResource.reload();
+    } else if (info.account) {
       this.router.navigate(['ledger', info.account.id], {
         queryParams: {
           startDate: info.startDate,

overlord/src/app/ledger/ledger.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/mozimo-daily-register/mozimo-daily-register.component.ts

@@ -111,7 +111,11 @@ export class MozimoDailyRegisterComponent {
 
   show() {
     const date = moment(this.model().date).format('DD-MMM-YYYY');
-    this.router.navigate(['/mozimo-daily-register', date]);
+    if (this.date() === date) {
+      this.infoResource.reload();
+    } else {
+      this.router.navigate(['/mozimo-daily-register', date]);
+    }
   }
 
   save() {

overlord/src/app/mozimo-daily-register/mozimo-daily-register.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Product Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':date',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Product Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/mozimo-product-register/mozimo-product-register.component.ts

@@ -136,12 +136,20 @@ export class MozimoProductRegisterComponent {
   show() {
     const info = this.getInfo();
     if (info.product) {
-      this.router.navigate(['mozimo-product-register', info.product.id], {
+      if (
-        queryParams: {
+        this.id() === info.product.id &&
-          startDate: info.startDate,
+        this.startDate() === info.startDate &&
-          finishDate: info.finishDate,
+        this.finishDate() === info.finishDate
-        },
+      ) {
-      });
+        this.infoResource.reload();
+      } else {
+        this.router.navigate(['mozimo-product-register', info.product.id], {
+          queryParams: {
+            startDate: info.startDate,
+            finishDate: info.finishDate,
+          },
+        });
+      }
     }
   }
 

overlord/src/app/mozimo-product-register/mozimo-product-register.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Product Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Product Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/net-transactions/net-transactions.component.ts

@@ -117,12 +117,16 @@ export class NetTransactionsComponent {
 
   show() {
     const l = this.prepareSubmit();
-    this.router.navigate(['net-transactions'], {
+    if (this.startDate() === l.startDate && this.finishDate() === l.finishDate) {
-      queryParams: {
+      this.infoResource.reload();
-        startDate: l.startDate,
+    } else {
-        finishDate: l.finishDate,
+      this.router.navigate(['net-transactions'], {
-      },
+        queryParams: {
-    });
+          startDate: l.startDate,
+          finishDate: l.finishDate,
+        },
+      });
+    }
   }
 
   prepareSubmit(): NetTransactions {

overlord/src/app/net-transactions/net-transactions.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Net Transactions',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/non-contact-purchase/non-contract-purchase.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Product Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/payment/payment.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'journal',
     },
-    runGuardsAndResolvers: 'paramsChange',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'journal',
     },
-    runGuardsAndResolvers: 'paramsChange',
   },
 ];

overlord/src/app/product-ledger/product-ledger.component.ts

@@ -211,12 +211,20 @@ export class ProductLedgerComponent {
   show() {
     const info = this.getInfo();
     if (info.product) {
-      this.router.navigate(['product-ledger', info.product.id], {
+      if (
-        queryParams: {
+        this.id() === info.product.id &&
-          startDate: info.startDate,
+        this.startDate() === info.startDate &&
-          finishDate: info.finishDate,
+        this.finishDate() === info.finishDate
-        },
+      ) {
-      });
+        this.infoResource.reload();
+      } else {
+        this.router.navigate(['product-ledger', info.product.id], {
+          queryParams: {
+            startDate: info.startDate,
+            finishDate: info.finishDate,
+          },
+        });
+      }
     }
   }
 

overlord/src/app/product-ledger/product-ledger.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Product Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Product Ledger',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/profit-loss/profit-loss.component.ts

@@ -117,12 +117,16 @@ export class ProfitLossComponent {
 
   show() {
     const info = this.getInfo();
-    this.router.navigate(['profit-loss'], {
+    if (this.startDate() === info.startDate && this.finishDate() === info.finishDate) {
-      queryParams: {
+      this.infoResource.reload();
-        startDate: info.startDate,
+    } else {
-        finishDate: info.finishDate,
+      this.router.navigate(['profit-loss'], {
-      },
+        queryParams: {
-    });
+          startDate: info.startDate,
+          finishDate: info.finishDate,
+        },
+      });
+    }
   }
 
   getInfo(): ProfitLoss {

overlord/src/app/profit-loss/profit-loss.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Profit & Loss',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/purchase-entries/purchase-entries.component.ts

@@ -121,12 +121,16 @@ export class PurchaseEntriesComponent {
 
   show() {
     const l = this.prepareSubmit();
-    this.router.navigate(['purchase-entries'], {
+    if (this.startDate() === l.startDate && this.finishDate() === l.finishDate) {
-      queryParams: {
+      this.resource.reload();
-        startDate: l.startDate,
+    } else {
-        finishDate: l.finishDate,
+      this.router.navigate(['purchase-entries'], {
-      },
+        queryParams: {
-    });
+          startDate: l.startDate,
+          finishDate: l.finishDate,
+        },
+      });
+    }
   }
 
   prepareSubmit(): PurchaseEntries {

overlord/src/app/purchase-entries/purchase-entries.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Purchase Entries',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/purchase-return/purchase-return.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Purchase Return',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Purchase Return',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/purchase/purchase.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Purchase',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Purchase',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/purchases/purchases.component.ts

@@ -115,12 +115,16 @@ export class PurchasesComponent {
 
   show() {
     const l = this.prepareSubmit();
-    this.router.navigate(['purchases'], {
+    if (this.startDate() === l.startDate && this.finishDate() === l.finishDate) {
-      queryParams: {
+      this.resource.reload();
-        startDate: l.startDate,
+    } else {
-        finishDate: l.finishDate,
+      this.router.navigate(['purchases'], {
-      },
+        queryParams: {
-    });
+          startDate: l.startDate,
+          finishDate: l.finishDate,
+        },
+      });
+    }
   }
 
   prepareSubmit(): Purchases {

overlord/src/app/purchases/purchases.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Purchases',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/raw-material-cost/raw-material-cost.component.ts

@@ -131,12 +131,16 @@ export class RawMaterialCostComponent {
 
   show() {
     const model = this.prepareSubmit();
-    this.router.navigate(['raw-material-cost'], {
+    if (!this.id() && this.startDate() === model.startDate && this.finishDate() === model.finishDate) {
-      queryParams: {
+      this.infoResource.reload();
-        startDate: model.startDate,
+    } else {
-        finishDate: model.finishDate,
+      this.router.navigate(['raw-material-cost'], {
-      },
+        queryParams: {
-    });
+          startDate: model.startDate,
+          finishDate: model.finishDate,
+        },
+      });
+    }
   }
 
   prepareSubmit(): RawMaterialCost {

overlord/src/app/raw-material-cost/raw-material-cost.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Raw Material Cost',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Raw Material Cost',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/receipt/receipt.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'journal',
     },
-    runGuardsAndResolvers: 'paramsChange',
   },
   {
     path: ':id',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'journal',
     },
-    runGuardsAndResolvers: 'paramsChange',
   },
 ];

overlord/src/app/recipe/recipe.routes.ts

@@ -12,7 +12,6 @@ export const routes: Routes = [
     data: {
       permission: 'Recipes',
     },
-    runGuardsAndResolvers: 'paramsOrQueryParamsChange',
   },
   {
     path: 'new',

overlord/src/app/settings/settings.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Maintenance', // 'Lock Date'
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/stock-movement/stock-movement.component.ts

@@ -114,12 +114,16 @@ export class StockMovementComponent {
 
   show() {
     const l = this.prepareSubmit();
-    this.router.navigate(['stock-movement'], {
+    if (this.startDate() === l.startDate && this.finishDate() === l.finishDate) {
-      queryParams: {
+      this.resource.reload();
-        startDate: l.startDate,
+    } else {
-        finishDate: l.finishDate,
+      this.router.navigate(['stock-movement'], {
-      },
+        queryParams: {
-    });
+          startDate: l.startDate,
+          finishDate: l.finishDate,
+        },
+      });
+    }
   }
 
   prepareSubmit(): StockMovement {

overlord/src/app/stock-movement/stock-movement.routes.ts

@@ -11,6 +11,5 @@ export const routes: Routes = [
     data: {
       permission: 'Stock Movement',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/app/trial-balance/trial-balance.component.ts

@@ -109,7 +109,11 @@ export class TrialBalanceComponent {
 
   show() {
     const info = this.getInfo();
-    this.router.navigate(['trial-balance', info.date]);
+    if (this.date() === info.date) {
+      this.resource.reload();
+    } else {
+      this.router.navigate(['trial-balance', info.date]);
+    }
   }
 
   getInfo(): TrialBalance {

overlord/src/app/trial-balance/trial-balance.routes.ts

@@ -11,7 +11,6 @@ export const routes: Routes = [
     data: {
       permission: 'Trial Balance',
     },
-    runGuardsAndResolvers: 'always',
   },
   {
     path: ':date',
@@ -20,6 +19,5 @@ export const routes: Routes = [
     data: {
       permission: 'Trial Balance',
     },
-    runGuardsAndResolvers: 'always',
   },
 ];

overlord/src/styles.sass

@@ -32,12 +32,12 @@ a
   text-decoration: underline
 
 
-button.mat-primary 
+button.mat-primary:not(:disabled)
   background: var(--mat-sys-primary) !important
   color: var(--mat-sys-on-primary) !important
 
 
-button.mat-warn 
+button.mat-warn:not(:disabled)
   background: var(--mat-sys-error) !important
   color: var(--mat-sys-on-error) !important