Merge branch 'main' into fix/sitemap-pipes

Author: joanagmaia

frontend/package-lock.json

@@ -29,6 +29,7 @@ DESCRIPTION >
     - `forksPrevious365Days` column is the count of forks in the previous 365 days (365-730 days ago).
     - `activeContributorsPrevious365Days` column is the unique count of active contributors in the previous 365 days (365-730 days ago).
     - `activeOrganizationsPrevious365Days` column is the unique count of active organizations in the previous 365 days (365-730 days ago).
+    - `status` column is the current status of the project (e.g., 'active', 'archived').
 
 TAGS "Project insights", "Metrics"
 
@@ -38,6 +39,7 @@ SCHEMA >
     `slug` String,
     `logoUrl` String,
     `isLF` UInt8,
+    `status` String,
     `contributorCount` UInt64,
     `organizationCount` UInt64,
     `softwareValue` UInt64,

services/libs/tinybird/datasources/project_insights_copy_ds.datasource

@@ -42,5 +42,5 @@ SCHEMA >
 
 ENGINE ReplacingMergeTree
 ENGINE_PARTITION_KEY toYear(createdAt)
-ENGINE_SORTING_KEY slug
+ENGINE_SORTING_KEY slug, id
 ENGINE_VER updatedAt

services/libs/tinybird/datasources/segments.datasource

@@ -8,6 +8,7 @@ SQL >
             memberId != ''
             AND segmentId = (SELECT segmentId FROM segments_filtered)
             AND channel NOT IN (SELECT channel FROM repos_to_channels_excluded)
+            AND (type, platform) IN (SELECT activityType, platform FROM activityTypes_filtered)
             {% if defined(repos) %} AND channel IN (SELECT channel FROM repos_to_channels) {% end %}
             {% if defined(endDate) %}
                 AND timestamp >= toStartOfQuarter(
@@ -30,7 +31,9 @@ SQL >
         SELECT segmentId, groupUniqArray(memberId) AS currentQuarterMembers
         FROM activityRelations_deduplicated_cleaned_bucket_union
         WHERE
-            memberId != '' AND channel NOT IN (SELECT channel FROM repos_to_channels_excluded)
+            memberId != ''
+            AND channel NOT IN (SELECT channel FROM repos_to_channels_excluded)
+            AND (type, platform) IN (SELECT activityType, platform FROM activityTypes_filtered)
             {% if defined(endDate) %}
                 AND timestamp >= toStartOfQuarter(
                     parseDateTimeBestEffort(
@@ -60,6 +63,7 @@ SQL >
             memberId != ''
             AND segmentId = (SELECT segmentId FROM segments_filtered)
             AND channel NOT IN (SELECT channel FROM repos_to_channels_excluded)
+            AND (type, platform) IN (SELECT activityType, platform FROM activityTypes_filtered)
             {% if defined(endDate) %}
                 AND timestamp >= toStartOfQuarter(
                     parseDateTimeBestEffort(
@@ -82,7 +86,9 @@ SQL >
         SELECT segmentId, groupUniqArray(memberId) AS previousQuarterMembers
         FROM activityRelations_deduplicated_cleaned_bucket_union
         WHERE
-            memberId != '' AND channel NOT IN (SELECT channel FROM repos_to_channels_excluded)
+            memberId != ''
+            AND channel NOT IN (SELECT channel FROM repos_to_channels_excluded)
+            AND (type, platform) IN (SELECT activityType, platform FROM activityTypes_filtered)
             {% if defined(endDate) %}
                 AND timestamp >= toStartOfQuarter(
                     parseDateTimeBestEffort(