fluentui-extended 2026.2.6 → 2026.2.8

package/README.md

@@ -349,7 +349,7 @@ The Validate button checks query structure and optionally tests against the Dyna
 ```
 
 When running inside Dynamics 365:
-- Detects `Xrm.WebApi` availability
+- Uses native fetch to `/api/data/v9.2/` endpoints
 - Executes a test query with `$top=1&$count=true`
 - Shows record count or API error message
 
@@ -405,7 +405,7 @@ const fields: QueryBuilderField[] = [
 |------|------|---------|-------------|
 | `entityName` | `string` | - | Logical name of the entity (required) |
 | `entityDisplayName` | `string` | - | Display name shown in header |
-| `fields` | `QueryBuilderField[]` | - | Fields for filtering (auto-loaded from Xrm if omitted) |
+| `fields` | `QueryBuilderField[]` | - | Fields for filtering (auto-loaded via Web API if omitted) |
 | `initialFetchXml` | `string` | - | FetchXML to pre-populate the query builder |
 | `initialState` | `QueryBuilderState` | - | Initial query state object |
 | `onSerializedChange` | `(result: QueryBuilderApplyResult) => void` | - | Called when query changes |

package/dist/index.d.mts

@@ -156,7 +156,7 @@ interface QueryBuilderLookupOption {
 }
 interface QueryBuilderProps {
     entityName: string;
-    /** Entity set name for OData queries (e.g., "accounts"). If not provided, will be fetched from Xrm metadata. */
+    /** Entity set name for OData queries (e.g., "accounts"). If not provided, will be fetched from the Web API. */
     entitySetName?: string;
     entityDisplayName?: string;
     fields?: QueryBuilderField[];
@@ -189,6 +189,8 @@ interface QueryBuilderProps {
     onSerializedChange?: (result: QueryBuilderApplyResult) => void;
     /** Callback for lookup field search - returns options for the lookup dropdown */
     onLookupSearch?: (fieldId: string, searchText: string) => Promise<QueryBuilderLookupOption[]> | QueryBuilderLookupOption[];
+    /** Callback to fetch fields for a related entity. If provided, this is used instead of the native Web API. */
+    onFetchEntityFields?: (entityLogicalName: string) => Promise<QueryBuilderField[]>;
 }
 
 /**

package/dist/index.d.ts

@@ -156,7 +156,7 @@ interface QueryBuilderLookupOption {
 }
 interface QueryBuilderProps {
     entityName: string;
-    /** Entity set name for OData queries (e.g., "accounts"). If not provided, will be fetched from Xrm metadata. */
+    /** Entity set name for OData queries (e.g., "accounts"). If not provided, will be fetched from the Web API. */
     entitySetName?: string;
     entityDisplayName?: string;
     fields?: QueryBuilderField[];
@@ -189,6 +189,8 @@ interface QueryBuilderProps {
     onSerializedChange?: (result: QueryBuilderApplyResult) => void;
     /** Callback for lookup field search - returns options for the lookup dropdown */
     onLookupSearch?: (fieldId: string, searchText: string) => Promise<QueryBuilderLookupOption[]> | QueryBuilderLookupOption[];
+    /** Callback to fetch fields for a related entity. If provided, this is used instead of the native Web API. */
+    onFetchEntityFields?: (entityLogicalName: string) => Promise<QueryBuilderField[]>;
 }
 
 /**

package/dist/index.js

@@ -2452,9 +2452,13 @@ var isValueEmpty = (value) => {
   return String(value).trim() === "";
 };
 var dataTypeFromAttribute = (attribute) => {
-  const type = String(attribute?.AttributeType || attribute?.Type || "").toLowerCase();
+  const typeValue = attribute?.AttributeTypeName?.Value || attribute?.AttributeType || attribute?.Type || "";
+  const type = String(typeValue).toLowerCase();
+  if (attribute?.Targets && Array.isArray(attribute.Targets) && attribute.Targets.length > 0) {
+    return "lookup";
+  }
   if (["picklist", "state", "status"].includes(type)) return "optionset";
-  if (["lookup", "customer", "owner", "partylist", "uniqueidentifier"].includes(type)) return "lookup";
+  if (["lookup", "customer", "owner", "partylist", "uniqueidentifier", "lookuptype"].includes(type)) return "lookup";
   if (["datetime"].includes(type)) return "datetime";
   if (["boolean"].includes(type)) return "boolean";
   if (["integer", "decimal", "double", "money", "bigint", "int"].includes(type)) return "number";
@@ -2532,9 +2536,8 @@ var LookupValueInput = ({
   const [lookupLoading, setLookupLoading] = React3__namespace.useState(false);
   const [resultCount, setResultCount] = React3__namespace.useState(0);
   const [headerText, setHeaderText] = React3__namespace.useState("");
-  const searchUsingXrm = React3__namespace.useCallback(async (searchText, limit = 15) => {
-    const xrm = window.Xrm;
-    if (!xrm?.WebApi?.retrieveMultipleRecords || !targets || targets.length === 0) {
+  const searchUsingWebApi = React3__namespace.useCallback(async (searchText, limit = 15) => {
+    if (!targets || targets.length === 0) {
       return { results: [], entityDisplayName: "" };
     }
     const results = [];
@@ -2546,12 +2549,20 @@ var LookupValueInput = ({
       }
       try {
         const nameAttr = target.primaryNameAttribute;
-        let options = `?$select=${nameAttr}&$top=${limit}`;
+        let queryOptions = `$select=${nameAttr}&$top=${limit}`;
         if (searchText) {
-          options += `&$filter=contains(${nameAttr},'${searchText.replace(/'/g, "''")}')`;
+          queryOptions += `&$filter=contains(${nameAttr},'${searchText.replace(/'/g, "''")}')`;
         }
