gsadmin/ActiveDirectoryManager
1
0
Fork 0
mirror of https://github.com/freedbygrace/ActiveDirectoryManager.git synced 2026-08-24 17:46:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve dynamic group rule editor to correctly handle connection IDs.

Browse Source 
Replit-Commit-Author: Agent
Replit-Commit-Session-Id: 705f2157-ef97-4fbd-89e4-8c7f2ecaea90
Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/7ed01c5f-a82d-405a-b728-b2e3d127c60c/b6bb9e86-10d4-45d0-8f83-e336d9109dfa.jpg
This commit is contained in:
alphaeusmote
2025-04-10 16:27:18 +00:00
parent ae6edb7db0
commit d3eef75481
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/dynamic-groups/rule-editor.tsx
+23 -5
View File
@@ -47,9 +47,25 @@ interface RuleEditorProps {
onCancel: () => void; onCancel: () => void;
} }
// Extend the DynamicGroupRule type to include connectionIds for frontend use // Define a custom type matching what the onSave function expects
interface ExtendedDynamicGroupRule extends DynamicGroupRule { interface DynamicGroupRuleWithConnectionIds {
connectionIds?: number[]; id: number;
name: string;
description: string | null;
targetGroup: string;
enabled: boolean;
schedule: string;
createdAt: Date;
updatedAt: Date;
lastRun: Date | null;
lastRunStatus: string | null;
variablePattern: string | null;
useAdvancedScheduling: boolean;
createGroupIfNotExists: boolean;
createOUIfNotExists: boolean;
createGroupForEachAttributeValue: boolean;
createOUForEachAttributeValue: boolean;
connectionIds: number[];
} }
export const RuleEditor: React.FC<RuleEditorProps> = ({ rule, onSave, onCancel }) => { export const RuleEditor: React.FC<RuleEditorProps> = ({ rule, onSave, onCancel }) => {
@@ -237,7 +253,7 @@ export const RuleEditor: React.FC<RuleEditorProps> = ({ rule, onSave, onCancel }
const targetGroupDN = getTargetGroupDN(); const targetGroupDN = getTargetGroupDN();
const ruleData: ExtendedDynamicGroupRule = { const ruleData: DynamicGroupRuleWithConnectionIds = {
id: rule?.id || 0, // Default to 0 for new records id: rule?.id || 0, // Default to 0 for new records
name: formData.name, name: formData.name,
description: formData.description || null, description: formData.description || null,
@@ -252,7 +268,9 @@ export const RuleEditor: React.FC<RuleEditorProps> = ({ rule, onSave, onCancel }
createGroupIfNotExists: formData.createGroupIfNotExists, createGroupIfNotExists: formData.createGroupIfNotExists,
createOUIfNotExists: formData.createOUIfNotExists, createOUIfNotExists: formData.createOUIfNotExists,
createGroupForEachAttributeValue: formData.createGroupForEachAttributeValue, createGroupForEachAttributeValue: formData.createGroupForEachAttributeValue,
createOUForEachAttributeValue: formData.createOUForEachAttributeValue createOUForEachAttributeValue: formData.createOUForEachAttributeValue,
schedule: rule?.schedule || "0 0 * * *", // Default: daily at midnight
useAdvancedScheduling: rule?.useAdvancedScheduling || false
}; };
onSave(ruleData, schedules); onSave(ruleData, schedules);