Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "22"

- name: Setup Bun
uses: oven-sh/setup-bun@v2

Expand Down
3 changes: 3 additions & 0 deletions apps/api/src/frameworks/frameworks-upsert.helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ export async function upsertOrgFrameworkStructure({
}

// Upsert policy instances
const createdPolicyIds: string[] = [];
const existingPolicies = await tx.policy.findMany({
where: {
organizationId,
Expand Down Expand Up @@ -182,6 +183,7 @@ export async function upsertOrgFrameworkStructure({
});

if (newPolicies.length > 0) {
createdPolicyIds.push(...newPolicies.map((p) => p.id));
await tx.policyVersion.createMany({
data: newPolicies.map((p) => ({
policyId: p.id,
Expand Down Expand Up @@ -360,5 +362,6 @@ export async function upsertOrgFrameworkStructure({
controlTemplates,
policyTemplates,
taskTemplates,
createdPolicyIds,
};
}
2 changes: 2 additions & 0 deletions apps/api/src/frameworks/frameworks.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,12 @@ export class FrameworksController {
async addFrameworks(
@OrganizationId() organizationId: string,
@Body() dto: AddFrameworksDto,
@AuthContext() authContext: AuthContextType,
) {
return this.frameworksService.addFrameworks(
organizationId,
dto.frameworkIds,
authContext.memberId,
);
}

Expand Down
111 changes: 108 additions & 3 deletions apps/api/src/frameworks/frameworks.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
NotFoundException,
} from '@nestjs/common';
import { db, type EvidenceFormType } from '@db';

import { tasks } from '@trigger.dev/sdk';
import {
getOverviewScores,
getCurrentMember,
Expand All @@ -15,6 +17,7 @@ import { createTimelinesForFrameworks } from './frameworks-timeline.helper';
import { TimelinesService } from '../timelines/timelines.service';
import type { FrameworkManifest } from './framework-versioning/manifest.types';
import { buildUpdatePreview } from './framework-versioning/framework-update-preview';
import type { updatePolicy } from '../trigger/policies/update-policy';

type RequirementDef = {
id: string;
Expand Down Expand Up @@ -543,7 +546,11 @@ export class FrameworksService {
return { ...scores, currentMember };
}

async addFrameworks(organizationId: string, frameworkIds: string[]) {
async addFrameworks(
organizationId: string,
frameworkIds: string[],
memberId?: string,
) {
const result = await db.$transaction(async (tx) => {
const frameworks = await tx.frameworkEditorFramework.findMany({
where: { id: { in: frameworkIds }, visible: true },
Expand All @@ -558,14 +565,19 @@ export class FrameworksService {

const finalIds = frameworks.map((f) => f.id);

await upsertOrgFrameworkStructure({
const upsertResult = await upsertOrgFrameworkStructure({
organizationId,
targetFrameworkEditorIds: finalIds,
frameworkEditorFrameworks: frameworks,
tx,
});

return { success: true, frameworksAdded: finalIds.length, finalIds };
return {
success: true,
frameworksAdded: finalIds.length,
finalIds,
createdPolicyIds: upsertResult.createdPolicyIds,
};
});

// Auto-create timeline instances from templates for newly added
Expand All @@ -584,9 +596,102 @@ export class FrameworksService {
);
});

// Regenerate only newly created policies so placeholder replacement runs
// without touching customer-edited existing policies.
if (result.createdPolicyIds.length > 0) {
this.enqueuePolicyGenerationForNewPolicies({
organizationId,
policyIds: result.createdPolicyIds,
memberId,
}).catch((err) => {
this.logger.warn(
'enqueuePolicyGenerationForNewPolicies failed after framework add',
err,
);
});
}

return { success: result.success, frameworksAdded: result.frameworksAdded };
}

private async enqueuePolicyGenerationForNewPolicies({
organizationId,
policyIds,
memberId,
}: {
organizationId: string;
policyIds: string[];
memberId?: string;
}) {
const [instances, contextEntries] = await Promise.all([
db.frameworkInstance.findMany({
where: { organizationId },
include: { framework: true, customFramework: true },
}),
db.context.findMany({
where: { organizationId },
orderBy: { createdAt: 'asc' },
}),
]);

const normalized = instances.map((fi) => {
if (fi.framework) {
return {
id: fi.framework.id,
name: fi.framework.name,
version: fi.framework.version,
description: fi.framework.description,
visible: fi.framework.visible,
createdAt: fi.framework.createdAt,
updatedAt: fi.framework.updatedAt,
};
}
if (fi.customFramework) {
return {
id: fi.customFramework.id,
name: fi.customFramework.name,
version: fi.customFramework.version,
description: fi.customFramework.description,
visible: true,
createdAt: fi.customFramework.createdAt,
updatedAt: fi.customFramework.updatedAt,
};
}
return null;
});
const uniqueFrameworks = Array.from(
new Map(
normalized
.filter((f): f is NonNullable<typeof f> => f !== null)
.map((f) => [f.id, f]),
).values(),
);

const contextHub = contextEntries
.map((c) => `${c.question}\n${c.answer}`)
.join('\n');

const triggerResults = await Promise.allSettled(
policyIds.map((policyId) =>
tasks.trigger<typeof updatePolicy>('update-policy', {
organizationId,
policyId,
contextHub,
frameworks: uniqueFrameworks,
memberId,
}),
),
);

const failedTrigger = triggerResults.find(
(result): result is PromiseRejectedResult => result.status === 'rejected',
);
if (failedTrigger) {
this.logger.error('Failed to trigger policy update', failedTrigger.reason);
throw new Error('Failed to trigger policy update');
}
}

async findRequirement(
frameworkInstanceId: string,
requirementKey: string,
Expand Down
7 changes: 7 additions & 0 deletions apps/api/src/people/dto/invite-people.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {
IsString,
ValidateNested,
ArrayMinSize,
IsBoolean,
IsOptional,
} from 'class-validator';
import { Type } from 'class-transformer';

Expand All @@ -20,6 +22,11 @@ export class InviteItemDto {
@IsString({ each: true })
@ArrayMinSize(1)
roles: string[];

@ApiProperty({ example: false, required: false })
@IsBoolean()
@IsOptional()
sendPortalEmail?: boolean;
}

export class InvitePeopleDto {
Expand Down
Loading
Loading