Skip to content

#4284 fix project rules #4289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cielbellerose wants to merge 16 commits into
base: feature/rules-dashboard
Choose a base branch
from
Open

#4284 fix project rules #4289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d1df37d
#4284 project rules viewable
cielbellerose Jun 18, 2026
410dd85
#4284 remove rule completion reviewing
cielbellerose Jun 23, 2026
467aad5
#4284 rule completion migration
cielbellerose Jun 23, 2026
a7d0563
#4284 add completion dropdown and spacing between project rules
cielbellerose Jun 24, 2026
6b8aa27
#4284 child rule indentation
cielbellerose Jun 24, 2026
a91af46
#4284 update transformer and comments
cielbellerose Jun 24, 2026
1efea50
#4284 update seed data with real rules
cielbellerose Jun 24, 2026
cf26c61
#4284 project rule seed update
cielbellerose Jun 25, 2026
c017f0f
#4284 add active ruleset name and assign rules link
cielbellerose Jun 25, 2026
1b2b7fa
#4284 team highlighted in assign team view + added team name visibility
cielbellerose Jun 25, 2026
01fdb86
#4284 rules can be in multiple projects for the same team
cielbellerose Jun 25, 2026
272d9c3
#4284 combine migrations + fix type casting
cielbellerose Jul 4, 2026
f9719ee
#4284 fix loading and error ordering
cielbellerose Jul 4, 2026
d099db7
#4284 add pdf parser to yarn lock to hopefully fix failing tests
cielbellerose Jul 4, 2026
e6d5de9
#4284 linting and typescript fixes
cielbellerose Jul 4, 2026
669a562
#4284 .js and test fix
cielbellerose Jul 4, 2026
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
103 changes: 50 additions & 53 deletions src/backend/src/controllers/rules.controllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { HttpException } from '../utils/errors.utils.js';
export default class RulesController {
static async getActiveRuleset(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetTypeId } = req.params;
const rulesetType = await RulesService.getActiveRuleset(req.currentUser, rulesetTypeId as string, req.organization);
const { rulesetTypeId } = req.params as Record<string, string>;
const rulesetType = await RulesService.getActiveRuleset(req.currentUser, rulesetTypeId, req.organization);
res.status(200).json(rulesetType);
} catch (error: unknown) {
next(error);
Expand All @@ -16,8 +16,8 @@ export default class RulesController {

static async getRulesetById(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetId } = req.params;
const ruleset = await RulesService.getRulesetById(rulesetId as string, req.organization.organizationId);
const { rulesetId } = req.params as Record<string, string>;
const ruleset = await RulesService.getRulesetById(rulesetId, req.organization.organizationId);
res.status(200).json(ruleset);
} catch (error: unknown) {
next(error);
Expand Down Expand Up @@ -47,8 +47,8 @@ export default class RulesController {

static async deleteRule(req: Request, res: Response, next: NextFunction) {
try {
const { ruleId } = req.params;
const deletedRule = await RulesService.deleteRule(ruleId as string, req.currentUser, req.organization);
const { ruleId } = req.params as Record<string, string>;
const deletedRule = await RulesService.deleteRule(ruleId, req.currentUser, req.organization);
res.status(200).json(deletedRule);
} catch (error: unknown) {
next(error);
Expand Down Expand Up @@ -83,13 +83,13 @@ export default class RulesController {

static async editRule(req: Request, res: Response, next: NextFunction) {
try {
const { ruleId } = req.params;
const { ruleId } = req.params as Record<string, string>;
const { ruleContent, ruleCode, imageFileIds, parentRuleId } = req.body;

const rule = await RulesService.editRule(
req.currentUser,
ruleContent,
ruleId as string,
ruleId,
ruleCode,
imageFileIds,
req.organization,
Expand All @@ -112,8 +112,8 @@ export default class RulesController {

static async getRulesetsByRulesetType(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetTypeId } = req.params;
const rulesets = await RulesService.getRulesetsByRulesetType(rulesetTypeId as string, req.organization.organizationId);
const { rulesetTypeId } = req.params as Record<string, string>;
const rulesets = await RulesService.getRulesetsByRulesetType(rulesetTypeId, req.organization.organizationId);
res.status(200).json(rulesets);
} catch (error: unknown) {
next(error);
Expand All @@ -122,8 +122,8 @@ export default class RulesController {

static async getRulesetType(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetTypeId } = req.params;
const rulesetType = await RulesService.getRulesetType(rulesetTypeId as string, req.organization.organizationId);
const { rulesetTypeId } = req.params as Record<string, string>;
const rulesetType = await RulesService.getRulesetType(rulesetTypeId, req.organization.organizationId);
res.status(200).json(rulesetType);
} catch (error: unknown) {
next(error);
Expand All @@ -132,12 +132,8 @@ export default class RulesController {

static async deleteRuleset(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetId } = req.params;
const ruleset = await RulesService.deleteRuleset(
rulesetId as string,
req.currentUser.userId,
req.organization.organizationId
);
const { rulesetId } = req.params as Record<string, string>;
const ruleset = await RulesService.deleteRuleset(rulesetId, req.currentUser.userId, req.organization.organizationId);
res.status(200).json(ruleset);
} catch (error: unknown) {
next(error);
Expand All @@ -146,42 +142,39 @@ export default class RulesController {

static async deleteProjectRule(req: Request, res: Response, next: NextFunction) {
try {
const { projectRuleId } = req.params;
const deletedProjectRule = await RulesService.deleteProjectRule(
projectRuleId as string,
req.currentUser,
req.organization
);
const { projectRuleId } = req.params as Record<string, string>;
const deletedProjectRule = await RulesService.deleteProjectRule(projectRuleId, req.currentUser, req.organization);
res.status(200).json(deletedProjectRule);
} catch (error: unknown) {
next(error);
}
}

static async editProjectRuleStatus(req: Request, res: Response, next: NextFunction) {
static async setRuleCompletion(req: Request, res: Response, next: NextFunction) {
try {
const { projectRuleId } = req.params;
const { newStatus } = req.body;
const { ruleId } = req.params as Record<string, string>;
const { isComplete, projectId } = req.body;

const projectRule: ProjectRule = await RulesService.editProjectRuleStatus(
const rule: Rule = await RulesService.setRuleCompletion(
req.currentUser,
req.organization,
projectRuleId as string,
newStatus
ruleId,
isComplete,
projectId
);

res.status(200).json(projectRule);
res.status(200).json(rule);
} catch (error: unknown) {
next(error);
}
}

static async toggleRuleTeam(req: Request, res: Response, next: NextFunction) {
try {
const { ruleId } = req.params;
const { ruleId } = req.params as Record<string, string>;
const { teamId } = req.body;

const changedRule = await RulesService.toggleRuleTeam(ruleId as string, teamId, req.currentUser, req.organization);
const changedRule = await RulesService.toggleRuleTeam(ruleId, teamId, req.currentUser, req.organization);

res.status(200).json(changedRule);
} catch (error: unknown) {
Expand Down Expand Up @@ -211,9 +204,9 @@ export default class RulesController {

static async deleteRulesetType(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetTypeId } = req.params;
const { rulesetTypeId } = req.params as Record<string, string>;

const rulesetType = await RulesService.deleteRulesetType(req.currentUser, rulesetTypeId as string, req.organization);
const rulesetType = await RulesService.deleteRulesetType(req.currentUser, rulesetTypeId, req.organization);

res.status(200).json(rulesetType);
} catch (error: unknown) {
Expand All @@ -223,13 +216,13 @@ export default class RulesController {

static async updateRuleset(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetId } = req.params;
const { rulesetId } = req.params as Record<string, string>;
const { name, isActive } = req.body;

const ruleset: Ruleset = await RulesService.updateRuleset(
req.currentUser,
req.organization.organizationId,
rulesetId as string,
rulesetId,
name,
isActive
);
Expand All @@ -242,8 +235,8 @@ export default class RulesController {

static async getChildRules(req: Request, res: Response, next: NextFunction) {
try {
const { ruleId: parentRuleId } = req.params;
const childrenRules: Rule[] = await RulesService.getChildRules(parentRuleId as string, req.organization);
const { ruleId: parentRuleId } = req.params as Record<string, string>;
const childrenRules: Rule[] = await RulesService.getChildRules(parentRuleId, req.organization);

res.status(200).json(childrenRules);
} catch (error: unknown) {
Expand All @@ -253,8 +246,8 @@ export default class RulesController {

static async getUnassignedRules(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetId } = req.params;
const rules = await RulesService.getUnassignedRules(rulesetId as string, req.organization);
const { rulesetId } = req.params as Record<string, string>;
const rules = await RulesService.getUnassignedRules(rulesetId, req.organization);
res.status(200).json(rules);
} catch (error: unknown) {
next(error);
Expand All @@ -263,10 +256,14 @@ export default class RulesController {

static async getUnassignedRulesForRuleset(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetId, teamId } = req.params;
const { rulesetId, teamId } = req.params as Record<string, string>;
const { projectId } = req.query;
Comment thread
cielbellerose marked this conversation as resolved.
const projectIdString = typeof projectId === 'string' ? projectId : undefined;

const rules = await RulesService.getUnassignedRulesForRuleset(
rulesetId as string,
rulesetId,
teamId,
projectIdString,
req.organization.organizationId
);
res.status(200).json(rules);
Expand All @@ -277,9 +274,9 @@ export default class RulesController {

static async getProjectRules(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetId, projectId } = req.params;
const { rulesetId, projectId } = req.params as Record<string, string>;

const projectRules = await RulesService.getProjectRules(rulesetId as string, projectId, req.organization);
const projectRules = await RulesService.getProjectRules(rulesetId, projectId, req.organization);

res.status(200).json(projectRules);
} catch (error: unknown) {
Expand All @@ -289,8 +286,8 @@ export default class RulesController {

static async getTeamRulesInRulesetType(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetTypeId, teamId } = req.params;
const rules = await RulesService.getTeamRulesInRulesetType(teamId as string, rulesetTypeId, req.organization);
const { rulesetTypeId, teamId } = req.params as Record<string, string>;
const rules = await RulesService.getTeamRulesInRulesetType(teamId, rulesetTypeId, req.organization);
res.status(200).json(rules);
} catch (error: unknown) {
next(error);
Expand All @@ -299,8 +296,8 @@ export default class RulesController {

static async getTopLevelRules(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetId } = req.params;
const rules = await RulesService.getTopLevelRules(rulesetId as string, req.organization.organizationId);
const { rulesetId } = req.params as Record<string, string>;
const rules = await RulesService.getTopLevelRules(rulesetId, req.organization.organizationId);
res.status(200).json(rules);
} catch (error: unknown) {
next(error);
Expand All @@ -310,13 +307,13 @@ export default class RulesController {
static async parseRuleset(req: Request, res: Response, next: NextFunction) {
try {
const { fileId, parserType } = req.body;
const { rulesetId } = req.params;
const { rulesetId } = req.params as Record<string, string>;

const parseResult = await RulesService.parseRuleset(
req.currentUser,
req.organization.organizationId,
fileId,
rulesetId as string,
rulesetId,
parserType
);

Expand All @@ -341,8 +338,8 @@ export default class RulesController {

static async getSingleRuleset(req: Request, res: Response, next: NextFunction) {
try {
const { rulesetId } = req.params;
const ruleset = await RulesService.getSingleRuleset(req.currentUser, rulesetId as string, req.organization);
const { rulesetId } = req.params as Record<string, string>;
const ruleset = await RulesService.getSingleRuleset(req.currentUser, rulesetId, req.organization);
res.status(200).json(ruleset);
} catch (error: unknown) {
next(error);
Expand Down
35 changes: 19 additions & 16 deletions src/backend/src/prisma-query-args/rules.query-args.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,32 @@ export const getRulePreviewQueryArgs = () =>
teamId: true,
teamName: true
}
},
completedBy: {
select: {
firstName: true,
lastName: true
}
},
completedInProject: {
select: {
projectId: true,
wbsElement: {
select: {
name: true
}
}
}
}
}
});

export type ProjectRuleQueryArgs = ReturnType<typeof getProjectRuleQueryArgs>;

export const getProjectRuleQueryArgs = () =>
Prisma.validator<Prisma.Project_RuleDefaultArgs>()({
include: {
rule: getRulePreviewQueryArgs(),
project: { select: { projectId: true } },
statusHistory: {
include: {
createdBy: {
select: {
userId: true,
firstName: true,
lastName: true
}
}
},
orderBy: {
dateCreated: 'desc'
}
}
rule: getRulePreviewQueryArgs()
}
});

Expand Down
Loading
Loading