cameleer/cameleer-server
1
0
Fork 0
Code Issues 41 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deploy): compare samplingRate as number in dirty detection

Browse Source 
Drop the Number.isInteger normalization hack in useDeploymentPageState
that mapped 1.0 → "1.0" but broke for values like 1.10 (which round-trip
to 1.1). Instead, useFormDirty now parseFloats samplingRate on both sides
before comparing, so "1", "1.0", and "1.00" all compare equal regardless
of how the backend serializes the number.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
hsiegeln
2026-04-23 00:41:33 +02:00
parent b5ecd39100
commit 8a7f9cb370
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/pages/AppsTab/AppDeploymentPage/hooks/useDeploymentPageState.ts
View File

@@ -97,7 +97,7 @@ export function useDeploymentPageState(
metricsEnabled: agentConfig?.metricsEnabled ?? defaultForm.monitoring.metricsEnabled, metricsEnabled: agentConfig?.metricsEnabled ?? defaultForm.monitoring.metricsEnabled,
metricsInterval: defaultForm.monitoring.metricsInterval, metricsInterval: defaultForm.monitoring.metricsInterval,
samplingRate: agentConfig?.samplingRate !== undefined samplingRate: agentConfig?.samplingRate !== undefined
? (Number.isInteger(agentConfig.samplingRate) ? `${agentConfig.samplingRate}.0` : String(agentConfig.samplingRate)) ? String(agentConfig.samplingRate)
: defaultForm.monitoring.samplingRate, : defaultForm.monitoring.samplingRate,
compressSuccess: agentConfig?.compressSuccess ?? defaultForm.monitoring.compressSuccess, compressSuccess: agentConfig?.compressSuccess ?? defaultForm.monitoring.compressSuccess,
replayEnabled: defaultForm.monitoring.replayEnabled, replayEnabled: defaultForm.monitoring.replayEnabled,

13
ui/src/pages/AppsTab/AppDeploymentPage/hooks/useFormDirty.ts
View File

@@ -1,5 +1,5 @@
import { useMemo } from 'react'; import { useMemo } from 'react';
import type { DeploymentPageFormState } from './useDeploymentPageState'; import type { DeploymentPageFormState, MonitoringFormState } from './useDeploymentPageState';
export interface PerTabDirty { export interface PerTabDirty {
monitoring: boolean; monitoring: boolean;
@@ -9,13 +9,22 @@ export interface PerTabDirty {
anyLocalEdit: boolean; anyLocalEdit: boolean;
} }
// Normalize free-text numeric fields (user types "1.0" / "1" / "1.00" — all equal).
// NaN compares as NaN through JSON, which is harmless since both sides coerce the same.
function normalizeMonitoring(m: MonitoringFormState): Omit<MonitoringFormState, 'samplingRate'> & { samplingRate: number } {
const { samplingRate, ...rest } = m;
return { ...rest, samplingRate: parseFloat(samplingRate) };
}
export function useFormDirty( export function useFormDirty(
form: DeploymentPageFormState, form: DeploymentPageFormState,
serverState: DeploymentPageFormState, serverState: DeploymentPageFormState,
stagedJar: File | null, stagedJar: File | null,
): PerTabDirty { ): PerTabDirty {
return useMemo(() => { return useMemo(() => {
const monitoring = JSON.stringify(form.monitoring) !== JSON.stringify(serverState.monitoring); const monitoring =
JSON.stringify(normalizeMonitoring(form.monitoring)) !==
JSON.stringify(normalizeMonitoring(serverState.monitoring));
const resources = JSON.stringify(form.resources) !== JSON.stringify(serverState.resources); const resources = JSON.stringify(form.resources) !== JSON.stringify(serverState.resources);
const variables = JSON.stringify(form.variables) !== JSON.stringify(serverState.variables); const variables = JSON.stringify(form.variables) !== JSON.stringify(serverState.variables);
const sensitiveKeys = JSON.stringify(form.sensitiveKeys) !== JSON.stringify(serverState.sensitiveKeys); const sensitiveKeys = JSON.stringify(form.sensitiveKeys) !== JSON.stringify(serverState.sensitiveKeys);