RBAC Improvements

Caching improvements Maker-Checker Implementation
2026-10-21 07:27:47 +02:00
parent dee9098379
commit 5d7e2f74ce
25 changed files with 1269 additions and 309 deletions
@@ -71,7 +71,7 @@ type OutcomeFormValues = z.infer<typeof outcomeSchema>;
 export const BeneficiariesPage: React.FC = () => {
  const queryClient = useQueryClient();
  const { success, error: toastError } = useToast();
-  const { canAdd, canApprove, canExport } = useRbac();
+  const { canAdd, canApprove, canExport, canApproveRecord, isMaker } = useRbac();

  const [selectedProjectId, setSelectedProjectId] = useState<string>('all');
  const [activeTab, setActiveTab] = useState<'beneficiaries' | 'compliance'>('beneficiaries');
@@ -1024,16 +1024,25 @@ export const BeneficiariesPage: React.FC = () => {
                {...compForm.register('status')}
                className="w-full bg-slate-900 border border-slate-800 rounded-xl px-3 py-2 text-xs text-white focus:outline-none focus:border-blue-500"
              >
-                {APPROVAL_STATUS_OPTIONS.map((opt) => (
-                  <option
-                    key={opt.value}
-                    value={opt.value}
-                    disabled={opt.value === ApprovalStatus.Approved && !canApprove('beneficiaries')}
-                  >
-                    {opt.label}
-                    {opt.value === ApprovalStatus.Approved && !canApprove('beneficiaries') ? ' (Requires Update Permission)' : ''}
-                  </option>
-                ))}
+                {(() => {
+                  const canApproveComp = canApproveRecord('beneficiaries', editingComp?.createdBy);
+                  const isSelf = isMaker(editingComp?.createdBy);
+                  return APPROVAL_STATUS_OPTIONS.map((opt) => {
+                    const isApprovedOpt = opt.value === ApprovalStatus.Approved;
+                    const isOptDisabled = isApprovedOpt && !canApproveComp;
+                    let reason = '';
+                    if (isApprovedOpt && !canApprove('beneficiaries')) {
+                      reason = ' (Requires Update Permission)';
+                    } else if (isApprovedOpt && isSelf) {
+                      reason = ' (Maker-Checker: Cannot approve own record)';
+                    }
+                    return (
+                      <option key={opt.value} value={opt.value} disabled={isOptDisabled}>
+                        {opt.label}{reason}
+                      </option>
+                    );
+                  });
+                })()}
              </select>
            </div>
          )}