mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-17 19:20:39 +09:00
feat(company-skills): implement skill deletion with agent usage check
Added functionality to prevent deletion of skills that are still in use by agents. Updated the company skill service to throw an unprocessable error if a skill is attempted to be deleted while still referenced by agents. Enhanced the UI to include a delete button and confirmation dialog, displaying relevant messages based on agent usage. Updated tests to cover the new deletion logic and error handling.
This commit is contained in:
parent
5b479652f2
commit
77f854c081
4 changed files with 189 additions and 31 deletions
|
|
@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url";
|
|||
import { and, asc, eq } from "drizzle-orm";
|
||||
import type { Db } from "@paperclipai/db";
|
||||
import { companySkills } from "@paperclipai/db";
|
||||
import { readPaperclipSkillSyncPreference, writePaperclipSkillSyncPreference } from "@paperclipai/adapter-utils/server-utils";
|
||||
import { readPaperclipSkillSyncPreference } from "@paperclipai/adapter-utils/server-utils";
|
||||
import type { PaperclipSkillEntry } from "@paperclipai/adapter-utils/server-utils";
|
||||
import type {
|
||||
CompanySkill,
|
||||
|
|
@ -2298,26 +2298,23 @@ export function companySkillService(db: Db) {
|
|||
if (!row) return null;
|
||||
|
||||
const skill = toCompanySkill(row);
|
||||
const usedByAgents = await usage(companyId, skill.key);
|
||||
|
||||
// Remove from any agent desiredSkills that reference this skill
|
||||
const agentRows = await agents.list(companyId);
|
||||
const allSkills = await listFull(companyId);
|
||||
for (const agent of agentRows) {
|
||||
const config = agent.adapterConfig as Record<string, unknown>;
|
||||
const preference = readPaperclipSkillSyncPreference(config);
|
||||
const referencesSkill = preference.desiredSkills.some((ref) => {
|
||||
const resolved = resolveSkillReference(allSkills, ref);
|
||||
return resolved.skill?.id === skillId;
|
||||
});
|
||||
if (referencesSkill) {
|
||||
const filtered = preference.desiredSkills.filter((ref) => {
|
||||
const resolved = resolveSkillReference(allSkills, ref);
|
||||
return resolved.skill?.id !== skillId;
|
||||
});
|
||||
await agents.update(agent.id, {
|
||||
adapterConfig: writePaperclipSkillSyncPreference(config, filtered),
|
||||
});
|
||||
}
|
||||
if (usedByAgents.length > 0) {
|
||||
const agentNames = usedByAgents.map((agent) => agent.name).sort((left, right) => left.localeCompare(right));
|
||||
throw unprocessable(
|
||||
`Cannot delete skill "${skill.name}" while it is still used by ${agentNames.join(", ")}. Detach it from those agents first.`,
|
||||
{
|
||||
skillId: skill.id,
|
||||
skillKey: skill.key,
|
||||
usedByAgents: usedByAgents.map((agent) => ({
|
||||
id: agent.id,
|
||||
name: agent.name,
|
||||
urlKey: agent.urlKey,
|
||||
adapterType: agent.adapterType,
|
||||
})),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
// Delete DB row
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue