a little cleanup

jpetey75 · jpetey75 · commit 52252c5b7c84 · 2025-12-05T11:21:46.000-06:00
diff --git a/models/demo/accounts.yml b/models/demo/accounts.yml
@@ -27,6 +27,7 @@ models:
         meta:
           dimension:
             type: number
+            label: Account ID
             urls:
               - label: 'Open in CRM'
                 url: https://demo_saas.com/example/account/${ value.raw }
@@ -76,10 +77,11 @@ models:
         meta:
           dimension:
             type: number
+            hidden: true
           metrics:
             total_estimated_annual_recurring_revenue:
               type: sum
-              label: "Total Estimated Annual Recurring Revenue"
+              label: "Total Estimated ARR"
               description: "Sum of all estimated annual recurring revenue"
               format: 'usd'
             
diff --git a/models/demo/activities.sql b/models/demo/activities.sql
@@ -12,15 +12,19 @@ WITH activities_raw AS (
 
   FROM {{ ref('activities_raw') }}
 
-), leads_raw AS (
+), 
+
+leads_raw AS (
 
   SELECT
     lead_id
     , deal_id
 
   FROM {{ ref('leads') }}
 
-), final AS (
+), 
+
+final AS (
 
   SELECT
     a.activity_id
@@ -34,7 +38,9 @@ WITH activities_raw AS (
     , l.deal_id
 
   FROM activities_raw a
-  LEFT JOIN leads_raw l
-    ON CAST(a.lead_id as string) = l.lead_id
+    LEFT JOIN leads_raw l
+      ON CAST(a.lead_id as string) = l.lead_id
+
+) 
 
-) SELECT * FROM final
+SELECT * FROM final
diff --git a/models/demo/activities.yml b/models/demo/activities.yml
@@ -38,6 +38,7 @@ models:
         meta:
           dimension:
             type: string
+            label: Activity ID
           metrics:
             total_activities:
               type: count
@@ -78,6 +79,7 @@ models:
         meta:
           dimension:
             type: string
+            label: Lead ID
           lead_id_total_leads:
             label: Total Leads
             description: 'Count distinct of Lead id on the table Activities '
@@ -89,6 +91,7 @@ models:
         meta:
           dimension:
             type: string
+            label: Deal ID
           lead_id_total_leads:
             label: Total Deals
             description: 'Count distinct of Lead id on the table Activities '
@@ -101,6 +104,7 @@ models:
         meta:
           dimension:
             type: string
+            label: SDR Name
       - name: activity_type
         description: "Type of activity (Call, Email, Meeting, etc.)"
         tests:
@@ -156,5 +160,6 @@ models:
               groups: ['Call Metrics']
             avg_call_time:
               type: average
+              label: Average call time
               description: "Average call time in seconds"
               groups: ['Call Metrics']
diff --git a/models/demo/deals.yml b/models/demo/deals.yml
@@ -1,35 +1,16 @@
-version: 2
 models:
 - name: deals
   meta:
     description: All sales deals of any status, pulled from our CRM 
     primary_key: deal_id
+    order_fields_by: 'index'
     ai_hint: |
           CloseRate Kevin: This is your primary deals model for analyzing pipeline progression and win/loss performance.
           Use this to measure stage-to-stage conversion (New → Qualified → PoC → Negotiation → Won/Lost), calculate win rates, and identify stalled deals.
           Key dimensions: `stage` (with stages: New, Qualified, PoC, Negotiation, Won, Lost), `created_date` (for cohort analysis).
           Core metrics: `win_rate` (won deals / total deals), stage-specific counts (`new_deals`, `qualified_deals`, `poc_deals`, `negotiation_deals`, `won_deals`, `lost_deals`), `total_amount`, `total_won_amount`.
           Critical for AE performance analysis. Focus on demo-to-close rates (PoC → Negotiation → Won conversion) and identifying aging deals at each stage.
           Default to line charts for trend analysis, with period-over-period comparisons using `created_date` dimensions.
-          
-    explores:
-      deals_accounts:
-        required_attributes:
-          is_admin_saas_demo: "true"
-        label: 'Deals w/Accounts'
-        description: The Deals table with the Accounts table details included (only accessible by admins since it includes account names)
-        joins:
-        - join: accounts
-          relationship: many-to-one
-          sql_on: ${deals.account_id} = ${accounts.account_id}
-      deals_accounts_no_names:
-        label: 'Deals w/Accounts (no Names)'
-        description: The deals table with the Accounts table details included, except for names (to keep anonymous)
-        joins:
-        - join: accounts
-          relationship: many-to-one
-          sql_on: ${deals.account_id} = ${accounts.account_id}
-          fields: [industry, segment, unique_accounts, unique_smb_accounts, unique_midmarket_accounts, unique_enterprise_accounts]
 
     parameters:
         deal_value_toggle:
