upgraded dependencies improved widgets

Author: roncodes

addon/components/wallet/transaction-history.js

@@ -66,18 +66,13 @@ export default class WalletTransactionHistoryComponent extends Component {
         if (!wallet?.id) return;
 
         try {
-            console.log('fetching wallet transactions');
             const result = yield this.fetch.get(`wallets/${wallet.id}/transactions`, { page: this.page, limit: 20 }, { namespace: 'ledger/int/v1' });
-
             const transactions = (result?.transactions ?? []).map((trx) => this.store.push(this.store.normalize('ledger-transaction', trx)));
 
-            console.log('[result]', result);
-            console.log('[transactions]', transactions);
             this.transactions = transactions;
             this.meta = result?.meta ?? null;
         } catch (e) {
             console.error(e);
-            console.log(e.message);
             this.transactions = [];
         }
     }

addon/components/widget/activity-feed.js

@@ -9,7 +9,7 @@ export default class WidgetActivityFeedComponent extends Component {
     @tracked entries = [];
 
     get companyCurrency() {
-        return this.currentUser.getCompany()?.currency ?? 'USD';
+        return this.currentUser.company?.currency ?? this.currentUser.whoisData?.currency?.code ?? 'USD';
     }
 
     constructor() {

addon/components/widget/ar-aging.js

@@ -9,7 +9,7 @@ export default class WidgetArAgingComponent extends Component {
     @tracked buckets = null;
 
     get companyCurrency() {
-        return this.currentUser.getCompany()?.currency ?? 'USD';
+        return this.currentUser.company?.currency ?? this.currentUser.whoisData?.currency?.code ?? 'USD';
     }
 
     constructor() {

addon/components/widget/invoice-summary.js

@@ -9,7 +9,7 @@ export default class WidgetInvoiceSummaryComponent extends Component {
     @tracked counts = null;
 
     get companyCurrency() {
-        return this.currentUser.getCompany()?.currency ?? 'USD';
+        return this.currentUser.company?.currency ?? this.currentUser.whoisData?.currency?.code ?? 'USD';
     }
 
     constructor() {

addon/components/widget/overview.js

@@ -9,7 +9,7 @@ export default class WidgetOverviewComponent extends Component {
     @tracked data = null;
 
     get companyCurrency() {
-        return this.currentUser.getCompany()?.currency ?? 'USD';
+        return this.currentUser.company?.currency ?? this.currentUser.whoisData?.currency?.code ?? 'USD';
     }
 
     constructor() {

addon/components/widget/revenue-chart.hbs

@@ -9,7 +9,7 @@
             <div class="space-y-1">
                 {{#each this.data as |day|}}
                     <div class="flex items-center gap-2 text-sm">
-                        <span class="w-20 text-gray-500 text-xs">{{day.date}}</span>
+                        <span class="w-20 text-gray-500 text-xs">{{format-date-fns day.date "yyyy-MM-dd"}}</span>
                         <div class="flex-1 bg-gray-100 dark:bg-gray-700 rounded-full h-2">
                             <div class="bg-blue-500 h-2 rounded-full" style={{html-safe (concat "width: " day.pct "%")}}></div>
                         </div>

addon/components/widget/revenue-chart.js

@@ -2,15 +2,14 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
-import { format } from 'date-fns';
 
 export default class WidgetRevenueChartComponent extends Component {
     @service fetch;
     @service currentUser;
     @tracked data = [];
 
     get companyCurrency() {
-        return this.currentUser.getCompany()?.currency ?? 'USD';
+        return this.currentUser.company?.currency ?? this.currentUser.whoisData?.currency?.code ?? 'USD';
     }
 
     constructor() {
@@ -29,7 +28,7 @@ export default class WidgetRevenueChartComponent extends Component {
             const maxAmount = trend.reduce((max, row) => Math.max(max, row.daily_revenue ?? 0), 0);
 
             this.data = trend.map((row) => ({
-                date: format(row.date, 'yyyy-MM-DD'),
+                date: row.date,
                 amount: row.daily_revenue ?? 0,
                 // Percentage of the tallest bar; guard against division-by-zero.
                 pct: maxAmount > 0 ? Math.round(((row.daily_revenue ?? 0) / maxAmount) * 100) : 0,

addon/components/widget/top-wallets.js

@@ -9,7 +9,7 @@ export default class WidgetTopWalletsComponent extends Component {
     @tracked wallets = [];
 
     get companyCurrency() {
-        return this.currentUser.getCompany()?.currency ?? 'USD';
+        return this.currentUser.company?.currency ?? this.currentUser.whoisData?.currency?.code ?? 'USD';
     }
 
     constructor() {

addon/components/widget/wallet-balances.js

@@ -9,7 +9,7 @@ export default class WidgetWalletBalancesComponent extends Component {
     @tracked totals = null;
 
     get companyCurrency() {
-        return this.currentUser.getCompany()?.currency ?? 'USD';
+        return this.currentUser.company?.currency ?? this.currentUser.whoisData?.currency?.code ?? 'USD';
     }
 
     constructor() {

addon/extension.js

@@ -56,6 +56,8 @@ export default {
             ],
         });
 
+        console.log('[menuService]', menuService);
+
         // ── Public customer invoice view ───────────────────────────────────────
         // Registers the customer-facing invoice view to the 'engine:ledger'
         // registry so it is accessible at /ledger/invoice/<public_id> without
@@ -99,8 +101,6 @@ export default {
                 slug: 'invoice',
             })
         );
-        console.log('[menuService]', menuService);
-        console.log(menuService.getMenuItems('fleet-ops:component:order:details'));
 
         // Register dashboard and widgets
         this.registerWidgets(widgetService);
@@ -125,7 +125,7 @@ export default {
                 description: 'Daily revenue trend chart for the current period.',
                 icon: 'chart-line',
                 component: new ExtensionComponent('@fleetbase/ledger-engine', 'widget/revenue-chart'),
-                grid_options: { w: 8, h: 6, minW: 6, minH: 5 },
+                grid_options: { w: 8, h: 7, minW: 6, minH: 6 },
                 options: { title: 'Revenue Chart' },
                 default: true,
             }),
@@ -158,7 +158,7 @@ export default {
                 description: 'Live feed of the most recent double-entry journal entries in the ledger.',
                 icon: 'book',
                 component: new ExtensionComponent('@fleetbase/ledger-engine', 'widget/activity-feed'),
-                grid_options: { w: 8, h: 10, minW: 6, minH: 8 },
+                grid_options: { w: 8, h: 11, minW: 6, minH: 8 },
                 options: { title: 'Recent Journal Entries' },
                 default: true,
             }),