Skip to content

Commit 11dde9f

Browse files
authored
Merge branch 'main' into fix/security-results-update-in-1093
2 parents 8ba1883 + 5c84350 commit 11dde9f

6 files changed

Lines changed: 356 additions & 39 deletions

File tree

backend/src/database/repositories/organizationRepository.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,14 +1491,8 @@ class OrganizationRepository {
14911491
SELECT
14921492
${fields}
14931493
FROM organizations o
1494-
${
1495-
withAggregates
1496-
? ` INNER JOIN "organizationSegmentsAgg" osa ON osa."organizationId" = o.id AND ${
1497-
segmentId ? `osa."segmentId" = $(segmentId)` : `osa."segmentId" IS NULL`
1498-
}`
1499-
: ` LEFT JOIN "organizationSegmentsAgg" osa ON osa."organizationId" = o.id AND ${
1500-
segmentId ? `osa."segmentId" = $(segmentId)` : `osa."segmentId" IS NULL`
1501-
}`
1494+
LEFT JOIN "organizationSegmentsAgg" osa ON osa."organizationId" = o.id AND ${
1495+
segmentId ? `osa."segmentId" = $(segmentId)` : `osa."segmentId" IS NULL`
15021496
}
15031497
LEFT JOIN "organizationEnrichments" oe ON oe."organizationId" = o.id
15041498
WHERE 1=1

frontend/package-lock.json

Lines changed: 30 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"eslint-import-resolver-alias": "^1.1.2",
4242
"eslint-plugin-import": "^2.27.5",
4343
"lodash": "^4.17.23",
44-
"lodash-es": "^4.17.23",
44+
"lodash-es": "^4.18.1",
4545
"logrocket": "^3.0.1",
4646
"logrocket-vuex": "^0.0.3",
4747
"marked": "^4.3.0",
@@ -51,7 +51,7 @@
5151
"pluralize": "^8.0.0",
5252
"qs": "^6.15.0",
5353
"socket.io-client": "^4.8.3",
54-
"vite": "^7.3.1",
54+
"vite": "^7.3.2",
5555
"vue": "^3.3.1",
5656
"vue-3-sanitize": "^0.1.4",
5757
"vue-draggable-next": "^2.2.1",

pnpm-lock.yaml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/apps/script_executor_worker/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"dev": "nodemon --watch src --watch ../../libs --ext ts --exec pnpm run start:debug",
99
"cleanup-fork-activities": "npx tsx src/bin/cleanup-fork-activities-and-maintainers.ts",
1010
"cleanup-member-aggregates": "npx tsx src/bin/cleanup-member-aggregates.ts",
11+
"recalculate-enrichment-affiliations": "npx tsx src/bin/recalculate-enrichment-affiliations.ts",
1112
"add-lf-projects-to-collection": "npx tsx src/bin/add-lf-projects-to-collection.ts",
1213
"lint": "npx eslint --ext .ts src --max-warnings=0",
1314
"format": "npx prettier --write \"src/**/*.ts\"",
@@ -24,6 +25,7 @@
2425
"@crowd/redis": "workspace:*",
2526
"@crowd/snowflake": "workspace:*",
2627
"@crowd/types": "workspace:*",
28+
"@crowd/temporal": "workspace:*",
2729
"@temporalio/client": "~1.11.8",
2830
"@temporalio/workflow": "~1.11.8",
2931
"axios": "^1.6.8",

0 commit comments

Comments
 (0)