Merge branch 'master' into dn-chore/remove-rows

PostHog · Dec 22, 2023 · 13b796f · 13b796f
2 parents 4d5d6b7 + 8c21377
commit 13b796f
Show file tree

Hide file tree

Showing 1,193 changed files with 708 additions and 651 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -128,6 +128,16 @@ module.exports = {
                         message:
                             'use flex utility classes instead, e.g. <Row align="middle"> could be <div className="flex items-center">',
                     },
+                    {
+                        name: 'antd',
+                        importNames: ['Col'],
+                        message: 'use flex utility classes instead - most of the time can simply be a plain <div>',
+                    },
+                    {
+                        name: 'antd',
+                        importNames: ['Card'],
+                        message: 'use utility classes instead',
+                    },
                 ],
             },
         ],
@@ -147,18 +157,10 @@ module.exports = {
             'warn',
             {
                 forbid: [
-                    {
-                        element: 'Col',
-                        message: 'use flex utility classes instead - most of the time can simply be a plain <div>',
-                    },
                     {
                         element: 'Divider',
                         message: 'use <LemonDivider> instead',
                     },
-                    {
-                        element: 'Card',
-                        message: 'use utility classes instead',
-                    },
                     {
                         element: 'Button',
                         message: 'use <LemonButton> instead',

diff --git a/.storybook/test-runner.ts b/.storybook/test-runner.ts
@@ -36,8 +36,6 @@ declare module '@storybook/types' {
             snapshotBrowsers?: SupportedBrowserName[]
             /** If taking a component snapshot, you can narrow it down by specifying the selector. */
             snapshotTargetSelector?: string
-            /** Include snapshots of buttons in 3000. */
-            include3000?: boolean
         }
         msw?: {
             mocks?: Mocks
@@ -99,7 +97,6 @@ async function expectStoryToMatchSnapshot(
         waitForLoadersToDisappear = true,
         waitForSelector,
         excludeNavigationFromSnapshot = false,
-        include3000 = false,
     } = storyContext.parameters?.testOptions ?? {}
 
     let check: (
@@ -141,20 +138,18 @@ async function expectStoryToMatchSnapshot(
 
     await check(page, context, browser, 'legacy', storyContext.parameters?.testOptions?.snapshotTargetSelector)
 
-    if (include3000) {
-        await page.evaluate(() => {
-            document.body.classList.add('posthog-3000')
-            document.body.setAttribute('theme', 'light')
-        })
+    await page.evaluate(() => {
+        document.body.classList.add('posthog-3000')
+        document.body.setAttribute('theme', 'light')
+    })
 
-        await check(page, context, browser, 'light', storyContext.parameters?.testOptions?.snapshotTargetSelector)
+    await check(page, context, browser, 'light', storyContext.parameters?.testOptions?.snapshotTargetSelector)
 
-        await page.evaluate(() => {
-            document.body.setAttribute('theme', 'dark')
-        })
+    await page.evaluate(() => {
+        document.body.setAttribute('theme', 'dark')
+    })
 
-        await check(page, context, browser, 'dark', storyContext.parameters?.testOptions?.snapshotTargetSelector)
-    }
+    await check(page, context, browser, 'dark', storyContext.parameters?.testOptions?.snapshotTargetSelector)
 }
 
 async function expectStoryToMatchFullPageSnapshot(

diff --git a/ee/billing/quota_limiting.py b/ee/billing/quota_limiting.py
@@ -147,12 +147,12 @@ def set_org_usage_summary(
     new_usage = copy.deepcopy(new_usage)
 
     for field in ["events", "recordings", "rows_synced"]:
-        resource_usage = new_usage[field]  # type: ignore
+        resource_usage = new_usage.get(field, {"limit": None, "usage": 0, "todays_usage": 0})
         if not resource_usage:
             continue
 
         if todays_usage:
-            resource_usage["todays_usage"] = todays_usage[field]  # type: ignore
+            resource_usage["todays_usage"] = todays_usage.get(field, 0)
         else:
             # TRICKY: If we are not explictly setting todays_usage, we want to reset it to 0 IF the incoming new_usage is different
             if (organization.usage or {}).get(field, {}).get("usage") != resource_usage.get("usage"):

diff --git a/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel.ambr b/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel.ambr
@@ -19,7 +19,7 @@
     AND notEmpty(e.person_id)
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -160,7 +160,7 @@
     AND notEmpty(e.person_id)
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -299,7 +299,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -437,7 +437,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -572,7 +572,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -707,7 +707,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -842,7 +842,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -979,7 +979,7 @@
     AND notEmpty(e.person_id)
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -1120,7 +1120,7 @@
     AND notEmpty(e.person_id)
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -1259,7 +1259,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -1397,7 +1397,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -1510,7 +1510,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -1623,7 +1623,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -1736,7 +1736,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -1851,7 +1851,7 @@
     AND notEmpty(e.person_id)
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -1992,7 +1992,7 @@
     AND notEmpty(e.person_id)
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2131,7 +2131,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2269,7 +2269,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2292,7 +2292,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2315,7 +2315,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2547,7 +2547,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2570,7 +2570,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2593,7 +2593,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2825,7 +2825,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2848,7 +2848,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -2871,7 +2871,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -3103,7 +3103,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -3126,7 +3126,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---
@@ -3149,7 +3149,7 @@
     AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
   GROUP BY value
   ORDER BY count DESC, value DESC
-  LIMIT 25
+  LIMIT 26
   OFFSET 0
   '
 ---