diff --git a/apps/app/src/components/decisions/ProcessBuilder/stepContent/rubric/rubricCriterionRegistry.tsx b/apps/app/src/components/decisions/ProcessBuilder/stepContent/rubric/rubricCriterionRegistry.tsx
new file mode 100644
index 000000000..c34a3f2ea
--- /dev/null
+++ b/apps/app/src/components/decisions/ProcessBuilder/stepContent/rubric/rubricCriterionRegistry.tsx
@@ -0,0 +1,41 @@
+import type { TranslationKey } from '@/lib/i18n/routing';
+
+import type { RubricCriterionType } from '@/components/decisions/rubricTemplate';
+
+/**
+ * Display metadata for each rubric criterion type.
+ */
+interface CriterionTypeRegistryEntry {
+ /** Translation key for the type label */
+ labelKey: TranslationKey;
+ /** Translation key for a short description shown in the radio selector */
+ descriptionKey: TranslationKey;
+}
+
+export const CRITERION_TYPE_REGISTRY: Record<
+ RubricCriterionType,
+ CriterionTypeRegistryEntry
+> = {
+ scored: {
+ labelKey: 'Rating Scale',
+ descriptionKey:
+ 'Reviewers select a number with descriptions for each point value',
+ },
+ yes_no: {
+ labelKey: 'Yes/No',
+ descriptionKey: 'Simple binary assessment',
+ },
+ long_text: {
+ labelKey: 'Text response only',
+ descriptionKey: 'No score, just written feedback',
+ },
+};
+
+/**
+ * Ordered list of criterion types for the radio selector.
+ */
+export const CRITERION_TYPES: RubricCriterionType[] = [
+ 'scored',
+ 'yes_no',
+ 'long_text',
+];
diff --git a/apps/app/src/components/decisions/ProcessBuilder/stepContent/template/TemplateEditorContent.tsx b/apps/app/src/components/decisions/ProcessBuilder/stepContent/template/TemplateEditorContent.tsx
index 9b1c9d0b1..60e0e2d33 100644
--- a/apps/app/src/components/decisions/ProcessBuilder/stepContent/template/TemplateEditorContent.tsx
+++ b/apps/app/src/components/decisions/ProcessBuilder/stepContent/template/TemplateEditorContent.tsx
@@ -1,6 +1,7 @@
'use client';
import { trpc } from '@op/api/client';
+import { ProcessStatus } from '@op/api/encoders';
import { SYSTEM_FIELD_KEYS } from '@op/common/client';
import type {
ProposalTemplateSchema,
@@ -18,6 +19,8 @@ import { LuAlignLeft, LuChevronDown, LuHash } from 'react-icons/lu';
import { useTranslations } from '@/lib/i18n';
+import type { SectionProps } from '@/components/decisions/ProcessBuilder/contentRegistry';
+import { useProcessBuilderStore } from '@/components/decisions/ProcessBuilder/stores/useProcessBuilderStore';
import {
type FieldType,
type FieldView,
@@ -33,9 +36,8 @@ import {
setFieldRequired,
updateFieldDescription,
updateFieldLabel,
-} from '../../../proposalTemplate';
-import type { SectionProps } from '../../contentRegistry';
-import { useProcessBuilderStore } from '../../stores/useProcessBuilderStore';
+} from '@/components/decisions/proposalTemplate';
+
import { AddFieldMenu } from './AddFieldMenu';
import { BudgetFieldConfig } from './BudgetFieldConfig';
import {
@@ -62,7 +64,7 @@ export function TemplateEditorContent({
// Load instance data from the backend
const [instance] = trpc.decision.getInstance.useSuspenseQuery({ instanceId });
- const isDraft = instance.status === 'draft';
+ const isDraft = instance.status === ProcessStatus.DRAFT;
const utils = trpc.useUtils();
const instanceData = instance.instanceData;
diff --git a/apps/app/src/components/decisions/ProcessBuilder/stores/useProcessBuilderStore.ts b/apps/app/src/components/decisions/ProcessBuilder/stores/useProcessBuilderStore.ts
index 616f7fc1f..eddfab236 100644
--- a/apps/app/src/components/decisions/ProcessBuilder/stores/useProcessBuilderStore.ts
+++ b/apps/app/src/components/decisions/ProcessBuilder/stores/useProcessBuilderStore.ts
@@ -31,7 +31,7 @@
* - `saveStates[decisionId]` - UI save indicator state
*/
import type { InstanceData, InstancePhaseData } from '@op/api/encoders';
-import type { ProposalTemplateSchema } from '@op/common';
+import type { ProposalTemplateSchema, RubricTemplateSchema } from '@op/common';
import { create } from 'zustand';
import { createJSONStorage, persist } from 'zustand/middleware';
@@ -45,14 +45,15 @@ import { createJSONStorage, persist } from 'zustand/middleware';
* `stewardProfileId`) that live outside the JSON blob.
*/
export interface ProcessBuilderInstanceData
- extends Omit
, 'proposalTemplate'> {
+ extends Omit, 'proposalTemplate' | 'rubricTemplate'> {
// Instance columns (not in instanceData JSON)
name?: string;
description?: string;
stewardProfileId?: string;
- // Override InstanceData's proposalTemplate with form-specific type
+ // Override InstanceData's generic JSON Schema types with specific ones
proposalTemplate?: ProposalTemplateSchema;
+ rubricTemplate?: RubricTemplateSchema;
}
// ============ UI-only Types ============
@@ -101,6 +102,15 @@ interface ProcessBuilderState {
decisionId: string,
) => ProposalTemplateSchema | undefined;
+ // Actions for rubric template
+ setRubricTemplateSchema: (
+ decisionId: string,
+ template: RubricTemplateSchema,
+ ) => void;
+ getRubricTemplateSchema: (
+ decisionId: string,
+ ) => RubricTemplateSchema | undefined;
+
// Actions for save state
setSaveStatus: (decisionId: string, status: SaveStatus) => void;
markSaved: (decisionId: string) => void;
@@ -190,6 +200,21 @@ export const useProcessBuilderStore = create()(
getProposalTemplateSchema: (decisionId) =>
get().instances[decisionId]?.proposalTemplate,
+ // Rubric template actions
+ setRubricTemplateSchema: (decisionId, template) =>
+ set((state) => ({
+ instances: {
+ ...state.instances,
+ [decisionId]: {
+ ...state.instances[decisionId],
+ rubricTemplate: template,
+ },
+ },
+ })),
+
+ getRubricTemplateSchema: (decisionId) =>
+ get().instances[decisionId]?.rubricTemplate,
+
// Save state actions
setSaveStatus: (decisionId, status) =>
set((state) => ({
diff --git a/apps/app/src/components/decisions/proposalTemplate.ts b/apps/app/src/components/decisions/proposalTemplate.ts
index 996eddc8c..33042a46c 100644
--- a/apps/app/src/components/decisions/proposalTemplate.ts
+++ b/apps/app/src/components/decisions/proposalTemplate.ts
@@ -5,6 +5,10 @@
* top-level `x-field-order` array. Per-field widget selection is driven by `x-format`
* on each property (consumed by the renderer's FORMAT_REGISTRY).
*
+ * Generic JSON Schema operations are delegated to `templateUtils.ts`.
+ * This file adds proposal-specific logic: field types, options, locked fields,
+ * and category management.
+ *
* No separate uiSchema is stored — everything lives in the JSON Schema itself
* via vendor extensions (`x-*` properties).
*/
@@ -16,6 +20,19 @@ import {
schemaHasOptions,
} from '@op/common/client';
+import {
+ addProperty,
+ getPropertyDescription,
+ getPropertyLabel,
+ getPropertyOrder,
+ isPropertyRequired,
+ removeProperty,
+ reorderProperties,
+ setPropertyRequired,
+ updatePropertyDescription,
+ updatePropertyLabel,
+} from './templateUtils';
+
export type { ProposalTemplateSchema };
export type FieldType = 'short_text' | 'long_text' | 'dropdown';
@@ -90,13 +107,15 @@ function asSchema(def: unknown): ProposalTemplateSchema | undefined {
}
export function getFieldOrder(template: ProposalTemplateSchema): string[] {
- return (template['x-field-order'] as string[] | undefined) ?? [];
+ return getPropertyOrder(template);
}
export function getFieldSchema(
template: ProposalTemplateSchema,
fieldId: string,
): ProposalTemplateSchema | undefined {
+ // Use asSchema to handle legacy schemas where properties may not match
+ // the XFormatPropertySchema type exactly.
const props = template.properties;
if (!props) {
return undefined;
@@ -123,27 +142,21 @@ export function getFieldLabel(
template: ProposalTemplateSchema,
fieldId: string,
): string {
- const schema = getFieldSchema(template, fieldId);
- return (schema?.title as string | undefined) ?? '';
+ return getPropertyLabel(template, fieldId);
}
export function getFieldDescription(
template: ProposalTemplateSchema,
fieldId: string,
): string | undefined {
- const schema = getFieldSchema(template, fieldId);
- return schema?.description;
+ return getPropertyDescription(template, fieldId);
}
export function isFieldRequired(
template: ProposalTemplateSchema,
fieldId: string,
): boolean {
- const required = template.required;
- if (!Array.isArray(required)) {
- return false;
- }
- return required.includes(fieldId);
+ return isPropertyRequired(template, fieldId);
}
export function getFieldOptions(
@@ -268,42 +281,21 @@ export function addField(
label: string,
): ProposalTemplateSchema {
const jsonSchema = { ...createFieldJsonSchema(type), title: label };
- const order = getFieldOrder(template);
-
- return {
- ...template,
- properties: {
- ...template.properties,
- [fieldId]: jsonSchema,
- },
- 'x-field-order': [...order, fieldId],
- };
+ return addProperty(template, fieldId, jsonSchema);
}
export function removeField(
template: ProposalTemplateSchema,
fieldId: string,
): ProposalTemplateSchema {
- const { [fieldId]: _removed, ...restProps } = template.properties ?? {};
- const order = getFieldOrder(template).filter((id) => id !== fieldId);
- const required = (template.required ?? []).filter((id) => id !== fieldId);
-
- return {
- ...template,
- properties: restProps,
- required: required.length > 0 ? required : undefined,
- 'x-field-order': order,
- };
+ return removeProperty(template, fieldId);
}
export function reorderFields(
template: ProposalTemplateSchema,
newOrder: string[],
): ProposalTemplateSchema {
- return {
- ...template,
- 'x-field-order': newOrder,
- };
+ return reorderProperties(template, newOrder);
}
export function updateFieldLabel(
@@ -311,18 +303,7 @@ export function updateFieldLabel(
fieldId: string,
label: string,
): ProposalTemplateSchema {
- const schema = getFieldSchema(template, fieldId);
- if (!schema) {
- return template;
- }
-
- return {
- ...template,
- properties: {
- ...template.properties,
- [fieldId]: { ...schema, title: label },
- },
- };
+ return updatePropertyLabel(template, fieldId, label);
}
export function updateFieldDescription(
@@ -330,25 +311,7 @@ export function updateFieldDescription(
fieldId: string,
description: string | undefined,
): ProposalTemplateSchema {
- const schema = getFieldSchema(template, fieldId);
- if (!schema) {
- return template;
- }
-
- const updated = { ...schema };
- if (description) {
- updated.description = description;
- } else {
- delete updated.description;
- }
-
- return {
- ...template,
- properties: {
- ...template.properties,
- [fieldId]: updated,
- },
- };
+ return updatePropertyDescription(template, fieldId, description);
}
export function setFieldRequired(
@@ -356,14 +319,7 @@ export function setFieldRequired(
fieldId: string,
required: boolean,
): ProposalTemplateSchema {
- const current = template.required ?? [];
- const filtered = current.filter((id) => id !== fieldId);
- const next = required ? [...filtered, fieldId] : filtered;
-
- return {
- ...template,
- required: next.length > 0 ? next : undefined,
- };
+ return setPropertyRequired(template, fieldId, required);
}
// ---------------------------------------------------------------------------
diff --git a/apps/app/src/components/decisions/rubricTemplate.ts b/apps/app/src/components/decisions/rubricTemplate.ts
new file mode 100644
index 000000000..ba863ebc8
--- /dev/null
+++ b/apps/app/src/components/decisions/rubricTemplate.ts
@@ -0,0 +1,445 @@
+/**
+ * Rubric Template — JSON Schema utilities.
+ *
+ * Uses `RubricTemplateSchema` from `@op/common`. Field ordering is stored as a
+ * top-level `x-field-order` array. Per-criterion widget selection is driven by
+ * `x-format` on each property (consumed by the renderer's rubric field logic).
+ *
+ * Generic JSON Schema operations are delegated to `templateUtils.ts`.
+ * This file adds rubric-specific logic: criterion types, scored config, and
+ * type inference from schema shape.
+ */
+import type {
+ RubricTemplateSchema,
+ XFormatPropertySchema,
+} from '@op/common/client';
+import type { JSONSchema7 } from 'json-schema';
+
+import type { TranslationKey } from '@/lib/i18n/routing';
+
+import {
+ addProperty,
+ getPropertyDescription,
+ getPropertyLabel,
+ getPropertyOrder,
+ getPropertySchema,
+ isPropertyRequired,
+ isSchemaObject,
+ removeProperty,
+ reorderProperties,
+ setPropertyRequired,
+ updateProperty,
+ updatePropertyDescription,
+ updatePropertyLabel,
+} from './templateUtils';
+
+export type { RubricTemplateSchema };
+
+// ---------------------------------------------------------------------------
+// Criterion types
+// ---------------------------------------------------------------------------
+
+export type RubricCriterionType = 'scored' | 'yes_no' | 'long_text';
+
+/**
+ * Flat read-only view of a single rubric criterion, derived from the template.
+ * Gives builder/renderer code a friendly object instead of requiring
+ * multiple reader calls per criterion.
+ */
+export interface CriterionView {
+ id: string;
+ criterionType: RubricCriterionType;
+ label: string;
+ description?: string;
+ required: boolean;
+ /** Maximum points for scored criteria. */
+ maxPoints?: number;
+ /** Labels for each score level (index 0 = score 1, ascending). Scored criteria only. */
+ scoreLabels: string[];
+}
+
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+
+const DEFAULT_MAX_POINTS = 5;
+
+/**
+ * Extract oneOf entries as typed `JSONSchema7[]`, filtering out boolean
+ * definitions.
+ */
+function getOneOfEntries(schema: XFormatPropertySchema): JSONSchema7[] {
+ if (!Array.isArray(schema.oneOf)) {
+ return [];
+ }
+ return schema.oneOf.filter(isSchemaObject);
+}
+
+// ---------------------------------------------------------------------------
+// Criterion type ↔ JSON Schema mapping
+// ---------------------------------------------------------------------------
+
+/**
+ * Create the JSON Schema for a given criterion type.
+ */
+export function createCriterionJsonSchema(
+ type: RubricCriterionType,
+): XFormatPropertySchema {
+ switch (type) {
+ case 'scored': {
+ const max = DEFAULT_MAX_POINTS;
+ const oneOf = Array.from({ length: max }, (_, i) => ({
+ const: i + 1,
+ title: '',
+ }));
+ return {
+ type: 'integer',
+ 'x-format': 'dropdown',
+ minimum: 1,
+ maximum: max,
+ oneOf,
+ };
+ }
+ case 'yes_no':
+ return {
+ type: 'string',
+ 'x-format': 'dropdown',
+ oneOf: [
+ { const: 'yes', title: 'Yes' },
+ { const: 'no', title: 'No' },
+ ],
+ };
+ case 'long_text':
+ return {
+ type: 'string',
+ 'x-format': 'long-text',
+ };
+ }
+}
+
+// ---------------------------------------------------------------------------
+// Type inference from schema shape
+// ---------------------------------------------------------------------------
+
+/**
+ * Infer the `RubricCriterionType` from a raw JSON Schema property.
+ */
+export function inferCriterionType(
+ schema: XFormatPropertySchema,
+): RubricCriterionType | undefined {
+ const xFormat = schema['x-format'];
+
+ if (xFormat === 'long-text') {
+ return 'long_text';
+ }
+
+ if (xFormat === 'dropdown') {
+ if (schema.type === 'integer' && schema.maximum != null) {
+ return 'scored';
+ }
+
+ if (schema.type === 'string') {
+ const values = getOneOfEntries(schema).map((e) => e.const);
+ if (
+ values.length === 2 &&
+ values.includes('yes') &&
+ values.includes('no')
+ ) {
+ return 'yes_no';
+ }
+ }
+ }
+
+ return undefined;
+}
+
+// ---------------------------------------------------------------------------
+// Readers (delegating to shared utils where possible)
+// ---------------------------------------------------------------------------
+
+export function getCriterionOrder(template: RubricTemplateSchema): string[] {
+ return getPropertyOrder(template);
+}
+
+export function getCriterionSchema(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): XFormatPropertySchema | undefined {
+ return getPropertySchema(template, criterionId);
+}
+
+export function getCriterionType(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): RubricCriterionType | undefined {
+ const schema = getCriterionSchema(template, criterionId);
+ if (!schema) {
+ return undefined;
+ }
+ return inferCriterionType(schema);
+}
+
+export function getCriterionLabel(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): string {
+ return getPropertyLabel(template, criterionId);
+}
+
+export function getCriterionDescription(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): string | undefined {
+ return getPropertyDescription(template, criterionId);
+}
+
+export function isCriterionRequired(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): boolean {
+ return isPropertyRequired(template, criterionId);
+}
+
+export function getCriterionMaxPoints(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): number | undefined {
+ const schema = getCriterionSchema(template, criterionId);
+ if (!schema || schema.type !== 'integer') {
+ return undefined;
+ }
+ return schema.maximum;
+}
+
+export function getCriterionScoreLabels(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): string[] {
+ const schema = getCriterionSchema(template, criterionId);
+ if (!schema || schema.type !== 'integer') {
+ return [];
+ }
+ return getOneOfEntries(schema)
+ .filter(
+ (e): e is JSONSchema7 & { const: number; title: string } =>
+ typeof e.const === 'number' && typeof e.title === 'string',
+ )
+ .sort((a, b) => a.const - b.const)
+ .map((e) => e.title);
+}
+
+// ---------------------------------------------------------------------------
+// Composite readers
+// ---------------------------------------------------------------------------
+
+export function getCriterion(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): CriterionView | undefined {
+ const criterionType = getCriterionType(template, criterionId);
+ if (!criterionType) {
+ return undefined;
+ }
+
+ return {
+ id: criterionId,
+ criterionType,
+ label: getCriterionLabel(template, criterionId),
+ description: getCriterionDescription(template, criterionId),
+ required: isCriterionRequired(template, criterionId),
+ maxPoints: getCriterionMaxPoints(template, criterionId),
+ scoreLabels: getCriterionScoreLabels(template, criterionId),
+ };
+}
+
+export function getCriteria(template: RubricTemplateSchema): CriterionView[] {
+ const order = getCriterionOrder(template);
+ const criteria: CriterionView[] = [];
+ for (const id of order) {
+ const criterion = getCriterion(template, id);
+ if (criterion) {
+ criteria.push(criterion);
+ }
+ }
+ return criteria;
+}
+
+// ---------------------------------------------------------------------------
+// Validation
+// ---------------------------------------------------------------------------
+
+/**
+ * Returns translation keys for validation errors on a criterion.
+ * Pass each key through `t()` in the UI layer.
+ */
+export function getCriterionErrors(criterion: CriterionView): TranslationKey[] {
+ const errors: TranslationKey[] = [];
+
+ if (!criterion.label.trim()) {
+ errors.push('Criterion label is required');
+ }
+
+ if (criterion.criterionType === 'scored') {
+ if (criterion.scoreLabels.some((l) => !l.trim())) {
+ errors.push('Score labels cannot be empty');
+ }
+ }
+
+ return errors;
+}
+
+// ---------------------------------------------------------------------------
+// Immutable mutators — each returns a new template
+// ---------------------------------------------------------------------------
+
+export function addCriterion(
+ template: RubricTemplateSchema,
+ criterionId: string,
+ type: RubricCriterionType,
+ label: string,
+): RubricTemplateSchema {
+ const jsonSchema = { ...createCriterionJsonSchema(type), title: label };
+ return addProperty(template, criterionId, jsonSchema);
+}
+
+export function removeCriterion(
+ template: RubricTemplateSchema,
+ criterionId: string,
+): RubricTemplateSchema {
+ return removeProperty(template, criterionId);
+}
+
+export function reorderCriteria(
+ template: RubricTemplateSchema,
+ newOrder: string[],
+): RubricTemplateSchema {
+ return reorderProperties(template, newOrder);
+}
+
+export function updateCriterionLabel(
+ template: RubricTemplateSchema,
+ criterionId: string,
+ label: string,
+): RubricTemplateSchema {
+ return updatePropertyLabel(template, criterionId, label);
+}
+
+export function updateCriterionDescription(
+ template: RubricTemplateSchema,
+ criterionId: string,
+ description: string | undefined,
+): RubricTemplateSchema {
+ return updatePropertyDescription(template, criterionId, description);
+}
+
+export function setCriterionRequired(
+ template: RubricTemplateSchema,
+ criterionId: string,
+ required: boolean,
+): RubricTemplateSchema {
+ return setPropertyRequired(template, criterionId, required);
+}
+
+/**
+ * Change a criterion's type while preserving its label, description, and
+ * required status. The schema is rebuilt from scratch for the new type.
+ */
+export function changeCriterionType(
+ template: RubricTemplateSchema,
+ criterionId: string,
+ newType: RubricCriterionType,
+): RubricTemplateSchema {
+ return updateProperty(template, criterionId, (existing) => {
+ const newSchema: XFormatPropertySchema = {
+ ...createCriterionJsonSchema(newType),
+ title: existing.title,
+ };
+ if (existing.description) {
+ newSchema.description = existing.description;
+ }
+ return newSchema;
+ });
+}
+
+/**
+ * Low-level updater for the raw JSON Schema of a criterion.
+ * Used for restoring cached scored config, etc.
+ */
+export function updateCriterionJsonSchema(
+ template: RubricTemplateSchema,
+ criterionId: string,
+ updates: Partial,
+): RubricTemplateSchema {
+ return updateProperty(template, criterionId, (s) => ({ ...s, ...updates }));
+}
+
+/**
+ * Update the maximum points for a scored criterion.
+ * Rebuilds the `oneOf` array to match the new max, preserving existing
+ * labels where possible and generating defaults for new levels.
+ */
+export function updateScoredMaxPoints(
+ template: RubricTemplateSchema,
+ criterionId: string,
+ newMax: number,
+): RubricTemplateSchema {
+ const schema = getCriterionSchema(template, criterionId);
+ if (!schema || schema.type !== 'integer') {
+ return template;
+ }
+
+ const clampedMax = Math.max(2, newMax);
+ const existingLabels = getCriterionScoreLabels(template, criterionId);
+
+ const oneOf = Array.from({ length: clampedMax }, (_, i) => ({
+ const: i + 1,
+ title: existingLabels[i] ?? '',
+ }));
+
+ return updateProperty(template, criterionId, (s) => ({
+ ...s,
+ maximum: clampedMax,
+ oneOf,
+ }));
+}
+
+/**
+ * Update a single score label for a scored criterion.
+ * `scoreValue` is the 1-based score (the `.const` in the oneOf entry),
+ * not an array index.
+ */
+export function updateScoreLabel(
+ template: RubricTemplateSchema,
+ criterionId: string,
+ scoreValue: number,
+ label: string,
+): RubricTemplateSchema {
+ const schema = getCriterionSchema(template, criterionId);
+ if (!schema || schema.type !== 'integer' || !Array.isArray(schema.oneOf)) {
+ return template;
+ }
+
+ const oneOf = schema.oneOf.map((entry) => {
+ if (isSchemaObject(entry) && entry.const === scoreValue) {
+ return { ...entry, title: label };
+ }
+ return entry;
+ });
+
+ return updateProperty(template, criterionId, (s) => ({ ...s, oneOf }));
+}
+
+// ---------------------------------------------------------------------------
+// Factory
+// ---------------------------------------------------------------------------
+
+/**
+ * Creates an empty rubric template with no criteria.
+ */
+export function createEmptyRubricTemplate(): RubricTemplateSchema {
+ return {
+ type: 'object',
+ properties: {},
+ 'x-field-order': [],
+ };
+}
diff --git a/apps/app/src/components/decisions/templateUtils.ts b/apps/app/src/components/decisions/templateUtils.ts
new file mode 100644
index 000000000..a8bdaf9d3
--- /dev/null
+++ b/apps/app/src/components/decisions/templateUtils.ts
@@ -0,0 +1,202 @@
+/**
+ * Shared JSON Schema template utilities.
+ *
+ * Provides generic, type-safe operations for templates that store their
+ * properties in a JSON Schema `properties` object and maintain ordering
+ * via a top-level `x-field-order` array. Both proposal and rubric
+ * templates share this structure.
+ *
+ * Domain-specific logic (e.g. scored criteria, locked proposal fields)
+ * lives in `rubricTemplate.ts` and `proposalTemplate.ts` respectively.
+ */
+import type { XFormatPropertySchema } from '@op/common/client';
+import type { JSONSchema7 } from 'json-schema';
+
+// ---------------------------------------------------------------------------
+// Base template shape
+// ---------------------------------------------------------------------------
+
+/**
+ * Minimal contract that both `ProposalTemplateSchema` and
+ * `RubricTemplateSchema` satisfy. All shared utilities are generic
+ * over this interface.
+ */
+export interface BaseTemplateSchema extends JSONSchema7 {
+ [key: string]: unknown;
+ properties?: Record;
+ 'x-field-order'?: string[];
+}
+
+// ---------------------------------------------------------------------------
+// Type guards
+// ---------------------------------------------------------------------------
+
+/**
+ * Type guard that narrows a `JSONSchema7Definition` (which is
+ * `JSONSchema7 | boolean`) to `JSONSchema7`.
+ */
+export function isSchemaObject(
+ entry: JSONSchema7 | boolean,
+): entry is JSONSchema7 {
+ return typeof entry !== 'boolean';
+}
+
+// ---------------------------------------------------------------------------
+// Readers
+// ---------------------------------------------------------------------------
+
+/** Returns the ordered list of property IDs in the template. */
+export function getPropertyOrder(
+ template: T,
+): string[] {
+ return template['x-field-order'] ?? [];
+}
+
+/** Returns the raw JSON Schema for a single property. */
+export function getPropertySchema(
+ template: T,
+ propertyId: string,
+): XFormatPropertySchema | undefined {
+ return template.properties?.[propertyId];
+}
+
+/** Returns the `title` of a property, falling back to `''`. */
+export function getPropertyLabel(
+ template: T,
+ propertyId: string,
+): string {
+ return getPropertySchema(template, propertyId)?.title ?? '';
+}
+
+/** Returns the `description` of a property. */
+export function getPropertyDescription(
+ template: T,
+ propertyId: string,
+): string | undefined {
+ return getPropertySchema(template, propertyId)?.description;
+}
+
+/** Returns whether a property is listed in the `required` array. */
+export function isPropertyRequired(
+ template: T,
+ propertyId: string,
+): boolean {
+ return template.required?.includes(propertyId) ?? false;
+}
+
+// ---------------------------------------------------------------------------
+// Immutable updater (internal building block)
+// ---------------------------------------------------------------------------
+
+/**
+ * Update a single property's schema within a template. Returns the
+ * template unchanged if the property doesn't exist.
+ */
+export function updateProperty(
+ template: T,
+ propertyId: string,
+ updater: (schema: XFormatPropertySchema) => XFormatPropertySchema,
+): T {
+ const schema = getPropertySchema(template, propertyId);
+ if (!schema) {
+ return template;
+ }
+ return {
+ ...template,
+ properties: {
+ ...template.properties,
+ [propertyId]: updater(schema),
+ },
+ };
+}
+
+// ---------------------------------------------------------------------------
+// Immutable mutators
+// ---------------------------------------------------------------------------
+
+/** Add a property with the given schema and append it to the order. */
+export function addProperty(
+ template: T,
+ propertyId: string,
+ schema: XFormatPropertySchema,
+): T {
+ const order = getPropertyOrder(template);
+ return {
+ ...template,
+ properties: {
+ ...template.properties,
+ [propertyId]: schema,
+ },
+ 'x-field-order': [...order, propertyId],
+ };
+}
+
+/** Remove a property from the template, including from `required` and order. */
+export function removeProperty(
+ template: T,
+ propertyId: string,
+): T {
+ const { [propertyId]: _removed, ...restProps } = template.properties ?? {};
+ const order = getPropertyOrder(template).filter((id) => id !== propertyId);
+ const required = (template.required ?? []).filter((id) => id !== propertyId);
+
+ return {
+ ...template,
+ properties: restProps,
+ required: required.length > 0 ? required : undefined,
+ 'x-field-order': order,
+ };
+}
+
+/** Replace the property order with the given array. */
+export function reorderProperties(
+ template: T,
+ newOrder: string[],
+): T {
+ return {
+ ...template,
+ 'x-field-order': newOrder,
+ };
+}
+
+/** Update the `title` of a property. */
+export function updatePropertyLabel(
+ template: T,
+ propertyId: string,
+ label: string,
+): T {
+ return updateProperty(template, propertyId, (s) => ({ ...s, title: label }));
+}
+
+/** Update the `description` of a property. Removes the key when empty. */
+export function updatePropertyDescription(
+ template: T,
+ propertyId: string,
+ description: string | undefined,
+): T {
+ return updateProperty(template, propertyId, (s) => {
+ const updated = { ...s };
+ if (description) {
+ updated.description = description;
+ } else {
+ delete updated.description;
+ }
+ return updated;
+ });
+}
+
+/** Set or unset a property as required. */
+export function setPropertyRequired(
+ template: T,
+ propertyId: string,
+ required: boolean,
+): T {
+ const current = template.required ?? [];
+ const filtered = current.filter((id) => id !== propertyId);
+ const next = required ? [...filtered, propertyId] : filtered;
+
+ return {
+ ...template,
+ required: next.length > 0 ? next : undefined,
+ };
+}
diff --git a/apps/app/src/lib/i18n/dictionaries/bn.json b/apps/app/src/lib/i18n/dictionaries/bn.json
index aeaf1e2ea..798a8a195 100644
--- a/apps/app/src/lib/i18n/dictionaries/bn.json
+++ b/apps/app/src/lib/i18n/dictionaries/bn.json
@@ -884,5 +884,35 @@
"Proposal Title": "প্রস্তাবের শিরোনাম",
"Start typing...": "টাইপ করা শুরু করুন...",
"Reason(s) and Insight(s)": "কারণ এবং অন্তর্দৃষ্টি",
- "Placeholder": "প্লেসহোল্ডার"
+ "Placeholder": "প্লেসহোল্ডার",
+ "Add criterion": "মানদণ্ড যোগ করুন",
+ "Describe what earns {number} points...": "{number} পয়েন্ট পেতে কী প্রয়োজন তা বর্ণনা করুন...",
+ "Define what each score means": "প্রতিটি স্কোরের অর্থ নির্ধারণ করুন",
+ "Max points": "সর্বোচ্চ পয়েন্ট",
+ "Minimum is 2": "সর্বনিম্ন 2",
+ "New criterion": "নতুন মানদণ্ড",
+ "Remove criterion": "মানদণ্ড সরান",
+ "Rubric criteria": "রুব্রিক মানদণ্ড",
+ "Help reviewers score consistently by describing what each point value represents": "প্রতিটি পয়েন্ট মান কী বোঝায় তা বর্ণনা করে পর্যালোচকদের ধারাবাহিকভাবে স্কোর করতে সাহায্য করুন",
+ "Review Criteria": "পর্যালোচনার মানদণ্ড",
+ "No review criteria yet": "এখনো কোনো পর্যালোচনার মানদণ্ড নেই",
+ "Add criteria to help reviewers evaluate proposals consistently": "পর্যালোচকদের ধারাবাহিকভাবে প্রস্তাব মূল্যায়নে সহায়তার জন্য মানদণ্ড যোগ করুন",
+ "Add your first criterion": "আপনার প্রথম মানদণ্ড যোগ করুন",
+ "Criterion {number}": "মানদণ্ড {number}",
+ "Criterion name": "মানদণ্ডের নাম",
+ "Criterion label is required": "মানদণ্ডের লেবেল আবশ্যক",
+ "Drag to reorder criterion": "মানদণ্ড পুনর্বিন্যাস করতে টানুন",
+ "e.g., Goal Alignment": "যেমন, লক্ষ্য সারিবদ্ধকরণ",
+ "Add a short, clear name for this evaluation criterion": "এই মূল্যায়ন মানদণ্ডের জন্য একটি সংক্ষিপ্ত, স্পষ্ট নাম যোগ করুন",
+ "What should reviewers evaluate? Be specific about what you're looking for.": "পর্যালোচকদের কী মূল্যায়ন করা উচিত? আপনি কী খুঁজছেন সে সম্পর্কে সুনির্দিষ্ট হন।",
+ "Help reviewers understand what to assess": "পর্যালোচকদের কী মূল্যায়ন করতে হবে তা বুঝতে সাহায্য করুন",
+ "How should reviewers score this?": "পর্যালোচকরা কীভাবে এটি স্কোর করবেন?",
+ "Rating Scale": "রেটিং স্কেল",
+ "Reviewers select a number with descriptions for each point value": "পর্যালোচকরা প্রতিটি পয়েন্ট মানের বিবরণ সহ একটি সংখ্যা নির্বাচন করেন",
+ "Simple binary assessment": "সহজ বাইনারি মূল্যায়ন",
+ "Text response only": "শুধুমাত্র পাঠ্য প্রতিক্রিয়া",
+ "No score, just written feedback": "কোনো স্কোর নেই, শুধু লিখিত প্রতিক্রিয়া",
+ "Score labels cannot be empty": "স্কোর লেবেল খালি রাখা যাবে না",
+ "Delete criterion": "মানদণ্ড মুছুন",
+ "Are you sure you want to delete this criterion? This action cannot be undone.": "আপনি কি নিশ্চিত যে এই মানদণ্ডটি মুছতে চান? এই কাজটি পূর্বাবস্থায় ফেরানো যাবে না।"
}
diff --git a/apps/app/src/lib/i18n/dictionaries/en.json b/apps/app/src/lib/i18n/dictionaries/en.json
index dfaadf48d..e044c4867 100644
--- a/apps/app/src/lib/i18n/dictionaries/en.json
+++ b/apps/app/src/lib/i18n/dictionaries/en.json
@@ -877,5 +877,35 @@
"Proposal Title": "Proposal Title",
"Start typing...": "Start typing...",
"Reason(s) and Insight(s)": "Reason(s) and Insight(s)",
- "Placeholder": "Placeholder"
+ "Placeholder": "Placeholder",
+ "Add criterion": "Add criterion",
+ "Describe what earns {number} points...": "Describe what earns {number} points...",
+ "Define what each score means": "Define what each score means",
+ "Max points": "Max points",
+ "Minimum is 2": "Minimum is 2",
+ "New criterion": "New criterion",
+ "Remove criterion": "Remove criterion",
+ "Rubric criteria": "Rubric criteria",
+ "Help reviewers score consistently by describing what each point value represents": "Help reviewers score consistently by describing what each point value represents",
+ "Review Criteria": "Review Criteria",
+ "No review criteria yet": "No review criteria yet",
+ "Add criteria to help reviewers evaluate proposals consistently": "Add criteria to help reviewers evaluate proposals consistently",
+ "Add your first criterion": "Add your first criterion",
+ "Criterion {number}": "Criterion {number}",
+ "Criterion name": "Criterion name",
+ "Criterion label is required": "Criterion label is required",
+ "Drag to reorder criterion": "Drag to reorder criterion",
+ "e.g., Goal Alignment": "e.g., Goal Alignment",
+ "Add a short, clear name for this evaluation criterion": "Add a short, clear name for this evaluation criterion",
+ "What should reviewers evaluate? Be specific about what you're looking for.": "What should reviewers evaluate? Be specific about what you're looking for.",
+ "Help reviewers understand what to assess": "Help reviewers understand what to assess",
+ "How should reviewers score this?": "How should reviewers score this?",
+ "Rating Scale": "Rating Scale",
+ "Reviewers select a number with descriptions for each point value": "Reviewers select a number with descriptions for each point value",
+ "Simple binary assessment": "Simple binary assessment",
+ "Text response only": "Text response only",
+ "No score, just written feedback": "No score, just written feedback",
+ "Score labels cannot be empty": "Score labels cannot be empty",
+ "Delete criterion": "Delete criterion",
+ "Are you sure you want to delete this criterion? This action cannot be undone.": "Are you sure you want to delete this criterion? This action cannot be undone."
}
diff --git a/apps/app/src/lib/i18n/dictionaries/es.json b/apps/app/src/lib/i18n/dictionaries/es.json
index d87539f70..d75b98a57 100644
--- a/apps/app/src/lib/i18n/dictionaries/es.json
+++ b/apps/app/src/lib/i18n/dictionaries/es.json
@@ -877,5 +877,35 @@
"Proposal Title": "Título de la Propuesta",
"Start typing...": "Empieza a escribir...",
"Reason(s) and Insight(s)": "Razón(es) y perspectiva(s)",
- "Placeholder": "Marcador de posición"
+ "Placeholder": "Marcador de posición",
+ "Add criterion": "Agregar criterio",
+ "Describe what earns {number} points...": "Describa qué merece {number} puntos...",
+ "Define what each score means": "Defina qué significa cada puntuación",
+ "Max points": "Puntos máximos",
+ "Minimum is 2": "El mínimo es 2",
+ "New criterion": "Nuevo criterio",
+ "Remove criterion": "Eliminar criterio",
+ "Rubric criteria": "Criterios de rúbrica",
+ "Help reviewers score consistently by describing what each point value represents": "Ayude a los revisores a puntuar de manera consistente describiendo lo que representa cada valor de punto",
+ "Review Criteria": "Criterios de revisión",
+ "No review criteria yet": "Aún no hay criterios de revisión",
+ "Add criteria to help reviewers evaluate proposals consistently": "Agregue criterios para ayudar a los revisores a evaluar propuestas de manera consistente",
+ "Add your first criterion": "Agregue su primer criterio",
+ "Criterion {number}": "Criterio {number}",
+ "Criterion name": "Nombre del criterio",
+ "Criterion label is required": "La etiqueta del criterio es obligatoria",
+ "Drag to reorder criterion": "Arrastrar para reordenar criterio",
+ "e.g., Goal Alignment": "p. ej., Alineación con objetivos",
+ "Add a short, clear name for this evaluation criterion": "Agregue un nombre corto y claro para este criterio de evaluación",
+ "What should reviewers evaluate? Be specific about what you're looking for.": "¿Qué deben evaluar los revisores? Sea específico sobre lo que busca.",
+ "Help reviewers understand what to assess": "Ayude a los revisores a entender qué evaluar",
+ "How should reviewers score this?": "¿Cómo deben puntuar esto los revisores?",
+ "Rating Scale": "Escala de calificación",
+ "Reviewers select a number with descriptions for each point value": "Los revisores seleccionan un número con descripciones para cada valor de punto",
+ "Simple binary assessment": "Evaluación binaria simple",
+ "Text response only": "Solo respuesta de texto",
+ "No score, just written feedback": "Sin puntuación, solo retroalimentación escrita",
+ "Score labels cannot be empty": "Las etiquetas de puntuación no pueden estar vacías",
+ "Delete criterion": "Eliminar criterio",
+ "Are you sure you want to delete this criterion? This action cannot be undone.": "¿Está seguro de que desea eliminar este criterio? Esta acción no se puede deshacer."
}
diff --git a/apps/app/src/lib/i18n/dictionaries/fr.json b/apps/app/src/lib/i18n/dictionaries/fr.json
index 538bef132..2d3705c9f 100644
--- a/apps/app/src/lib/i18n/dictionaries/fr.json
+++ b/apps/app/src/lib/i18n/dictionaries/fr.json
@@ -877,5 +877,35 @@
"Proposal Title": "Titre de la Proposition",
"Start typing...": "Commencez à taper...",
"Reason(s) and Insight(s)": "Raison(s) et aperçu(s)",
- "Placeholder": "Espace réservé"
+ "Placeholder": "Espace réservé",
+ "Add criterion": "Ajouter un critère",
+ "Describe what earns {number} points...": "Décrivez ce qui mérite {number} points...",
+ "Define what each score means": "Définissez ce que signifie chaque note",
+ "Max points": "Points maximum",
+ "Minimum is 2": "Le minimum est 2",
+ "New criterion": "Nouveau critère",
+ "Remove criterion": "Supprimer le critère",
+ "Rubric criteria": "Critères de la grille",
+ "Help reviewers score consistently by describing what each point value represents": "Aidez les évaluateurs à noter de manière cohérente en décrivant ce que représente chaque valeur de point",
+ "Review Criteria": "Critères d'évaluation",
+ "No review criteria yet": "Pas encore de critères d'évaluation",
+ "Add criteria to help reviewers evaluate proposals consistently": "Ajoutez des critères pour aider les évaluateurs à évaluer les propositions de manière cohérente",
+ "Add your first criterion": "Ajoutez votre premier critère",
+ "Criterion {number}": "Critère {number}",
+ "Criterion name": "Nom du critère",
+ "Criterion label is required": "Le libellé du critère est obligatoire",
+ "Drag to reorder criterion": "Glisser pour réordonner le critère",
+ "e.g., Goal Alignment": "p. ex., Alignement des objectifs",
+ "Add a short, clear name for this evaluation criterion": "Ajoutez un nom court et clair pour ce critère d'évaluation",
+ "What should reviewers evaluate? Be specific about what you're looking for.": "Que doivent évaluer les évaluateurs ? Soyez précis sur ce que vous recherchez.",
+ "Help reviewers understand what to assess": "Aidez les évaluateurs à comprendre quoi évaluer",
+ "How should reviewers score this?": "Comment les évaluateurs doivent-ils noter ceci ?",
+ "Rating Scale": "Échelle de notation",
+ "Reviewers select a number with descriptions for each point value": "Les évaluateurs sélectionnent un nombre avec des descriptions pour chaque valeur de point",
+ "Simple binary assessment": "Évaluation binaire simple",
+ "Text response only": "Réponse textuelle uniquement",
+ "No score, just written feedback": "Pas de note, uniquement des commentaires écrits",
+ "Score labels cannot be empty": "Les libellés des notes ne peuvent pas être vides",
+ "Delete criterion": "Supprimer le critère",
+ "Are you sure you want to delete this criterion? This action cannot be undone.": "Êtes-vous sûr de vouloir supprimer ce critère ? Cette action est irréversible."
}
diff --git a/apps/app/src/lib/i18n/dictionaries/pt.json b/apps/app/src/lib/i18n/dictionaries/pt.json
index 7fc1f8c44..62eca8966 100644
--- a/apps/app/src/lib/i18n/dictionaries/pt.json
+++ b/apps/app/src/lib/i18n/dictionaries/pt.json
@@ -877,5 +877,35 @@
"Proposal Title": "Título da Proposta",
"Start typing...": "Comece a digitar...",
"Reason(s) and Insight(s)": "Razão(ões) e percepção(ões)",
- "Placeholder": "Espaço reservado"
+ "Placeholder": "Espaço reservado",
+ "Add criterion": "Adicionar critério",
+ "Describe what earns {number} points...": "Descreva o que merece {number} pontos...",
+ "Define what each score means": "Defina o que cada nota significa",
+ "Max points": "Pontos máximos",
+ "Minimum is 2": "O mínimo é 2",
+ "New criterion": "Novo critério",
+ "Remove criterion": "Remover critério",
+ "Rubric criteria": "Critérios da rubrica",
+ "Help reviewers score consistently by describing what each point value represents": "Ajude os avaliadores a pontuar de forma consistente descrevendo o que cada valor de ponto representa",
+ "Review Criteria": "Critérios de avaliação",
+ "No review criteria yet": "Ainda não há critérios de avaliação",
+ "Add criteria to help reviewers evaluate proposals consistently": "Adicione critérios para ajudar os avaliadores a avaliar propostas de forma consistente",
+ "Add your first criterion": "Adicione seu primeiro critério",
+ "Criterion {number}": "Critério {number}",
+ "Criterion name": "Nome do critério",
+ "Criterion label is required": "O rótulo do critério é obrigatório",
+ "Drag to reorder criterion": "Arrastar para reordenar critério",
+ "e.g., Goal Alignment": "p. ex., Alinhamento de objetivos",
+ "Add a short, clear name for this evaluation criterion": "Adicione um nome curto e claro para este critério de avaliação",
+ "What should reviewers evaluate? Be specific about what you're looking for.": "O que os avaliadores devem avaliar? Seja específico sobre o que procura.",
+ "Help reviewers understand what to assess": "Ajude os avaliadores a entender o que avaliar",
+ "How should reviewers score this?": "Como os avaliadores devem pontuar isto?",
+ "Rating Scale": "Escala de classificação",
+ "Reviewers select a number with descriptions for each point value": "Os avaliadores selecionam um número com descrições para cada valor de ponto",
+ "Simple binary assessment": "Avaliação binária simples",
+ "Text response only": "Apenas resposta de texto",
+ "No score, just written feedback": "Sem pontuação, apenas feedback escrito",
+ "Score labels cannot be empty": "Os rótulos das notas não podem estar vazios",
+ "Delete criterion": "Excluir critério",
+ "Are you sure you want to delete this criterion? This action cannot be undone.": "Tem certeza de que deseja excluir este critério? Esta ação não pode ser desfeita."
}
diff --git a/packages/ui/src/components/RadioGroup.tsx b/packages/ui/src/components/RadioGroup.tsx
index 679358e66..8916f4c97 100644
--- a/packages/ui/src/components/RadioGroup.tsx
+++ b/packages/ui/src/components/RadioGroup.tsx
@@ -12,6 +12,7 @@ import type {
} from 'react-aria-components';
import { tv } from 'tailwind-variants';
+import { cn } from '../lib/utils';
import { composeTailwindRenderProps } from '../utils';
import { Description, FieldError, Label } from './Field';
@@ -20,6 +21,7 @@ export interface RadioGroupProps extends Omit {
children?: ReactNode;
description?: string;
errorMessage?: string | ((validation: ValidationResult) => string);
+ labelClassName?: string;
}
export const RadioGroup = (props: RadioGroupProps) => {
@@ -31,7 +33,7 @@ export const RadioGroup = (props: RadioGroupProps) => {
'group flex flex-col gap-2',
)}
>
-