@@ -48,39 +29,16 @@ models:
         type: left
         relationship: one-to-many
 
-    metrics:
-      win_rate:
-        type: number
-        description: The percentage of deals that have been won
-        format: percent
-        sql: ${won_deals} / NULLIF(${unique_deals}, 0)
-        spotlight:
-          visibility: show
-          categories:
-            - kpi
-        ai_hint: |
-          CloseRate Kevin: Use `win_rate` to measure overall deal closure effectiveness (won deals ÷ total deals).
-          This is a core KPI for AE performance. Break down by time period (week, month, quarter) to identify trends.
-          Compare period-over-period to spot declining win rates early. Pair with `loss_rate` to understand win/loss balance.
-      loss_rate:
-        type: number
-        format: percent
-        sql: ${lost_deals} / NULLIF(${unique_deals}, 0)
-      win_vs_lost_ratio:
-        type: number
-        round: 2
-        sql: ${lost_deals} / NULLIF(${won_deals}, 0)
-
   columns:
     - name: deal_id
       description: "The unique identified for a Deal"
       meta:
         dimension:
           type: string
+          label: Deal ID
         metrics:
           unique_deals:
             type: count_distinct
-            groups: ['Deal Counts']
             description: Count unique deals based on Account ID (each account can only have one deal)
             spotlight:
               visibility: show
@@ -146,6 +104,38 @@ models:
               visibility: show
               categories:
                 - sales
+          win_rate:
+            type: number
+            description: The percentage of deals that have been won
+            format: percent
+            sql: ${won_deals} / NULLIF(${unique_deals}, 0)
+            spotlight:
+              visibility: show
+              categories:
+                - kpi
+            ai_hint: |
+              CloseRate Kevin: Use `win_rate` to measure overall deal closure effectiveness (won deals ÷ total deals).
+              This is a core KPI for AE performance. Break down by time period (week, month, quarter) to identify trends.
+              Compare period-over-period to spot declining win rates early. Pair with `loss_rate` to understand win/loss balance.
+            groups: ['Rates & Ratios']
+          loss_rate:
+            type: number
+            format: percent
+            sql: ${lost_deals} / NULLIF(${unique_deals}, 0)
+            groups: ['Rates & Ratios']
+          win_vs_lost_ratio:
+            type: number
+            round: 2
+            sql: ${lost_deals} / NULLIF(${won_deals}, 0)
+            groups: ['Rates & Ratios']
+
+
+    - name: created_date
+      description: "The date the deal was created"
+      meta:
+        dimension:
+          type: date
+          time_intervals: ['DAY', 'WEEK', 'MONTH', 'MONTH_NAME', 'YEAR', 'QUARTER']
     - name: account_id
       description: "The Account ID from our database"
       meta:
@@ -190,23 +180,26 @@ models:
       meta:
         dimension:
           type: number
+          hidden: true
         metrics:
           total_seats:
             type: sum
             description: The sum of seats for selected deals
+            groups: ['Seats']
           average_seats:
             type: average
             round: 0
+            groups: ['Seats']
             description: The average number of seats per deal for selected deals
     - name: amount
       description: "The deal amount based on plan price per seat multiplied by seats"
       meta:
         dimension:
           type: number
+          hidden: true
           format: '$#,##0'
         metrics:
           total_amount:
-            groups: ['Deal Amounts']
             type: sum
             description: The sum of deal amount for selected deals
             format: '$#,##0'
@@ -219,16 +212,16 @@ models:
               CloseRate Kevin: Use `total_amount` to measure total pipeline value across all deal stages.
               Track over time to monitor pipeline health and growth. Break down by `stage` to see value distribution across funnel stages.
           total_won_amount:
-              groups: ['Deal Amounts']
-              type: sum
-              description: The sum of deal amount for won deals
-              format: '$#,##0'
-              filters:
-                - stage: 'Won'
-              ai_hint: |
-                CloseRate Kevin: Use `total_won_amount` to measure actual closed revenue—your core revenue KPI.
-                Track by time period (week, month, quarter) to monitor revenue trends. Compare period-over-period for growth analysis.
-              spotlight:
+            groups: ['Deal Amounts']
+            type: sum
+            description: The sum of deal amount for won deals
+            format: '$#,##0'
+            filters:
+              - stage: 'Won'
+            ai_hint: |
+              CloseRate Kevin: Use `total_won_amount` to measure actual closed revenue—your core revenue KPI.
+              Track by time period (week, month, quarter) to monitor revenue trends. Compare period-over-period for growth analysis.
+            spotlight:
               visibility: show
               categories:
                 - kpi
