@snapdragonsnursery/react-components 1.23.0 → 1.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapdragonsnursery/react-components",
-  "version": "1.23.0",
+  "version": "1.26.0",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/ChildSearchModal.jsx

@@ -1,6 +1,7 @@
 import React, {
   useState,
   useEffect,
+  useLayoutEffect,
   useRef,
   useCallback,
   useMemo,
@@ -90,6 +91,30 @@ const ChildSearchModal = ({
   const { instance, accounts } = useMsal();
   const modalRef = useRef();
   const searchInputRef = useRef();
+  const prevIsOpenRef = useRef(false);
+  const statusPropRef = useRef(status);
+  const activeOnlyPropRef = useRef(activeOnly);
+  statusPropRef.current = status;
+  activeOnlyPropRef.current = activeOnly;
+
+  // When the modal opens (closed → open), reset status from props so a previous session
+  // does not stick and cause searches with no status param (API defaults to active-only).
+  useLayoutEffect(() => {
+    if (!isOpen) {
+      prevIsOpenRef.current = false;
+      return;
+    }
+    const wasOpen = prevIsOpenRef.current;
+    prevIsOpenRef.current = true;
+    if (wasOpen) return;
+    setAdvancedFilters((prev) => ({
+      ...prev,
+      // Match useState initialiser: treat "" like missing so we do not omit status on the API.
+      status:
+        statusPropRef.current ||
+        (activeOnlyPropRef.current ? "active" : "all"),
+    }));
+  }, [isOpen]);
 
   // Debounce search term
   useEffect(() => {
@@ -101,6 +126,42 @@ const ChildSearchModal = ({
     return () => clearTimeout(timer);
   }, [searchTerm]);
 
+  // Value-stable key for siteIds so the sync effect only runs when the set of site IDs actually
+  // changes, not on every parent re-render (avoids resetting user's site/room selection and pagination).
+  const siteIdsKey = useMemo(
+    () =>
+      Array.isArray(siteIds) && siteIds.length > 0
+        ? [...siteIds].sort((a, b) => a - b).join(",")
+        : "",
+    [siteIds]
+  );
+
+  // Keep the internal site filter in sync with externally controlled site changes
+  // (for example when the app site is switched from a sidebar while the page stays mounted).
+  useEffect(() => {
+    const nextSelectedSiteId =
+      siteIdsKey !== "" ? "" : siteId || "";
+
+    setAdvancedFilters((prev) => {
+      if (
+        prev.selectedSiteId === nextSelectedSiteId &&
+        prev.selectedRoomId === ""
+      ) {
+        return prev;
+      }
+
+      return {
+        ...prev,
+        selectedSiteId: nextSelectedSiteId,
+        selectedRoomId: "",
+      };
+    });
+
+    setPagination((prev) =>
+      prev.page === 1 ? prev : { ...prev, page: 1 }
+    );
+  }, [siteId, siteIdsKey]);
+
   // Close modal when clicking outside
   useEffect(() => {
     const handleClickOutside = (event) => {
@@ -196,9 +257,8 @@ const ChildSearchModal = ({
         );
       }
 
-      // Build query parameters
+      // Build query parameters (caller identity: Bearer token — Common API extracts oid from JWT)
       const params = new URLSearchParams({
-        entra_id: accounts[0].localAccountId,
         search_term: debouncedSearchTerm,
         page: pagination.page,
         page_size: pagination.pageSize,
@@ -215,11 +275,20 @@ const ChildSearchModal = ({
         params.append("site_id", siteId.toString());
       }
 
-      // Handle status filtering
-      // Important: when status is "all", do not send active_only=true.
-      // The status dropdown is the source of truth for active/inactive/all.
-      if (advancedFilters.status && advancedFilters.status !== "all") {
-        params.append("status", advancedFilters.status);
+      // Resolve status: prefer non-empty UI state, else props (handles empty/stale state before open sync).
+      const resolvedStatus =
+        advancedFilters.status != null &&
+        String(advancedFilters.status).trim() !== ""
+          ? String(advancedFilters.status).trim()
+          : status || (activeOnly ? "active" : "all");
+
+      // Backend (search-children) defaults active_only to true when status is omitted, so "all"
+      // must be sent explicitly as status=all — otherwise only active children are returned.
+      if (resolvedStatus === "all") {
+        params.append("status", "all");
+        params.append("active_only", "false");
+      } else if (resolvedStatus) {
+        params.append("status", resolvedStatus);
       }
 
       // Add room filter
@@ -296,6 +365,8 @@ const ChildSearchModal = ({
     advancedFilters,
     applicationContext,
     bypassPermissions,
+    status,
+    activeOnly,
   ]);
 
   // Search when debounced term changes

package/src/ChildSearchPage.jsx

@@ -329,8 +329,8 @@ const ChildSearchPage = ({
         );
       }
 
+      // Caller identity: Bearer token — Common API extracts oid from JWT (do not send entra_id in query)
       const params = new URLSearchParams({
-        entra_id: accounts[0].localAccountId,
         search_term: debouncedSearchTerm,
         page: pagination.page,
         page_size: pagination.pageSize,
@@ -347,14 +347,19 @@ const ChildSearchPage = ({
         params.append("site_id", siteId.toString());
       }
 
-      // Handle status filtering
-      // Important: when status is "all", do not send active_only=true.
-      // The status dropdown is the source of truth for active/inactive/all.
-      if (
-        debouncedAdvancedFilters.status &&
-        debouncedAdvancedFilters.status !== "all"
-      ) {
-        params.append("status", debouncedAdvancedFilters.status);
+      const resolvedStatus =
+        debouncedAdvancedFilters.status != null &&
+        String(debouncedAdvancedFilters.status).trim() !== ""
+          ? String(debouncedAdvancedFilters.status).trim()
+          : status || (activeOnly ? "active" : "all");
+
+      // Backend (search-children) defaults active_only to true when status is omitted, so "all"
+      // must be sent explicitly as status=all — otherwise only active children are returned.
+      if (resolvedStatus === "all") {
+        params.append("status", "all");
+        params.append("active_only", "false");
+      } else if (resolvedStatus) {
+        params.append("status", resolvedStatus);
       }
 
       // Add room filter
@@ -437,6 +442,8 @@ const ChildSearchPage = ({
     debouncedAdvancedFilters,
     applicationContext,
     bypassPermissions,
+    status,
+    activeOnly,
   ]);
 
   // Search when debounced term changes

package/src/EmployeeSearchModal.jsx

@@ -613,8 +613,8 @@ const EmployeeSearchModal = ({
         );
       }
 
+      // Caller identity: Bearer token — Common API extracts oid from JWT (do not send entra_id in query)
       const params = new URLSearchParams({
-        entra_id: accounts[0].localAccountId,
         search_term: debouncedSearchTerm,
         page: pagination.page,
         page_size: pagination.pageSize,

package/src/EmployeeSearchPage.jsx

@@ -426,8 +426,8 @@ const EmployeeSearchPage = ({
         );
       }
 
+      // Caller identity: Bearer token — Common API extracts oid from JWT (do not send entra_id in query)
       const params = new URLSearchParams({
-        entra_id: accounts[0].localAccountId,
         search_term: debouncedSearchTerm,
         page: loadAllResults ? 1 : pagination.page,
         page_size: loadAllResults ? 10000 : pagination.pageSize,