@peers-app/peers-ui 0.19.0 → 0.19.6

package/src/screens/packages/package-versions.tsx

@@ -2,6 +2,7 @@ import {
   computePackageVersionHash,
   getEffectivePackagePrefs,
   getMe,
+  hasDeviceFollowOverride,
   type IDoc,
   type IPackage,
   type IPackageVersion,
@@ -14,6 +15,7 @@ import {
 } from "@peers-app/peers-sdk";
 import { useState } from "react";
 import { useObservable, useObservableState, usePromise } from "../../hooks";
+import { activatePackageVersion, isGroupAdmin } from "./package-helpers";
 
 function formatDate(iso: string): string {
   try {
@@ -84,19 +86,7 @@ export const PackageVersionsList = (props: { pkg: IDoc<IPackage> }) => {
   async function activateVersion(pv: IPackageVersion) {
     setActivating(pv.packageVersionId);
     try {
-      await updatePackagePrefs(pkg.packageId, {
-        activePackageVersionId: pv.packageVersionId,
-      });
-
-      // For non-dev versions, also update the group default so other devices
-      // can discover this as the recommended version.
-      if (pv.versionTag !== "dev") {
-        const current = await Packages().get(pkg.packageId);
-        if (current) {
-          current.activePackageVersionId = pv.packageVersionId;
-          await Packages().signAndSave(current);
-        }
-      }
+      await activatePackageVersion(pkg.packageId, pv);
       await pkg.load();
       refreshKey(refreshKey() + 1);
     } catch (err: unknown) {
@@ -183,7 +173,17 @@ export const PackageVersionsList = (props: { pkg: IDoc<IPackage> }) => {
   async function pinVersion() {
     setPinning(true);
     try {
-      await updatePackagePrefs(pkg.packageId, { pinned: true });
+      const pinsGroup = !hasDeviceFollowOverride(devicePrefs) && (await isGroupAdmin());
+
+      if (pinsGroup) {
+        const current = await Packages().get(pkg.packageId);
+        if (current) {
+          current.versionFollowRange = "pinned";
+          await Packages().signAndSave(current);
+        }
+      } else {
+        await updatePackagePrefs(pkg.packageId, { pinned: true });
+      }
       await pkg.load();
     } catch (err: unknown) {
       alert(`Failed to pin version: ${err instanceof Error ? err.message : String(err)}`);

package/src/system-apps/index.ts

@@ -1,4 +1,5 @@
-import type { IAppNav, IPackage } from "@peers-app/peers-sdk";
+import type { IAppNav } from "@peers-app/peers-sdk";
+import type { IPackageWithNavs } from "../ui-router/routes-loader";
 
 export { accountApp } from "./account.app";
 export { assistantsApp } from "./assistants.app";
@@ -73,7 +74,7 @@ export const systemApps: IAppNav[] = [
 ];
 
 // Virtual system package for tabs integration
-export const systemPackage: IPackage = {
+export const systemPackage: IPackageWithNavs = {
   packageId: "system-apps",
   name: "System Apps",
   description: "Core system functionality and management tools",

package/src/tabs-layout/tabs-state.ts

@@ -2,14 +2,13 @@ import {
   groupDeviceVar,
   groupUserVar,
   type IAppNav,
-  type IPackage,
   newid,
   type Observable,
   observable,
 } from "@peers-app/peers-sdk";
 import { _mainContentPath } from "../globals";
 import { systemPackage } from "../system-apps";
-import { allPackages } from "../ui-router/routes-loader";
+import { allPackages, type IPackageWithNavs } from "../ui-router/routes-loader";
 
 export interface TabState {
   tabId: string;
@@ -158,7 +157,7 @@ export const handleMainPathChanged = (
   }
 };
 
-type AppInfo = { navItem: IAppNav; package: IPackage };
+type AppInfo = { navItem: IAppNav; package: IPackageWithNavs };
 
 export function determineAppFromPath(path: string): AppInfo | undefined {
   const launcherInfo = {
@@ -186,7 +185,7 @@ export function determineAppFromPath(path: string): AppInfo | undefined {
     .flatMap((pkg) => {
       const navs = pkg.appNavs;
       if (!navs) return [];
-      return navs.map((navItem) => ({ navItem, package: pkg as IPackage }));
+      return navs.map((navItem) => ({ navItem, package: pkg }));
     });
 
   // Find the most relevant app based on path

package/src/ui-router/routes-loader.ts

@@ -1,5 +1,6 @@
 import {
   debounceByArgs,
+  type IAppNav,
   type IPackage,
   type IPeersPackageRoutes,
   type IPeersUIRoute,
@@ -11,7 +12,10 @@ import {
 } from "@peers-app/peers-sdk";
 import "../ui-defaults";
 
-export const allPackages = observable<IPackage[]>([]);
+/** IPackage enriched with appNavs from the active PackageVersion. */
+export type IPackageWithNavs = IPackage & { appNavs?: IAppNav[] };
+
+export const allPackages = observable<IPackageWithNavs[]>([]);
 let allRoutesLoaded = false;
 
 const prefsSubscribed = new Set<string>();
@@ -41,10 +45,9 @@ function subscribeToPrefs(packageId: string) {
 }
 
 /**
- * Enrich an IPackage with appNavs from the device's active PV record.
- * Falls back to `pkg.appNavs` for backward compat with older data.
+ * Enrich an IPackage with appNavs from the device's active PackageVersion record.
  */
-async function enrichWithPvAppNavs(pkg: IPackage): Promise<IPackage> {
+async function enrichWithPvAppNavs(pkg: IPackage): Promise<IPackageWithNavs> {
   let pvId = pkg.activePackageVersionId;
   try {
     const pvar = packagePrefsVar(pkg.packageId);
@@ -60,7 +63,7 @@ async function enrichWithPvAppNavs(pkg: IPackage): Promise<IPackage> {
       return { ...pkg, appNavs: pv.appNavs };
     }
   } catch {
-    /* fall through to pkg.appNavs */
+    /* PV not found */
   }
   return pkg;
 }
@@ -115,7 +118,7 @@ type RoutesBundleWindow = Window & {
 };
 
 const routeLoadingPromises: Record<string, Promise<unknown>> = {};
-function loadRoutesBundle(pkg: IPackage, forceRefresh?: boolean): Promise<unknown> {
+function loadRoutesBundle(pkg: IPackageWithNavs, forceRefresh?: boolean): Promise<unknown> {
   // Dynamically import the bundle
   let importPromise: Promise<unknown> = routeLoadingPromises[pkg.packageId];
   if (!importPromise || forceRefresh) {