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

Improve dynamic group rule editor variable handling

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/48afe50d-f402-46e5-9380-44e8ffa1a918.jpg
This commit is contained in:
alphaeusmote
2025-04-10 16:39:00 +00:00
parent 828b1cc552 793305caa4
commit 7b31495181
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/dynamic-groups/rule-editor.tsx
+9 -6
View File
@@ -439,12 +439,15 @@ export const RuleEditor: React.FC<RuleEditorProps> = ({ rule, onSave, onCancel }
<div className="absolute right-1 top-1"> <div className="absolute right-1 top-1">
<VariableSelector <VariableSelector
onSelectVariable={(variable) => { onSelectVariable={(variable) => {
// Direct insertion of variable or prefixed OU segment // Direct insertion of variable which should already be properly formatted
// with OU= or DC= prefix by the VariableSelector
const currentValue = formData.targetOU || ''; const currentValue = formData.targetOU || '';
// Check if this is a variable or a direct DC value
const newValue = variable.startsWith("DC=") || variable.startsWith("OU=") // Add a comma if needed before adding the variable
? (currentValue && !currentValue.endsWith(",") ? currentValue + "," : currentValue) + variable const newValue = (currentValue && !currentValue.endsWith(",") && variable !== '')
? currentValue + "," + variable
: currentValue + variable; : currentValue + variable;
setFormData({ ...formData, targetOU: newValue }); setFormData({ ...formData, targetOU: newValue });
}} }}
connections={formData.connections} connections={formData.connections}
@@ -482,9 +485,9 @@ export const RuleEditor: React.FC<RuleEditorProps> = ({ rule, onSave, onCancel }
<div className="absolute right-1 top-1"> <div className="absolute right-1 top-1">
<VariableSelector <VariableSelector
onSelectVariable={(variable) => { onSelectVariable={(variable) => {
const variableText = `{${variable}}`; // Variable was already formatted with CN= prefix by the VariableSelector
const currentValue = formData.targetGroupName || ''; const currentValue = formData.targetGroupName || '';
const newValue = currentValue + variableText; const newValue = currentValue + variable;
setFormData({ ...formData, targetGroupName: newValue }); setFormData({ ...formData, targetGroupName: newValue });
}} }}
connections={formData.connections} connections={formData.connections}
client/src/components/dynamic-groups/variable-selector.tsx
+6 -2
View File
@@ -88,7 +88,9 @@ const VariableSelector: React.FC<VariableSelectorProps> = ({ onSelectVariable, c
const formattedVar = `OU={${attribute}}`; const formattedVar = `OU={${attribute}}`;
onSelectVariable(formattedVar); onSelectVariable(formattedVar);
} else { } else {
onSelectVariable(attribute); // Format for group name with CN prefix
const formattedVar = `CN={${attribute}}`;
onSelectVariable(formattedVar);
} }
setIsOpen(false); setIsOpen(false);
}; };
@@ -108,7 +110,9 @@ const VariableSelector: React.FC<VariableSelectorProps> = ({ onSelectVariable, c
const formattedVar = `OU={${customAttribute.trim()}}`; const formattedVar = `OU={${customAttribute.trim()}}`;
onSelectVariable(formattedVar); onSelectVariable(formattedVar);
} else { } else {
onSelectVariable(customAttribute.trim()); // Format custom attribute for group name with CN prefix
const formattedVar = `CN={${customAttribute.trim()}}`;
onSelectVariable(formattedVar);
} }
setCustomAttribute(''); setCustomAttribute('');
setIsOpen(false); setIsOpen(false);