gsadmin/ActiveDirectoryManager
1
0
Fork 0
mirror of https://github.com/freedbygrace/ActiveDirectoryManager.git synced 2026-07-26 11:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve LDAP query builder by dynamically loading attribute names from the selected connection.

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/46a2e92f-185c-4511-a1dd-1b0ef6718ac5.jpg
This commit is contained in:
alphaeusmote
2025-04-09 03:13:35 +00:00
parent 1ad5600315
commit ecf4f13d11
1 changed files with 92 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/pages/ldap-query-builder-page.tsx
+92 -12
View File
@@ -75,6 +75,8 @@ const LdapQueryBuilderPage = () => {
const [testResults, setTestResults] = useState<any[]>([]);
const [isActive, setIsActive] = useState(true);
const [autoUpdateEnabled, setAutoUpdateEnabled] = useState(false);
const [ldapAttributes, setLdapAttributes] = useState<string[]>([]);
const [isLoadingAttributes, setIsLoadingAttributes] = useState(false);
const [filterBuilder, setFilterBuilder] = useState<any>({
operator: "and",
groups: []
@@ -327,6 +329,45 @@ const LdapQueryBuilderPage = () => {
generateLdapFilter();
}
}, [filterBuilder, autoUpdateEnabled]);
// Load LDAP attributes from the selected connection
const loadLdapAttributes = async () => {
if (!selectedConnectionId) return;
try {
setIsLoadingAttributes(true);
const res = await apiRequest("GET", `/api/connections/${selectedConnectionId}/schema-attributes?objectClass=${objectClass}`);
const data = await res.json();
// Set default attributes if none are returned
if (!data || !data.length) {
setLdapAttributes([
'cn', 'sAMAccountName', 'givenName', 'sn', 'mail', 'userPrincipalName',
'displayName', 'memberOf', 'objectSid', 'objectGUID', 'distinguishedName',
'whenCreated', 'whenChanged', 'accountExpires', 'userAccountControl'
]);
} else {
setLdapAttributes(data);
}
} catch (error) {
console.error("Failed to load LDAP attributes:", error);
// Set default attributes on error
setLdapAttributes([
'cn', 'sAMAccountName', 'givenName', 'sn', 'mail', 'userPrincipalName',
'displayName', 'memberOf', 'objectSid', 'objectGUID', 'distinguishedName',
'whenCreated', 'whenChanged', 'accountExpires', 'userAccountControl'
]);
} finally {
setIsLoadingAttributes(false);
}
};
// Load attributes when connection or object class changes
useEffect(() => {
if (selectedConnectionId) {
loadLdapAttributes();
}
}, [selectedConnectionId, objectClass]);
// Save filter
const handleSaveFilter = () => {
@@ -773,18 +814,57 @@ const LdapQueryBuilderPage = () => {
{group.conditions.map((condition: any, condIndex: number) => (
<div key={condIndex} className="grid grid-cols-12 gap-2 items-center">
<div className="col-span-4">
<Input
placeholder="Attribute"
value={condition.attribute}
onChange={(e) => {
const updatedGroups = [...filterBuilder.groups];
updatedGroups[groupIndex].conditions[condIndex].attribute = e.target.value;
setFilterBuilder({
...filterBuilder,
groups: updatedGroups
});
}}
/>
{ldapAttributes.length > 0 ? (
<Select
value={condition.attribute}
onValueChange={(value) => {
const updatedGroups = [...filterBuilder.groups];
updatedGroups[groupIndex].conditions[condIndex].attribute = value;
setFilterBuilder({
...filterBuilder,
groups: updatedGroups
});
}}
>
<SelectTrigger>
<SelectValue placeholder={isLoadingAttributes ? "Loading attributes..." : "Select attribute"} />
</SelectTrigger>
<SelectContent className="max-h-[280px]">
{ldapAttributes.map((attr) => (
<SelectItem key={attr} value={attr}>{attr}</SelectItem>
))}
<SelectItem value="custom">Custom attribute...</SelectItem>
</SelectContent>
</Select>
) : (
<Input
placeholder={isLoadingAttributes ? "Loading attributes..." : "Attribute name"}
value={condition.attribute}
onChange={(e) => {
const updatedGroups = [...filterBuilder.groups];
updatedGroups[groupIndex].conditions[condIndex].attribute = e.target.value;
setFilterBuilder({
...filterBuilder,
groups: updatedGroups
});
}}
/>
)}
{condition.attribute === "custom" && (
<Input
placeholder="Custom attribute name"
className="mt-1"
value=""
onChange={(e) => {
const updatedGroups = [...filterBuilder.groups];
updatedGroups[groupIndex].conditions[condIndex].attribute = e.target.value;
setFilterBuilder({
...filterBuilder,
groups: updatedGroups
});
}}
/>
)}
</div>
<div className="col-span-3">
<Select