@uxland/primary-shell 5.3.6 → 5.3.7

package/dist/index.js

@@ -12114,20 +12114,22 @@ const activityHistoryFiltersSelector = (X) => X.activityHistoryFilters.filters,
     }), J.items = re, J.subGroups = te;
   }), W;
 }, sortGroupsByMostRecentDate = (X) => {
-  const W = (re) => re.reduce((ne, oe) => {
-    const de = new Date(oe.date);
-    return de > ne ? de : ne;
-  }, /* @__PURE__ */ new Date(0)), J = (re) => re.sort((ne, oe) => new Date(oe.date) - new Date(ne.date)), te = (re) => {
-    let ne = [];
-    return re.items.length > 0 && ne.push(W(re.items)), re.subGroups.forEach((oe) => {
-      oe.items.length > 0 && ne.push(W(oe.items));
-    }), ne.length > 0 ? new Date(Math.max(...ne)) : /* @__PURE__ */ new Date(0);
+  const W = (ne) => ne.reduce((oe, de) => {
+    const ue = new Date(de.date);
+    return ue > oe ? ue : oe;
+  }, /* @__PURE__ */ new Date(0)), J = (ne) => ne.sort((oe, de) => new Date(de.date).getTime() - new Date(oe.date).getTime()), te = (ne) => W(ne.items), re = (ne) => {
+    const oe = ne.items.length > 0 ? [W(ne.items)] : [], de = ne.subGroups.map(te), ue = [...oe, ...de];
+    return ue.length > 0 ? new Date(Math.max(...ue.map((ce) => ce.getTime()))) : /* @__PURE__ */ new Date(0);
   };
-  return X.forEach((re) => {
-    re.items = J(re.items), re.subGroups.forEach((ne) => {
-      ne.items = J(ne.items);
-    });
-  }), X.sort((re, ne) => te(ne) - te(re));
+  return X.forEach((ne) => {
+    ne.items = J(ne.items), ne.subGroups.forEach((oe) => {
+      oe.items = J(oe.items);
+    }), ne.subGroups.sort(
+      (oe, de) => te(de).getTime() - te(oe).getTime()
+    );
+  }), X.sort(
+    (ne, oe) => re(oe).getTime() - re(ne).getTime()
+  );
 }, activityHistoryCollectionsSelector = (X) => X.activityHistoryCollections.collections, mapItemsWithMetadata = (X, W, J, te) => X.map(
   (re) => ({
     ...re,
@@ -15522,6 +15524,17 @@ function shouldShowRole(X) {
 const hasItemDivider = (X, W) => {
   const J = W.findIndex((te) => te.id === X.id);
   return J === -1 ? !1 : J === W.length - 1 ? !0 : !X.diagnostics.length;
+}, mergeHistoryItemsAndSubgroups = (X) => {
+  const W = X.items.map((te) => ({
+    type: "item",
+    date: new Date(te.date),
+    item: te
+  })), J = X.subGroups.map((te) => ({
+    type: "subGroup",
+    date: te.items.length ? new Date(te.items[0].date) : /* @__PURE__ */ new Date(0),
+    subGroup: te
+  }));
+  return [...W, ...J].sort((te, re) => re.date.getTime() - te.date.getTime());
 }, template$f = (X) => {
   var W;
   return X._hasUpdatedOnce ? ke$1`
@@ -15537,24 +15550,41 @@ const hasItemDivider = (X, W) => {
                   ${visitHeaderTemplate(X, J.items[0] || ((de = J.subGroups[0]) == null ? void 0 : de.items[0]))}
                   <div class="visit__items">
                     ${Qt(
-        J.items,
-        (ue) => ue.id,
-        (ue) => ke$1`<div class="item" ?has-divider=${hasItemDivider(ue, J.items)}>${ue.component}</div> `
-      )}
-                    ${Qt(
-        J.subGroups,
-        (ue) => ke$1`
-                        <div class="diagnostics">
-                          ${diagnosticHeaderTemplate(ue.items[0])}
-                          <div class="diagnostics__items">
-                            ${Qt(
-          ue.items,
-          (ce) => ce.id,
-          (ce) => ke$1`<div class="item" ?has-divider=${hasItemDivider(ce, ue.items)}>${ce == null ? void 0 : ce.component}</div>`
-        )}
-                          </div>
-                        </div>
-                      `
+        mergeHistoryItemsAndSubgroups(J),
+        (ue) => ue.type === "item" ? ue.item.id : ue.subGroup.id,
+        (ue) => {
+          if (ue.type === "item") {
+            const he = ue.item;
+            return ke$1`
+                            <div
+                              class="item"
+                              ?has-divider=${hasItemDivider(he, J.items)}
+                            >
+                              ${he.component}
+                            </div>
+                          `;
+          }
+          const ce = ue.subGroup;
+          return ke$1`
+                            <div class="diagnostics">
+                              ${diagnosticHeaderTemplate(ce.items[0])}
+                              <div class="diagnostics__items">
+                                ${Qt(
+            ce.items,
+            (he) => he.id,
+            (he) => ke$1`
+                                    <div
+                                      class="item"
+                                      ?has-divider=${hasItemDivider(he, ce.items)}
+                                    >
+                                      ${he.component}
+                                    </div>
+                                  `
+          )}
+                              </div>
+                            </div>
+                          `;
+        }
       )}
                   </div>
                 </div>
@@ -15583,7 +15613,7 @@ const hasItemDivider = (X, W) => {
   const J = shouldShowRole(W), te = [
     X.highlighted(W.professional.name),
     J ? X.highlighted(W.professional.role.description) : null,
-    X.highlighted(W.center.description),
+    X.highlighted(W.up.description) ?? X.highlighted(W.center.description),
     X.highlighted(W.professional.speciality.description),
     X.highlighted(W.service.description)
   ].filter(Boolean);