@ossy/distribution 1.10.2 → 3.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/distribution",
   "description": "Analytics module — workspace analytics for website traffic",
-  "version": "1.10.2",
+  "version": "3.0.1",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -27,5 +27,5 @@
     "@ossy/sdk-react": "*",
     "react": "*"
   },
-  "gitHead": "2b8745d57fee8b6c08787e2755b4df489291a5cd"
+  "gitHead": "4a70ec216448680d2fddc57b2a8a0077489720ae"
 }

package/src/Definition.js

@@ -3,5 +3,5 @@ export const Definition = {
   title: 'Distribution',
   description: 'Distribution channels and external publishing integrations.',
   icon: 'share',
-  statuses: ['beta'],
+  status: ['beta'],
 }

package/src/distribution.page.jsx

@@ -1,9 +1,8 @@
 import React from 'react'
 import { useRouter } from '@ossy/router-react'
-import { Title, Text, View, Tags, Button, Switch, useLocale } from '@ossy/design-system'
+import { Text, View, Button, Switch, Page, useLocale, Tags } from '@ossy/design-system'
 import { AsyncStatus } from '@ossy/sdk-react'
 import { Definition } from '@ossy/distribution'
-import { moduleStatusTags } from './moduleStatus.js'
 
 export const metadata = {
   id: 'distribution/home',
@@ -26,31 +25,23 @@ export const DistributionPage = () => {
     icon: key === 'pinterest' ? 'details-more' : key === 'x' ? 'screen-shot' : 'arrows-expand-up-right',
   }))
 
-  return (
-    <View gap="m" surface="primary" style={{ padding: 'var(--space-m) var(--space-l)', height: '100%', overflowY: 'auto' }}>
-
-      <View inset="s" gap="s">
-
-        <View layout="row" justifyContent="space-between" alignItems="center">
-            <View layout='row' gap="s" alignItems="center">
-              <Title>{t('distribution.home.title')}</Title>
-              {moduleStatusTags(Definition).length > 0 && (
-                <Tags tags={moduleStatusTags(Definition)} size="s" />
-              )}
-            </View>
-            <Button variant="cta" disabled={true} prefix="add">
-              {t('distribution.home.addIntegration')}
-            </Button>
-        </View>
-
-        <Text style={{ maxWidth: '400px' }}>
-          {t('distribution.home.description')}
-        </Text>
+  const statusTags = (Definition.status ?? [])
+    .map((s) => ({ beta: 'Beta', 'coming-soon': 'Coming Soon' }[s]))
+    .filter(Boolean)
 
-      </View>
-
-      <View gap="m" inset="s">
-          <Title variant="secondary">{t('distribution.home.integrations')}</Title>
+  return (
+    <Page
+      title="distribution.home.title"
+      near={statusTags.length > 0 ? <Tags tags={statusTags} size="s" /> : undefined}
+      description="distribution.home.description"
+      far={(
+        <Button variant="cta" disabled prefix="add">
+          {t('distribution.home.addIntegration')}
+        </Button>
+      )}
+    >
+      <View gap="m">
+          <Text variant="heading-secondary" as="h2" text="distribution.home.integrations" />
           <Switch on={AsyncStatus.Success}>
 
               <Switch.Case match={[AsyncStatus.NotInitialized, AsyncStatus.Loading]}>
@@ -91,7 +82,7 @@ export const DistributionPage = () => {
           </Switch>
       </View>
 
-    </View>
+    </Page>
   )
 }
 

package/src/moduleStatus.js

@@ -1,95 +0,0 @@
-/**
- * Module lifecycle & visibility helpers.
- *
- * - `statuses` is a string[] on each Definition (e.g. `['beta']`, `['beta', 'internal']`).
- * - Legacy single `status` is still read for compatibility.
- * - Optional workspace gating via `workspaceServiceKey` or `workspaceServiceKeys` + `workspaceServiceRequirement`.
- */
-
-export const MODULE_STATUS = {
-  beta: 'beta',
-  comingSoon: 'coming-soon',
-  stable: 'stable',
-  /** When present, the module is omitted from the primary sidebar. */
-  hidden: 'hidden',
-}
-
-const STATUS_TO_TAG_LABEL = {
-  [MODULE_STATUS.beta]: 'Beta',
-  [MODULE_STATUS.comingSoon]: 'Coming Soon',
-  [MODULE_STATUS.stable]: null,
-  [MODULE_STATUS.hidden]: null,
-}
-
-/** Status values that exclude a module from the sidebar (in addition to workspace gating). */
-const SIDEBAR_HIDE_STATUSES = new Set([MODULE_STATUS.hidden])
-
-/**
- * Normalize legacy `definition.status` and `definition.statuses` into one array.
- * @param {{ status?: string, statuses?: string[] }} definition
- * @returns {string[]}
- */
-export function moduleStatuses(definition) {
-  const fromArray = Array.isArray(definition?.statuses) ? definition.statuses : []
-  const fromLegacy = definition?.status && typeof definition.status === 'string' ? [definition.status] : []
-  if (fromArray.length) return [...new Set(fromArray)]
-  if (fromLegacy.length) return [...new Set(fromLegacy)]
-  return []
-}
-
-/**
- * @param {{ status?: string, statuses?: string[] }} definition
- * @returns {string[]} labels for `<Tags tags={...} />` (stable/hidden emit none)
- */
-export function moduleStatusTags(definition) {
-  const labels = []
-  for (const s of moduleStatuses(definition)) {
-    const label = STATUS_TO_TAG_LABEL[s]
-    if (label) labels.push(label)
-  }
-  return [...new Set(labels)]
-}
-
-/**
- * @param {{ status?: string, statuses?: string[] }} definition
- * @returns {boolean}
- */
-export function isHiddenFromSidebar(definition) {
-  if (!definition) return true
-  return moduleStatuses(definition).some(s => SIDEBAR_HIDE_STATUSES.has(s))
-}
-
-/**
- * @param {Record<string, boolean> | undefined} services workspace.services
- * @param {{ workspaceServiceKey?: string, workspaceServiceKeys?: string[], workspaceServiceRequirement?: 'all' | 'any' }} definition
- * @returns {boolean}
- */
-export function workspaceAllowsModule(services, definition) {
-  if (!definition) return false
-  const keys = definition.workspaceServiceKeys?.length
-    ? definition.workspaceServiceKeys
-    : definition.workspaceServiceKey
-      ? [definition.workspaceServiceKey]
-      : null
-  if (!keys?.length) return true
-  const mode = definition.workspaceServiceRequirement || 'all'
-  const map = services || {}
-  /** Treat missing keys as allowed (legacy workspaces); only explicit `false` from disable turns a service off. */
-  const flags = keys.map(k => map[k] !== false)
-  return mode === 'any' ? flags.some(Boolean) : flags.every(Boolean)
-}
-
-/**
- * Router ref for a module’s default page: `@<moduleId>/home`
- * @param {string} moduleId — matches `Definition.module.id` / folder name
- */
-export function moduleHomeRef(moduleId) {
-  return `@${moduleId}/home`
-}
-
-/**
- * @param {{ requiresModules?: Array<{ id: string, label: string, href: string }> }} definition
- */
-export function moduleRequiresModules(definition) {
-  return definition?.requiresModules ?? []
-}