@igstack/app-catalog-frontend-core 2.0.4 → 3.0.0-alpha-20260917212201

package/src/modules/appCatalog/utils/areaGrouping.ts

@@ -0,0 +1,85 @@
+import type {
+  GroupingTagDefinition,
+  Resource,
+} from '@igstack/app-catalog-backend-core'
+
+/**
+ * Grouping of the full resource list into areas.
+ *
+ * The vocabulary itself is NOT here: which `category:<value>` tags exist, what
+ * they are called and which of them belong on the day-to-day shelf is
+ * deployment-specific. Labels come from the catalog's own tag definitions and
+ * icons from `UiSettings.areas`, so the core only knows the mechanism.
+ */
+
+const CATEGORY_PREFIX = 'category:'
+const EVERYONE_TAG = 'universality:everyone'
+
+/**
+ * Synthetic key for the merged first group. Underscored so it cannot collide
+ * with a real `category:<value>`.
+ */
+export const DAY_TO_DAY_AREA_KEY = '__day-to-day__'
+
+/** Fallback area for resources carrying no `category:` tag. */
+export const OTHER_AREA_KEY = 'other'
+
+export const categoryOf = (app: Resource): string =>
+  app.tags
+    ?.find((t) => t.startsWith(CATEGORY_PREFIX))
+    ?.slice(CATEGORY_PREFIX.length) ?? OTHER_AREA_KEY
+
+const humanize = (key: string): string => {
+  const words = key.replace(/[-_]+/g, ' ').trim()
+  return words.charAt(0).toUpperCase() + words.slice(1)
+}
+
+/**
+ * Day-to-day tools first, then one area per category, biggest area first.
+ * Input order is preserved inside each group.
+ *
+ * `dayToDayCategories` are categories that fold into the day-to-day group
+ * instead of getting an area of their own (perks, office services, …).
+ */
+export function groupByArea(
+  apps: Resource[],
+  dayToDayCategories: readonly string[] = [],
+): [string, Resource[]][] {
+  const folded = new Set(dayToDayCategories)
+  const dayToDay: Resource[] = []
+  const byCategory = new Map<string, Resource[]>()
+
+  for (const app of apps) {
+    const key = categoryOf(app)
+    if (app.tags?.includes(EVERYONE_TAG) || folded.has(key)) {
+      dayToDay.push(app)
+      continue
+    }
+    const list = byCategory.get(key)
+    if (list) list.push(app)
+    else byCategory.set(key, [app])
+  }
+
+  const areas = [...byCategory.entries()].sort(
+    (a, b) => b[1].length - a[1].length,
+  )
+  return dayToDay.length
+    ? [[DAY_TO_DAY_AREA_KEY, dayToDay] as [string, Resource[]], ...areas]
+    : areas
+}
+
+/**
+ * Title for an area. The catalog's `category` tag definition supplies the
+ * display names; an unknown value still gets a readable humanized slug.
+ */
+export function areaLabel(
+  key: string,
+  tagsDefinitions: readonly GroupingTagDefinition[] = [],
+  dayToDayLabel = 'Day-to-day tools',
+): string {
+  if (key === DAY_TO_DAY_AREA_KEY) return dayToDayLabel
+  const defined = tagsDefinitions
+    .find((d) => d.prefix === 'category')
+    ?.values.find((v) => v.value === key)?.displayName
+  return defined || humanize(key)
+}

package/src/modules/pwa/PwaAutoUpdateController.ts

@@ -1,6 +1,6 @@
 import type { PwaAutoUpdateOptions, PwaUpdateHandle } from './types'
 
-const DEFAULT_IDLE_TIMEOUT_MS = 5 * 60 * 1000 // 5 minutes
+const DEFAULT_IDLE_TIMEOUT_MS = 60 * 1000 // 1 minute
 const DEFAULT_MIN_CHECK_INTERVAL_MS = 30 * 1000 // 30 seconds
 const VISIBILITY_DEBOUNCE_MS = 1000
 const ERROR_UPDATE_WAIT_MS = 3000
@@ -96,6 +96,8 @@ export class PwaAutoUpdateController {
       } catch {
         this.log('registration.update() failed, reloading anyway')
       }
+
+      this.activateWaitingWorker(registration)
     }
 
     // Wait briefly for a new SW to activate, then reload
@@ -158,8 +160,22 @@ export class PwaAutoUpdateController {
     } catch (error) {
       this.log('registration.update() failed:', error)
     }
-    // With autoUpdate registerType, vite-plugin-pwa handles
-    // skipWaiting + clientsClaim + calling updateSW() automatically
+
+    this.activateWaitingWorker(registration)
+  }
+
+  /**
+   * A freshly installed worker stays in `waiting` for as long as this page is
+   * controlled by the old one — a reload does not release it, only closing
+   * every tab on the origin does. Ask it to take over now; the generated
+   * worker answers this message with `skipWaiting()`, and the registration's
+   * own `activated` listener reloads the page onto the new build.
+   */
+  private activateWaitingWorker(registration: ServiceWorkerRegistration): void {
+    if (!registration.waiting) return
+
+    this.log('New worker is waiting, sending SKIP_WAITING')
+    registration.waiting.postMessage({ type: 'SKIP_WAITING' })
   }
 
   private reload(): void {

package/src/types/uiSettings.ts

@@ -1,5 +1,33 @@
+import type { ComponentType } from 'react'
 import type { PwaAutoUpdateOptions } from '~/modules/pwa/types'
 
+/** Icon component for an area header. Lucide icon components satisfy this. */
+export type AreaIcon = ComponentType<{
+  size?: number
+  strokeWidth?: number
+  className?: string
+}>
+
+/**
+ * Presentation of the area sections on the home view. The taxonomy is
+ * deployment-specific, so the core ships none of it: labels come from the
+ * catalog's own `category` tag definition and everything below is optional.
+ */
+export interface AreasSettings {
+  /**
+   * Icon per `category:<value>`; the key `DAY_TO_DAY_AREA_KEY` targets the
+   * merged first group. Areas without an icon render title-only.
+   */
+  icons?: Record<string, AreaIcon>
+  /**
+   * Category values that fold into the day-to-day group instead of getting an
+   * area of their own (e.g. perks, office services).
+   */
+  dayToDayCategories?: string[]
+  /** Title of the merged first group. Defaults to "Day-to-day tools". */
+  dayToDayLabel?: string
+}
+
 /**
  * UI settings passed from the app entry point.
  */
@@ -11,6 +39,8 @@ export interface UiSettings {
   }
   /** Frontend build identifier baked at build time (e.g., pipeline ID via VITE env var) */
   frontendBuildId?: string
+  /** Area sections on the home view: icons and the day-to-day fold. */
+  areas?: AreasSettings
   /** PWA auto-update configuration (idle timeout, check interval, debug) */
   pwaAutoUpdate?: PwaAutoUpdateOptions
   /**