Consolidate old/new vendor and category routes, enhance new brands route, update frontend accordingly for all three pages, improve hierarchy on categories page, fix some calculations

inventory-server/src/routes/brandsAggregate.js

@@ -28,6 +28,8 @@ const COLUMN_MAP = {
     avgMargin30d: { dbCol: 'bm.avg_margin_30d', type: 'number' },
     // Add aliases if needed
     name: { dbCol: 'bm.brand_name', type: 'string' },
+    // Add status for filtering
+    status: { dbCol: 'brand_status', type: 'string' },
 };
 
 function getSafeColumnInfo(queryParamKey) {
@@ -41,11 +43,26 @@ router.get('/filter-options', async (req, res) => {
     const pool = req.app.locals.pool;
     console.log('GET /brands-aggregate/filter-options');
     try {
+        // Get brand names
         const { rows: brandRows } = await pool.query(`
             SELECT DISTINCT brand_name FROM public.brand_metrics ORDER BY brand_name
         `);
+        
+        // Get status values - calculate them since they're derived
+        const { rows: statusRows } = await pool.query(`
+            SELECT DISTINCT
+                CASE 
+                    WHEN active_product_count > 0 AND sales_30d > 0 THEN 'active'
+                    WHEN active_product_count > 0 THEN 'inactive'
+                    ELSE 'pending'
+                END as status
+            FROM public.brand_metrics
+            ORDER BY status
+        `);
+        
         res.json({
             brands: brandRows.map(r => r.brand_name),
+            statuses: statusRows.map(r => r.status)
         });
      } catch(error) {
         console.error('Error fetching brand filter options:', error);
@@ -61,16 +78,17 @@ router.get('/stats', async (req, res) => {
          const { rows: [stats] } = await pool.query(`
             SELECT
                 COUNT(*) AS total_brands,
+                COUNT(CASE WHEN active_product_count > 0 THEN 1 END) AS active_brands,
                 SUM(active_product_count) AS total_active_products,
                 SUM(current_stock_cost) AS total_stock_value,
                 -- Weighted Average Margin
                 SUM(profit_30d) * 100.0 / NULLIF(SUM(revenue_30d), 0) AS overall_avg_margin_weighted
-                -- Add other stats
             FROM public.brand_metrics bm
          `);
 
          res.json({
              totalBrands: parseInt(stats?.total_brands || 0),
+             activeBrands: parseInt(stats?.active_brands || 0),
              totalActiveProducts: parseInt(stats?.total_active_products || 0),
              totalValue: parseFloat(stats?.total_stock_value || 0),
              avgMargin: parseFloat(stats?.overall_avg_margin_weighted || 0),
@@ -177,10 +195,40 @@ router.get('/', async (req, res) => {
 
         // --- Execute Queries ---
         const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
-        const baseSql = `FROM public.brand_metrics bm ${whereClause}`;
+        
+        // Status calculation similar to vendors
+        const statusCase = `
+            CASE 
+                WHEN active_product_count > 0 AND sales_30d > 0 THEN 'active'
+                WHEN active_product_count > 0 THEN 'inactive'
+                ELSE 'pending'
+            END as brand_status
+        `;
+        
+        const baseSql = `
+            FROM (
+                SELECT 
+                    bm.*,
+                    ${statusCase}
+                FROM public.brand_metrics bm
+            ) bm
+            ${whereClause}
+        `;
 
         const countSql = `SELECT COUNT(*) AS total ${baseSql}`;
-        const dataSql = `SELECT bm.* ${baseSql} ${sortClause} LIMIT $${paramCounter} OFFSET $${paramCounter + 1}`;
+        const dataSql = `
+            WITH brand_data AS (
+                SELECT 
+                    bm.*,
+                    ${statusCase}
+                FROM public.brand_metrics bm
+            )
+            SELECT bm.*
+            FROM brand_data bm
+            ${whereClause}
+            ${sortClause}
+            LIMIT $${paramCounter} OFFSET $${paramCounter + 1}
+        `;
         const dataParams = [...params, limit, offset];
 
         console.log("Count SQL:", countSql, params);