diff --git a/src/shared/versions.ts b/src/shared/versions.ts index 8d19af4..df43503 100644 --- a/src/shared/versions.ts +++ b/src/shared/versions.ts @@ -1,6 +1,6 @@ export const HARBOR_VERSIONS = Object.freeze({ - macClient: '0.30.5', - gatewayClient: '0.31.5', + macClient: '0.30.6', + gatewayClient: '0.31.6', gatewayBackend: '0.31.0', }); diff --git a/src/web/features/activity-journal/ActivityJournalFeature.tsx b/src/web/features/activity-journal/ActivityJournalFeature.tsx index 22f367c..d63eaa7 100644 --- a/src/web/features/activity-journal/ActivityJournalFeature.tsx +++ b/src/web/features/activity-journal/ActivityJournalFeature.tsx @@ -156,15 +156,13 @@ export function ActivityJournalPanel({ feature, loadPage }: {
    {group.items.map((item) => { const { event } = item; const [title, details] = refreshStreakCopy(item) || eventCopy(event); - return
  1. + return
  2. {event.source}
    {title}{details && {details}}{event.severity !== 'info' && {event.severity === 'error' ? 'Ошибка' : 'Внимание'}}
  3. ; diff --git a/src/web/styles/features/activity-journal.css b/src/web/styles/features/activity-journal.css index dd4e1d7..77b0acd 100644 --- a/src/web/styles/features/activity-journal.css +++ b/src/web/styles/features/activity-journal.css @@ -16,17 +16,22 @@ .client-journal-time span, .client-journal-groups li span { color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); overflow-wrap: anywhere; } .client-journal-time span { text-transform: var(--type-label-transform); } .client-journal-groups li strong { font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); } -.client-journal-groups li em { width: fit-content; color: oklch(0.68 0.15 28); font: var(--type-label); font-style: normal; letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); } -.client-journal-event.is-switch-primary::before, -.client-journal-event.is-switch-reserve::before, -.client-journal-event.is-warning::before, -.client-journal-event.is-error::before { content: ''; position: absolute; inset: 9px auto 9px -8px; width: 3px; border-radius: 999px; } -.client-journal-event.is-switch-primary::before { background: var(--harbor-connect); } -.client-journal-event.is-switch-reserve::before { background: var(--harbor-gateway); } -.client-journal-event.is-warning::before { background: oklch(0.68 0.14 72); } -.client-journal-event.is-error::before { background: oklch(0.68 0.15 28); } -.client-journal-event.is-warning em { color: oklch(0.68 0.14 72); } -.client-journal-event.is-error em { color: oklch(0.68 0.15 28); } +.client-journal-groups li em { width: fit-content; color: var(--client-journal-tone); font: var(--type-label); font-style: normal; letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); } +.client-journal-event { --client-journal-tone: var(--client-muted); } +.client-journal-event::before { content: ''; position: absolute; inset: 9px auto 9px -8px; width: 3px; border-radius: 999px; background: var(--client-journal-tone); } +.client-journal-event .client-journal-time span { color: var(--client-journal-tone); } +.client-journal-event[data-event-type='connection.started'], +.client-journal-event[data-event-type='subscription.added'], +.client-journal-event[data-event-type='subscription.refreshed'], +.client-journal-event[data-event-type='failover.enabled'], +.client-journal-event[data-event-type='failover.resumed'], +.client-journal-event[data-event-type='failover.recovered'], +.client-journal-event[data-event-type='failover.switched'][data-target-role='primary'] { --client-journal-tone: var(--harbor-connect); } +.client-journal-event[data-event-type='failover.switched'][data-target-role='reserve'] { --client-journal-tone: var(--harbor-gateway); } +.client-journal-event[data-event-type='failover.waiting_for_idle'], +.client-journal-event[data-event-type='failover.paused'], +.client-journal-event[data-severity='warning'] { --client-journal-tone: oklch(0.68 0.14 72); } +.client-journal-event[data-severity='error'] { --client-journal-tone: oklch(0.68 0.15 28); } .client-journal-error, .client-journal-empty { min-height: 80px; margin: 0 8px; color: var(--client-muted); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); } .client-journal-error button, .client-journal-footer button { border: 0; background: transparent; color: var(--client-accent); font: var(--type-control); letter-spacing: var(--type-control-tracking); text-transform: var(--type-control-transform); cursor: pointer; } .client-journal-skeleton { display: grid; gap: 14px; margin: 0 8px; } diff --git a/test/web/activity-journal-feature-contract.test.js b/test/web/activity-journal-feature-contract.test.js index 33decdc..ca3623e 100644 --- a/test/web/activity-journal-feature-contract.test.js +++ b/test/web/activity-journal-feature-contract.test.js @@ -27,8 +27,11 @@ test('journal presents 30-day grouped history with refresh, pagination and stabl assert.match(styles, /@media \(prefers-reduced-motion: reduce\)/); assert.match(feature, /compactActivityJournalEvents\(events\)/); assert.match(model, /Подписки обновлялись без ошибок/); - assert.match(styles, /\.client-journal-event\.is-switch-primary::before \{ background: var\(--harbor-connect\); \}/); - assert.match(styles, /\.client-journal-event\.is-switch-reserve::before \{ background: var\(--harbor-gateway\); \}/); - assert.match(styles, /\.client-journal-event\.is-warning::before \{ background: oklch\(0\.68 0\.14 72\); \}/); - assert.match(styles, /\.client-journal-event\.is-error::before \{ background: oklch\(0\.68 0\.15 28\); \}/); + assert.match(feature, /data-event-type=\{event\.type\}[\s\S]*data-severity=\{event\.severity\}[\s\S]*data-target-role=/); + assert.match(styles, /\.client-journal-event::before \{[^}]*background: var\(--client-journal-tone\); \}/); + assert.match(styles, /\.client-journal-event \.client-journal-time span \{ color: var\(--client-journal-tone\); \}/); + assert.match(styles, /\[data-event-type='subscription\.refreshed'\][\s\S]*\[data-event-type='failover\.recovered'\][\s\S]*--client-journal-tone: var\(--harbor-connect\)/); + assert.match(styles, /\[data-target-role='reserve'\] \{ --client-journal-tone: var\(--harbor-gateway\); \}/); + assert.match(styles, /\[data-event-type='failover\.waiting_for_idle'\][\s\S]*\[data-severity='warning'\] \{ --client-journal-tone: oklch\(0\.68 0\.14 72\); \}/); + assert.match(styles, /\[data-severity='error'\] \{ --client-journal-tone: oklch\(0\.68 0\.15 28\); \}/); }); diff --git a/test/web/style-boundaries.test.js b/test/web/style-boundaries.test.js index 1521c30..5d4f7c6 100644 --- a/test/web/style-boundaries.test.js +++ b/test/web/style-boundaries.test.js @@ -39,26 +39,26 @@ const expectedImports = [ const sha256 = (value) => crypto.createHash('sha256').update(value).digest('hex'); const acceptedLedger = { counts: { - cascadeEdges: 1098, - customProperties: 106, - declarations: 4122, + cascadeEdges: 1054, + customProperties: 111, + declarations: 4123, important: 0, keyframes: 50, media: 17, rules: 1113, - variableReferences: 1051, + variableReferences: 1055, }, hashes: { - cascadeEdges: '9814b59202515f6993f2836d529b7bb9e25e632b0803c832a363ac264e5b60a3', - customProperties: 'fd6f16069f9fe3526f09d4d574431ddae67150d8e7a8a40e04c9fd2d179ec7ac', - declarations: 'dcbf716667469136ad6c25412fb24741c3b66749ceefb799d5785a6668dbf9de', + cascadeEdges: 'c3b2ebc3f49891437122b19af5e9a42e7db11a311ecb4c2c76446c1541fe1023', + customProperties: '14fb162f1c6d754e69dd355fefb1a3a192a191324468f85d7a5d811665ce35b4', + declarations: '37b2f9f3ace795a826ad5eca6e6c4ba98ab6bb893aac87938bdeef826c383d63', duplicateKeyframes: '4f53cda18c2baa0c0354bb5f9a3ecbe5ed12ab4d8e11ba873c2f11161202b945', duplicateSelectors: '8982145dba05b33bf1c93b2d54cfbe76305b276ff3c657aa020144016ada5848', keyframes: 'af4b9ae18d070fd2462a9b050293f3821bf5017c6e7cc53bbe18dc826f0fe3b9', - ruleDeclarationSequences: '55167d84597ea8e8a4c4898f8fc8431593e920dc2e089728cc18c52f31d8c2cb', - selectors: '2ab1759842aadbf1e733e9fc97946f48578903bb47d192b0b373329262982299', - variableReferences: '2065fa19b325d995769988999b4e5dc51b54e8b011af39397f980584c3fffbe4', - witnesses: '2ade0023244f8fc6a2fed0b2e1c3a99c4055c32abd6d8bfcd0d5f117a48f05bb', + ruleDeclarationSequences: '24377c2c29079886b62124688c2f858142913247426728c9b81f4b0a79e559e6', + selectors: '0b7624b5064d514a267e9bb45c40c445ce10f3e6998a34af7e1b604e4c0445b9', + variableReferences: '56dbfff5943b1ddd09d31b9d6699ff6680d07e5e562285f5f8268cc7566dca59', + witnesses: 'e9f8c6e640c19375635847dc064edd6752a8216c6acd3c2aad6ffd18c1a4aaa2', }, }; @@ -408,8 +408,8 @@ test('main owns one public stylesheet and the regrouped production CSS is determ assert.equal((main.match(/import ['"][^'"]+\.css['"]/g) || []).length, 1); const assets = fs.readdirSync(path.join(root, 'dist/assets')).filter((file) => file.endsWith('.css')); - assert.deepEqual(assets, ['index-BH_msVtT.css']); + assert.deepEqual(assets, ['index-Dng8HPUW.css']); const built = fs.readFileSync(path.join(root, 'dist/assets', assets[0])); - assert.equal(built.byteLength, 156918); - assert.equal(sha256(built), 'a1eafbf8c9c89a57478ba5c78d8b2a2fa1d44bcc8dc7bb747cba2889096509c5'); + assert.equal(built.byteLength, 157518); + assert.equal(sha256(built), '4fbc6c3e73a497101cacc456b580c6c4b8a58a44870856689719f2ada5b92bd7'); });