Multi-site distribution readiness: settings-driven site config, security closeout, release engineering, v0.5.0
Make the app distributable to other GE Aerospace sites (one self-hosted
instance per site, ADR-004). GE values remain the shipped defaults; every
site-specific behavior is now a Setting an admin can change in the UI.
Settings-driven site config:
- Branding: site/QR/badge logos, favicon, primary color (upload endpoints
mirror the map-blueprint pattern; new Settings > Branding section).
- ServiceNow: search/incident/change URL templates ({ticket}), ticket
prefixes, enable toggle. Defaults point at the current
geaerospaceqa.service-now.com global search. Disabled = plain-text tickets.
- Employee-id regex (employeeid_pattern), printer hostname template,
QR label targets (qr_target_printer / qr_target_usb, blank = asset page,
else URL template with placeholders), usb_label_style (barcode|qr).
- West Jefferson floor-plan PNGs removed from the tree; generic placeholder
ships as the map default and sites upload their own blueprint.
Security closeout:
- dashboarddefaults writes now require admin.
- Collector: generic error messages (no str(exc) leak); API key accepted
via X-API-Key header only (BREAKING: querystring api_key removed).
- IP-based login rate limiting (AUTH_RATELIMIT_* knobs) atop account lockout.
- Setting.set() creation race fixed (IntegrityError retry).
Release engineering and docs:
- __version__ 0.5.0 (distinct from __contract_version__, ADR-007),
CHANGELOG.md, Gitea Actions CI config, frontend version aligned.
- One wizard-first install story across README/DEPLOY; new CONFIG.md,
UPGRADE.md, BACKUP-RESTORE.md; CLAUDE.md and ROADMAP de-staled.
- Dockerfile multi-stage build now bundles the frontend; compose binds
MySQL to 127.0.0.1; stale database/schema.sql and one-off SQL removed.
Debt and fixes:
- .query.get() -> db.session.get() sweep; datetime.utcnow() removed
(naive-UTC via timezone-aware now); users.py on authz decorators.
- Fixed 4 stale tests (slides feed shape, shopfloor splitperemployee,
plugin contract purity) and the USB label page field mapping (both usb
modes emit the cmmc shape: device_id/device_desc).
- Health endpoint reports the real version.
248 tests pass; naming/style check green; frontend builds; fresh-DB
flask db upgrade + seeds verified; QR targets verified by decoding
rendered codes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
<div class="shopfloor-dashboard">
|
||||
<header class="dashboard-header">
|
||||
<div class="logo-container">
|
||||
<img src="/ge-aerospace-logo.svg" alt="GE Aerospace" class="logo" />
|
||||
<img :src="siteLogo" alt="Site logo" class="logo" />
|
||||
</div>
|
||||
|
||||
<div class="header-center">
|
||||
@@ -54,8 +54,8 @@
|
||||
/>
|
||||
<img
|
||||
v-else
|
||||
src="/ge-aerospace-logo.svg"
|
||||
alt="GE Aerospace"
|
||||
:src="siteLogo"
|
||||
alt="Site logo"
|
||||
class="recognition-photo ge-logo-fallback"
|
||||
/>
|
||||
</div>
|
||||
@@ -98,8 +98,8 @@
|
||||
/>
|
||||
<img
|
||||
v-else
|
||||
src="/ge-aerospace-logo.svg"
|
||||
alt="GE Aerospace"
|
||||
:src="siteLogo"
|
||||
alt="Site logo"
|
||||
class="recert-photo ge-logo-fallback"
|
||||
/>
|
||||
<div class="recert-name">{{ rec.employeename || rec.employeesso }}</div>
|
||||
@@ -132,9 +132,12 @@
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<a v-if="n.ticketnumber" :href="getTicketUrl(n.ticketnumber)" target="_blank" class="event-ticket">
|
||||
{{ n.ticketnumber }}
|
||||
</a>
|
||||
<template v-if="n.ticketnumber">
|
||||
<a v-if="getTicketUrl(n.ticketnumber)" :href="getTicketUrl(n.ticketnumber)" target="_blank" class="event-ticket">
|
||||
{{ n.ticketnumber }}
|
||||
</a>
|
||||
<span v-else class="event-ticket">{{ n.ticketnumber }}</span>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@@ -155,9 +158,12 @@
|
||||
<strong>{{ formatDateTime(n.starttime) }}</strong>
|
||||
</div>
|
||||
</div>
|
||||
<a v-if="n.ticketnumber" :href="getTicketUrl(n.ticketnumber)" target="_blank" class="event-ticket">
|
||||
{{ n.ticketnumber }}
|
||||
</a>
|
||||
<template v-if="n.ticketnumber">
|
||||
<a v-if="getTicketUrl(n.ticketnumber)" :href="getTicketUrl(n.ticketnumber)" target="_blank" class="event-ticket">
|
||||
{{ n.ticketnumber }}
|
||||
</a>
|
||||
<span v-else class="event-ticket">{{ n.ticketnumber }}</span>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@@ -179,10 +185,13 @@
|
||||
<script setup>
|
||||
import { ref, computed, onMounted, onUnmounted } from 'vue'
|
||||
import { notificationsApi, businessUnitsApi, dashboardDefaultsApi } from '@/api'
|
||||
import { getFacilityName } from '@/utils/siteSettings'
|
||||
import { getFacilityName, getSiteLogo, getServicenowUrls } from '@/utils/siteSettings'
|
||||
|
||||
const loading = ref(true)
|
||||
const facilityName = ref('West Jefferson')
|
||||
const facilityName = ref('ShopDB')
|
||||
const siteLogo = ref('/ge-aerospace-logo.svg')
|
||||
// ServiceNow ticket-link config; loaded on mount. Empty/disabled = plain text.
|
||||
const servicenowConfig = ref({ enabled: true, incidentUrl: '', changeUrl: '' })
|
||||
const businessUnit = ref('')
|
||||
const businessUnits = ref([])
|
||||
const notifications = ref({ current: [], upcoming: [] })
|
||||
@@ -266,6 +275,8 @@ onMounted(async () => {
|
||||
setInterval(updateClock, 1000)
|
||||
|
||||
getFacilityName().then(name => { facilityName.value = name })
|
||||
getSiteLogo().then(logo => { siteLogo.value = logo })
|
||||
getServicenowUrls().then(config => { servicenowConfig.value = config })
|
||||
|
||||
// Load business units
|
||||
try {
|
||||
@@ -383,19 +394,22 @@ function formatDateTime(dateStr) {
|
||||
}
|
||||
|
||||
function getTicketUrl(ticketnumber) {
|
||||
if (!ticketnumber) return '#'
|
||||
// ServiceNow ticket URLs
|
||||
if (ticketnumber.startsWith('GEINC')) {
|
||||
return `https://ge.service-now.com/nav_to.do?uri=incident.do?sysparm_query=number=${ticketnumber}`
|
||||
// Return a URL only when ServiceNow is enabled and a matching template is set.
|
||||
// Null means "render the ticket number as plain text, no link".
|
||||
if (!ticketnumber) return null
|
||||
const config = servicenowConfig.value
|
||||
if (!config.enabled) return null
|
||||
if (ticketnumber.startsWith('GEINC') && config.incidentUrl) {
|
||||
return config.incidentUrl.replace('{ticket}', ticketnumber)
|
||||
}
|
||||
if (ticketnumber.startsWith('GECHG')) {
|
||||
return `https://ge.service-now.com/nav_to.do?uri=change_request.do?sysparm_query=number=${ticketnumber}`
|
||||
if (ticketnumber.startsWith('GECHG') && config.changeUrl) {
|
||||
return config.changeUrl.replace('{ticket}', ticketnumber)
|
||||
}
|
||||
return '#'
|
||||
return null
|
||||
}
|
||||
|
||||
function handlePhotoError(e) {
|
||||
e.target.src = '/ge-aerospace-logo.svg'
|
||||
e.target.src = siteLogo.value
|
||||
e.target.classList.add('ge-logo-fallback')
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user