Resolved conflicts: - ui CompanySettingsSidebar.tsx: keep both Secrets (local) and Cloud upstream (master) nav items - ui CompanySettingsNav.tsx + test: take master's cloud-upstream/members (drops deprecated `access` tab now consolidated into `members`) - server plugin-worker-manager.ts: take master's 15min RPC timeout cap - pnpm-lock.yaml: regenerated via `pnpm install` against merged package.json files Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -4144,7 +4144,14 @@ export function companyPortabilityService(db: Db, storage?: StorageService) {
|
||||
if (mode === "agent_safe" && options?.sourceCompanyId) {
|
||||
await access.copyActiveUserMemberships(options.sourceCompanyId, created.id);
|
||||
} else {
|
||||
await access.ensureMembership(created.id, "user", actorUserId ?? "board", "owner", "active");
|
||||
const ownerPrincipalId = actorUserId ?? "board";
|
||||
await access.ensureMembership(created.id, "user", ownerPrincipalId, "owner", "active");
|
||||
await access.ensureRoleDefaultGrants(
|
||||
created.id,
|
||||
ownerPrincipalId,
|
||||
"owner",
|
||||
actorUserId ?? null,
|
||||
);
|
||||
}
|
||||
targetCompany = created;
|
||||
companyAction = "created";
|
||||
|
||||
Reference in New Issue
Block a user