-        const response = await xrm.WebApi.retrieveMultipleRecords(target.entitySetName, options);
-        const records = response.value || response.entities || [];
+        const response = await fetch(`/api/data/v9.2/${target.entitySetName}?${queryOptions}`, {
+          headers: {
+            "OData-MaxVersion": "4.0",
+            "OData-Version": "4.0",
+            "Accept": "application/json"
+          }
+        });
+        if (!response.ok) continue;
+        const data = await response.json();
+        const records = data.value || [];
         for (const record of records) {
           const idField = `${target.entityLogicalName}id`;
           const id = record[idField] || record.id || "";
@@ -2570,12 +2581,11 @@ var LookupValueInput = ({
   }, [targets]);
   React3__namespace.useEffect(() => {
     const loadInitialRecords = async () => {
-      const xrm = window.Xrm;
       const hasValidTargets2 = targets && targets.length > 0 && targets.some((t) => t.entitySetName && t.primaryNameAttribute);
-      if (!disabled && hasValidTargets2 && xrm?.WebApi?.retrieveMultipleRecords && !onLookupSearch) {
+      if (!disabled && hasValidTargets2 && !onLookupSearch) {
         setLookupLoading(true);
         try {
-          const searchResult = await searchUsingXrm("", 5);
+          const searchResult = await searchUsingWebApi("", 5);
           setLookupOptions(searchResult.results);
           setResultCount(searchResult.results.length);
           setHeaderText(searchResult.entityDisplayName);
@@ -2585,7 +2595,7 @@ var LookupValueInput = ({
       }
     };
     loadInitialRecords();
-  }, [targets, disabled, onLookupSearch, searchUsingXrm]);
+  }, [targets, disabled, onLookupSearch, searchUsingWebApi]);
   const handleSearchChange = React3__namespace.useCallback(
     async (searchText) => {
       setLookupLoading(true);
@@ -2601,7 +2611,7 @@ var LookupValueInput = ({
           }));
           entityName = targets?.[0]?.displayName || "";
         } else {
-          const searchResult = await searchUsingXrm(searchText);
+          const searchResult = await searchUsingWebApi(searchText);
           results = searchResult.results;
           entityName = searchResult.entityDisplayName;
         }
@@ -2612,7 +2622,7 @@ var LookupValueInput = ({
         setLookupLoading(false);
       }
     },
-    [fieldId, onLookupSearch, searchUsingXrm, targets]
+    [fieldId, onLookupSearch, searchUsingWebApi, targets]
   );
   const handleOptionSelect = React3__namespace.useCallback(
     (option) => {
@@ -2727,67 +2737,118 @@ var QueryBuilder = (props) => {
       }
       setLoading(true);
       try {
-        const xrm = window.Xrm;
-        if (xrm?.Utility?.getEntityMetadata) {
-          const metadata = await xrm.Utility.getEntityMetadata(props.entityName);
-          if (metadata?.EntitySetName && !disposed) {
-            setEntitySetName(metadata.EntitySetName);
+        const entityResponse = await fetch(
+          `/api/data/v9.2/EntityDefinitions(LogicalName='${props.entityName}')?$select=EntitySetName,DisplayName,PrimaryNameAttribute`,
+          {
+            headers: {
+              "OData-MaxVersion": "4.0",
+              "OData-Version": "4.0",
+              "Accept": "application/json"
+            }
           }
-          const attributesCollection = metadata?.Attributes?._collection || metadata?.Attributes || {};
-          const attributesArray = Array.isArray(attributesCollection) ? attributesCollection : Object.keys(attributesCollection).map((key) => attributesCollection[key]);
-          const targetEntityNames = /* @__PURE__ */ new Set();
-          for (const attribute of attributesArray) {
-            if (Array.isArray(attribute?.Targets)) {
-              for (const target of attribute.Targets) {
-                const entityName = typeof target === "string" ? target : target?.entityLogicalName;
-                if (entityName) targetEntityNames.add(entityName);
-              }
+        );
+        if (!entityResponse.ok) {
+          console.warn("[QueryBuilder] Failed to fetch entity metadata");
+          return;
+        }
+        const entityMetadata = await entityResponse.json();
+        if (entityMetadata?.EntitySetName && !disposed) {
+          setEntitySetName(entityMetadata.EntitySetName);
+        }
+        const attributesResponse = await fetch(
+          `/api/data/v9.2/EntityDefinitions(LogicalName='${props.entityName}')/Attributes?$select=LogicalName,SchemaName,DisplayName,AttributeType,AttributeTypeName`,
+          {
+            headers: {
+              "OData-MaxVersion": "4.0",
+              "OData-Version": "4.0",
+              "Accept": "application/json"
+            }
+          }
+        );
+        if (!attributesResponse.ok) {
+          console.warn("[QueryBuilder] Failed to fetch entity attributes");
+          return;
+        }
+        const attributesData = await attributesResponse.json();
+        const attributesArray = attributesData.value || [];
+        const lookupResponse = await fetch(
+          `/api/data/v9.2/EntityDefinitions(LogicalName='${props.entityName}')/Attributes/Microsoft.Dynamics.CRM.LookupAttributeMetadata?$select=LogicalName,SchemaName,DisplayName,AttributeType,AttributeTypeName,Targets`,
+          {
+            headers: {
+              "OData-MaxVersion": "4.0",
+              "OData-Version": "4.0",
+              "Accept": "application/json"
             }
           }
-          const targetMetadataCache = {};
-          for (const targetEntityName of targetEntityNames) {
-            try {
-              const targetMeta = await xrm.Utility.getEntityMetadata(targetEntityName);
+        );
+        const lookupData = lookupResponse.ok ? await lookupResponse.json() : { value: [] };
+        const lookupAttributes = lookupData.value || [];
+        const lookupMap = new Map(lookupAttributes.map((attr) => [attr.LogicalName, attr]));
+        const mergedAttributes = attributesArray.map((attr) => {
+          const lookupAttr = lookupMap.get(attr.LogicalName);
+          if (lookupAttr?.Targets) {
+            return { ...attr, Targets: lookupAttr.Targets };
+          }
+          return attr;
+        });
+        const targetEntityNames = /* @__PURE__ */ new Set();
+        for (const attribute of mergedAttributes) {
+          if (Array.isArray(attribute?.Targets)) {
+            for (const target of attribute.Targets) {
+              const entityName = typeof target === "string" ? target : target?.entityLogicalName;
+              if (entityName) targetEntityNames.add(entityName);
+            }
+          }
+        }
+        const targetMetadataCache = {};
+        for (const targetEntityName of targetEntityNames) {
+          try {
+            const targetResponse = await fetch(
+              `/api/data/v9.2/EntityDefinitions(LogicalName='${targetEntityName}')?$select=EntitySetName,DisplayName,PrimaryNameAttribute`,
+              {
+                headers: {
+                  "OData-MaxVersion": "4.0",
+                  "OData-Version": "4.0",
+                  "Accept": "application/json"
+                }
+              }
+            );
+            if (targetResponse.ok) {
+              const targetMeta = await targetResponse.json();
               targetMetadataCache[targetEntityName] = {
                 entitySetName: targetMeta?.EntitySetName,
                 displayName: targetMeta?.DisplayName?.UserLocalizedLabel?.Label || targetMeta?.LogicalName,
                 primaryNameAttribute: targetMeta?.PrimaryNameAttribute
               };
-            } catch (targetErr) {
-              console.warn(`[QueryBuilder] Could not fetch metadata for target entity "${targetEntityName}":`, targetErr);
             }
+          } catch (targetErr) {
+            console.warn(`[QueryBuilder] Could not fetch metadata for target entity "${targetEntityName}":`, targetErr);
           }
-          const resolvedFields = attributesArray.filter((attribute) => attribute?.LogicalName && attribute?.IsValidForAdvancedFind !== false).map((attribute) => {
-            const dataType = dataTypeFromAttribute(attribute);
-            const optionSet = attribute?.OptionSet?.Options;
-            const options = dataType === "optionset" && Array.isArray(optionSet) ? optionSet.map((option) => ({
-              label: option?.Label?.UserLocalizedLabel?.Label || option?.Label || String(option?.Value),
-              value: option?.Value
-            })).filter((option) => option.value !== void 0 && option.value !== null) : void 0;
-            const targets = dataType === "lookup" && Array.isArray(attribute.Targets) ? attribute.Targets.map((target) => {
-              const entityLogicalName = typeof target === "string" ? target : target?.entityLogicalName || target;
-              const cached = targetMetadataCache[entityLogicalName] || {};
-              return {
-                entityLogicalName,
-                entitySetName: target?.entitySetName || cached.entitySetName,
-                displayName: target?.displayName || cached.displayName,
-                primaryNameAttribute: target?.primaryNameAttribute || cached.primaryNameAttribute
-              };
-            }) : void 0;
-            const displayName = attribute.DisplayName;
-            const label = typeof displayName === "string" ? displayName : displayName?.UserLocalizedLabel?.Label || attribute.SchemaName || attribute.LogicalName;
+        }
+        const resolvedFields = mergedAttributes.filter((attribute) => attribute?.LogicalName && attribute?.IsValidForAdvancedFind !== false).map((attribute) => {
+          const dataType = dataTypeFromAttribute(attribute);
+          const targets = dataType === "lookup" && Array.isArray(attribute.Targets) ? attribute.Targets.map((target) => {
+            const entityLogicalName = typeof target === "string" ? target : target?.entityLogicalName || target;
+            const cached = targetMetadataCache[entityLogicalName] || {};
             return {
-              id: attribute.LogicalName,
-              label,
-              schemaName: attribute.SchemaName,
-              dataType,
-              options,
-              targets
+              entityLogicalName,
+              entitySetName: target?.entitySetName || cached.entitySetName,
+              displayName: target?.displayName || cached.displayName,
+              primaryNameAttribute: target?.primaryNameAttribute || cached.primaryNameAttribute
             };
-          }).sort((left, right) => String(left.label).localeCompare(String(right.label), void 0, { sensitivity: "base" }));
-          if (!disposed && resolvedFields.length > 0) {
-            setAvailableFields(resolvedFields);
-          }
+          }) : void 0;
+          const displayName = attribute.DisplayName;
+          const label = typeof displayName === "string" ? displayName : displayName?.UserLocalizedLabel?.Label || attribute.SchemaName || attribute.LogicalName;
+          return {
+            id: attribute.LogicalName,
+            label,
+            schemaName: attribute.SchemaName,
+            dataType,
+            targets
+          };
+        }).sort((left, right) => String(left.label).localeCompare(String(right.label), void 0, { sensitivity: "base" }));
+        if (!disposed && resolvedFields.length > 0) {
+          setAvailableFields(resolvedFields);
         }
       } catch (error) {
         console.error("[QueryBuilder] Error loading fields:", error);
@@ -2873,45 +2934,48 @@ var QueryBuilder = (props) => {
   const loadRelatedEntityFields = React3__namespace.useCallback(
     async (groupId, conditionId, targetEntity) => {
       try {
-        const xrm = window.Xrm;
-        if (!xrm?.Utility?.getEntityMetadata) {
-          console.warn("[QueryBuilder] Xrm.Utility.getEntityMetadata not available, cannot load related entity fields");
-          return;
-        }
-        const metadata = await xrm.Utility.getEntityMetadata(targetEntity);
-        if (!metadata) {
-          console.warn("[QueryBuilder] No metadata returned for entity:", targetEntity);
-          return;
-        }
-        const attributesCollection = metadata?.Attributes?._collection || metadata?.Attributes || {};
-        const attributesArray = Array.isArray(attributesCollection) ? attributesCollection : Object.keys(attributesCollection).map((key) => attributesCollection[key]);
-        if (attributesArray.length === 0) {
-          console.warn("[QueryBuilder] No attributes found in metadata for entity:", targetEntity);
-          return;
+        let resolvedFields = [];
+        if (props.onFetchEntityFields) {
+          resolvedFields = await props.onFetchEntityFields(targetEntity);
+        } else {
+          const response = await fetch(
+            `/api/data/v9.2/EntityDefinitions(LogicalName='${targetEntity}')/Attributes?$select=LogicalName,SchemaName,DisplayName,AttributeType,AttributeTypeName`,
+            {
+              headers: {
+                "OData-MaxVersion": "4.0",
+                "OData-Version": "4.0",
+                "Accept": "application/json"
+              }
+            }
+          );
+          if (!response.ok) {
+            console.warn("[QueryBuilder] Failed to fetch entity metadata:", response.status, response.statusText);
+            return;
+          }
+          const data = await response.json();
+          const attributesArray = data.value || [];
+          if (attributesArray.length === 0) {
+            console.warn("[QueryBuilder] No attributes found for entity:", targetEntity);
+            return;
+          }
+          resolvedFields = attributesArray.filter((attr) => {
+            if (!attr?.LogicalName) return false;
+            const attrType = attr.AttributeType || attr.AttributeTypeName?.Value;
+            if (attrType === "Virtual" || attrType === "CalendarRules") return false;
+            if (attrType === "Uniqueidentifier" && !attr.LogicalName.endsWith("id")) return false;
+            return true;
+          }).map((attr) => {
+            const dataType = dataTypeFromAttribute(attr);
+            const displayName = attr.DisplayName;
+            const label = typeof displayName === "string" ? displayName : displayName?.UserLocalizedLabel?.Label || attr.SchemaName || attr.LogicalName;
+            return {
+              id: attr.LogicalName,
+              label,
+              schemaName: attr.SchemaName,
+              dataType
+            };
+          }).sort((a, b) => String(a.label).localeCompare(String(b.label), void 0, { sensitivity: "base" }));
         }
-        const resolvedFields = attributesArray.filter((attr) => {
-          if (!attr?.LogicalName) return false;
-          const attrType = attr.AttributeType || attr.AttributeTypeName?.Value;
-          if (attrType === "Virtual" || attrType === "CalendarRules") return false;
-          if (attrType === "Uniqueidentifier" && !attr.LogicalName.endsWith("id")) return false;
-          return true;
-        }).map((attr) => {
-          const dataType = dataTypeFromAttribute(attr);
-          const optionSet = attr?.OptionSet?.Options;
-          const options = dataType === "optionset" && Array.isArray(optionSet) ? optionSet.map((opt) => ({
-            label: opt?.Label?.UserLocalizedLabel?.Label || opt?.Label || String(opt?.Value),
-            value: opt?.Value
-          })).filter((opt) => opt.value !== void 0 && opt.value !== null) : void 0;
-          const displayName = attr.DisplayName;
-          const label = typeof displayName === "string" ? displayName : displayName?.UserLocalizedLabel?.Label || attr.SchemaName || attr.LogicalName;
-          return {
-            id: attr.LogicalName,
-            label,
-            schemaName: attr.SchemaName,
-            dataType,
-            options
-          };
-        }).sort((a, b) => String(a.label).localeCompare(String(b.label), void 0, { sensitivity: "base" }));
         if (resolvedFields.length > 0) {
           const defaultCondition = createCondition(resolvedFields[0]);
           updateGroup(groupId, (group) => ({
@@ -2931,7 +2995,7 @@ var QueryBuilder = (props) => {
         console.error("[QueryBuilder] Error loading related entity fields:", error);
       }
     },
-    [updateGroup]
+    [props.onFetchEntityFields, updateGroup]
   );
   const addNestedCondition = React3__namespace.useCallback(
     (groupId, conditionId, nestedFields) => {
@@ -3054,24 +3118,8 @@ var QueryBuilder = (props) => {
     if (!validationResult) return /* @__PURE__ */ new Set();
     return new Set(validationResult.errors.map((e) => e.conditionId).filter(Boolean));
   }, [validationResult]);
-  const isXrmAvailable = React3__namespace.useMemo(() => {
-    try {
-      return typeof window.Xrm?.WebApi?.retrieveMultipleRecords === "function";
-    } catch {
-      return false;
-    }
-  }, []);
   const onValidate = React3__namespace.useCallback(async () => {
     const result = validateQueryBuilderState(builderState, availableFields);
-    if (!isXrmAvailable) {
-      result.apiValidation = {
-        available: false,
-        tested: false
-      };
-      setValidationResult(result);
-      setValidationDialogOpen(true);
-      return;
-    }
     if (!result.isValid) {
       result.apiValidation = {
         available: true,
@@ -3085,18 +3133,29 @@ var QueryBuilder = (props) => {
     setValidationResult(result);
     setValidationDialogOpen(true);
     try {
-      const Xrm = window.Xrm;
       const { odataFilter } = serializeQueryBuilderState(builderState, availableFields, props.entityName, entitySetName);
-      const options = odataFilter ? `?$filter=${odataFilter}&$top=1&$count=true` : "?$top=1&$count=true";
       const entitySetForApi = entitySetName || props.entityName;
-      const response = await Xrm.WebApi.retrieveMultipleRecords(entitySetForApi, options);
+      const queryOptions = odataFilter ? `$filter=${odataFilter}&$top=1&$count=true` : "$top=1&$count=true";
+      const response = await fetch(`/api/data/v9.2/${entitySetForApi}?${queryOptions}`, {
+        headers: {
+          "OData-MaxVersion": "4.0",
+          "OData-Version": "4.0",
+          "Accept": "application/json",
+          "Prefer": 'odata.include-annotations="*"'
+        }
+      });
+      if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(errorText || `HTTP ${response.status}`);
+      }
+      const data = await response.json();
       setValidationResult({
         ...result,
         apiValidation: {
           available: true,
           tested: true,
           success: true,
-          recordCount: response["@odata.count"] ?? response.entities?.length ?? 0
+          recordCount: data["@odata.count"] ?? data.value?.length ?? 0
         }
       });
     } catch (err) {
@@ -3112,7 +3171,7 @@ var QueryBuilder = (props) => {
     } finally {
       setApiValidating(false);
     }
-  }, [builderState, availableFields, entitySetName, isXrmAvailable, props.entityName]);
+  }, [builderState, availableFields, entitySetName, props.entityName]);
   const onOpenUploadDialog = React3__namespace.useCallback(() => {
     setUploadXmlText("");
     setUploadError(null);