Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/components/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/components",
"version": "6.68.1",
"version": "6.68.2",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
4 changes: 4 additions & 0 deletions packages/components/releaseNotes/components.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages

### version 6.68.2
*Released*: 3 November 2025
- SVGChart: render curve fit statistics when available

### version 6.68.1
*Released* 2 November 2025
- Issue 52063: Domain designer to handle lookup to a query with a pipe character
Expand Down
22 changes: 15 additions & 7 deletions packages/components/src/internal/components/chart/Chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { LoadingSpinner } from '../base/LoadingSpinner';
import { ChartAPIWrapper, DEFAULT_API_WRAPPER } from './api';
import { ChartConfig, ChartQueryConfig } from './models';
import { getChartRenderMsg } from './ChartBuilderModal';
import { CurveFitStatsGrid } from './CurveFitStatsGrid';

interface ChartLoadingMaskProps {
msg?: string;
Expand Down Expand Up @@ -82,7 +83,7 @@ interface Props {
chart: DataViewInfo;
container?: string;
filters?: Filter.IFilter[];
queryParameters?: { [key: string]: any };
queryParameters?: Record<string, any>;
}

export const SVGChart: FC<Props> = memo(({ api, chart, container, filters, queryParameters }) => {
Expand All @@ -95,6 +96,7 @@ export const SVGChart: FC<Props> = memo(({ api, chart, container, filters, query
const [loadingData, setLoadingData] = useState<boolean>(false);
const [measureStore, setMeasureStore] = useState<any>(undefined);
const [trendlineData, setTrendlineData] = useState<any>(undefined);
const [plot, setPlot] = useState(undefined);
const [renderMsg, setRenderMsg] = useState<string>(undefined);
const [loadError, setLoadError] = useState<string>(undefined);
const filterKey = useMemo(() => computeFilterKey(filters), [filters]);
Expand Down Expand Up @@ -163,7 +165,7 @@ export const SVGChart: FC<Props> = memo(({ api, chart, container, filters, query
}
);
} else {
LABKEY_VIS.GenericChartHelper.generateChartSVG(
const plots = LABKEY_VIS.GenericChartHelper.generateChartSVG(
divId,
{
...chartConfig,
Expand All @@ -173,6 +175,7 @@ export const SVGChart: FC<Props> = memo(({ api, chart, container, filters, query
measureStore,
trendlineData
);
setPlot(plots[0]);
}
}
};
Expand All @@ -189,17 +192,22 @@ export const SVGChart: FC<Props> = memo(({ api, chart, container, filters, query
{(isLoading(loadingState) || loadingData) && <ChartLoadingMask />}
{renderMsg && <span className="gray-text pull-right">{renderMsg}</span>}
<div className="svg-chart__chart" id={divId} ref={ref} />
{trendlineData !== undefined && (
<CurveFitStatsGrid name={chart.name} plot={plot} trendLineData={trendlineData} />
)}
</div>
);
});
SVGChart.displayName = 'SVGChart';

interface FileAnchor {
href: string;
text: string;
}

interface RReportData {
error?: string;
fileAnchors: Array<{
href: string;
text: string;
}>;
fileAnchors: FileAnchor[];
imageUrls: string[];
}

Expand Down Expand Up @@ -309,7 +317,7 @@ const RReport: FC<Props> = memo(({ api, chart, container, filters }) => {
{imageUrls !== undefined && (
<div className="r-report__images">
{imageUrls.map(url => (
<div key={url} className="r-report__image">
<div className="r-report__image" key={url}>
<img alt="R Report Image Output" src={url} />
</div>
))}
Expand Down
Loading