@@ -255,9 +248,3 @@ models:
             format: '$#,##0'
             filters:
               - stage: 'Won'
-    - name: created_date
-      description: "The date the deal was created"
-      meta:
-        dimension:
-          type: date
-          time_intervals: ['DAY', 'WEEK', 'MONTH', 'MONTH_NAME', 'YEAR', 'QUARTER']
diff --git a/models/demo/leads.sql b/models/demo/leads.sql
@@ -2,9 +2,9 @@
     tags=['closerate_kevin', 'tori']
 ) }}
 
-WITH source_data AS ( SELECT * FROM {{ ref ('marketing_leads') }}
+WITH source_data AS ( SELECT * FROM {{ ref ('marketing_leads') }}), 
 
-), final AS (
+final AS (
 
   SELECT 
     CAST(lead_id AS STRING) AS lead_id   -- primary key
@@ -31,4 +31,6 @@ WITH source_data AS ( SELECT * FROM {{ ref ('marketing_leads') }}
 
   FROM source_data
 
-) SELECT * FROM final
+) 
+
+SELECT * FROM final
diff --git a/models/demo/leads.yml b/models/demo/leads.yml
@@ -80,11 +80,11 @@ models:
         meta:
           dimension:
             type: string
+            label: Lead ID
           metrics:
             unique_lead_count:
               type: count_distinct
               description: "The unique number of leads based on distinct lead IDs"
-              groups: ['Lead Counts']
               spotlight:
                 visibility: show
                 categories:
@@ -154,11 +154,13 @@ models:
         meta:
           dimension:
             type: string
+            label: User ID
       - name: sdr
         description: "The Sales Development Representative assigned to the lead"
         meta:
           dimension:
             type: string
+            label: "SDR"
           ai_hint: |
             CloseRate Kevin: Use `sdr` to analyze individual SDR performance. Critical for identifying top performers vs. underperformers.
             Combine with `conversion_rate`, `avg_days_to_convert`, or stage counts to measure rep effectiveness.
@@ -173,11 +175,11 @@ models:
         meta:
           dimension:
             type: string
+            label: Deal ID
           metrics:
             unique_deal_count:
               type: count_distinct
               description: "The unique number of deals"
-              groups: ['Counts']
               spotlight:
                 visibility: show
                 categories:
diff --git a/models/demo/tracks.yml b/models/demo/tracks.yml
@@ -22,6 +22,7 @@ models:
         meta:
           dimension:
             type: string
+            label: User ID
           metrics:
             unique_user_count:
               type: count_distinct
@@ -31,6 +32,7 @@ models:
         meta:
           dimension:
             type: string
+            label: Track ID
           metrics:
             event_count:
               type: count_distinct
diff --git a/models/demo/users.yml b/models/demo/users.yml
@@ -26,6 +26,7 @@ models:
         meta:
           dimension:
             type: string
+            label: User ID
           metrics:
             unique_users:
               type: count_distinct
@@ -50,6 +51,7 @@ models:
         meta:
           dimension:
             type: string
+            label: Account ID
       - name: email
         description: "The email of the user"
         meta:
diff --git a/models/fanouts_examples/fanouts_accounts.yml b/models/fanouts_examples/fanouts_accounts.yml
@@ -1,4 +1,3 @@
-version: 2
 models:
   - name: fanouts_accounts
     description: |
diff --git a/models/fanouts_examples/fanouts_accounts_bridged_fanout.yml b/models/fanouts_examples/fanouts_accounts_bridged_fanout.yml
@@ -1,4 +1,3 @@
-version: 2
 models:
   - name: fanouts_accounts_bridged_fanout
     description: |
diff --git a/models/fanouts_examples/fanouts_deals.yml b/models/fanouts_examples/fanouts_deals.yml
@@ -1,4 +1,3 @@
-version: 2
 models:
   - name: fanouts_deals
     meta: 
diff --git a/models/fanouts_examples/fanouts_tracks.yml b/models/fanouts_examples/fanouts_tracks.yml
@@ -1,4 +1,3 @@
-version: 2
 models:
   - name: fanouts_tracks
     meta: 
diff --git a/models/fanouts_examples/fanouts_user_deals.yml b/models/fanouts_examples/fanouts_user_deals.yml
@@ -1,4 +1,3 @@
-version: 2
 models:
   - name: fanouts_user_deals
     meta: 
diff --git a/models/fanouts_examples/fanouts_users.yml b/models/fanouts_examples/fanouts_users.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-version: 2`
`2`	`1`	`models:`
`3`	`2`	`- name: fanouts_accounts`
`4`	`3`	`description: \|`