merge from develop

Author: labkey-susanh

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.65.2-showSelectedValue-52310.2",
+  "version": "6.65.3-showSelectedValue-52310.2",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -5,6 +5,10 @@ Components, models, actions, and utility functions for LabKey applications and p
 *Released* TBD
 - Issue 52310: Change application single-value dropdowns to include the current value in the listed options
 
+### version TBD
+*Released*: TBD
+- Various minor fixes for exception reports
+
 ### version 6.65.1
 *Released*: 20 October 2025
 - SelectionStatus null check for rowCount

packages/components/releaseNotes/components.md

@@ -25,9 +25,9 @@ export const BaseModal: FC<BaseModalProps> = ({ bsSize, children, className }) =
 
     useEffect(() => {
         // Prevent scrolling the body when a modal is shown
-        document.body.classList.toggle('no-scroll', true);
+        document.body.classList?.toggle('no-scroll', true);
         return () => {
-            document.body.classList.toggle('no-scroll', false);
+            document.body.classList?.toggle('no-scroll', false);
         };
     }, []);
 

packages/components/src/internal/Modal.tsx

@@ -142,7 +142,7 @@ export function checkPermissions(
  * @param perms Array of permission strings (See models/constants)
  * @param checkIsAdmin Indicates if user.isAdmin should override check. Defaults to true.
  * @param permissionCheck Sets which "has permissions" check logic is used.
- *   `all` - Require user to have all of the specified permissions (default).
+ *   `all` - Require user to have all the specified permissions (default).
  *   `any` - Require user to have any of the specified permissions.
  */
 export function hasPermissions(
@@ -151,7 +151,7 @@ export function hasPermissions(
     checkIsAdmin = true,
     permissionCheck: 'all' | 'any' = 'all'
 ): boolean {
-    return checkPermissions(user.isAdmin, user.permissionsList, perms, checkIsAdmin, permissionCheck);
+    return checkPermissions(user?.isAdmin, user?.permissionsList, perms, checkIsAdmin, permissionCheck);
 }
 
 /**

packages/components/src/internal/components/base/models/User.ts

@@ -779,7 +779,7 @@ export class QueryModel {
         }
 
         let sortStrings = sorts.map(sortStringMapper);
-        const viewSorts = queryInfo.getSorts(viewName).map(sortStringMapper);
+        const viewSorts = queryInfo.getSorts(viewName)?.map(sortStringMapper) ?? [];
 
         if (viewSorts.length > 0) {
             sortStrings = sortStrings.concat(viewSorts);